From 870a89675528664aa5c0aca57f50c584b76a8b8f Mon Sep 17 00:00:00 2001
From: Bogumil Zebek <bogumil.zebek@nokia.com>
Date: Fri, 9 Aug 2019 13:54:44 +0200
Subject: Improve code quality

Change-Id: I60090d9da403bf8e6c3e5ba77ef4acfd6f41ec2b
Issue-ID: VNFSDK-449
Signed-off-by: Zebek Bogumil <bogumil.zebek@nokia.com>
---
 .../main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR01123.java    | 2 +-
 .../main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR04298.java    | 2 +-
 .../main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR07879.java    | 2 +-
 .../main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR13390.java    | 2 +-
 .../main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR21322.java    | 2 +-
 .../main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR23823.java    | 2 +-
 .../main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR26881.java    | 2 +-
 .../main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR26885.java    | 2 +-
 .../main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR27310.java    | 2 +-
 .../main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR293901.java   | 2 +-
 .../main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR40293.java    | 2 +-
 .../main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR40820.java    | 2 +-
 .../main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR43958.java    | 2 +-
 .../main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR66070.java    | 2 +-
 .../main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR77707.java    | 2 +-
 .../main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR77786.java    | 2 +-
 .../main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR787965.java   | 2 +-
 17 files changed, 17 insertions(+), 17 deletions(-)

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

diff --git a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR01123.java b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR01123.java
index a34196e..5afc1d9 100644
--- a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR01123.java
+++ b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR01123.java
@@ -27,7 +27,7 @@ public class VTPValidateCSARR01123 extends VTPValidateCSARBase {
     public static class CSARErrorEntryVNFProviderDetailsNotFound extends CSARErrorEntryMissing {
         public CSARErrorEntryVNFProviderDetailsNotFound() {
             super("VNF Vendor details",
-                    CSARArchive.TOSCA_Metadata + " or " + CSARArchive.TOSCA_Metadata__TOSCA_Meta__Entry_Definitions + " file");
+                    CSARArchive.TOSCA_METADATA + " or " + CSARArchive.TOSCA_METADATA_TOSCA_META_ENTRY_DEFINITIONS + " file");
             this.setCode("0x1000");
         }
     }
diff --git a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR04298.java b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR04298.java
index 1be9814..2c4924a 100644
--- a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR04298.java
+++ b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR04298.java
@@ -26,7 +26,7 @@ public class VTPValidateCSARR04298 extends VTPValidateCSARBase {
 
     public static class CSARErrorEntryMissingTestFolderNotFound extends CSARErrorEntryMissing {
         public CSARErrorEntryMissingTestFolderNotFound() {
-            super("Tests", CSARArchive.CSAR_Archive);
+            super("Tests", CSARArchive.CSAR_ARCHIVE);
             this.setCode("0x1000");
         }
     }
diff --git a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR07879.java b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR07879.java
index ad46620..a79f07b 100644
--- a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR07879.java
+++ b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR07879.java
@@ -26,7 +26,7 @@ public class VTPValidateCSARR07879 extends VTPValidateCSARBase {
 
     public static class CSARErrorEntryMissingAnsiblePlaybookNotFound extends CSARErrorEntryMissing {
         public CSARErrorEntryMissingAnsiblePlaybookNotFound() {
-            super("playbooks", CSARArchive.CSAR_Archive);
+            super("playbooks", CSARArchive.CSAR_ARCHIVE);
             this.setCode("0x1000");
         }
     }
diff --git a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR13390.java b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR13390.java
index d33ed3f..8ddd1a4 100644
--- a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR13390.java
+++ b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR13390.java
@@ -26,7 +26,7 @@ public class VTPValidateCSARR13390 extends VTPValidateCSARBase {
 
     public static class CSARErrorEntryMissingAnsiblePlaybookNotFound extends CSARErrorEntryMissing {
         public CSARErrorEntryMissingAnsiblePlaybookNotFound() {
-            super("playbooks", CSARArchive.CSAR_Archive);
+            super("playbooks", CSARArchive.CSAR_ARCHIVE);
             this.setCode("0x1000");
         }
     }
diff --git a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR21322.java b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR21322.java
index 9c0a791..8b5a4e8 100644
--- a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR21322.java
+++ b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR21322.java
@@ -26,7 +26,7 @@ public class VTPValidateCSARR21322 extends VTPValidateCSARBase {
 
     public static class CSARErrorEntryMissingTestFolderNotFound extends CSARErrorEntryMissing {
         public CSARErrorEntryMissingTestFolderNotFound() {
-            super("Tests", CSARArchive.CSAR_Archive);
+            super("Tests", CSARArchive.CSAR_ARCHIVE);
             this.setCode("0x1000");
         }
     }
diff --git a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR23823.java b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR23823.java
index 6919f28..62a533e 100644
--- a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR23823.java
+++ b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR23823.java
@@ -26,7 +26,7 @@ public class VTPValidateCSARR23823 extends VTPValidateCSARBase {
 
     public static class CSARErrorEntryMissingCertificatesNotFound extends CSARErrorEntryMissing {
         public CSARErrorEntryMissingCertificatesNotFound() {
-            super("Certificates", CSARArchive.CSAR_Archive);
+            super("Certificates", CSARArchive.CSAR_ARCHIVE);
             this.setCode("0x1000");
         }
     }
diff --git a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR26881.java b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR26881.java
index f06b84a..16314a3 100644
--- a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR26881.java
+++ b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR26881.java
@@ -26,7 +26,7 @@ public class VTPValidateCSARR26881 extends VTPValidateCSARBase {
 
     public static class CSARErrorEntryMissingArtifactsNotFound extends CSARErrorEntryMissing {
         public CSARErrorEntryMissingArtifactsNotFound() {
-            super("Artifacts", CSARArchive.CSAR_Archive);
+            super("Artifacts", CSARArchive.CSAR_ARCHIVE);
             this.setCode("0x1000");
         }
     }
diff --git a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR26885.java b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR26885.java
index 97f2d3c..d71e814 100644
--- a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR26885.java
+++ b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR26885.java
@@ -26,7 +26,7 @@ public class VTPValidateCSARR26885 extends VTPValidateCSARBase {
 
     public static class CSARErrorEntryMissingArtifactImage extends CSARErrorEntryMissing {
         public CSARErrorEntryMissingArtifactImage() {
-            super("Artifacts/VNF_Image.bin", CSARArchive.CSAR_Archive);
+            super("Artifacts/VNF_Image.bin", CSARArchive.CSAR_ARCHIVE);
             this.setCode("0x1000");
         }
     }
diff --git a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR27310.java b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR27310.java
index 4c2210a..189624b 100644
--- a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR27310.java
+++ b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR27310.java
@@ -26,7 +26,7 @@ public class VTPValidateCSARR27310 extends VTPValidateCSARBase {
 
     public static class CSARErrorEntryMissingChefArtifactsNotFound extends CSARErrorEntryMissing {
         public CSARErrorEntryMissingChefArtifactsNotFound() {
-            super("cookbooks", CSARArchive.CSAR_Archive);
+            super("cookbooks", CSARArchive.CSAR_ARCHIVE);
             this.setCode("0x1000");
         }
     }
diff --git a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR293901.java b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR293901.java
index a832b4d..345cec6 100644
--- a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR293901.java
+++ b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR293901.java
@@ -43,7 +43,7 @@ public class VTPValidateCSARR293901 extends VTPValidateCSARBase {
         if (Objects.isNull(entryManifestMf)) {
             this.errors.add(new PnfCSARErrorEntryMissing(
                     toscaMetaAttributeName,
-                    CSARArchive.TOSCA_Metadata__TOSCA_Meta,
+                    CSARArchive.TOSCA_METADATA_TOSCA_META,
                     UNKNOWN_LINE_NUMBER)
             );
         }
diff --git a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR40293.java b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR40293.java
index 7173156..d67eaf3 100644
--- a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR40293.java
+++ b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR40293.java
@@ -26,7 +26,7 @@ public class VTPValidateCSARR40293 extends VTPValidateCSARBase {
 
     public static class CSARErrorEntryMissingAnsiblePlaybookNotFound extends CSARErrorEntryMissing {
         public CSARErrorEntryMissingAnsiblePlaybookNotFound() {
-            super("playbooks", CSARArchive.CSAR_Archive);
+            super("playbooks", CSARArchive.CSAR_ARCHIVE);
             this.setCode("0x1000");
         }
     }
diff --git a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR40820.java b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR40820.java
index 99f180b..20dbd5e 100644
--- a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR40820.java
+++ b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR40820.java
@@ -26,7 +26,7 @@ public class VTPValidateCSARR40820 extends VTPValidateCSARBase {
 
     public static class CSARErrorEntryMissingLicenseTerm extends CSARErrorEntryMissing {
         public CSARErrorEntryMissingLicenseTerm() {
-            super("Licenses/License_term.txt", CSARArchive.CSAR_Archive);
+            super("Licenses/License_term.txt", CSARArchive.CSAR_ARCHIVE);
             this.setCode("0x1000");
         }
     }
diff --git a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR43958.java b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR43958.java
index 0d42628..b9c093c 100644
--- a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR43958.java
+++ b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR43958.java
@@ -26,7 +26,7 @@ public class VTPValidateCSARR43958 extends VTPValidateCSARBase {
 
     public static class CSARErrorEntryMissingTestReportNotFound extends CSARErrorEntryMissing {
         public CSARErrorEntryMissingTestReportNotFound() {
-            super("Tests/report.txt", CSARArchive.CSAR_Archive);
+            super("Tests/report.txt", CSARArchive.CSAR_ARCHIVE);
             this.setCode("0x1000");
         }
     }
diff --git a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR66070.java b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR66070.java
index 1d5c3c5..eac0b93 100644
--- a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR66070.java
+++ b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR66070.java
@@ -27,7 +27,7 @@ public class VTPValidateCSARR66070 extends VTPValidateCSARBase {
     public static class CSARErrorEntryVNFProviderDetailsNotFound extends CSARErrorEntryMissing {
         public CSARErrorEntryVNFProviderDetailsNotFound() {
             super("VNF Vendor details",
-                    CSARArchive.TOSCA_Metadata + " or " + CSARArchive.TOSCA_Metadata__TOSCA_Meta__Entry_Definitions + " file");
+                    CSARArchive.TOSCA_METADATA + " or " + CSARArchive.TOSCA_METADATA_TOSCA_META_ENTRY_DEFINITIONS + " file");
             this.setCode("0x1000");
         }
     }
diff --git a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR77707.java b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR77707.java
index 13ac502..fc6fa11 100644
--- a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR77707.java
+++ b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR77707.java
@@ -27,7 +27,7 @@ public class VTPValidateCSARR77707 extends VTPValidateCSARBase {
     public static class CSARErrorEntryMissingDefinitionNotFound extends CSARErrorEntryMissing {
         public CSARErrorEntryMissingDefinitionNotFound() {
             super("TOSCA definition or Tosca.Meata",
-                    CSARArchive.CSAR_Archive);
+                    CSARArchive.CSAR_ARCHIVE);
             this.setCode("0x1000");
         }
     }
diff --git a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR77786.java b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR77786.java
index bf55530..3ca882c 100644
--- a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR77786.java
+++ b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR77786.java
@@ -27,7 +27,7 @@ public class VTPValidateCSARR77786 extends VTPValidateCSARBase {
     public static class CSARErrorEntryMissingAnsiblePlaybookNotFound extends CSARErrorEntryMissing {
         public CSARErrorEntryMissingAnsiblePlaybookNotFound() {
             super("playbooks",
-                    CSARArchive.CSAR_Archive);
+                    CSARArchive.CSAR_ARCHIVE);
             this.setCode("0x1000");
         }
     }
diff --git a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR787965.java b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR787965.java
index ef233f8..a3ab865 100644
--- a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR787965.java
+++ b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR787965.java
@@ -85,7 +85,7 @@ public class VTPValidateCSARR787965 extends VTPValidateCSARBase {
 
     }
 
-    private void verifyZipStructure(FileArchive.Workspace workspace) throws Exception {
+    private void verifyZipStructure(FileArchive.Workspace workspace) throws IOException, CmsSignatureValidatorException {
         final Optional<Path> pathToCsarFile = workspace.getPathToCsarFile();
         final Optional<Path> pathToCertFile = workspace.getPathToCertFile();
         final Optional<Path> pathToCmsFile = workspace.getPathToCmsFile();
-- 
cgit 1.2.3-korg