diff options
Diffstat (limited to 'catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/ComponentMetadataData.java')
| -rw-r--r-- | catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/ComponentMetadataData.java | 57 |
1 files changed, 25 insertions, 32 deletions
diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/ComponentMetadataData.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/ComponentMetadataData.java index e39dfe226f..0ad081832f 100644 --- a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/ComponentMetadataData.java +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/ComponentMetadataData.java @@ -28,6 +28,8 @@ import java.util.Map; import org.openecomp.sdc.be.dao.graph.datatype.GraphNode; import org.openecomp.sdc.be.dao.neo4j.GraphPropertiesDictionary; import org.openecomp.sdc.be.datatypes.components.ComponentMetadataDataDefinition; +import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum; +import org.openecomp.sdc.be.datatypes.enums.GraphPropertyEnum; import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum; import com.google.gson.reflect.TypeToken; @@ -43,44 +45,37 @@ public abstract class ComponentMetadataData extends GraphNode { this.componentInstanceCounter = 0; } - public ComponentMetadataData(NodeTypeEnum label, ComponentMetadataDataDefinition metadataDataDefinition, - Map<String, Object> properties) { + @SuppressWarnings("unchecked") + public ComponentMetadataData(NodeTypeEnum label, ComponentMetadataDataDefinition metadataDataDefinition, Map<String, Object> properties) { this(label, metadataDataDefinition); metadataDataDefinition.setUniqueId((String) properties.get(GraphPropertiesDictionary.UNIQUE_ID.getProperty())); - metadataDataDefinition - .setCreationDate((Long) properties.get(GraphPropertiesDictionary.CREATION_DATE.getProperty())); - metadataDataDefinition - .setDescription((String) properties.get(GraphPropertiesDictionary.DESCRIPTION.getProperty())); + metadataDataDefinition.setCreationDate((Long) properties.get(GraphPropertiesDictionary.CREATION_DATE.getProperty())); + metadataDataDefinition.setDescription((String) properties.get(GraphPropertiesDictionary.DESCRIPTION.getProperty())); metadataDataDefinition.setIcon((String) properties.get(GraphPropertiesDictionary.ICON.getProperty())); - metadataDataDefinition.setHighestVersion( - (Boolean) properties.get(GraphPropertiesDictionary.IS_HIGHEST_VERSION.getProperty())); - metadataDataDefinition - .setLastUpdateDate((Long) properties.get(GraphPropertiesDictionary.LAST_UPDATE_DATE.getProperty())); + metadataDataDefinition.setHighestVersion((Boolean) properties.get(GraphPropertiesDictionary.IS_HIGHEST_VERSION.getProperty())); + metadataDataDefinition.setLastUpdateDate((Long) properties.get(GraphPropertiesDictionary.LAST_UPDATE_DATE.getProperty())); metadataDataDefinition.setName((String) properties.get(GraphPropertiesDictionary.NAME.getProperty())); metadataDataDefinition.setState((String) properties.get(GraphPropertiesDictionary.STATE.getProperty())); - Type listType = new TypeToken<List<String>>() { - }.getType(); - List<String> tagsFromJson = getGson() - .fromJson((String) properties.get(GraphPropertiesDictionary.TAGS.getProperty()), listType); + List<String> tagsFromJson; + if(properties.get(GraphPropertiesDictionary.TAGS.getProperty()) instanceof List<?>){ + tagsFromJson = (List<String>) properties.get(GraphPropertiesDictionary.TAGS.getProperty()); + } else { + Type listType = new TypeToken<List<String>>() {}.getType(); + tagsFromJson = getGson().fromJson((String) properties.get(GraphPropertiesDictionary.TAGS.getProperty()), listType); + } metadataDataDefinition.setTags(tagsFromJson); metadataDataDefinition.setVersion((String) properties.get(GraphPropertiesDictionary.VERSION.getProperty())); - metadataDataDefinition - .setContactId((String) properties.get(GraphPropertiesDictionary.CONTACT_ID.getProperty())); + metadataDataDefinition.setContactId((String) properties.get(GraphPropertiesDictionary.CONTACT_ID.getProperty())); metadataDataDefinition.setUUID((String) properties.get(GraphPropertiesDictionary.UUID.getProperty())); - metadataDataDefinition - .setNormalizedName((String) properties.get(GraphPropertiesDictionary.NORMALIZED_NAME.getProperty())); - metadataDataDefinition - .setSystemName((String) properties.get(GraphPropertiesDictionary.SYSTEM_NAME.getProperty())); - metadataDataDefinition - .setIsDeleted((Boolean) properties.get(GraphPropertiesDictionary.IS_DELETED.getProperty())); + metadataDataDefinition.setNormalizedName((String) properties.get(GraphPropertiesDictionary.NORMALIZED_NAME.getProperty())); + metadataDataDefinition.setSystemName((String) properties.get(GraphPropertiesDictionary.SYSTEM_NAME.getProperty())); + metadataDataDefinition.setIsDeleted((Boolean) properties.get(GraphPropertiesDictionary.IS_DELETED.getProperty())); metadataDataDefinition.setProjectCode((String) properties.get(GraphPropertiesDictionary.PROJECT_CODE.getProperty())); metadataDataDefinition.setCsarUUID((String) properties.get(GraphPropertiesDictionary.CSAR_UUID.getProperty())); - metadataDataDefinition - .setCsarVersion((String) properties.get(GraphPropertiesDictionary.CSAR_VERSION.getProperty())); - metadataDataDefinition.setImportedToscaChecksum( - (String) properties.get(GraphPropertiesDictionary.IMPORTED_TOSCA_CHECKSUM.getProperty())); - metadataDataDefinition - .setInvariantUUID((String) properties.get(GraphPropertiesDictionary.INVARIANT_UUID.getProperty())); + metadataDataDefinition.setCsarVersion((String) properties.get(GraphPropertiesDictionary.CSAR_VERSION.getProperty())); + metadataDataDefinition.setImportedToscaChecksum((String) properties.get(GraphPropertiesDictionary.IMPORTED_TOSCA_CHECKSUM.getProperty())); + metadataDataDefinition.setInvariantUUID((String) properties.get(GraphPropertiesDictionary.INVARIANT_UUID.getProperty())); +// metadataDataDefinition.setComponentType(ComponentTypeEnum.valueOf((String) properties.get(GraphPropertyEnum.COMPONENT_TYPE.getProperty()))); componentInstanceCounter = (Integer) properties.get(GraphPropertiesDictionary.INSTANCE_COUNTER.getProperty()); } @@ -107,8 +102,7 @@ public abstract class ComponentMetadataData extends GraphNode { addIfExists(map, GraphPropertiesDictionary.PROJECT_CODE, metadataDataDefinition.getProjectCode()); addIfExists(map, GraphPropertiesDictionary.CSAR_UUID, metadataDataDefinition.getCsarUUID()); addIfExists(map, GraphPropertiesDictionary.CSAR_VERSION, metadataDataDefinition.getCsarVersion()); - addIfExists(map, GraphPropertiesDictionary.IMPORTED_TOSCA_CHECKSUM, - metadataDataDefinition.getImportedToscaChecksum()); + addIfExists(map, GraphPropertiesDictionary.IMPORTED_TOSCA_CHECKSUM, metadataDataDefinition.getImportedToscaChecksum()); addIfExists(map, GraphPropertiesDictionary.INVARIANT_UUID, metadataDataDefinition.getInvariantUUID()); return map; } @@ -140,8 +134,7 @@ public abstract class ComponentMetadataData extends GraphNode { @Override public String toString() { - return "ComponentMetadataData [metadataDataDefinition=" + metadataDataDefinition + ", componentInstanceCounter=" - + componentInstanceCounter + "]"; + return "ComponentMetadataData [metadataDataDefinition=" + metadataDataDefinition + ", componentInstanceCounter=" + componentInstanceCounter + "]"; } } |