Merge "Fix sonar issues for vnfsdk"

4 files changed, 51 insertions, 37 deletions

diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/filemanage/http/ToolUtil.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/filemanage/http/ToolUtil.java
index 48a7d0ca..c199a0e1 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/filemanage/http/ToolUtil.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/filemanage/http/ToolUtil.java
@@ -74,7 +74,9 @@ public class ToolUtil {
   {
     File destDir = new File(destDirName);
     if (destDir.exists() && overlay) {
-        new File(destDirName).delete();
+      if (!new File(destDirName).delete()) {
+        LOGGER.error("failed to delete file in createDestDir()");
+      }
     } else if (destDir.exists() && !overlay) {
         return false;
     }
@@ -154,7 +156,8 @@ public class ToolUtil {
 
     File destFile = new File(destFileName);
     if (destFile.exists() && overlay) {
-        new File(destFileName).delete();
+        if(!new File(destFileName).delete())
+          LOGGER.error("failed to delete file in copyFile()");
     } else if (!destFile.exists() && !destFile.getParentFile().exists() && !destFile.getParentFile().mkdirs()) {
         return false;
     }
@@ -174,7 +177,8 @@ public class ToolUtil {
     }
     File dir = new File(useDestDirName);
     if (dir.exists()) {
-      dir.delete();
+      if(!dir.delete())
+        LOGGER.error("failed to delete file in createDir()");
     }
 
     return dir.mkdirs();
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/wrapper/PackageWrapperUtil.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/wrapper/PackageWrapperUtil.java
index 9f9974e0..ac0f97cc 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/wrapper/PackageWrapperUtil.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/wrapper/PackageWrapperUtil.java
@@ -93,8 +93,8 @@ public class PackageWrapperUtil {
     public static boolean isUploadEnd(String contentRange) {
         String range = contentRange;
         range = range.replace("bytes", "").trim();
-        range = range.substring(0, range.indexOf("/"));
-        String size = contentRange.substring(contentRange.indexOf("/") + 1, contentRange.length()).trim();
+        range = range.substring(0, range.indexOf('/'));
+        String size = contentRange.substring(contentRange.indexOf('/') + 1, contentRange.length()).trim();
         int fileSize = Integer.parseInt(size);
         String[] ranges = range.split("-");
         int endPosition = Integer.parseInt(ranges[1]) + 1;
@@ -186,7 +186,7 @@ public class PackageWrapperUtil {
      * @return package name
      */
     public static String getPackageName(String ftpUrl) {
-        int index = ftpUrl.lastIndexOf("/");
+        int index = ftpUrl.lastIndexOf('/');
 
         return ftpUrl.substring(index);
     }
@@ -325,18 +325,18 @@ public class PackageWrapperUtil {
                     continue;
                 }
 
-                int count1 = tempString.indexOf(":");
+                int count1 = tempString.indexOf(':');
                 String meta = tempString.substring(0, count1).trim();
 
                 // Check for the package provider name
                 if(meta.equalsIgnoreCase(CommonConstant.CSAR_PROVIDER_META)) {
-                    int count = tempString.indexOf(":") + 1;
+                    int count = tempString.indexOf(':') + 1;
                     basicInfo.setProvider(tempString.substring(count).trim());
                 }
 
                 // Check for package version
                 if(meta.equalsIgnoreCase(CommonConstant.CSAR_VERSION_META)) {
-                    int count = tempString.indexOf(":") + 1;
+                    int count = tempString.indexOf(':') + 1;
                     basicInfo.setVersion(tempString.substring(count).trim());
                 }
 
@@ -358,23 +358,23 @@ public class PackageWrapperUtil {
 
     private static EnumType getEnumType(String type) {
         EnumType vnfType = EnumType.CSAR;
-        if(type == "CSAR") {
+        if("CSAR".equals(type)) {
             vnfType = EnumType.CSAR;
         }
 
-        if(type == "GSAR") {
+        if("GSAR".equals(type)) {
             vnfType = EnumType.GSAR;
         }
 
-        if(type == "NSAR") {
+        if("NSAR".equals(type)) {
             vnfType = EnumType.NSAR;
         }
 
-        if(type == "SSAR") {
+        if("SSAR".equals(type)) {
             vnfType = EnumType.SSAR;
         }
 
-        if(type == "NFAR") {
+        if("NFAR".equals(type)) {
             vnfType = EnumType.NFAR;
         }
 
@@ -396,18 +396,18 @@ public class PackageWrapperUtil {
                     continue;
                 }
 
-                int count1 = tempString.indexOf(":");
+                int count1 = tempString.indexOf(':');
                 String meta = tempString.substring(0, count1).trim();
 
                 // Check for the package provider name
                 if(meta.equalsIgnoreCase(CommonConstant.MF_PROVIDER_META)) {
-                    int count = tempString.indexOf(":") + 1;
+                    int count = tempString.indexOf(':') + 1;
                     basicInfo.setProvider(tempString.substring(count).trim());
                 }
 
                 // Check for package version
                 if(meta.equalsIgnoreCase(CommonConstant.MF_VERSION_META)) {
-                    int count = tempString.indexOf(":") + 1;
+                    int count = tempString.indexOf(':') + 1;
                     basicInfo.setVersion(tempString.substring(count).trim());
                 }
             }
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vtp/execution/VTPExecutionResource.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vtp/execution/VTPExecutionResource.java
index 77888c27..eb43b937 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vtp/execution/VTPExecutionResource.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vtp/execution/VTPExecutionResource.java
@@ -85,6 +85,11 @@ public class VTPExecutionResource  extends VTPResource{
     private static final String INPUT = "input";
     private static final String ERROR = "error";
     private static final String FILE = "file://";
+    private static final String EXCEPTION_OCCURS ="Exception occurs";
+    private static final String PRODUCT_ARG="--product";
+    private static final String OPEN_CLI="open-cli";
+    private static final String FORMAT="--format";
+
     private static Gson gson = new Gson();
 
     public VTPTestExecutionList executeHandler(VTPTestExecutionList executions, String requestId) throws VTPException {
@@ -124,14 +129,14 @@ public class VTPExecutionResource  extends VTPResource{
                 try {
                     execution.setResults(jsonParser.parse(m.get(ERROR)));
                 } catch (Exception e) { //NOSONAR
-                    LOG.error("Exception occurs",e);
+                    LOG.error(EXCEPTION_OCCURS,e);
                 }
             }
             else if (m.containsKey("results")) {
                 try {
                     execution.setResults(jsonParser.parse(m.get("results")));
                 } catch (Exception e) { //NOSONAR
-                    LOG.error("Exception occurs",e);
+                    LOG.error(EXCEPTION_OCCURS,e);
                 }
             }
         }
@@ -210,7 +215,7 @@ public class VTPExecutionResource  extends VTPResource{
             executions.setExecutions(
                         gson.fromJson(executionsJson, new TypeToken<List<VTPTestExecution>>(){}.getType()));
         } catch (Exception e) { //NOSONAR
-            LOG.error("Exception occurs",e);
+            LOG.error(EXCEPTION_OCCURS,e);
         }
 
         executions = this.executeHandler(executions, requestId);
@@ -236,7 +241,7 @@ public class VTPExecutionResource  extends VTPResource{
             String endTime) throws Exception{
         List<String> args = new ArrayList<>();
         args.addAll(Arrays.asList(new String[] {
-                "--product", "open-cli", "execution-list", "--format", "json"
+                PRODUCT_ARG, OPEN_CLI, "execution-list", FORMAT, "json"
                 }));
 
         if (startTime != null && !startTime.isEmpty()) {
@@ -260,7 +265,7 @@ public class VTPExecutionResource  extends VTPResource{
         }
 
         if (scenario != null && !scenario.isEmpty()) {
-            args.add("--product");
+            args.add(PRODUCT_ARG);
             args.add(scenario);
         }
 
@@ -342,7 +347,7 @@ public class VTPExecutionResource  extends VTPResource{
             String executionId) throws Exception{
         List<String> args = new ArrayList<>();
         args.addAll(Arrays.asList(new String[] {
-                "--product", "open-cli", "execution-show", "--execution-id", executionId, "--format", "json"
+                PRODUCT_ARG, OPEN_CLI, "execution-show", "--execution-id", executionId, FORMAT, "json"
                 }));
 
 
@@ -389,7 +394,7 @@ public class VTPExecutionResource  extends VTPResource{
                             resultJson = jsonParser.parse(resultObj.get(OUTPUT).toString());
                         }
                     } catch (Exception e) {
-                        LOG.error("Exception occurs", e);
+                        LOG.error(EXCEPTION_OCCURS, e);
                         JsonObject node = new JsonObject();
                         node.addProperty(ERROR, resultObj.get(OUTPUT).toString());
                         resultJson = node;
@@ -422,7 +427,7 @@ public class VTPExecutionResource  extends VTPResource{
             String executionId, String action) throws VTPException {
         List<String> args = new ArrayList<>();
         args.addAll(Arrays.asList(new String[] {
-                "--product", "open-cli", "execution-show-" + action, "--execution-id", executionId, "--format", "text"
+                PRODUCT_ARG, OPEN_CLI, "execution-show-" + action, "--execution-id", executionId, FORMAT, "text"
                 }));
 
 
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vtp/scenario/VTPScenarioResource.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vtp/scenario/VTPScenarioResource.java
index 47a7696d..29cb8f6a 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vtp/scenario/VTPScenarioResource.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vtp/scenario/VTPScenarioResource.java
@@ -57,18 +57,23 @@ import io.swagger.annotations.ApiResponses;
 @Api(tags = {"VTP Scenario"})
 public class VTPScenarioResource extends VTPResource{
     private static final String DESCRIPTION = "description";
+    private static final String PRODUCT_ARG="--product";
+    private static final String OPEN_CLI="open-cli";
+    private static final String FORMAT="--format";
+    private static final String IO_EXCEPTION_OCCURS ="IOException occurs";
+    private static final String SERVICE="service";
     public VTPTestScenarioList listTestScenariosHandler() throws VTPException {
         List<String> args = new ArrayList<>();
 
         args.addAll(Arrays.asList(new String[] {
-                "--product", "open-cli", "product-list", "--format", "json"
+                PRODUCT_ARG, OPEN_CLI, "product-list", FORMAT, "json"
                 }));
 
         JsonElement results = null;
         try {
             results = this.makeRpcAndGetJson(args);
         } catch (IOException e) {
-            LOG.error("IOException occurs",e);
+            LOG.error(IO_EXCEPTION_OCCURS,e);
         }
 
         VTPTestScenarioList list = new VTPTestScenarioList();
@@ -81,7 +86,7 @@ public class VTPScenarioResource extends VTPResource{
                     if (n.entrySet().iterator().hasNext()) {
                         String name = n.get("product").getAsString();
 
-                        if ("open-cli".equalsIgnoreCase(name))
+                        if (OPEN_CLI.equalsIgnoreCase(name))
                             continue;
 
                         list.getScenarios().add(new VTPTestScenario().setName(name).setDescription(
@@ -109,14 +114,14 @@ public class VTPScenarioResource extends VTPResource{
         List<String> args = new ArrayList<>();
 
         args.addAll(Arrays.asList(new String[] {
-                "--product", "open-cli", "service-list", "--product", scenario, "--format", "json"
+                PRODUCT_ARG, OPEN_CLI, "service-list", PRODUCT_ARG, scenario, FORMAT, "json"
                 }));
 
         JsonElement results = null;
         try {
             results = this.makeRpcAndGetJson(args);
         } catch (IOException e) {
-            LOG.error("IOException occurs",e);
+            LOG.error(IO_EXCEPTION_OCCURS,e);
         }
 
         VTPTestSuiteList list = new VTPTestSuiteList();
@@ -127,7 +132,7 @@ public class VTPScenarioResource extends VTPResource{
                     JsonElement jsonElement = it.next();
                     JsonObject n = jsonElement.getAsJsonObject();
                     if (n.entrySet().iterator().hasNext()) {
-                        list.getSuites().add(new VTPTestSuite().setName(n.get("service").getAsString()).setDescription(
+                        list.getSuites().add(new VTPTestSuite().setName(n.get(SERVICE).getAsString()).setDescription(
                                 n.get(DESCRIPTION).getAsString()));
                     }
                 }
@@ -154,7 +159,7 @@ public class VTPScenarioResource extends VTPResource{
         List<String> args = new ArrayList<>();
 
         args.addAll(Arrays.asList(new String[] {
-                "--product", "open-cli", "schema-list", "--product", scenario, "--format", "json"
+                PRODUCT_ARG, OPEN_CLI, "schema-list", PRODUCT_ARG, scenario, FORMAT, "json"
                 }));
         if (testSuiteName != null) {
             args.add("--service");
@@ -165,7 +170,7 @@ public class VTPScenarioResource extends VTPResource{
         try {
             results = this.makeRpcAndGetJson(args);
         } catch (IOException e) {
-            LOG.error("IOException occurs",e);
+            LOG.error(IO_EXCEPTION_OCCURS,e);
         }
 
         VTPTestCaseList list = new VTPTestCaseList();
@@ -179,7 +184,7 @@ public class VTPScenarioResource extends VTPResource{
                         list.getTestCases().add(
                                 new VTPTestCase().setTestCaseName(
                                         n.get("command").getAsString()).setTestSuiteName(
-                                                n.get("service").getAsString()));
+                                                n.get(SERVICE).getAsString()));
                 }
         }
 
@@ -205,13 +210,13 @@ public class VTPScenarioResource extends VTPResource{
     public VTPTestCase getTestcaseHandler(String scenario, String testSuiteName, String testCaseName) throws VTPException {
         List<String> args = new ArrayList<>();
         args.addAll(Arrays.asList(new String[] {
-                 "--product", "open-cli", "schema-show", "--product", scenario, "--service", testSuiteName, "--command", testCaseName , "--format", "json"
+                PRODUCT_ARG, OPEN_CLI, "schema-show", PRODUCT_ARG, scenario, "--service", testSuiteName, "--command", testCaseName , FORMAT, "json"
                 }));
         JsonElement results = null;
         try {
             results = this.makeRpcAndGetJson(args);
         } catch (IOException e) {
-            LOG.error("IOException occurs",e);
+            LOG.error(IO_EXCEPTION_OCCURS,e);
         }
 
         JsonObject schema = results.getAsJsonObject().getAsJsonObject("schema");
@@ -219,7 +224,7 @@ public class VTPScenarioResource extends VTPResource{
         VTPTestCase tc = new VTPTestCase();
         tc.setTestCaseName(schema.get("name").getAsString());
         tc.setDescription(schema.get(DESCRIPTION).getAsString());
-        tc.setTestSuiteName(schema.get("service").getAsString());
+        tc.setTestSuiteName(schema.get(SERVICE).getAsString());
         tc.setAuthor(schema.get("author").getAsString());
         JsonElement inputsJson = schema.get("inputs");
         if (inputsJson != null && inputsJson.isJsonArray()) {