Merge "Implement framework to process REST notifications"

[ccsdk/sli/plugins.git] / restapi-call-node / provider / src / main / java / org / onap / ccsdk / sli / plugins / restapicall / RestapiCallNode.java

diff --git a/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/RestapiCallNode.java b/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/RestapiCallNode.java
index fb77226..ca227c7 100644 (file)
--- a/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/RestapiCallNode.java
+++ b/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/RestapiCallNode.java
@@ -147,8 +147,8 @@ public class RestapiCallNode implements SvcLogicJavaPlugin {
                         mm = JsonParser.convertToProperties(r.body);
 
                     if (mm != null)
-                        for (String key : mm.keySet())
-                            ctx.setAttribute(pp + key, mm.get(key));
+                        for (Map.Entry<String,String> entry : mm.entrySet())
+                            ctx.setAttribute(pp + entry.getKey(), entry.getValue());
                 }
             }
         } catch (Exception e) {
@@ -173,7 +173,7 @@ public class RestapiCallNode implements SvcLogicJavaPlugin {
                     if (retryCount < retryPolicy.getMaximumRetries() + 1) {
                         URI uri = new URI(paramMap.get("restapiUrl"));
                         String hostname = uri.getHost();
-                        String retryString = retryPolicy.getNextHostName((uri.toString()));
+                        String retryString = retryPolicy.getNextHostName(uri.toString());
                         URI uriTwo = new URI(retryString);
                         URI retryUri = UriBuilder.fromUri(uri).host(uriTwo.getHost()).port(uriTwo.getPort()).scheme(
                                 uriTwo.getScheme()).build();
@@ -212,7 +212,7 @@ public class RestapiCallNode implements SvcLogicJavaPlugin {
         p.responsePrefix = parseParam(paramMap, "responsePrefix", false, null);
         p.listNameList = getListNameList(paramMap);
         String skipSendingStr = paramMap.get("skipSending");
-        p.skipSending = skipSendingStr != null && skipSendingStr.equalsIgnoreCase("true");
+        p.skipSending = "true".equalsIgnoreCase(skipSendingStr);
         p.convertResponse = Boolean.valueOf(parseParam(paramMap, "convertResponse", false, "true"));
         p.trustStoreFileName = parseParam(paramMap, "trustStoreFileName", false, null);
         p.trustStorePassword = parseParam(paramMap, "trustStorePassword", false, null);
@@ -227,10 +227,10 @@ public class RestapiCallNode implements SvcLogicJavaPlugin {
     }
 
     protected Set<String> getListNameList(Map<String, String> paramMap) {
-        Set<String> ll = new HashSet<String>();
-        for (String key : paramMap.keySet())
-            if (key.startsWith("listName"))
-                ll.add(paramMap.get(key));
+        Set<String> ll = new HashSet<>();
+        for (Map.Entry<String,String> entry : paramMap.entrySet())
+            if (entry.getKey().startsWith("listName"))
+                ll.add(entry.getValue());
         return ll;
     }
 
@@ -473,7 +473,7 @@ public class RestapiCallNode implements SvcLogicJavaPlugin {
     }
 
     protected SSLContext createSSLContext(Parameters p) {
-        try {
+        try (FileInputStream in = new FileInputStream(p.keyStoreFileName)) {
             System.setProperty("jsse.enableSNIExtension", "false");
             System.setProperty("javax.net.ssl.trustStore", p.trustStoreFileName);
             System.setProperty("javax.net.ssl.trustStorePassword", p.trustStorePassword);
@@ -487,7 +487,6 @@ public class RestapiCallNode implements SvcLogicJavaPlugin {
             });
 
             KeyManagerFactory kmf = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
-            FileInputStream in = new FileInputStream(p.keyStoreFileName);
             KeyStore ks = KeyStore.getInstance("PKCS12");
             char[] pwd = p.keyStorePassword.toCharArray();
             ks.load(in, pwd);
@@ -503,12 +502,12 @@ public class RestapiCallNode implements SvcLogicJavaPlugin {
     }
 
     protected void setFailureResponseStatus(SvcLogicContext ctx, String prefix, String errorMessage, HttpResponse r) {
-        r = new HttpResponse();
-        r.code = 500;
-        r.message = errorMessage;
+        HttpResponse resp = new HttpResponse();
+        resp.code = 500;
+        resp.message = errorMessage;
         String pp = prefix != null ? prefix + '.' : "";
-        ctx.setAttribute(pp + "response-code", String.valueOf(r.code));
-        ctx.setAttribute(pp + "response-message", r.message);
+        ctx.setAttribute(pp + "response-code", String.valueOf(resp.code));
+        ctx.setAttribute(pp + "response-message", resp.message);
     }
 
     protected void setResponseStatus(SvcLogicContext ctx, String prefix, HttpResponse r) {
@@ -560,7 +559,7 @@ public class RestapiCallNode implements SvcLogicJavaPlugin {
         p.httpMethod = HttpMethod.fromString(parseParam(paramMap, "httpMethod", false, "post"));
         p.responsePrefix = parseParam(paramMap, "responsePrefix", false, null);
         String skipSendingStr = paramMap.get("skipSending");
-        p.skipSending = skipSendingStr != null && skipSendingStr.equalsIgnoreCase("true");
+        p.skipSending = "true".equalsIgnoreCase(skipSendingStr);
         return p;
     }
 
@@ -627,13 +626,13 @@ public class RestapiCallNode implements SvcLogicJavaPlugin {
     }
 
     public void postMessageOnUeb(Map<String, String> paramMap, SvcLogicContext ctx) throws SvcLogicException {
-        HttpResponse r = null;
+        HttpResponse r;
         try {
             UebParam p = getUebParameters(paramMap);
 
             String pp = p.responsePrefix != null ? p.responsePrefix + '.' : "";
 
-            String req = null;
+            String req;
 
             if (p.templateFileName == null) {
                 log.info("No template file name specified. Using default UEB template: " + defaultUebTemplateFileName);
@@ -659,7 +658,7 @@ public class RestapiCallNode implements SvcLogicJavaPlugin {
             setResponseStatus(ctx, prefix, r);
         }
 
-        if (r != null && r.code >= 300)
+        if (r.code >= 300)
             throw new SvcLogicException(String.valueOf(r.code) + ": " + r.message);
     }
 
@@ -679,7 +678,7 @@ public class RestapiCallNode implements SvcLogicJavaPlugin {
         p.rootVarName = parseParam(paramMap, "rootVarName", false, null);
         p.responsePrefix = parseParam(paramMap, "responsePrefix", false, null);
         String skipSendingStr = paramMap.get("skipSending");
-        p.skipSending = skipSendingStr != null && skipSendingStr.equalsIgnoreCase("true");
+        p.skipSending = "true".equalsIgnoreCase(skipSendingStr);
         return p;
     }