1 files changed, 8 insertions, 96 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/dao/type/DeploymentFlavorEntity.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/dao/type/DeploymentFlavorEntity.java
index fb28154a48..dd145b1f54 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/dao/type/DeploymentFlavorEntity.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/dao/type/DeploymentFlavorEntity.java
@@ -21,12 +21,20 @@
 package org.openecomp.sdc.vendorsoftwareproduct.dao.type;
 
 import com.datastax.driver.mapping.annotations.*;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
 import org.openecomp.core.utilities.json.JsonUtil;
 import org.openecomp.sdc.vendorsoftwareproduct.types.composition.CompositionEntityId;
 import org.openecomp.sdc.vendorsoftwareproduct.types.composition.CompositionEntityType;
 import org.openecomp.sdc.vendorsoftwareproduct.types.composition.DeploymentFlavor;
 import org.openecomp.sdc.versioning.dao.types.Version;
 
+@EqualsAndHashCode
+@Getter
+@Setter
+@NoArgsConstructor
 @Table(keyspace = "dox", name = "vsp_deployment_flavor")
 public class DeploymentFlavorEntity implements CompositionEntity{
     private static final String ENTITY_TYPE = "Vendor Software Product Deployment Flavor";
@@ -46,15 +54,6 @@ public class DeploymentFlavorEntity implements CompositionEntity{
     private String questionnaireData;
 
     /**
-     * Every entity class must have a default constructor according to
-     * <a href="http://docs.datastax.com/en/developer/java-driver/2.1/manual/object_mapper/creating/">
-     * Definition of mapped classes</a>.
-     */
-    public DeploymentFlavorEntity() {
-        // Don't delete! Default constructor is required by DataStax driver
-    }
-
-    /**
      * Instantiates a new DeploymentFlavor entity.
      *
      * @param vspId   the vsp id
@@ -77,34 +76,6 @@ public class DeploymentFlavorEntity implements CompositionEntity{
     }
 
     @Override
-    public String getCompositionData() {
-        return compositionData;
-    }
-
-    @Override
-    public void setCompositionData(String compositionData) {
-        this.compositionData = compositionData;
-    }
-
-    @Override
-    public String getQuestionnaireData() {
-        return questionnaireData;
-    }
-
-    @Override
-    public void setQuestionnaireData(String questionnaireData) {
-        this.questionnaireData = questionnaireData;
-    }
-
-    public String getVspId() {
-        return vspId;
-    }
-
-    public void setVspId(String vspId) {
-        this.vspId = vspId;
-    }
-
-    @Override
     public String getEntityType() {
         return ENTITY_TYPE;
     }
@@ -114,26 +85,6 @@ public class DeploymentFlavorEntity implements CompositionEntity{
         return getVspId();
     }
 
-    @Override
-    public String getId() {
-        return id;
-    }
-
-    @Override
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    @Override
-    public Version getVersion() {
-        return version;
-    }
-
-    @Override
-    public void setVersion(Version version) {
-        this.version = version;
-    }
-
    public DeploymentFlavor getDeploymentFlavorCompositionData() {
         return compositionData == null ? null : JsonUtil.json2Object(compositionData, DeploymentFlavor.class);
     }
@@ -141,43 +92,4 @@ public class DeploymentFlavorEntity implements CompositionEntity{
     public void setDeploymentFlavorCompositionData(DeploymentFlavor deploymentFlavor) {
         this.compositionData = deploymentFlavor == null ? null : JsonUtil.object2Json(deploymentFlavor);
     }
-
-    @Override
-    public int hashCode() {
-        int result = vspId != null ? vspId.hashCode() : 0;
-        result = 31 * result + (version != null ? version.hashCode() : 0);
-        result = 31 * result + (id != null ? id.hashCode() : 0);
-        result = 31 * result + (compositionData != null ? compositionData.hashCode() : 0);
-        result = 31 * result + (questionnaireData != null ? questionnaireData.hashCode() : 0);
-        return result;
-    }
-
-    @Override
-    public boolean equals(Object object) {
-        if (this == object) {
-            return true;
-        }
-        if (object == null || getClass() != object.getClass()) {
-            return false;
-        }
-
-        DeploymentFlavorEntity that = (DeploymentFlavorEntity) object;
-
-        if (vspId != null ? !vspId.equals(that.vspId) : that.vspId != null) {
-            return false;
-        }
-        if (version != null ? !version.equals(that.version) : that.version != null) {
-            return false;
-        }
-        if (id != null ? !id.equals(that.id) : that.id != null) {
-            return false;
-        }
-        if (compositionData != null ? !compositionData.equals(that.compositionData)
-                : that.compositionData != null) {
-            return false;
-        }
-        return questionnaireData != null ? questionnaireData.equals(that.questionnaireData)
-                : that.questionnaireData == null;
-
-    }
 }