Merge "Sonar fix: XmlParser.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 39399a2..83b12c7 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
@@ -4,6 +4,7 @@
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
  *                     reserved.
+ * Modifications Copyright © 2018 IBM.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -78,6 +79,13 @@ public class RestapiCallNode implements SvcLogicJavaPlugin {
     private String uebServers;
     private String defaultUebTemplateFileName = "/opt/bvc/restapi/templates/default-ueb-message.json";
 
+    private String responseReceivedMessage = "Response received. Time: {}";
+    private String responseHttpCodeMessage = "HTTP response code: {}";
+    private String requestPostingException = "Exception while posting http request to client ";
+    private static String skipSendingMessage = "skipSending";
+    private static String responsePrefix = "responsePrefix";
+    private static String restapiUrlString = "restapiUrl";
+
     public RestapiCallNode() {
         String configDir = System.getProperty(PROPERTIES_DIR_KEY, DEFAULT_PROPERTIES_DIR);
 
@@ -115,7 +123,7 @@ public class RestapiCallNode implements SvcLogicJavaPlugin {
         p.templateFileName = parseParam(paramMap, "templateFileName",
             false, null);
         p.requestBody = parseParam(paramMap, "requestBody", false, null);
-        p.restapiUrl = parseParam(paramMap, "restapiUrl", true, null);
+        p.restapiUrl = parseParam(paramMap, restapiUrlString, true, null);
         validateUrl(p.restapiUrl);
         p.restapiUser = parseParam(paramMap, "restapiUser", false, null);
         p.restapiPassword = parseParam(paramMap, "restapiPassword", false,
@@ -134,9 +142,9 @@ public class RestapiCallNode implements SvcLogicJavaPlugin {
             "unspecified"));
         p.httpMethod = HttpMethod.fromString(parseParam(paramMap, "httpMethod",
             false, "post"));
-        p.responsePrefix = parseParam(paramMap, "responsePrefix", false, null);
+        p.responsePrefix = parseParam(paramMap, responsePrefix, false, null);
         p.listNameList = getListNameList(paramMap);
-        String skipSendingStr = paramMap.get("skipSending");
+        String skipSendingStr = paramMap.get(skipSendingMessage);
         p.skipSending = "true".equalsIgnoreCase(skipSendingStr);
         p.convertResponse = valueOf(parseParam(paramMap, "convertResponse",
             false, "true"));
@@ -344,8 +352,8 @@ public class RestapiCallNode implements SvcLogicJavaPlugin {
             }
 
             log.error("Error sending the request: " + e.getMessage(), e);
-            String prefix = parseParam(paramMap, "responsePrefix", false, null);
-            if (retryPolicy == null || shouldRetry == false) {
+            String prefix = parseParam(paramMap, responsePrefix, false, null);
+            if (retryPolicy == null || !shouldRetry) {
                 setFailureResponseStatus(ctx, prefix, e.getMessage(), r);
             } else {
                 if (retryCount == null) {
@@ -357,13 +365,13 @@ public class RestapiCallNode implements SvcLogicJavaPlugin {
                 try {
                     retryCount = retryCount + 1;
                     if (retryCount < retryPolicy.getMaximumRetries() + 1) {
-                        URI uri = new URI(paramMap.get("restapiUrl"));
+                        URI uri = new URI(paramMap.get(restapiUrlString));
                         String hostname = uri.getHost();
                         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();
-                        paramMap.put("restapiUrl", retryUri.toString());
+                        paramMap.put(restapiUrlString, retryUri.toString());
                         log.debug("URL was set to {}", retryUri.toString());
                         log.debug("Failed to communicate with host {}. Request will be re-attempted using the host {}.",
                             hostname, retryString);
@@ -417,7 +425,6 @@ public class RestapiCallNode implements SvcLogicJavaPlugin {
 
             String var1 = template.substring(i1 + 2, i2);
             String value1 = format == Format.XML ? XmlJsonUtil.getXml(mm, var1) : XmlJsonUtil.getJson(mm, var1);
-            // log.info(" " + var1 + ": " + value1);
             if (value1 == null || value1.trim().length() == 0) {
                 // delete the whole element (line)
                 int i3 = template.lastIndexOf('\n', i1);
@@ -653,7 +660,7 @@ public class RestapiCallNode implements SvcLogicJavaPlugin {
             try {
                 response = invocationBuilder.method(p.httpMethod.toString(), entity(request, tt1));
             } catch (ProcessingException | IllegalStateException e) {
-                throw new SvcLogicException("Exception while posting http request to client " +
+                throw new SvcLogicException(requestPostingException +
                     e.getLocalizedMessage(), e);
             }
 
@@ -669,8 +676,8 @@ public class RestapiCallNode implements SvcLogicJavaPlugin {
         }
 
         long t2 = System.currentTimeMillis();
-        log.info("Response received. Time: {}", (t2 - t1));
-        log.info("HTTP response code: {}", r.code);
+        log.info(responseReceivedMessage, (t2 - t1));
+        log.info(responseHttpCodeMessage, r.code);
         log.info("HTTP response message: {}", r.message);
         logHeaders(r.headers);
         log.info("HTTP response: {}", r.body);
@@ -731,7 +738,7 @@ public class RestapiCallNode implements SvcLogicJavaPlugin {
             r = new HttpResponse();
             r.code = 500;
             r.message = e.getMessage();
-            String prefix = parseParam(paramMap, "responsePrefix", false, null);
+            String prefix = parseParam(paramMap, responsePrefix, false, null);
             setResponseStatus(ctx, prefix, r);
         }
 
@@ -747,8 +754,8 @@ public class RestapiCallNode implements SvcLogicJavaPlugin {
         p.user = parseParam(paramMap, "user", false, null);
         p.password = parseParam(paramMap, "password", false, null);
         p.httpMethod = HttpMethod.fromString(parseParam(paramMap, "httpMethod", false, "post"));
-        p.responsePrefix = parseParam(paramMap, "responsePrefix", false, null);
-        String skipSendingStr = paramMap.get("skipSending");
+        p.responsePrefix = parseParam(paramMap, responsePrefix, false, null);
+        String skipSendingStr = paramMap.get(skipSendingMessage);
         p.skipSending = "true".equalsIgnoreCase(skipSendingStr);
         p.oAuthConsumerKey = parseParam(paramMap, "oAuthConsumerKey", false, null);
         p.oAuthVersion = parseParam(paramMap, "oAuthVersion", false, null);
@@ -788,7 +795,7 @@ public class RestapiCallNode implements SvcLogicJavaPlugin {
             r = new HttpResponse();
             r.code = 500;
             r.message = e.getMessage();
-            String prefix = parseParam(paramMap, "responsePrefix", false, null);
+            String prefix = parseParam(paramMap, responsePrefix, false, null);
             setResponseStatus(ctx, prefix, r);
         }
 
@@ -825,7 +832,7 @@ public class RestapiCallNode implements SvcLogicJavaPlugin {
                     throw new SvcLogicException("Http operation" + p.httpMethod + "not supported");
                 }
             } catch (ProcessingException e) {
-                throw new SvcLogicException("Exception while posting http request to client " +
+                throw new SvcLogicException(requestPostingException +
                     e.getLocalizedMessage(), e);
             }
 
@@ -856,7 +863,7 @@ public class RestapiCallNode implements SvcLogicJavaPlugin {
                         throw new SvcLogicException("Http operation" + p.httpMethod + "not supported");
                     }
                 } catch (ProcessingException e) {
-                    throw new SvcLogicException("Exception while posting http request to client " +
+                    throw new SvcLogicException(requestPostingException +
                         e.getLocalizedMessage(), e);
                 }
 
@@ -872,8 +879,8 @@ public class RestapiCallNode implements SvcLogicJavaPlugin {
         }
 
         long t2 = System.currentTimeMillis();
-        log.info("Response received. Time: {}", (t2 - t1));
-        log.info("HTTP response code: {}", r.code);
+        log.info(responseReceivedMessage, (t2 - t1));
+        log.info(responseHttpCodeMessage, r.code);
         log.info("HTTP response message: {}", r.message);
         logHeaders(r.headers);
         log.info("HTTP response: {}", r.body);
@@ -886,8 +893,8 @@ public class RestapiCallNode implements SvcLogicJavaPlugin {
         p.topic = parseParam(paramMap, "topic", true, null);
         p.templateFileName = parseParam(paramMap, "templateFileName", false, null);
         p.rootVarName = parseParam(paramMap, "rootVarName", false, null);
-        p.responsePrefix = parseParam(paramMap, "responsePrefix", false, null);
-        String skipSendingStr = paramMap.get("skipSending");
+        p.responsePrefix = parseParam(paramMap, responsePrefix, false, null);
+        String skipSendingStr = paramMap.get(skipSendingMessage);
         p.skipSending = "true".equalsIgnoreCase(skipSendingStr);
         return p;
     }
@@ -954,7 +961,7 @@ public class RestapiCallNode implements SvcLogicJavaPlugin {
             try {
                 response = invocationBuilder.post(Entity.entity(request, tt1));
             } catch (ProcessingException e) {
-                throw new SvcLogicException("Exception while posting http request to client " +
+                throw new SvcLogicException(requestPostingException +
                     e.getLocalizedMessage(), e);
             }
             r.code = response.getStatus();
@@ -965,8 +972,8 @@ public class RestapiCallNode implements SvcLogicJavaPlugin {
         }
 
         long t2 = System.currentTimeMillis();
-        log.info("Response received. Time: {}", (t2 - t1));
-        log.info("HTTP response code: {}", r.code);
+        log.info(responseReceivedMessage, (t2 - t1));
+        log.info(responseHttpCodeMessage, r.code);
         logHeaders(r.headers);
         log.info("HTTP response:\n {}", r.body);
 

diff --git a/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/restconfdiscovery/EventProcessor.java b/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/restconfdiscovery/EventProcessor.java
index 0eed42c..4f28072 100644 (file)
--- a/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/restconfdiscovery/EventProcessor.java
+++ b/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/restconfdiscovery/EventProcessor.java
@@ -3,6 +3,8 @@
  * ONAP - CCSDK
  * ================================================================================
  * Copyright (C) 2018 Huawei Technologies Co., Ltd. All rights reserved.
+ *
+ * Modifications Copyright © 2018 IBM
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +25,6 @@ package org.onap.ccsdk.sli.plugins.restconfdiscovery;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.util.Map;
 

diff --git a/sshapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/sshapicall/SshApiCallNode.java b/sshapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/sshapicall/SshApiCallNode.java
index 452d947..146188f 100644 (file)
--- a/sshapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/sshapicall/SshApiCallNode.java
+++ b/sshapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/sshapicall/SshApiCallNode.java
@@ -6,7 +6,9 @@
  * =============================================================================
  * Copyright (C) 2018 Samsung Electronics. All rights
                        reserved.
-*  * ================================================================================
+ * ================================================================================
+ * Modifications Copyright © 2018 IBM
+ * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -24,16 +26,9 @@
 
 package org.onap.ccsdk.sli.plugins.sshapicall;
 
-//import com.fasterxml.jackson.databind.ObjectMapper;
-
 import java.io.ByteArrayOutputStream;
-import java.util.Collections;
-import java.util.HashSet;
 import java.util.Map;
-import java.util.Set;
 
-import com.google.common.base.Strings;
-import org.json.JSONObject;
 import org.onap.appc.adapter.ssh.SshAdapter;
 import org.onap.appc.adapter.ssh.SshConnection;
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;
@@ -77,6 +72,10 @@ public class SshApiCallNode implements SvcLogicJavaPlugin {
      */
     private int DEF_SUCCESS_STATUS = 0;
 
+
+
+    private SshAdapter sshAdapter;
+
     /**
      * Used for jUnit test and testing interface
      */
@@ -88,8 +87,6 @@ public class SshApiCallNode implements SvcLogicJavaPlugin {
         PARAM_TEST_MODE = false;
     }
 
-    private SshAdapter sshAdapter;
-
     public void setSshAdapter(SshAdapter sshAdapter) {
         this.sshAdapter = sshAdapter;
     }
@@ -138,7 +135,8 @@ public class SshApiCallNode implements SvcLogicJavaPlugin {
         int status = -1;
         ByteArrayOutputStream stdout = new ByteArrayOutputStream();
         ByteArrayOutputStream stderr = new ByteArrayOutputStream();
-        String stdoutRes = "", stderrRes = "";
+        String stdoutRes = "";
+        String stderrRes = "";
         try {
             if (!PARAM_TEST_MODE) {
                 sshConnection = getSshConnection(p);
@@ -156,7 +154,7 @@ public class SshApiCallNode implements SvcLogicJavaPlugin {
                 stderrRes = stderr.toString();
 
             } else {
-                if (params.get("TestFail").equalsIgnoreCase("true"))
+                if (("true").equalsIgnoreCase(params.get("TestFail")))
                     status = 202;
                 else
                     status = DEF_SUCCESS_STATUS;
@@ -183,11 +181,9 @@ public class SshApiCallNode implements SvcLogicJavaPlugin {
             return sshAdapter.getConnection(p.sshapiUrl, p.sshapiPort, p.sshapiUser, p.sshapiPassword);
         // This is not supported yet in the API, patch has already been added to APPC
         else if (p.authtype == AuthType.KEY){
-            //return sshAdapter.getConnection(p.sshapiUrl, p.sshapiPort, p.sshKey);
             throw new SvcLogicException("SSH Key based Auth method not supported");
         }
         else if (p.authtype == AuthType.NONE){
-            //return sshAdapter.getConnection(p.sshapiUrl, p.sshapiPort, p.sshKey);
             throw new SvcLogicException("SSH Auth type required, BASIC auth in support");
         }
         else if (p.authtype == AuthType.UNSPECIFIED){

diff --git a/sshapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/sshapicall/model/JsonParser.java b/sshapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/sshapicall/model/JsonParser.java
index 296192a..3d48a79 100644 (file)
--- a/sshapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/sshapicall/model/JsonParser.java
+++ b/sshapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/sshapicall/model/JsonParser.java
@@ -7,6 +7,8 @@
  * Copyright (C) 2018 Samsung Electronics. All rights
  *                     reserved.
  * ================================================================================
+ * Modifications Copyright © 2018 IBM
+ * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -33,7 +35,6 @@ import java.util.Map;
 import org.codehaus.jettison.json.JSONArray;
 import org.codehaus.jettison.json.JSONException;
 import org.codehaus.jettison.json.JSONObject;
-import org.onap.ccsdk.sli.core.sli.SvcLogicException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/sshapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/sshapicall/model/ParseParam.java b/sshapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/sshapicall/model/ParseParam.java
index a72bc7b..35c1087 100644 (file)
--- a/sshapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/sshapicall/model/ParseParam.java
+++ b/sshapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/sshapicall/model/ParseParam.java
@@ -7,6 +7,8 @@
  * Copyright (C) 2018 Samsung Electronics. All rights
  *                     reserved.
  * ================================================================================
+ * Modifications Copyright © 2018 IBM
+ * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -32,12 +34,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 import java.util.Collections;
 import java.util.HashSet;