1 files changed, 10 insertions, 92 deletions

diff --git a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/SchemaDefinition.java b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/SchemaDefinition.java
index 1e4fc58ffe..c17e7fa3b5 100644
--- a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/SchemaDefinition.java
+++ b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/SchemaDefinition.java
@@ -20,26 +20,28 @@
 
 package org.openecomp.sdc.be.datatypes.elements;
 
-import org.openecomp.sdc.be.datatypes.tosca.ToscaDataDefinition;
-
 import java.util.List;
 import java.util.Map;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import org.openecomp.sdc.be.datatypes.tosca.ToscaDataDefinition;
 
 /**
  * Schema allows to create new types that can be used along TOSCA definitions.
  */
+@Getter
+@Setter
+@NoArgsConstructor
+@EqualsAndHashCode
 public class SchemaDefinition extends ToscaDataDefinition {
 
     private String derivedFrom;
     private List<String> constraints;
     private Map<String, PropertyDataDefinition> properties;
-
     private PropertyDataDefinition property;
 
-
-    public SchemaDefinition() {
-    }
-
     public SchemaDefinition(String derivedFrom, List<String> constraints,
                             Map<String, PropertyDataDefinition> properties) {
         this.setDerivedFrom(derivedFrom);
@@ -48,97 +50,13 @@ public class SchemaDefinition extends ToscaDataDefinition {
 
     }
 
-    public String getDerivedFrom() {
-        return derivedFrom;
-    }
-
-    public void setProperty(PropertyDataDefinition property) {
-        this.property = property;
-    }
-
-    public PropertyDataDefinition getProperty() {
-        return this.property;
-    }
-
-    public void setDerivedFrom(String derivedFrom) {
-        this.derivedFrom = derivedFrom;
-    }
-
-    public List<String> getConstraints() {
-        return constraints;
-    }
-
-    public void setConstraints(List<String> constraints) {
-        this.constraints = constraints;
-    }
-
-    public Map<String, PropertyDataDefinition> getProperties() {
-        return properties;
-    }
-
-    public void setProperties(Map<String, PropertyDataDefinition> properties) {
-        this.properties = properties;
-    }
-
     public void addProperty(String key, PropertyDataDefinition property) {
-
         properties.put(key, property);
     }
 
     @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((constraints == null) ? 0 : constraints.hashCode());
-        result = prime * result + ((derivedFrom == null) ? 0 : derivedFrom.hashCode());
-        result = prime * result + ((properties == null) ? 0 : properties.hashCode());
-        result = prime * result + ((property == null) ? 0 : property.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;
-        }
-        SchemaDefinition other = (SchemaDefinition) obj;
-        if (constraints == null) {
-            if (other.constraints != null) {
-                return false;
-            }
-        } else if (!constraints.equals(other.constraints)) {
-            return false;
-        }
-        if (derivedFrom == null) {
-            if (other.derivedFrom != null) {
-                return false;
-            }
-        } else if (!derivedFrom.equals(other.derivedFrom)) {
-            return false;
-        }
-        if (properties == null) {
-            if (other.properties != null) {
-                return false;
-            }
-        } else if (!properties.equals(other.properties)) {
-            return false;
-        }
-        if (property == null) {
-            return other.property == null;
-        } else {
-            return property.equals(other.property);
-        }
-    }
-
-    @Override
     public String toString() {
         return "SchemaDefinition [" + "derivedFrom='" + derivedFrom + ", constraints=" + constraints + ", properties="
-                + properties + ", property=" + property + ']';
+            + properties + ", property=" + property + ']';
     }
 }