diff options
5 files changed, 13 insertions, 10 deletions
diff --git a/csarvalidation/src/main/java/org/onap/cvc/csar/RulesToValidate.java b/csarvalidation/src/main/java/org/onap/cvc/csar/RulesToValidate.java index 7ca0dc5..14fe1de 100644 --- a/csarvalidation/src/main/java/org/onap/cvc/csar/RulesToValidate.java +++ b/csarvalidation/src/main/java/org/onap/cvc/csar/RulesToValidate.java @@ -21,17 +21,17 @@ import java.util.List; public class RulesToValidate { private static final String RULES_ATTRIBUTE_SEPARATOR = ","; - private final String rulesToValidate; + private final String validateRules; - public RulesToValidate(String rulesToValidate) { - this.rulesToValidate = rulesToValidate; + public RulesToValidate(String validationRules) { + this.validateRules = validationRules; } public List<String> get(){ List<String> rules = new ArrayList<>(); - if(!rulesToValidate.isEmpty()){ - String[] listOfRulesToValidate = rulesToValidate.split(RULES_ATTRIBUTE_SEPARATOR); + if(!validateRules.isEmpty()){ + String[] listOfRulesToValidate = validateRules.split(RULES_ATTRIBUTE_SEPARATOR); rules.addAll(Arrays.asList(listOfRulesToValidate)); } diff --git a/csarvalidation/src/main/java/org/onap/cvc/csar/VTPValidateCSAR.java b/csarvalidation/src/main/java/org/onap/cvc/csar/VTPValidateCSAR.java index 2e99be3..c39419e 100644 --- a/csarvalidation/src/main/java/org/onap/cvc/csar/VTPValidateCSAR.java +++ b/csarvalidation/src/main/java/org/onap/cvc/csar/VTPValidateCSAR.java @@ -270,8 +270,7 @@ public class VTPValidateCSAR extends OnapCommand { setOperationResult(validation); } catch (Exception e) { - LOG.error(e.getMessage(), e); - throw new OnapCommandExecutionFailed(e.getMessage()); + throw new OnapCommandExecutionFailed(e.getMessage(), e); } } diff --git a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol001/VTPValidateCSARR15837.java b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol001/VTPValidateCSARR15837.java index e89bb85..e230208 100644 --- a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol001/VTPValidateCSARR15837.java +++ b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol001/VTPValidateCSARR15837.java @@ -25,7 +25,7 @@ public class VTPValidateCSARR15837 extends VTPValidateCSARBase { @Override protected void validateCSAR(CSARArchive csar) throws Exception { - + // This Method is not used in this class } @Override diff --git a/csarvalidation/src/main/java/org/onap/validation/csar/CsarUtil.java b/csarvalidation/src/main/java/org/onap/validation/csar/CsarUtil.java index 7d48b06..bea5aae 100644 --- a/csarvalidation/src/main/java/org/onap/validation/csar/CsarUtil.java +++ b/csarvalidation/src/main/java/org/onap/validation/csar/CsarUtil.java @@ -91,7 +91,7 @@ public final class CsarUtil { if (!file.getParentFile().exists()) { FileUtil.createDirectory(file.getParentFile().getAbsolutePath()); } - try (BufferedOutputStream bos = new BufferedOutputStream(new FileOutputStream(file))){ + try (BufferedOutputStream bos = new BufferedOutputStream(new FileOutputStream(file))){// NOSONAR while (true) { int length = input.read(buffer); if (length == -1) { diff --git a/csarvalidation/src/main/java/org/onap/validation/csar/FileUtil.java b/csarvalidation/src/main/java/org/onap/validation/csar/FileUtil.java index 45c8db1..07dece1 100644 --- a/csarvalidation/src/main/java/org/onap/validation/csar/FileUtil.java +++ b/csarvalidation/src/main/java/org/onap/validation/csar/FileUtil.java @@ -50,8 +50,12 @@ public final class FileUtil { int tryCount = 0; while (tryCount < TRY_COUNT) { tryCount++; - if (folder.exists() || folder.mkdirs()) { + if (folder.exists()) { return true; + } else { + if (folder.mkdirs()) { + return true; + } } } |