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 7ddeb42..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) {
@@ -227,7 +227,7 @@ public class RestapiCallNode implements SvcLogicJavaPlugin {
     }
 
     protected Set<String> getListNameList(Map<String, String> paramMap) {
-        Set<String> ll = new HashSet<String>();
+        Set<String> ll = new HashSet<>();
         for (Map.Entry<String,String> entry : paramMap.entrySet())
             if (entry.getKey().startsWith("listName"))
                 ll.add(entry.getValue());
@@ -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);
@@ -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,7 +626,7 @@ 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);
 
@@ -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);
     }