JPA concepts for TOSCA

[policy/models.git] / models-tosca / src / main / java / org / onap / policy / models / tosca / simple / concepts / JpaToscaEntityType.java

diff --git a/models-tosca/src/main/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaEntityType.java b/models-tosca/src/main/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaEntityType.java
index 506add3..549d93e 100644 (file)
--- a/models-tosca/src/main/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaEntityType.java
+++ b/models-tosca/src/main/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaEntityType.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
+ *  Copyright (C) 2019-2020 Nordix Foundation.
  *  Modifications Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,7 +21,6 @@
 
 package org.onap.policy.models.tosca.simple.concepts;
 
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -122,22 +121,14 @@ public class JpaToscaEntityType<T extends ToscaEntity> extends PfConcept impleme
         toscaEntity.setVersion(getKey().getVersion());
 
         if (derivedFrom != null) {
-            toscaEntity.setDerivedFrom(derivedFrom.getId());
+            toscaEntity.setDerivedFrom(derivedFrom.getName());
         }
 
         if (description != null) {
             toscaEntity.setDescription(description);
         }
 
-        if (metadata != null) {
-            Map<String, String> metadataMap = new LinkedHashMap<>();
-
-            for (Entry<String, String> entry : metadata.entrySet()) {
-                metadataMap.put(entry.getKey(), entry.getValue());
-            }
-
-            toscaEntity.setMetadata(metadataMap);
-        }
+        toscaEntity.setMetadata(PfUtils.mapMap(metadata, item -> item));
 
         return toscaEntity;
     }
@@ -154,9 +145,8 @@ public class JpaToscaEntityType<T extends ToscaEntity> extends PfConcept impleme
             key.setVersion(toscaEntity.getVersion());
         }
 
-
         if (toscaEntity.getDerivedFrom() != null) {
-            // CHeck if the derived from field contains a name-version ID
+            // Check if the derived from field contains a name-version ID
             if (toscaEntity.getDerivedFrom().contains(":")) {
                 derivedFrom = new PfConceptKey(toscaEntity.getDerivedFrom());
             } else {
@@ -168,13 +158,7 @@ public class JpaToscaEntityType<T extends ToscaEntity> extends PfConcept impleme
             description = toscaEntity.getDescription();
         }
 
-        if (toscaEntity.getMetadata() != null) {
-            metadata = new LinkedHashMap<>();
-
-            for (Entry<String, String> metadataEntry : toscaEntity.getMetadata().entrySet()) {
-                metadata.put(metadataEntry.getKey(), metadataEntry.getValue());
-            }
-        }
+        metadata = PfUtils.mapMap(toscaEntity.getMetadata(), item -> item);
     }
 
     @Override
@@ -254,16 +238,18 @@ public class JpaToscaEntityType<T extends ToscaEntity> extends PfConcept impleme
 
         @SuppressWarnings("unchecked")
         final JpaToscaEntityType<T> other = (JpaToscaEntityType<T>) otherConcept;
-        if (!key.equals(other.key)) {
-            return key.compareTo(other.key);
+
+        int result = key.compareTo(other.key);
+        if (result != 0) {
+            return result;
         }
 
-        int result = ObjectUtils.compare(derivedFrom, other.derivedFrom);
+        result = ObjectUtils.compare(derivedFrom, other.derivedFrom);
         if (result != 0) {
             return result;
         }
 
-        result = PfUtils.compareObjects(metadata, other.metadata);
+        result = PfUtils.compareMaps(metadata, other.metadata);
         if (result != 0) {
             return result;
         }