Merge "Fixed major sonar issues in AAIClientRESTExecutor"

1 files changed, 4 insertions, 2 deletions

diff --git a/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIClientRESTExecutor.java b/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIClientRESTExecutor.java
index d362d0e06..53fcd9f4d 100755
--- a/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIClientRESTExecutor.java
+++ b/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIClientRESTExecutor.java
@@ -142,7 +142,7 @@ public class AAIClientRESTExecutor implements AAIExecutorInterface {
 
                     String extension = keystorePath.substring(keystorePath.lastIndexOf(".") + 1);
 
-                    if(extension != null && !extension.isEmpty() && extension.equalsIgnoreCase("JKS")) {
+                    if(extension != null && !extension.isEmpty() && "JKS".equalsIgnoreCase(extension)) {
                         storeType = "JKS";
                     }
                     KeyStore ks = KeyStore.getInstance(storeType);
@@ -609,7 +609,8 @@ public class AAIClientRESTExecutor implements AAIExecutorInterface {
             }
 
             URL requestUrl = null;
-            HttpURLConnection con = getConfiguredConnection(requestUrl = request.getRequestUrl("PATCH", resourceVersion), "PATCH");
+            requestUrl = request.getRequestUrl("PATCH", resourceVersion);
+            HttpURLConnection con = getConfiguredConnection(requestUrl, "PATCH");
             ObjectMapper mapper = AAIService.getObjectMapper();
             String jsonText = request.toJSONString();
 
@@ -631,6 +632,7 @@ public class AAIClientRESTExecutor implements AAIExecutorInterface {
             try {
             	responseMessage = con.getResponseMessage();
             } catch(Exception exc) {
+                LOG.info("Exception occured", exc.getMessage());
             	responseMessage = EnglishReasonPhraseCatalog.INSTANCE.getReason(responseCode,null);
             } finally {
             	if(responseMessage == null)