1 files changed, 11 insertions, 43 deletions

diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/CapabilityDefinition.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/CapabilityDefinition.java
index a74243eb7e..061262eec0 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/CapabilityDefinition.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/CapabilityDefinition.java
@@ -21,6 +21,11 @@
 package org.openecomp.sdc.be.model;
 
 import com.google.common.collect.Lists;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.collections.SetUtils;
@@ -31,9 +36,15 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
+
 /**
  * Specifies the capabilities that the Node Type exposes.
  */
+@Getter
+@Setter
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@ToString
 public class CapabilityDefinition extends CapabilityDataDefinition {
 
     /**
@@ -42,11 +53,6 @@ public class CapabilityDefinition extends CapabilityDataDefinition {
      */
     private List<ComponentInstanceProperty> properties;
 
-
-    public CapabilityDefinition() {
-        super();
-    }
-
     public CapabilityDefinition(CapabilityDataDefinition cap) {
         super(cap);
     }
@@ -70,44 +76,6 @@ public class CapabilityDefinition extends CapabilityDataDefinition {
         }
     }
 
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = super.hashCode();
-        result = prime * result + ((properties == null) ? 0 : properties.hashCode());
-        return result;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
-            return true;
-        if (!super.equals(obj))
-            return false;
-        if (getClass() != obj.getClass())
-            return false;
-        CapabilityDefinition other = (CapabilityDefinition) obj;
-        if (properties == null) {
-            if (other.properties != null)
-                return false;
-        } else if (!SetUtils.isEqualSet(properties, other.getProperties()))
-            return false;
-        return true;
-    }
-
-    @Override
-    public String toString() {
-        return "CapabilityDefinition [properties=" + properties + "]";
-    }
-
-    public List<ComponentInstanceProperty> getProperties() {
-        return properties;
-    }
-
-    public void setProperties(List<ComponentInstanceProperty> properties) {
-        this.properties = properties;
-    }
-
 	public void updateCapabilityProperties(CapabilityDefinition capabilityDefinition) {
 		if(CollectionUtils.isNotEmpty(getProperties()) && capabilityDefinition!= null && CollectionUtils.isNotEmpty(capabilityDefinition.getProperties())){
 			Map<String, ComponentInstanceProperty> propertiesInfo = capabilityDefinition.getProperties()