Log full URL for REST calls

Actors only log the URI, without the host and port info.  Modified
to log the full URL.
Also adjusted URLs for trailing "/".

Issue-ID: POLICY-1625
Signed-off-by: Jim Hahn <jrh3@att.com>
Change-Id: I0c9a2d139258ef23bc363a873b56f5cb4680247d

2 files changed, 21 insertions, 25 deletions

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 aa98c0d36..e83fe8c94 100644
--- 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 is 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());
     }
 
     /**
diff --git a/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/impl/HttpOperationTest.java b/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/impl/HttpOperationTest.java
index 2e9f58cbc..81238defa 100644
--- a/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/impl/HttpOperationTest.java
+++ b/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/impl/HttpOperationTest.java
@@ -216,8 +216,8 @@ public class HttpOperationTest {
     }
 
     @Test
-    public void testMakePath() {
-        assertEquals(PATH, oper.makePath());
+    public void testGetPath() {
+        assertEquals(PATH, oper.getPath());
     }
 
     @Test
@@ -227,7 +227,7 @@ public class HttpOperationTest {
 
         oper = new MyGetOperation<>(String.class);
 
-        assertThat(oper.makeUrl()).endsWith("/" + BASE_URI + PATH);
+        assertThat(oper.getUrl()).endsWith("/" + BASE_URI + PATH);
     }
 
     @Test
@@ -503,13 +503,13 @@ public class HttpOperationTest {
             Map<String, Object> headers = makeHeaders();
 
             headers.put("Accept", MediaType.APPLICATION_JSON);
-            String url = makeUrl();
+            String url = getUrl();
 
             logMessage(EventType.OUT, CommInfrastructure.REST, url, null);
 
             // @formatter:off
             return handleResponse(outcome, url,
-                callback -> getClient().get(callback, makePath(), headers));
+                callback -> getClient().get(callback, getPath(), headers));
             // @formatter:on
         }
     }
@@ -529,13 +529,13 @@ public class HttpOperationTest {
             Map<String, Object> headers = makeHeaders();
 
             headers.put("Accept", MediaType.APPLICATION_JSON);
-            String url = makeUrl();
+            String url = getUrl();
 
             logMessage(EventType.OUT, CommInfrastructure.REST, url, request);
 
             // @formatter:off
             return handleResponse(outcome, url,
-                callback -> getClient().post(callback, makePath(), entity, headers));
+                callback -> getClient().post(callback, getPath(), entity, headers));
             // @formatter:on
         }
     }
@@ -555,13 +555,13 @@ public class HttpOperationTest {
             Map<String, Object> headers = makeHeaders();
 
             headers.put("Accept", MediaType.APPLICATION_JSON);
-            String url = makeUrl();
+            String url = getUrl();
 
             logMessage(EventType.OUT, CommInfrastructure.REST, url, request);
 
             // @formatter:off
             return handleResponse(outcome, url,
-                callback -> getClient().put(callback, makePath(), entity, headers));
+                callback -> getClient().put(callback, getPath(), entity, headers));
             // @formatter:on
         }
     }
@@ -576,13 +576,13 @@ public class HttpOperationTest {
             Map<String, Object> headers = makeHeaders();
 
             headers.put("Accept", MediaType.APPLICATION_JSON);
-            String url = makeUrl();
+            String url = getUrl();
 
             logMessage(EventType.OUT, CommInfrastructure.REST, url, null);
 
             // @formatter:off
             return handleResponse(outcome, url,
-                callback -> getClient().delete(callback, makePath(), headers));
+                callback -> getClient().delete(callback, getPath(), headers));
             // @formatter:on
         }
     }