Java 17 Upgrade

[policy/models.git] / models-interactions / model-actors / actor.aai / src / main / java / org / onap / policy / controlloop / actor / aai / AaiGetOperation.java

diff --git a/models-interactions/model-actors/actor.aai/src/main/java/org/onap/policy/controlloop/actor/aai/AaiGetOperation.java b/models-interactions/model-actors/actor.aai/src/main/java/org/onap/policy/controlloop/actor/aai/AaiGetOperation.java
index 07738b0..275f716 100644 (file)
--- a/models-interactions/model-actors/actor.aai/src/main/java/org/onap/policy/controlloop/actor/aai/AaiGetOperation.java
+++ b/models-interactions/model-actors/actor.aai/src/main/java/org/onap/policy/controlloop/actor/aai/AaiGetOperation.java
@@ -3,6 +3,7 @@
  * ONAP
  * ================================================================================
  * Copyright (C) 2020 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,19 +21,16 @@
 
 package org.onap.policy.controlloop.actor.aai;
 
+import jakarta.ws.rs.client.Invocation.Builder;
+import jakarta.ws.rs.client.WebTarget;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.concurrent.CompletableFuture;
-import javax.ws.rs.client.Invocation.Builder;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.Response;
 import org.onap.policy.common.utils.coder.StandardCoderObject;
-import org.onap.policy.controlloop.actorserviceprovider.OperationOutcome;
+import org.onap.policy.controlloop.actorserviceprovider.OperationProperties;
 import org.onap.policy.controlloop.actorserviceprovider.impl.HttpOperation;
 import org.onap.policy.controlloop.actorserviceprovider.parameters.ControlLoopOperationParams;
 import org.onap.policy.controlloop.actorserviceprovider.parameters.HttpConfig;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * Superclass of A&AI operators that use "get" to perform their request and store their
@@ -40,16 +38,9 @@ import org.slf4j.LoggerFactory;
  * which they are stored is ${actor}.${operation}.${targetEntity}.
  */
 public class AaiGetOperation extends HttpOperation<StandardCoderObject> {
-    private static final Logger logger = LoggerFactory.getLogger(AaiGetOperation.class);
-
     public static final int DEFAULT_RETRY = 3;
 
-
-    /**
-     * Responses that are retrieved from A&AI are placed in the operation context under
-     * the name "${propertyPrefix}.${targetEntity}".
-     */
-    private final String propertyPrefix;
+    private static final List<String> PROPERTY_NAMES = List.of(OperationProperties.AAI_TARGET_ENTITY);
 
     /**
      * Constructs the object.
@@ -58,8 +49,7 @@ public class AaiGetOperation extends HttpOperation<StandardCoderObject> {
      * @param config configuration for this operation
      */
     public AaiGetOperation(ControlLoopOperationParams params, HttpConfig config) {
-        super(params, config, StandardCoderObject.class);
-        this.propertyPrefix = getFullName() + ".";
+        super(params, config, StandardCoderObject.class, PROPERTY_NAMES);
     }
 
     @Override
@@ -103,21 +93,6 @@ public class AaiGetOperation extends HttpOperation<StandardCoderObject> {
         return AaiUtil.makeHeaders(params);
     }
 
-    /**
-     * Injects the response into the context.
-     */
-    @Override
-    protected CompletableFuture<OperationOutcome> postProcessResponse(OperationOutcome outcome, String url,
-                    Response rawResponse, StandardCoderObject response) {
-        String entity = params.getTargetEntity();
-
-        logger.info("{}: caching response of {} for {}", getFullName(), entity, params.getRequestId());
-
-        params.getContext().setProperty(propertyPrefix + entity, response);
-
-        return super.postProcessResponse(outcome, url, rawResponse, response);
-    }
-
     /**
      * Provides a default retry value, if none specified.
      */