Fix derivedFrom field

TOSCA does not have a version on derivedFrom fields on policies and
policy types. THerefore, we use the default value of 0.0.0 for versions
on these fields in the database.

When reading back out derivedFrom fields, we need to just take the name
of the field and not the ID of the field.

Issue-ID: POLICY-2075
Change-Id: I55e9c479047d6c1a9376a1713f4ddb2536476b29
Signed-off-by: liamfallon <liam.fallon@est.tech>
(cherry picked from commit 0646adc54ef290609a4e7efa305d2dec2f1438af)

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..4823efc 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
@@ -122,7 +122,7 @@ 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) {