diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/main/java/org/openecomp/core/impl/services/ServiceTemplateReaderServiceImpl.java')
| -rw-r--r-- | openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/main/java/org/openecomp/core/impl/services/ServiceTemplateReaderServiceImpl.java | 50 |
1 files changed, 32 insertions, 18 deletions
diff --git a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/main/java/org/openecomp/core/impl/services/ServiceTemplateReaderServiceImpl.java b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/main/java/org/openecomp/core/impl/services/ServiceTemplateReaderServiceImpl.java index 9b1c0126c7..a74ec8eb7c 100644 --- a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/main/java/org/openecomp/core/impl/services/ServiceTemplateReaderServiceImpl.java +++ b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/main/java/org/openecomp/core/impl/services/ServiceTemplateReaderServiceImpl.java @@ -20,21 +20,29 @@ package org.openecomp.core.impl.services; -import org.onap.sdc.tosca.services.YamlUtil; -import org.openecomp.core.converter.ServiceTemplateReaderService; +import static org.openecomp.core.converter.datatypes.Constants.POLICIES; +import static org.openecomp.core.converter.datatypes.Constants.inputs; +import static org.openecomp.core.converter.datatypes.Constants.metadata; +import static org.openecomp.core.converter.datatypes.Constants.nodeTemplates; +import static org.openecomp.core.converter.datatypes.Constants.nodeTypes; +import static org.openecomp.core.converter.datatypes.Constants.outputs; +import static org.openecomp.core.converter.datatypes.Constants.substitutionMappings; +import static org.openecomp.core.converter.datatypes.Constants.topologyTemplate; +import static org.openecomp.sdc.be.utils.TypeUtils.ToscaTagNamesEnum.DATA_TYPES; +import static org.openecomp.sdc.be.utils.TypeUtils.ToscaTagNamesEnum.IMPORTS; +import static org.openecomp.sdc.be.utils.TypeUtils.ToscaTagNamesEnum.TOSCA_VERSION; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Objects; -import org.openecomp.sdc.be.utils.TypeUtils.ToscaTagNamesEnum; - -import static org.openecomp.core.converter.datatypes.Constants.*; +import org.onap.sdc.tosca.services.YamlUtil; +import org.openecomp.core.converter.ServiceTemplateReaderService; public class ServiceTemplateReaderServiceImpl implements ServiceTemplateReaderService { - private Map<String, Object> readServiceTemplate = new HashMap<>(); + private final Map<String, Object> readServiceTemplate; public ServiceTemplateReaderServiceImpl(byte[] serviceTemplateContent) { this.readServiceTemplate = readServiceTemplate(serviceTemplateContent); @@ -42,22 +50,21 @@ public class ServiceTemplateReaderServiceImpl implements ServiceTemplateReaderSe @Override public Map<String, Object> readServiceTemplate(byte[] serviceTemplateContent) { - return new YamlUtil().yamlToObject(new String(serviceTemplateContent), Map.class); - } @Override public List<Object> getImports() { - return Objects.isNull(this.readServiceTemplate.get("imports")) ? new ArrayList<>() - : (List<Object>) this.readServiceTemplate.get("imports"); + final String importsElementName = IMPORTS.getElementName(); + return Objects.isNull(this.readServiceTemplate.get(importsElementName)) ? new ArrayList<>() + : (List<Object>) this.readServiceTemplate.get(importsElementName); } @Override public Map<String, Object> getPolicies() { Map<String, Object> policiesAsMap = new HashMap<>(); if (!Objects.isNull(this.getTopologyTemplate()) && !Objects.isNull( - ((Map<String, Object>) this.getTopologyTemplate()).get(POLICIES))) { + ((Map<String, Object>) this.getTopologyTemplate()).get(POLICIES))) { policiesAsMap = (Map<String, Object>) ((Map<String, Object>) this.getTopologyTemplate()).get(POLICIES); } return policiesAsMap; @@ -70,13 +77,13 @@ public class ServiceTemplateReaderServiceImpl implements ServiceTemplateReaderSe @Override public Object getToscaVersion() { - return this.readServiceTemplate.get(ToscaTagNamesEnum.TOSCA_VERSION.getElementName()); + return this.readServiceTemplate.get(TOSCA_VERSION.getElementName()); } @Override public Map<String, Object> getNodeTypes() { return Objects.isNull(this.readServiceTemplate.get(nodeTypes)) ? new HashMap<>() - : (Map<String, Object>) this.readServiceTemplate.get(nodeTypes); + : (Map<String, Object>) this.readServiceTemplate.get(nodeTypes); } @Override @@ -87,25 +94,32 @@ public class ServiceTemplateReaderServiceImpl implements ServiceTemplateReaderSe @Override public Map<String, Object> getNodeTemplates() { return Objects.isNull(this.getTopologyTemplate()) ? new HashMap<>() - : (Map<String, Object>) ((Map<String, Object>) this.getTopologyTemplate()).get(nodeTemplates); + : (Map<String, Object>) ((Map<String, Object>) this.getTopologyTemplate()).get(nodeTemplates); } @Override public Map<String, Object> getInputs() { return Objects.isNull(this.getTopologyTemplate()) ? new HashMap<>() - : (Map<String, Object>) ((Map<String, Object>) this.getTopologyTemplate()).get(inputs); + : (Map<String, Object>) ((Map<String, Object>) this.getTopologyTemplate()).get(inputs); } @Override public Map<String, Object> getOutputs() { return Objects.isNull(this.getTopologyTemplate()) ? new HashMap<>() - : (Map<String, Object>) ((Map<String, Object>) this.getTopologyTemplate()).get(outputs); + : (Map<String, Object>) ((Map<String, Object>) this.getTopologyTemplate()).get(outputs); } @Override public Map<String, Object> getSubstitutionMappings() { return Objects.isNull(this.getTopologyTemplate()) ? new HashMap<>() - : (Map<String, Object>) ((Map<String, Object>) this.getTopologyTemplate()) - .get(substitutionMappings); + : (Map<String, Object>) ((Map<String, Object>) this.getTopologyTemplate()) + .get(substitutionMappings); + } + + @Override + public Map<String, Object> getDataTypes() { + final String dataTypesElementName = DATA_TYPES.getElementName(); + return Objects.isNull(this.readServiceTemplate.get(dataTypesElementName)) ? new HashMap<>() + : (Map<String, Object>) this.readServiceTemplate.get(dataTypesElementName); } } |