From 4c059762652cd47c2f5a37deec36b3bdb2381782 Mon Sep 17 00:00:00 2001 From: jitendra007 Date: Thu, 30 Jul 2020 14:57:18 +0530 Subject: Fix sonar issues for validation Issue-ID: VNFSDK-608 Signed-off-by: jitendra007 Change-Id: Ib56d706444190d11958f125e666b0e0fbeab5391 --- .../src/main/java/org/onap/cvc/csar/parser/MetadataParser.java | 2 +- .../main/java/org/onap/cvc/csar/parser/NonManoArtifactsParser.java | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'csarvalidation/src/main/java/org/onap/cvc/csar/parser') diff --git a/csarvalidation/src/main/java/org/onap/cvc/csar/parser/MetadataParser.java b/csarvalidation/src/main/java/org/onap/cvc/csar/parser/MetadataParser.java index b0c06ee..f529c45 100644 --- a/csarvalidation/src/main/java/org/onap/cvc/csar/parser/MetadataParser.java +++ b/csarvalidation/src/main/java/org/onap/cvc/csar/parser/MetadataParser.java @@ -85,7 +85,7 @@ public class MetadataParser { private boolean isNewSection(Pair data) { String key = data.getKey().trim(); String value = data.getValue().trim(); - return key.matches("[a-zA-z_0-9]+") && (value.isEmpty() || ManifestLine.of(value).startsWith("#")); + return key.matches("[a-zA-Z_0-9]+") && (value.isEmpty() || ManifestLine.of(value).startsWith("#")); } private boolean isSourceSection(Pair data) { diff --git a/csarvalidation/src/main/java/org/onap/cvc/csar/parser/NonManoArtifactsParser.java b/csarvalidation/src/main/java/org/onap/cvc/csar/parser/NonManoArtifactsParser.java index 22e8978..1aa7d32 100644 --- a/csarvalidation/src/main/java/org/onap/cvc/csar/parser/NonManoArtifactsParser.java +++ b/csarvalidation/src/main/java/org/onap/cvc/csar/parser/NonManoArtifactsParser.java @@ -51,10 +51,9 @@ public class NonManoArtifactsParser { if (isNewSection(data)) { attributeName = data.getKey(); nonManoArtifacts.put(attributeName, new HashMap<>()); - continue; - } - + } else { handleNonManoArtifactLine(nonManoArtifacts, attributeName, data); + } } } @@ -68,7 +67,7 @@ public class NonManoArtifactsParser { private boolean isNewSection(Pair data) { String key = data.getKey().trim(); String value = data.getValue().trim(); - return key.matches("[a-zA-z_0-9]+") && (value.isEmpty() || ManifestLine.of(value).startsWith("#")); + return key.matches("[a-zA-Z_0-9]+") && (value.isEmpty() || ManifestLine.of(value).startsWith("#")); } private void handleNonManoArtifactLine( -- cgit 1.2.3-korg