diff options
author | Pavel Aharoni <pa0916@att.com> | 2017-05-11 19:32:07 +0300 |
---|---|---|
committer | Pavel Aharoni <pa0916@att.com> | 2017-05-11 19:32:07 +0300 |
commit | 8caef088a9e5467cd0cb462acb217edceedac8fe (patch) | |
tree | e47c41688833daf2ac76e53324992be1f15d2e56 /jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/ToscaTemplate.java | |
parent | af2d8ef12f6b75ae837fffdeaf5d152756cec6d6 (diff) |
[SDC-19] VFC to CP props
Change-Id: I217934251fd8eeaf883b60161826306d6b7eaf3c
Signed-off-by: Pavel Aharoni <pa0916@att.com>
Diffstat (limited to 'jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/ToscaTemplate.java')
-rw-r--r-- | jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/ToscaTemplate.java | 57 |
1 files changed, 40 insertions, 17 deletions
diff --git a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/ToscaTemplate.java b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/ToscaTemplate.java index d1b0179..08b66bd 100644 --- a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/ToscaTemplate.java +++ b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/ToscaTemplate.java @@ -1,5 +1,15 @@ package org.openecomp.sdc.toscaparser.api; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + import org.openecomp.sdc.toscaparser.api.common.ExceptionCollector; import org.openecomp.sdc.toscaparser.api.common.JToscaException; import org.openecomp.sdc.toscaparser.api.elements.EntityType; @@ -12,11 +22,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.yaml.snakeyaml.Yaml; -import java.io.*; -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.Map; - public class ToscaTemplate extends Object { private static Logger log = LoggerFactory.getLogger(ToscaTemplate.class.getName()); @@ -501,24 +506,42 @@ public class ToscaTemplate extends Object { } private void verifyTemplate() throws JToscaException { - ArrayList<String> exceptionStrings = ExceptionCollector.getExceptionReport(); - if (exceptionStrings != null && exceptionStrings.size() > 0) { - int nexc = ExceptionCollector.errorsCaught(); - log.error("ToscaTemplate - verifyTemplate - {} Parsing Exception{} occurred...", nexc, (nexc > 1 ? "s" : "")); - for (String s : exceptionStrings) { + //Warnings + List<String> warningsStrings = ExceptionCollector.getWarningsReport(); + if (warningsStrings != null && warningsStrings.size() > 0) { + int nexcw = ExceptionCollector.warningsCaught(); + log.warn("####################################################################################################"); + log.warn("ToscaTemplate - verifyTemplate - {} Parsing Warning{} occurred...", nexcw, (nexcw > 1 ? "s" : "")); + for (String s : warningsStrings) { if (s != null) { log.debug("ToscaTemplate - verifyTemplate - {}", s); } } - if(bAbortOnParsingErrors) { - throw new JToscaException("Aborting because of parsing errors"); + log.warn("####################################################################################################"); + + + List<String> exceptionStrings = ExceptionCollector.getCriticalsReport(); + if (exceptionStrings != null && exceptionStrings.size() > 0) { + int nexc = ExceptionCollector.errorsCaught(); + log.error("####################################################################################################"); + log.error("ToscaTemplate - verifyTemplate - {} Parsing Critical{} occurred...", nexc, (nexc > 1 ? "s" : "")); + for (String s : exceptionStrings) { + if (s != null) { + log.debug("ToscaTemplate - verifyTemplate - {}", s); + } + } + log.error("####################################################################################################"); + if(bAbortOnParsingErrors) { + throw new JToscaException("Aborting because of parsing errors"); + } + } + else { + if (inputPath != null) { + log.debug("ToscaTemplate - verifyTemplate - The input {} passed validation", inputPath); + } } + } - else { - if (inputPath != null) { - log.debug("ToscaTemplate - verifyTemplate - The input {} passed validation", inputPath); - } - } } public String getPath() { |