Remove boolean entries in TOSCA Metadata

Change-Id: I0101bbe35656b4c7d7405429d95939b892e85402
Issue-ID: SDC-2876
Signed-off-by: MichaelMorris <michael.morris@est.tech>

diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/model/ToscaMetadata.java b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/model/ToscaMetadata.java
index f68f255..f496994 100644 (file)
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/model/ToscaMetadata.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/model/ToscaMetadata.java
@@ -36,8 +36,8 @@ public class ToscaMetadata implements IToscaMetadata {
     private String serviceType;
     private String serviceRole;
     private String instantiationType;
-    private Boolean serviceEcompNaming;
-    private Boolean ecompGeneratedNaming;
+    private String serviceEcompNaming;
+    private String ecompGeneratedNaming;
     private String namingPolicy;
     private String sourceModelInvariant;
     private String environmentContext;
@@ -162,11 +162,11 @@ public class ToscaMetadata implements IToscaMetadata {
     }
 
     public Boolean isEcompGeneratedNaming() {
-        return ecompGeneratedNaming;
+        return new Boolean(ecompGeneratedNaming);
     }
 
     public void setEcompGeneratedNaming(Boolean ecompGeneratedNaming) {
-        this.ecompGeneratedNaming = ecompGeneratedNaming;
+       this.ecompGeneratedNaming = ecompGeneratedNaming == null ? null : ecompGeneratedNaming.toString();
     }
 
     public String isNamingPolicy() {
@@ -178,11 +178,11 @@ public class ToscaMetadata implements IToscaMetadata {
     }
 
     public Boolean getServiceEcompNaming() {
-        return serviceEcompNaming;
+        return new Boolean(serviceEcompNaming);
     }
 
     public void setServiceEcompNaming(Boolean serviceEcompNaming) {
-        this.serviceEcompNaming = serviceEcompNaming;
+       this.serviceEcompNaming = serviceEcompNaming == null ? null : serviceEcompNaming.toString();
     }
 
     public String getVersion() {