1 files changed, 12 insertions, 93 deletions
diff --git a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/category/SubCategoryDataDefinition.java b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/category/SubCategoryDataDefinition.java
index 986f79fd4b..38d7027e49 100644
--- a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/category/SubCategoryDataDefinition.java
+++ b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/category/SubCategoryDataDefinition.java
@@ -21,113 +21,32 @@
 package org.openecomp.sdc.be.datatypes.category;
 
 import org.openecomp.sdc.be.datatypes.tosca.ToscaDataDefinition;
-
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
 import java.util.List;
 
+@Getter
+@Setter
+@EqualsAndHashCode(callSuper = false)
+@ToString
+@NoArgsConstructor
 public class SubCategoryDataDefinition extends ToscaDataDefinition {
 
     private String name;
     private String normalizedName;
     private String uniqueId;
     private List<String> icons;
-
-    public SubCategoryDataDefinition() {
-
-    }
+    private List<MetadataKeyDataDefinition> metadataKeys;
 
     public SubCategoryDataDefinition(SubCategoryDataDefinition c) {
         this.name = c.name;
         this.normalizedName = c.normalizedName;
         this.uniqueId = c.uniqueId;
         this.icons = c.icons;
+        this.metadataKeys = c.metadataKeys;
     }
 
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getNormalizedName() {
-        return normalizedName;
-    }
-
-    public void setNormalizedName(String normalizedName) {
-        this.normalizedName = normalizedName;
-    }
-
-    public String getUniqueId() {
-        return uniqueId;
-    }
-
-    public void setUniqueId(String uniqueId) {
-        this.uniqueId = uniqueId;
-    }
-
-    public List<String> getIcons() {
-        return icons;
-    }
-
-    public void setIcons(List<String> icons) {
-        this.icons = icons;
-    }
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((name == null) ? 0 : name.hashCode());
-        result = prime * result + ((normalizedName == null) ? 0 : normalizedName.hashCode());
-        result = prime * result + ((uniqueId == null) ? 0 : uniqueId.hashCode());
-        result = prime * result + ((icons == null) ? 0 : icons.hashCode());
-        return result;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        SubCategoryDataDefinition other = (SubCategoryDataDefinition) obj;
-        if (name == null) {
-            if (other.name != null) {
-                return false;
-            }
-        } else if (!name.equals(other.name)) {
-            return false;
-        }
-        if (normalizedName == null) {
-            if (other.normalizedName != null) {
-                return false;
-            }
-        } else if (!normalizedName.equals(other.normalizedName)) {
-            return false;
-        }
-        if (uniqueId == null) {
-            if (other.uniqueId != null) {
-                return false;
-            }
-        } else if (!uniqueId.equals(other.uniqueId)) {
-            return false;
-        }
-        if (icons == null) {
-            return other.icons == null;
-        } else {
-            return icons.equals(other.icons);
-        }
-    }
-
-    @Override
-    public String toString() {
-        return "SubCategoryDataDefinition [name=" + name + ", normalizedName=" + normalizedName + ", uniqueId="
-                + uniqueId + ", icons=" + icons + "]";
-    }
 }