Use "coder" to serialize Actor requests

[policy/models.git] / models-interactions / model-actors / actorServiceProvider / src / main / java / org / onap / policy / controlloop / actorserviceprovider / impl / HttpOperation.java

diff --git a/models-interactions/model-actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorserviceprovider/impl/HttpOperation.java b/models-interactions/model-actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorserviceprovider/impl/HttpOperation.java
index 4c007ea..766468c 100644 (file)
--- a/models-interactions/model-actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorserviceprovider/impl/HttpOperation.java
+++ b/models-interactions/model-actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorserviceprovider/impl/HttpOperation.java
@@ -80,6 +80,12 @@ public abstract class HttpOperation<T> extends OperationPartial {
         return config.getClient();
     }
 
+    /**
+     * Gets the path to be used when performing the request; this is typically appended to
+     * the base URL. This method simply invokes {@link #getPath()}.
+     *
+     * @return the path URI suffix
+     */
     public String getPath() {
         return config.getPath();
     }
@@ -106,24 +112,14 @@ public abstract class HttpOperation<T> extends OperationPartial {
     }
 
     /**
-     * Gets the path to be used when performing the request; this is typically appended to
-     * the base URL. This method simply invokes {@link #getPath()}.
-     *
-     * @return the path URI suffix
-     */
-    public String makePath() {
-        return getPath();
-    }
-
-    /**
-     * Makes the URL to which the "get" request should be posted. This ir primarily used
+     * Makes the URL to which the HTTP request should be posted. This is primarily used
      * for logging purposes. This particular method returns the base URL appended with the
-     * return value from {@link #makePath()}.
+     * return value from {@link #getPath()}.
      *
      * @return the URL to which from which to get
      */
-    public String makeUrl() {
-        return (getClient().getBaseUrl() + makePath());
+    public String getUrl() {
+        return (getClient().getBaseUrl() + getPath());
     }
 
     /**
@@ -181,7 +177,7 @@ public abstract class HttpOperation<T> extends OperationPartial {
 
         logger.info("{}.{}: response received for {}", params.getActor(), params.getOperation(), params.getRequestId());
 
-        String strResponse = HttpClient.getBody(rawResponse, String.class);
+        String strResponse = rawResponse.readEntity(String.class);
 
         logMessage(EventType.IN, CommInfrastructure.REST, url, strResponse);
 
@@ -221,6 +217,7 @@ public abstract class HttpOperation<T> extends OperationPartial {
     public OperationOutcome setOutcome(OperationOutcome outcome, PolicyResult result, Response rawResponse,
                     T response) {
 
+        outcome.setResponse(response);
         return setOutcome(outcome, result);
     }