summaryrefslogtreecommitdiffstats
path: root/openecomp-be/lib/openecomp-tosca-lib/src/main/java
diff options
context:
space:
mode:
authorshiria <shiri.amichai@amdocs.com>2019-03-26 10:08:43 +0200
committerAvi Gaffa <avi.gaffa@amdocs.com>2019-03-26 09:57:35 +0000
commit4428fc40a81ff3234b918af87da74a27ccbfe650 (patch)
tree31438af8fa2c273b019b55a7d2f5e461d43c3448 /openecomp-be/lib/openecomp-tosca-lib/src/main/java
parent52183bb7fed88d4dddaaa31e1114b8f77d7a5cc8 (diff)
Load tosca with no imports section
Change-Id: I50df2a149bd8d27973bb66e41f80a3260b8a9b8b Issue-ID: SDC-2192 Signed-off-by: shiria <shiri.amichai@amdocs.com>
Diffstat (limited to 'openecomp-be/lib/openecomp-tosca-lib/src/main/java')
-rw-r--r--openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/services/impl/ToscaAnalyzerServiceImpl.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/services/impl/ToscaAnalyzerServiceImpl.java b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/services/impl/ToscaAnalyzerServiceImpl.java
index bb557f6076..053253a993 100644
--- a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/services/impl/ToscaAnalyzerServiceImpl.java
+++ b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/services/impl/ToscaAnalyzerServiceImpl.java
@@ -182,7 +182,6 @@ public class ToscaAnalyzerServiceImpl implements ToscaAnalyzerService {
}
String convertServiceTemplateImport(ToscaExtensionYamlUtil toscaExtensionYamlUtil, byte[] fileContent) {
-
Map serviceTemplateMap = toscaExtensionYamlUtil.yamlToObject(new String(fileContent), Map.class);
convertToscaImports(serviceTemplateMap, toscaExtensionYamlUtil);
return toscaExtensionYamlUtil.objectToYaml(serviceTemplateMap);
@@ -191,8 +190,8 @@ public class ToscaAnalyzerServiceImpl implements ToscaAnalyzerService {
private void convertToscaImports(Map serviceTemplateMap, ToscaExtensionYamlUtil toscaExtensionYamlUtil) {
List<Map<String, Import>> convertedImport = new ArrayList<>();
Object importObj = serviceTemplateMap.get(IMPORTS);
- if (!(importObj instanceof List)) {
- throw new SdcRuntimeException("Illegal Statement");
+ if (Objects.nonNull(importObj) && !(importObj instanceof List)) {
+ throw new SdcRuntimeException(new IllegalStateException("Invalid TOSCA import section"));
}
List<Object> imports = (List) importObj;
if (CollectionUtils.isEmpty(imports)) {