1 files changed, 27 insertions, 18 deletions

diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/utils/ModelConverter.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/utils/ModelConverter.java
index 5ceb7f194c..839ae27a19 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/utils/ModelConverter.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/utils/ModelConverter.java
@@ -260,6 +260,7 @@ public class ModelConverter {
             convertCapabilities(nodeType, resource);
             convertRequirements(nodeType, resource);
             convertInterfaces(nodeType, resource);
+            convertDataTypes(nodeType, resource);
 
 		} else {
 			TopologyTemplate topologyTemplate = (TopologyTemplate) toscaElement;
@@ -813,6 +814,11 @@ public class ModelConverter {
         if (toscaVersion != null) {
             nodeType.setToscaVersion(toscaVersion);
         }
+        final List<DataTypeDefinition> dataTypes = resource.getDataTypes();
+        if (CollectionUtils.isNotEmpty(dataTypes)) {
+            nodeType.setDataTypes(dataTypes.stream()
+                .collect(Collectors.toMap(DataTypeDefinition::getName, dataTypeDefinition -> dataTypeDefinition)));
+        }
         convertCommonToscaData(component, nodeType);
         convertAdditionalInformation(component, nodeType);
         convertArtifacts(resource, nodeType);
@@ -1259,23 +1265,24 @@ public class ModelConverter {
 		}
 	}
 
-    private static void convertDataTypes(TopologyTemplate topologyTemplate, Component component) {
-        Map<String, DataTypeDataDefinition> dataTypeDataMap = topologyTemplate.getDataTypes();
+    private static void convertDataTypes(final ToscaElement toscaElement, final Component component) {
+        final Map<String, DataTypeDataDefinition> dataTypeDataMap = toscaElement.getDataTypes();
         if (MapUtils.isNotEmpty(dataTypeDataMap)) {
-            List<DataTypeDefinition> dataTypeMap = dataTypeDataMap.values().stream().map(e -> {
-                DataTypeDefinition dataType = new DataTypeDefinition(e);
-
-                if(CollectionUtils.isNotEmpty(e.getPropertiesData())) {
-                    log.debug("#convertDataTypes - propertiesData is not null. {}",
-                            ReflectionToStringBuilder.toString(e.getPropertiesData()));
-                    dataType.setProperties(e.getPropertiesData().stream()
+            final List<DataTypeDefinition> dataTypeDefinitionList =
+                dataTypeDataMap.values().stream().map(dataTypeDataDefinition -> {
+                    final DataTypeDefinition dataTypeDefinition = new DataTypeDefinition(dataTypeDataDefinition);
+
+                    if (CollectionUtils.isNotEmpty(dataTypeDataDefinition.getPropertiesData())) {
+                        log.debug("#convertDataTypes - propertiesData is not null. {}",
+                            ReflectionToStringBuilder.toString(dataTypeDataDefinition.getPropertiesData()));
+                        dataTypeDefinition.setProperties(dataTypeDataDefinition.getPropertiesData().stream()
                             .map(PropertyDefinition::new).collect(Collectors.toList()));
-                } else {
-                    log.debug("#convertDataTypes - propertiesData is null. ignore.");
-                }
-                return dataType;
-            }).collect(Collectors.toList());
-            component.setDataTypes(dataTypeMap);
+                    } else {
+                        log.debug("#convertDataTypes - propertiesData is null. ignore.");
+                    }
+                    return dataTypeDefinition;
+                }).collect(Collectors.toList());
+            component.setDataTypes(dataTypeDefinitionList);
         }
     }
 
@@ -1342,11 +1349,13 @@ public class ModelConverter {
         toscaElement.setMetadataValue(JsonPresentationFields.TAGS, component.getTags());
         toscaElement.setMetadataValue(JsonPresentationFields.INVARIANT_UUID, component.getInvariantUUID());
         toscaElement.setMetadataValue(JsonPresentationFields.CONTACT_ID, component.getContactId());
+        final List<DataTypeDefinition> dataTypes = component.getDataTypes();
+        if (CollectionUtils.isNotEmpty(dataTypes)) {
+            toscaElement.setDataTypes(dataTypes.stream()
+                .collect(Collectors.toMap(DataTypeDefinition::getName, dataTypeDefinition -> dataTypeDefinition)));
+        }
     }
 
-
-
-
     private static void setComponentInstancesToComponent(TopologyTemplate topologyTemplate, Component component) {
 
         List<ComponentInstance> componentInstances = new ArrayList<>();