Cleanup of A&AI message model module.

Fields have been made fields private in POJOs, and wrote JUnit unit tests to bring up code coverage. AAIManager also changed to use non-static methods so that it can be stubbed with Mockito.

Change-Id: I871427ced5db8a1dfd6495fef4e6d84adf264e65
Signed-off-by: Liam Fallon <liam.fallon@ericsson.com>
Issue-ID: POLICY-455
Signed-off-by: Liam Fallon <liam.fallon@ericsson.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/VFCManager.java b/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/VFCManager.java
index ebc3ad6cb..c951984bd 100644
--- a/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/VFCManager.java
+++ b/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/VFCManager.java
@@ -78,7 +78,7 @@ public final class VFCManager implements Runnable {
             String vfcRequestJson = Serialization.gsonPretty.toJson(vfcRequest);
             netLogger.info("[OUT|{}|{}|]{}{}", "VFC", vfcUrl, System.lineSeparator(), vfcRequestJson);
 
-            httpDetails = RESTManager.post(vfcUrl, username, password, headers,
+            httpDetails = new RESTManager().post(vfcUrl, username, password, headers,
                     "application/json", vfcRequestJson);
         } catch (Exception e) {
             logger.error(e.getMessage(), e);
@@ -108,7 +108,7 @@ public final class VFCManager implements Runnable {
                 while (attemptsLeft-- > 0) {
 
                     netLogger.info("[OUT|{}|{}|]", "VFC", urlGet);
-                    Pair<Integer, String> httpDetailsGet = RESTManager.get(urlGet, username, password, headers);
+                    Pair<Integer, String> httpDetailsGet = new RESTManager().get(urlGet, username, password, headers);
                     responseGet = Serialization.gsonPretty.fromJson(httpDetailsGet.b, VFCResponse.class);
                     netLogger.info("[IN|{}|{}|]{}{}", "VFC", urlGet, System.lineSeparator(), httpDetailsGet.b);
                     responseGet.requestId = vfcRequest.requestId.toString();