From 01787f2f35190cbd643535f6bb7602bf69314902 Mon Sep 17 00:00:00 2001
From: Bogumil Zebek <bogumil.zebek@nokia.com>
Date: Tue, 7 May 2019 11:40:25 +0200
Subject: Fix internal errors

Change-Id: Ifdc6995fdadfc4e0ef575e9688b4e331afedce73
Issue-ID: VNFSDK-404
Signed-off-by: Zebek Bogumil <bogumil.zebek@nokia.com>
---
 .../main/java/org/onap/cvc/csar/CSARArchive.java   | 27 +++++++++++++---------
 .../java/org/onap/cvc/csar/PnfCSARArchive.java     |  6 -----
 .../cvc/csar/cc/sol004/VTPValidateCSARR10087.java  | 15 +-----------
 3 files changed, 17 insertions(+), 31 deletions(-)

(limited to 'csarvalidation/src/main/java')

diff --git a/csarvalidation/src/main/java/org/onap/cvc/csar/CSARArchive.java b/csarvalidation/src/main/java/org/onap/cvc/csar/CSARArchive.java
index 448469d..0924de7 100644
--- a/csarvalidation/src/main/java/org/onap/cvc/csar/CSARArchive.java
+++ b/csarvalidation/src/main/java/org/onap/cvc/csar/CSARArchive.java
@@ -901,18 +901,19 @@ public class CSARArchive implements AutoCloseable {
     }
 
     private void setMode() {
-        if (new File(this.tempDir.toFile().getAbsolutePath() + File.separator + TOSCA_Metadata + File.separator + TOSCA_Metadata__TOSCA_Meta).exists()){
+        if (isToscaMetaFileExist()){
             this.toscaMeta.setMode(Mode.WITH_TOSCA_META_DIR);
         } else {
             this.toscaMeta.setMode(Mode.WITHOUT_TOSCA_META_DIR);
         }
     }
 
+    private boolean isToscaMetaFileExist() {
+        return new File(this.tempDir.toFile().getAbsolutePath() + File.separator +
+                TOSCA_Metadata + File.separator + TOSCA_Metadata__TOSCA_Meta).exists();
+    }
+
     void parseManifest() throws IOException {
-        //manifest is optional, so check for it
-        if (this.manifestMfFile == null) {
-            return;
-        }
 
         int lineNo =0;
         List<String>lines = FileUtils.readLines(this.manifestMfFile);
@@ -967,10 +968,6 @@ public class CSARArchive implements AutoCloseable {
     }
 
     private void parseDefinitionMetadata() throws IOException {
-        if(Objects.isNull(this.definitionYamlFile)){
-            return;
-        }
-
         try(FileInputStream ipStream = new FileInputStream(this.definitionYamlFile)) {
             Map<String, ?> yaml = (Map<String, ?>) new Yaml().load(ipStream);
 
@@ -1295,10 +1292,18 @@ public class CSARArchive implements AutoCloseable {
         this.parseMeta();
 
         //process manifest
-        this.parseManifest();
+        if(isFileExists(this.manifestMfFile)) {
+            this.parseManifest();
+        }
 
         //process definition
-        this.parseDefinitionMetadata();
+        if(isFileExists(this.definitionYamlFile)){
+            this.parseDefinitionMetadata();
+        }
+    }
+
+    private boolean isFileExists(File file) {
+        return !Objects.isNull(file) && file.exists();
     }
 
     public void cleanup() throws IOException {
diff --git a/csarvalidation/src/main/java/org/onap/cvc/csar/PnfCSARArchive.java b/csarvalidation/src/main/java/org/onap/cvc/csar/PnfCSARArchive.java
index b51faf8..5ac67cd 100644
--- a/csarvalidation/src/main/java/org/onap/cvc/csar/PnfCSARArchive.java
+++ b/csarvalidation/src/main/java/org/onap/cvc/csar/PnfCSARArchive.java
@@ -31,12 +31,6 @@ public class PnfCSARArchive extends CSARArchive {
 
     @Override
     void parseManifest() throws IOException {
-
-        //manifest is optional, so check for it
-        if (this.getManifestMfFile() == null) {
-            return;
-        }
-
         PnfManifestParser pnfManifestParser = PnfManifestParser.getInstance(
                 this.getManifestMfFile()
         );
diff --git a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR10087.java b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR10087.java
index 0e80add..396564e 100644
--- a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR10087.java
+++ b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR10087.java
@@ -18,11 +18,6 @@ package org.onap.cvc.csar.cc.sol004;
 
 import org.onap.cli.fw.schema.OnapCommandSchema;
 import org.onap.cvc.csar.CSARArchive;
-import org.onap.cvc.csar.CSARArchive.CSARError;
-import org.onap.cvc.csar.CSARArchive.CSARErrorEntryMissingToscaDefinitionMetadataTemplateName;
-import org.onap.cvc.csar.CSARArchive.CSARErrorEntryMissingToscaDefinitionNotFound;
-import org.onap.cvc.csar.CSARArchive.CSARErrorEntryMissingToscaMetaDefinition;
-import org.onap.cvc.csar.CSARArchive.CSARErrorInvalidEntryValueManifestNotFound;
 import org.onap.cvc.csar.cc.VTPValidateCSARBase;
 
 @OnapCommandSchema(schema = "vtp-validate-csar-r10087.yaml")
@@ -30,15 +25,7 @@ public class VTPValidateCSARR10087 extends VTPValidateCSARBase {
 
     @Override
     protected void validateCSAR(CSARArchive csar) throws Exception {
-
-        for (CSARError e : csar.getErrors()) {
-            if (e instanceof CSARErrorEntryMissingToscaMetaDefinition ||
-                    e instanceof CSARErrorEntryMissingToscaDefinitionNotFound ||
-                    e instanceof CSARErrorEntryMissingToscaDefinitionMetadataTemplateName ||
-                    e instanceof CSARErrorInvalidEntryValueManifestNotFound) {
-                this.errors.add(e);
-            }
-        }
+        // During CSAR parsing file structure was checked and errors were generated if needed.
     }
 
     @Override
-- 
cgit 1.2.3-korg