Fix remaining fixable Sonar issues on policy models

This patch fixes the remaining  easy to fix Sonar issues on policy
models. The remaining issues are
- methods that do not follow Java naming conventions and fixing those
  will probably break policies that use those methods
- TODO statements to do with functionality we didn't get done in Dublin
  and will address in Frankfurt

Issue-ID: POLICY-2165
Change-Id: I7f604bc2335388bdc0dd9286ae17a5ab76517665
Signed-off-by: liamfallon <liam.fallon@est.tech>

1 files changed, 5 insertions, 7 deletions

diff --git a/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoManager.java b/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoManager.java
index 6e2494b72..d8933c86c 100644
--- a/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoManager.java
+++ b/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoManager.java
@@ -142,7 +142,7 @@ public final class SoManager {
             final String vfModuleInstanceId,
             final SoRequest request) {
         return executors.submit(new AsyncSoRestCallThread(requestId, callback, serviceInstanceId, vnfInstanceId,
-                vfModuleInstanceId, request, this.url, this.user, this.password));
+                vfModuleInstanceId, request, this));
     }
 
     /**
@@ -173,18 +173,16 @@ public final class SoManager {
                 final SoCallback callback, final String serviceInstanceId,
                 final String vnfInstanceId, final String vfModuleInstanceId,
                 final SoRequest request,
-                final String url,
-                final String user,
-                final String password) {
+                final SoManager callingSoManager) {
             this.requestId = requestId;
             this.callback = callback;
             this.serviceInstanceId = serviceInstanceId;
             this.vnfInstanceId = vnfInstanceId;
             this.vfModuleInstanceId = vfModuleInstanceId;
             this.request = request;
-            this.baseUrl = url;
-            this.user = user;
-            this.password = password;
+            this.baseUrl = callingSoManager.url;
+            this.user = callingSoManager.user;
+            this.password = callingSoManager.password;
         }
 
         /**