From 6750f9e73f44e7fc6854d570142e6d30f5d3cd24 Mon Sep 17 00:00:00 2001
From: SravanKumarGunda <sravan.kumar1@huawei.com>
Date: Thu, 30 Jul 2020 21:30:09 +0530
Subject: Code Improvements-Vnfsdk-validation sonar issue fixes

Signed-off-by: SravanKumarGunda <sravan.kumar1@huawei.com>
Issue-ID: VNFSDK-608
Change-Id: Idba9f4876e41b699e2a2ac836eb2090f3694d0f1
---
 .../src/main/java/org/onap/cvc/csar/cc/VTPValidateCSARBase.java      | 2 +-
 .../main/java/org/onap/cvc/csar/cc/sol001/VTPValidateCSARR02454.java | 5 +++--
 .../main/java/org/onap/cvc/csar/cc/sol001/VTPValidateCSARR35851.java | 2 +-
 .../java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR130206.java     | 2 +-
 .../java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR972082.java     | 1 -
 5 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'csarvalidation/src/main/java/org/onap/cvc/csar/cc')

diff --git a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/VTPValidateCSARBase.java b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/VTPValidateCSARBase.java
index a5a13e3..e8c558b 100644
--- a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/VTPValidateCSARBase.java
+++ b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/VTPValidateCSARBase.java
@@ -34,7 +34,7 @@ public abstract class VTPValidateCSARBase extends OnapCommand {
 
     protected List<CSARError> errors = new ArrayList<>();
 
-    protected abstract void validateCSAR(CSARArchive csar) throws Exception;
+    protected abstract void validateCSAR(CSARArchive csar) throws Exception; //NOSONAR
 
     protected abstract String getVnfReqsNo();
 
diff --git a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol001/VTPValidateCSARR02454.java b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol001/VTPValidateCSARR02454.java
index 7d0489e..4270d87 100644
--- a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol001/VTPValidateCSARR02454.java
+++ b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol001/VTPValidateCSARR02454.java
@@ -60,10 +60,11 @@ public class VTPValidateCSARR02454 extends VTPValidateCSARBase {
                 }
             }
 
-            if (!vlExist)
-            this.errors.add(new CSARErrorEntryMissingSwImage(
+            if (!vlExist) {
+                this.errors.add(new CSARErrorEntryMissingSwImage(
                     csar.getDefinitionYamlFile().getName(),
                     "Software Image"));
+            }
         }
     }
 }
diff --git a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol001/VTPValidateCSARR35851.java b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol001/VTPValidateCSARR35851.java
index 52582a6..78be3e6 100644
--- a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol001/VTPValidateCSARR35851.java
+++ b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol001/VTPValidateCSARR35851.java
@@ -59,7 +59,7 @@ public class VTPValidateCSARR35851 extends VTPValidateCSARBase {
             yaml = (Map<String, ?>) yaml.get("topology_template");
             Map<String, ?> nodeTmpls = (Map<String,?>) yaml.get("node_templates");
 
-            boolean vlExist[] = new boolean[3];
+            boolean[] vlExist = new boolean[3];
 
             for (Object nodeO: nodeTmpls.values()) {
                 Map<String, ?> node = (Map<String, ?>) nodeO;
diff --git a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR130206.java b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR130206.java
index 41625a9..3a0f76b 100644
--- a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR130206.java
+++ b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR130206.java
@@ -293,7 +293,7 @@ public class VTPValidateCSARR130206 extends VTPValidateCSARBase {
 
     class ManifestFileSignatureValidator {
 
-        private final Logger LOG = LoggerFactory.getLogger(ManifestFileSignatureValidator.class);
+        private final Logger log = LoggerFactory.getLogger(ManifestFileSignatureValidator.class);
         private final ManifestFileSplitter manifestFileSplitter = new ManifestFileSplitter();
         private final CmsSignatureValidator cmsSignatureValidator = new CmsSignatureValidator();
 
diff --git a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR972082.java b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR972082.java
index 4b35328..27e3ce9 100644
--- a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR972082.java
+++ b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR972082.java
@@ -30,7 +30,6 @@ import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
-- 
cgit 1.2.3-korg