From 6c16c0b33dcfeaf781e7ebfcd1bc2ee2fd38f5f0 Mon Sep 17 00:00:00 2001 From: MichaelMorris Date: Mon, 6 Apr 2020 14:00:13 +0100 Subject: Remove boolean entries in TOSCA Metadata Change-Id: I0101bbe35656b4c7d7405429d95939b892e85402 Issue-ID: SDC-2876 Signed-off-by: MichaelMorris --- .../java/org/openecomp/sdc/be/tosca/model/ToscaMetadata.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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 f68f2550cf..f496994ac3 100644 --- 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() { -- cgit 1.2.3-korg