Fix R972082 bug

Fixed bug that was showing errors during validation of CSAR,
when any other non_mano_artifact_set than onap_pnf_sw_information
was present in manifest file.

Change-Id: Iebf4f586c3069bc8c22796ec0f809fc95e561159
Signed-off-by: Michal Banka <michal.banka@nokia.com>
Issue-ID: VNFSDK-585

3 files changed, 21 insertions, 31 deletions

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 1061480..60bdd47 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
@@ -23,13 +23,15 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Files;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 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;
 import lombok.EqualsAndHashCode;
@@ -115,13 +117,12 @@ public class VTPValidateCSARR972082 extends VTPValidateCSARBase {
 
     private static class ValidateNonManoSection {
 
+        private static final String ATTRIBUTE_NAME = "onap_pnf_sw_information";
+
         private final CSARArchive csar;
         private final String fileName;
         private final Map<String, Map<String, List<String>>> nonMano;
         private final List<CSARError> errors = new ArrayList<>();
-        private final List<String> attributeNames = Arrays.asList(
-            "onap_pnf_sw_information"
-        );
 
         private ValidateNonManoSection(final CSARArchive csar, final String fileName,
                                        final Map<String, Map<String, List<String>>> nonMano) {
@@ -141,28 +142,20 @@ public class VTPValidateCSARR972082 extends VTPValidateCSARBase {
         }
 
         private List<CSARError> validate() {
-            if (nonMano.keySet().stream().filter(Objects::nonNull).count() > 0) {
-                nonMano.keySet().stream().filter(Objects::nonNull).forEach(this::validateAttribute);
+            List<String> attributesNotNull = nonMano.keySet().stream()
+                    .filter(Objects::nonNull)
+                    .collect(Collectors.toList());
+            if (!attributesNotNull.isEmpty()) {
+                attributesNotNull.forEach(this::validateAttribute);
             } else {
-                errors.add(new PnfCSARErrorEntryMissing(
-                    attributeNames.toString(),
-                    fileName,
-                    UNKNOWN_LINE_NUMBER)
-                );
+                errors.add(new PnfCSARErrorEntryMissing(ATTRIBUTE_NAME, fileName, UNKNOWN_LINE_NUMBER));
             }
 
             return errors;
         }
 
         private void validateAttribute(final String nonManoAttributes) {
-
-            if (!attributeNames.contains(nonManoAttributes)) {
-                errors.add(new PnfCSARErrorEntryMissing(
-                    nonManoAttributes,
-                    fileName,
-                    UNKNOWN_LINE_NUMBER)
-                );
-            } else {
+            if (ATTRIBUTE_NAME.equals(nonManoAttributes)) {
                 validateSourceElementsUnderAttribute(nonManoAttributes);
             }
         }
diff --git a/csarvalidation/src/test/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR972082IntegrationTest.java b/csarvalidation/src/test/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR972082IntegrationTest.java
index 48b2d6e..66937d4 100644
--- a/csarvalidation/src/test/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR972082IntegrationTest.java
+++ b/csarvalidation/src/test/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR972082IntegrationTest.java
@@ -61,28 +61,25 @@ public class VTPValidateCSARR972082IntegrationTest {
     }
 
     @Test
-    public void shouldReportThatEntryHasInvalidPathWhenYamlFileIsNotPresent() throws Exception {
+    public void shouldReturnNoErrorWhenOptionalNonManoArtifactSetEntryIsNotPresent() throws Exception {
         // given
-        configureTestCase(testCase, PNF_R_972082 + "missingYamlFileReferedInSourceSessionOfManifest.csar",
-            VTP_VALIDATE_CSAR_R_972082_YAML,
-            IS_PNF);
+        configureTestCase(testCase, PNF_R_972082 + "missingOnapPnfSwInformationArtifactSetEntry.csar",
+                VTP_VALIDATE_CSAR_R_972082_YAML, IS_PNF);
 
         // when
         testCase.execute();
 
         // then
         final List<CSARError> errors = testCase.getErrors();
-        assertThat(errors.size()).isEqualTo(1);
-        assertThat(convertToMessagesList(errors)).contains(
-            "Invalid. Entry [Source under onap_pnf_sw_information has invalid 'Files/pnf-sw-information/pnf-sw-information.yaml' path]"
-        );
+        assertThat(errors.size()).isEqualTo(0);
     }
 
     @Test
-    public void shouldReportThatMandatoryNonManoArtifactSetEntryHasNotAllFields_() throws Exception {
+    public void shouldReportThatEntryHasInvalidPathWhenYamlFileIsNotPresent() throws Exception {
         // given
-        configureTestCase(testCase, PNF_R_972082 + "missingFieldsInNonManoArtifactManifest.csar",
-            VTP_VALIDATE_CSAR_R_972082_YAML, IS_PNF);
+        configureTestCase(testCase, PNF_R_972082 + "missingYamlFileReferedInSourceSessionOfManifest.csar",
+            VTP_VALIDATE_CSAR_R_972082_YAML,
+            IS_PNF);
 
         // when
         testCase.execute();
@@ -91,7 +88,7 @@ public class VTPValidateCSARR972082IntegrationTest {
         final List<CSARError> errors = testCase.getErrors();
         assertThat(errors.size()).isEqualTo(1);
         assertThat(convertToMessagesList(errors)).contains(
-            "Missing. Entry [[onap_pnf_sw_information]]"
+            "Invalid. Entry [Source under onap_pnf_sw_information has invalid 'Files/pnf-sw-information/pnf-sw-information.yaml' path]"
         );
     }
 
diff --git a/csarvalidation/src/test/resources/pnf/r972082/missingOnapPnfSwInformationArtifactSetEntry.csar b/csarvalidation/src/test/resources/pnf/r972082/missingOnapPnfSwInformationArtifactSetEntry.csar
new file mode 100644
index 0000000..518aaa8
--- /dev/null
+++ b/csarvalidation/src/test/resources/pnf/r972082/missingOnapPnfSwInformationArtifactSetEntry.csar