Merge "Fix a bug in adding one-digit policy-version in metadata"

diff --git a/models-tosca/src/main/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaPolicy.java b/models-tosca/src/main/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaPolicy.java
index 7655eb9..e21979b 100644 (file)
--- a/models-tosca/src/main/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaPolicy.java
+++ b/models-tosca/src/main/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaPolicy.java
@@ -191,12 +191,12 @@ public class JpaToscaPolicy extends JpaToscaEntityType<ToscaPolicy> implements P
 
         // Add the property metadata if it doesn't exist already
         if (toscaPolicy.getMetadata() == null) {
-            toscaPolicy.setMetadata(new LinkedHashMap<>());
+            setMetadata(new LinkedHashMap<>());
         }
 
         // Add the policy name and version fields to the metadata
-        toscaPolicy.getMetadata().put(METADATA_POLICY_ID_TAG, getKey().getName());
-        toscaPolicy.getMetadata().put(METADATA_POLICY_VERSION_TAG, Integer.toString(getKey().getMajorVersion()));
+        getMetadata().put(METADATA_POLICY_ID_TAG, getKey().getName());
+        getMetadata().put(METADATA_POLICY_VERSION_TAG, Integer.toString(getKey().getMajorVersion()));
     }
 
     @Override

diff --git a/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/serialization/MonitoringPolicySerializationTest.java b/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/serialization/MonitoringPolicySerializationTest.java
index 5f0cbb3..9d9ee60 100644 (file)
--- a/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/serialization/MonitoringPolicySerializationTest.java
+++ b/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/serialization/MonitoringPolicySerializationTest.java
@@ -171,7 +171,7 @@ public class MonitoringPolicySerializationTest {
         JpaToscaPolicy policyVal = policiesConceptMap.values().iterator().next();
 
         // Check metadata
-        assertTrue(policyVal.getMetadata().size() == 1);
+        assertTrue(policyVal.getMetadata().size() == 2);
         assertEquals("policy-id", policyVal.getMetadata().entrySet().iterator().next().getKey());
         assertEquals("onap.restart.tca", policyVal.getMetadata().entrySet().iterator().next().getValue());
 
@@ -204,7 +204,7 @@ public class MonitoringPolicySerializationTest {
         JpaToscaPolicy policyVal = policiesConceptMap.values().iterator().next();
 
         // Check metadata
-        assertTrue(policyVal.getMetadata().size() == 1);
+        assertTrue(policyVal.getMetadata().size() == 2);
         assertEquals("policy-id", policyVal.getMetadata().entrySet().iterator().next().getKey());
         assertEquals("onap.scaleout.tca", policyVal.getMetadata().entrySet().iterator().next().getValue());
 
@@ -237,7 +237,7 @@ public class MonitoringPolicySerializationTest {
         JpaToscaPolicy policyVal = policiesConceptMap.values().iterator().next();
 
         // Check metadata
-        assertTrue(policyVal.getMetadata().size() == 1);
+        assertTrue(policyVal.getMetadata().size() == 2);
         assertEquals("policy-id", policyVal.getMetadata().entrySet().iterator().next().getKey());
         assertEquals("onap.vfirewall.tca", policyVal.getMetadata().entrySet().iterator().next().getValue());