summaryrefslogtreecommitdiffstats
path: root/csarvalidation/src/main/java/org
diff options
context:
space:
mode:
authorBogumil Zebek <bogumil.zebek@nokia.com>2020-08-04 12:56:12 +0200
committerZebek Bogumil <bogumil.zebek@nokia.com>2020-08-21 11:15:31 +0200
commit158248d9e2006e8e5f5c181f07b5aac57cb9ddd0 (patch)
treec198dfd629a8ff4f2f96286d8c6445d2cec1c999 /csarvalidation/src/main/java/org
parent8cbf161905d50a97fd78f28fb14b08bbd75c3abe (diff)
Migrate from java 8 to java 11
Change-Id: If146dc0d99541a8a14ecc5e504c49a5c433a262f Issue-ID: VNFSDK-631 Signed-off-by: Zebek Bogumil <bogumil.zebek@nokia.com>
Diffstat (limited to 'csarvalidation/src/main/java/org')
-rw-r--r--csarvalidation/src/main/java/org/onap/validation/csar/CsarValidator.java25
1 files changed, 22 insertions, 3 deletions
diff --git a/csarvalidation/src/main/java/org/onap/validation/csar/CsarValidator.java b/csarvalidation/src/main/java/org/onap/validation/csar/CsarValidator.java
index 86952b1..0478758 100644
--- a/csarvalidation/src/main/java/org/onap/validation/csar/CsarValidator.java
+++ b/csarvalidation/src/main/java/org/onap/validation/csar/CsarValidator.java
@@ -97,16 +97,35 @@ public class CsarValidator {
}
}
+ static class CsarValidatorSeam {
+ public String validateCsarMeta() {
+ return CsarValidator.validateCsarMeta();
+ }
+
+ public String validateAndScanToscaMeta(){
+ return CsarValidator.validateAndScanToscaMeta();
+ }
+
+ public String validateMainService() {
+ return CsarValidator.validateMainService();
+ }
+
+ }
+
/**
* @return true if all validations are successful
*/
public static String validateCsar() {
+ return CsarValidator.validateCsarContent(new CsarValidatorSeam());
+ }
+
+ static String validateCsarContent(CsarValidatorSeam csarValidatorSeam) {
- String vsm = validateCsarMeta();
+ String vsm = csarValidatorSeam.validateCsarMeta();
- String vtm = validateAndScanToscaMeta();
+ String vtm = csarValidatorSeam.validateAndScanToscaMeta();
- String vms = validateMainService();
+ String vms = csarValidatorSeam.validateMainService();
//String r02454 = r02454();