2 files changed, 20 insertions, 74 deletions

diff --git a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/enums/GraphPropertyEnum.java b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/enums/GraphPropertyEnum.java
index 1f1c01f9a4..70f76030bd 100644
--- a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/enums/GraphPropertyEnum.java
+++ b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/enums/GraphPropertyEnum.java
@@ -18,8 +18,11 @@ package org.openecomp.sdc.be.datatypes.enums;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
 
-
+@AllArgsConstructor
+@Getter
 public enum GraphPropertyEnum {
 
     // field name ,class type ,unique ,indexed
@@ -59,25 +62,16 @@ public enum GraphPropertyEnum {
     IS_ARCHIVED("isArchived", Boolean.class, false, true),
     IS_VSP_ARCHIVED("isVspArchived", Boolean.class, false, true),
     ARCHIVE_TIME("archiveTime", Long.class, false, true),
-    PREV_CATALOG_UPDATE_TIME    ("previousUpdateTime",         Long.class,                 false,      true),
-    CURRENT_CATALOG_UPDATE_TIME ("currentUpdateTime",         Long.class,                 false,      true),
+    PREV_CATALOG_UPDATE_TIME("previousUpdateTime", Long.class, false, true),
+    CURRENT_CATALOG_UPDATE_TIME("currentUpdateTime", Long.class, false, true),
 
     //Healing
     HEALING_VERSION("healVersion", Integer.class, false, true);
 
-
-
-    private String property;
-    private Class clazz;
-    private boolean unique;
-    private boolean indexed;
-
-    GraphPropertyEnum(String property, Class clazz, boolean unique, boolean indexed) {
-        this.property = property;
-        this.clazz = clazz;
-        this.unique = unique;
-        this.indexed = indexed;
-    }
+    private final String property;
+    private final Class<?> clazz;
+    private final boolean unique;
+    private final boolean indexed;
 
     public static GraphPropertyEnum getByProperty(String property) {
         for (GraphPropertyEnum currProperty : GraphPropertyEnum.values()) {
@@ -88,38 +82,6 @@ public enum GraphPropertyEnum {
         return null;
     }
 
-    public String getProperty() {
-        return property;
-    }
-
-    public void setProperty(String property) {
-        this.property = property;
-    }
-
-    public Class getClazz() {
-        return clazz;
-    }
-
-    public void setClazz(Class clazz) {
-        this.clazz = clazz;
-    }
-
-    public boolean isUnique() {
-        return unique;
-    }
-
-    public void setUnique(boolean unique) {
-        this.unique = unique;
-    }
-
-    public boolean isIndexed() {
-        return indexed;
-    }
-
-    public void setIndexed(boolean indexed) {
-        this.indexed = indexed;
-    }
-
     public static List<String> getAllProperties() {
 
         List<String> arrayList = new ArrayList<>();
diff --git a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/enums/JsonPresentationFields.java b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/enums/JsonPresentationFields.java
index 46a3f99abc..41c04e77b2 100644
--- a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/enums/JsonPresentationFields.java
+++ b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/enums/JsonPresentationFields.java
@@ -17,7 +17,13 @@ package org.openecomp.sdc.be.datatypes.enums;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.ToString;
 
+@AllArgsConstructor
+@Getter
+@ToString(onlyExplicitlyIncluded = true)
 public enum JsonPresentationFields {
 
     UNIQUE_ID("uniqueId", GraphPropertyEnum.UNIQUE_ID),
@@ -256,32 +262,16 @@ public enum JsonPresentationFields {
 
     TOSCA_DEFINITIONS_VERSION("tosca_definitions_version", null);
 
-
-    private String presentation;
-    private GraphPropertyEnum storedAs;
-
-    JsonPresentationFields(String presentation, GraphPropertyEnum storedAs) {
-        this.presentation = presentation;
-        this.storedAs = storedAs;
-    }
+    @ToString.Include
+    private final String presentation;
+    @ToString.Exclude
+    private final GraphPropertyEnum storedAs;
 
     @JsonValue
     public String getPresentation() {
         return presentation;
     }
 
-    public void setPresentation(String presentation) {
-        this.presentation = presentation;
-    }
-
-    public GraphPropertyEnum getStoredAs() {
-        return storedAs;
-    }
-
-    public void setStoredAs(GraphPropertyEnum storedAs) {
-        this.storedAs = storedAs;
-    }
-
     public static String getPresentationByGraphProperty(GraphPropertyEnum property) {
         for (JsonPresentationFields currPresentation : JsonPresentationFields.values()) {
             if (currPresentation.getStoredAs() == property) {
@@ -291,12 +281,6 @@ public enum JsonPresentationFields {
         return null;
     }
 
-    @Override
-    public String toString() {
-        // TODO Auto-generated method stub
-        return presentation;
-    }
-
     @JsonCreator
     public static JsonPresentationFields getByPresentation(String presentation) {
         for (JsonPresentationFields inst : JsonPresentationFields.values()) {