X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=models-interactions%2Fmodel-actors%2Factor.aai%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fpolicy%2Fcontrolloop%2Factor%2Faai%2FAaiGetPnfOperation.java;h=519b1428f1820d5f9d8d3333ab88f93733283d89;hb=938005505883cf7a636a8840e20e3dc8a0ad9176;hp=d89d8350a46675dd1a92fce4cdcb9c6d357e67a0;hpb=43aaa62cdf9a7dadfb6d688f1fe83c5bd355a86d;p=policy%2Fmodels.git diff --git a/models-interactions/model-actors/actor.aai/src/main/java/org/onap/policy/controlloop/actor/aai/AaiGetPnfOperation.java b/models-interactions/model-actors/actor.aai/src/main/java/org/onap/policy/controlloop/actor/aai/AaiGetPnfOperation.java index d89d8350a..519b1428f 100644 --- a/models-interactions/model-actors/actor.aai/src/main/java/org/onap/policy/controlloop/actor/aai/AaiGetPnfOperation.java +++ b/models-interactions/model-actors/actor.aai/src/main/java/org/onap/policy/controlloop/actor/aai/AaiGetPnfOperation.java @@ -2,7 +2,8 @@ * ============LICENSE_START======================================================= * ONAP * ================================================================================ - * Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved. + * Modifications Copyright (C) 2023 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,17 +21,17 @@ package org.onap.policy.controlloop.actor.aai; +import jakarta.ws.rs.client.Invocation.Builder; +import jakarta.ws.rs.client.WebTarget; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; import java.util.Map; import java.util.concurrent.CompletableFuture; -import javax.ws.rs.client.Invocation.Builder; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; import org.onap.policy.aai.AaiConstants; import org.onap.policy.common.endpoints.event.comm.Topic.CommInfrastructure; import org.onap.policy.common.endpoints.utils.NetLoggerUtil.EventType; import org.onap.policy.controlloop.actorserviceprovider.OperationOutcome; +import org.onap.policy.controlloop.actorserviceprovider.OperationProperties; import org.onap.policy.controlloop.actorserviceprovider.parameters.ControlLoopOperationParams; import org.onap.policy.controlloop.actorserviceprovider.parameters.HttpConfig; @@ -70,11 +71,10 @@ public class AaiGetPnfOperation extends AaiGetOperation { protected CompletableFuture startOperationAsync(int attempt, OperationOutcome outcome) { Map headers = makeHeaders(); - headers.put("Accept", MediaType.APPLICATION_JSON); + var str = new StringBuilder(getClient().getBaseUrl()); - StringBuilder str = new StringBuilder(getClient().getBaseUrl()); - - String path = getPath() + URI_SEP + URLEncoder.encode(getTargetEntity(), StandardCharsets.UTF_8); + String target = getRequiredProperty(OperationProperties.AAI_TARGET_ENTITY, "target entity"); + String path = getPath() + URI_SEP + URLEncoder.encode(target, StandardCharsets.UTF_8); WebTarget web = getClient().getWebTarget().path(path); str.append(path); @@ -83,7 +83,7 @@ public class AaiGetPnfOperation extends AaiGetOperation { Builder webldr = web.request(); addHeaders(webldr, headers); - String url = str.toString(); + var url = str.toString(); logMessage(EventType.OUT, CommInfrastructure.REST, url, null);