4 files changed, 12 insertions, 22 deletions
diff --git a/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/AttributeDefinition.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/AttributeDefinition.java
index aa1392e2ce..1b72cbc030 100644
--- a/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/AttributeDefinition.java
+++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/AttributeDefinition.java
@@ -31,11 +31,11 @@ public class AttributeDefinition implements Cloneable {
   private String type;
   private String description;
   private Object _default;
-  private Status status;
+  private String status;
   private EntrySchema entry_schema;
 
   public AttributeDefinition() {
-    status = Status.SUPPORTED;
+    status = Status.SUPPORTED.getName();
   }
 
 
diff --git a/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/DefinitionOfDataType.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/DefinitionOfDataType.java
index 44da720fc4..310f9004af 100644
--- a/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/DefinitionOfDataType.java
+++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/DefinitionOfDataType.java
@@ -27,7 +27,7 @@ public class DefinitionOfDataType implements Cloneable {
   private Object value;
   private Boolean required;
   private Object _default;
-  private Status status;
+  private String status;
   private List<Constraint> constraints;
   private EntrySchema entry_schema;
 
@@ -71,11 +71,11 @@ public class DefinitionOfDataType implements Cloneable {
     this._default = _default;
   }
 
-  public Status getStatus() {
+  public String getStatus() {
     return status;
   }
 
-  public void setStatus(Status status) {
+  public void setStatus(String status) {
     this.status = status;
   }
 
diff --git a/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/PropertyDefinition.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/PropertyDefinition.java
index 0c1f804efa..331b7b0e64 100644
--- a/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/PropertyDefinition.java
+++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/PropertyDefinition.java
@@ -39,7 +39,7 @@ package org.onap.sdc.tosca.datatypes.model;
 public class PropertyDefinition extends DefinitionOfDataType {
 
   public PropertyDefinition() {
-    setStatus(Status.SUPPORTED);
+    setStatus(Status.SUPPORTED.getName());
     setRequired(true);
   }
 
diff --git a/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/Status.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/Status.java
index b58f13c3a5..c25a6adbaa 100644
--- a/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/Status.java
+++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/Status.java
@@ -20,27 +20,17 @@
 
 package org.onap.sdc.tosca.datatypes.model;
 
+import lombok.AllArgsConstructor;
+import lombok.Getter;
 
-
+@Getter
+@AllArgsConstructor
 public enum Status {
-
   SUPPORTED("supported"),
-  supported("supported"),
   UNSUPPORTED("unsupported"),
-  unsupported("unsupported"),
   EXPERIMENTAL("experimental"),
-  experimental("experimental"),
-  DEPRECATED("deprecated"),
-  deprecated("deprecated");
-  private String displayName;
-
-  Status(String displayName) {
-    this.displayName = displayName;
-  }
-
-  public String getDisplayName() {
-    return displayName;
-  }
+  DEPRECATED("deprecated");
 
+  private final String name;
 
 }