From 158248d9e2006e8e5f5c181f07b5aac57cb9ddd0 Mon Sep 17 00:00:00 2001 From: Bogumil Zebek Date: Tue, 4 Aug 2020 12:56:12 +0200 Subject: Migrate from java 8 to java 11 Change-Id: If146dc0d99541a8a14ecc5e504c49a5c433a262f Issue-ID: VNFSDK-631 Signed-off-by: Zebek Bogumil --- .../org/onap/validation/csar/CsarValidator.java | 25 +++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) (limited to 'csarvalidation/src/main') 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(); -- cgit 1.2.3-korg