From 2b293e3d6c9c2ff693ccebf8ee757980cf6e2499 Mon Sep 17 00:00:00 2001
From: Bogumil Zebek <bogumil.zebek@nokia.com>
Date: Wed, 29 May 2019 13:40:50 +0200
Subject: Clearer message

Change-Id: I1ca7c3596e55c4b6c58d3ccb8224929e8575176d
Issue-ID: VNFSDK-412
Signed-off-by: Zebek Bogumil <bogumil.zebek@nokia.com>
---
 .../cvc/csar/cc/sol004/VTPValidateCSARR146092.java   | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

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

diff --git a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR146092.java b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR146092.java
index 3d767ff..95b35bf 100644
--- a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR146092.java
+++ b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR146092.java
@@ -29,6 +29,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -58,10 +59,11 @@ public class VTPValidateCSARR146092 extends VTPValidateCSARBase {
 
     @Override
     protected void validateCSAR(CSARArchive csar) {
-        ValidateNonManoSection validateNonManoSection = ValidateNonManoSection.getInstance(csar);
-        List<CSARArchive.CSARError> csarErrors = validateNonManoSection.validate();
-
-        this.errors.addAll(csarErrors);
+        Optional<ValidateNonManoSection> validateNonManoSection = ValidateNonManoSection.getInstance(csar);
+        if(validateNonManoSection.isPresent()) {
+            List<CSARArchive.CSARError> csarErrors = validateNonManoSection.get().validate();
+            this.errors.addAll(csarErrors);
+        }
     }
 
 
@@ -71,10 +73,14 @@ public class VTPValidateCSARR146092 extends VTPValidateCSARBase {
         private final Map<String, Map<String, List<String>>> nonMano;
         private final List<CSARArchive.CSARError> errors = new ArrayList<>();
 
-        static ValidateNonManoSection getInstance(CSARArchive csar) {
-            final String fileName = csar.getManifestMfFile().getName();
+        static Optional<ValidateNonManoSection> getInstance(CSARArchive csar) {
+            final File manifestMfFile = csar.getManifestMfFile();
+            if(manifestMfFile == null){
+                return Optional.empty();
+            }
+            final String fileName = manifestMfFile.getName();
             final Map<String, Map<String, List<String>>> nonMano = csar.getManifest().getNonMano();
-            return new ValidateNonManoSection(csar, fileName,nonMano);
+            return Optional.of(new ValidateNonManoSection(csar, fileName,nonMano));
         }
 
         private ValidateNonManoSection(CSARArchive csar, String fileName, Map<String, Map<String, List<String>>> nonMano) {
-- 
cgit 1.2.3-korg