Increase test coverage - openecomp-sdc-vendor-software-product-api

Change-Id: Ifaaf73998ee0f7df66082fdc4963b4c05678e5c1
Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech>
Issue-ID: SDC-3001

8 files changed, 155 insertions, 562 deletions

diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/dao/type/TranslatedFileDataTest.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/dao/type/TranslatedFileDataTest.java
deleted file mode 100644
index 1d12a4b066..0000000000
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/dao/type/TranslatedFileDataTest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2019 Nokia. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.sdc.vendorsoftwareproduct.dao.type;
-
-import org.junit.Test;
-
-import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
-import static org.junit.Assert.assertThat;
-
-public class TranslatedFileDataTest {
-    @Test
-    public void accessorsTest() {
-        assertThat(TranslatedFileData.class,
-                hasValidGettersAndSetters());
-    }
-}
\ No newline at end of file
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/dao/type/VspDetailsTest.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/dao/type/VspDetailsTest.java
deleted file mode 100644
index 66f6bf23f4..0000000000
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/dao/type/VspDetailsTest.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2019 Nokia. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.sdc.vendorsoftwareproduct.dao.type;
-
-import org.junit.Test;
-
-import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSettersExcluding;
-import static org.junit.Assert.assertThat;
-
-public class VspDetailsTest {
-    @Test
-    public void accessorsTest() {
-        assertThat(VspDetails.class,
-                hasValidGettersAndSettersExcluding("compositionData", "compositionEntityId", "entityType",
-                        "firstClassCitizenId", "type"));
-    }
-}
\ No newline at end of file
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/dao/type/VspQuestionnaireEntityTest.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/dao/type/VspQuestionnaireEntityTest.java
deleted file mode 100644
index 07e3f31366..0000000000
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/dao/type/VspQuestionnaireEntityTest.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2019 Nokia. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.sdc.vendorsoftwareproduct.dao.type;
-
-import org.junit.Test;
-
-import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSettersExcluding;
-import static org.junit.Assert.assertThat;
-
-public class VspQuestionnaireEntityTest {
-    @Test
-    public void accessorsTest() {
-        assertThat(VspQuestionnaireEntity.class,
-                hasValidGettersAndSettersExcluding("compositionData", "compositionEntityId", "entityType",
-                        "firstClassCitizenId", "type"));
-    }
-}
\ No newline at end of file
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/OrchestrationTemplateCandidateData.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/OrchestrationTemplateCandidateData.java
index 57e8405138..c5e470e9c6 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/OrchestrationTemplateCandidateData.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/OrchestrationTemplateCandidateData.java
@@ -16,110 +16,45 @@
 
 package org.openecomp.sdc.vendorsoftwareproduct.dao.type;
 
+import java.nio.ByteBuffer;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
 import org.openecomp.core.utilities.json.JsonUtil;
 import org.openecomp.sdc.heat.datatypes.structure.ValidationStructureList;
 
-import java.nio.ByteBuffer;
-
+@Getter
+@Setter
+@NoArgsConstructor
 public class OrchestrationTemplateCandidateData {
-  private ByteBuffer contentData;
-  private String filesDataStructure;
-  private String fileSuffix;
-  private String fileName;
-  private String validationData;
-  private ByteBuffer originalFileContentData;
-  private String originalFileName;
-  private String originalFileSuffix;
-
-  public OrchestrationTemplateCandidateData() {
-  }
-
-  public OrchestrationTemplateCandidateData(final ByteBuffer contentData,
-                                            final String dataStructureJson,
-                                            final String fileSuffix, final String fileName,
-                                            final String originalFileName,
-                                            final String originalFileSuffix,
-                                            final ByteBuffer originalFileContentData) {
-    this.contentData = contentData;
-    this.filesDataStructure = dataStructureJson;
-    this.fileSuffix = fileSuffix;
-    this.fileName = fileName;
-    this.originalFileName = originalFileName;
-    this.originalFileSuffix = originalFileSuffix;
-    this.originalFileContentData = originalFileContentData;
-  }
-
-  public ByteBuffer getContentData() {
-    return contentData;
-  }
-
-  public void setContentData(ByteBuffer contentData) {
-    this.contentData = contentData;
-  }
-
-  public String getFilesDataStructure() {
-    return filesDataStructure;
-  }
-
-  public void setFilesDataStructure(String filesDataStructure) {
-    this.filesDataStructure = filesDataStructure;
-  }
-
-  public String getFileSuffix() {
-    return fileSuffix;
-  }
-
-  public void setFileSuffix(String fileSuffix) {
-    this.fileSuffix = fileSuffix;
-  }
-
-  public String getFileName() {
-    return fileName;
-  }
-
-  public void setFileName(String fileName) {
-    this.fileName = fileName;
-  }
-
-  public String getValidationData() {
-    return validationData;
-  }
-
-  public void setValidationData(String validationData) {
-    this.validationData = validationData;
-  }
-
-  public ValidationStructureList getValidationDataStructure() {
-    return validationData == null ? null
-        : JsonUtil.json2Object(validationData, ValidationStructureList.class);
-  }
-
-  public void setValidationDataStructure(ValidationStructureList validationData) {
-    this.validationData = validationData == null ? null
-        : JsonUtil.object2Json(validationData);
-  }
-
-  public ByteBuffer getOriginalFileContentData() {
-    return originalFileContentData;
-  }
-
-  public void setOriginalFileContentData(ByteBuffer originalFileContentData) {
-    this.originalFileContentData = originalFileContentData;
-  }
-
-  public String getOriginalFileName() {
-    return originalFileName;
-  }
-
-  public void setOriginalFileName(String originalFileName) {
-    this.originalFileName = originalFileName;
-  }
 
-  public String getOriginalFileSuffix() {
-    return originalFileSuffix;
-  }
+    private ByteBuffer contentData;
+    private String filesDataStructure;
+    private String fileSuffix;
+    private String fileName;
+    private String validationData;
+    private ByteBuffer originalFileContentData;
+    private String originalFileName;
+    private String originalFileSuffix;
+
+    public OrchestrationTemplateCandidateData(final ByteBuffer contentData,
+                                              final String dataStructureJson,
+                                              final String fileSuffix, final String fileName,
+                                              final String originalFileName,
+                                              final String originalFileSuffix,
+                                              final ByteBuffer originalFileContentData) {
+        this.contentData = contentData;
+        this.filesDataStructure = dataStructureJson;
+        this.fileSuffix = fileSuffix;
+        this.fileName = fileName;
+        this.originalFileName = originalFileName;
+        this.originalFileSuffix = originalFileSuffix;
+        this.originalFileContentData = originalFileContentData;
+    }
+
+    public ValidationStructureList getValidationDataStructure() {
+        return validationData == null ? null
+            : JsonUtil.json2Object(validationData, ValidationStructureList.class);
+    }
 
-  public void setOriginalFileSuffix(String originalFileSuffix) {
-    this.originalFileSuffix = originalFileSuffix;
-  }
 }
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/TranslatedFileData.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/TranslatedFileData.java
index 506d7e51aa..0dc3ac25a6 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/TranslatedFileData.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/TranslatedFileData.java
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,79 +20,22 @@
 
 package org.openecomp.sdc.vendorsoftwareproduct.dao.type;
 
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
 
+@Getter
+@Setter
+@NoArgsConstructor
 public class TranslatedFileData {
 
-  private String displayName;
-  private String version;
-  private String category;
-  private String subcategory;
-  private String vandorName;
-  private String vendorRelease;
-  private String packageChecksum;
-  private String packageType;
+    private String displayName;
+    private String version;
+    private String category;
+    private String subcategory;
+    private String vandorName;
+    private String vendorRelease;
+    private String packageChecksum;
+    private String packageType;
 
-  public String getDisplayName() {
-    return displayName;
-  }
-
-  public void setDisplayName(String displayName) {
-    this.displayName = displayName;
-  }
-
-  public String getVersion() {
-    return version;
-  }
-
-  public void setVersion(String version) {
-    this.version = version;
-  }
-
-  public String getCategory() {
-    return category;
-  }
-
-  public void setCategory(String category) {
-    this.category = category;
-  }
-
-  public String getSubcategory() {
-    return subcategory;
-  }
-
-  public void setSubcategory(String subcategory) {
-    this.subcategory = subcategory;
-  }
-
-  public String getVandorName() {
-    return vandorName;
-  }
-
-  public void setVandorName(String vandorName) {
-    this.vandorName = vandorName;
-  }
-
-  public String getVendorRelease() {
-    return vendorRelease;
-  }
-
-  public void setVendorRelease(String vendorRelease) {
-    this.vendorRelease = vendorRelease;
-  }
-
-  public String getPackageChecksum() {
-    return packageChecksum;
-  }
-
-  public void setPackageChecksum(String packageChecksum) {
-    this.packageChecksum = packageChecksum;
-  }
-
-  public String getPackageType() {
-    return packageType;
-  }
-
-  public void setPackageType(String packageType) {
-    this.packageType = packageType;
-  }
 }
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/VspDetails.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/VspDetails.java
index 9f82b73978..14e6bf52cf 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/VspDetails.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/VspDetails.java
@@ -20,168 +20,53 @@
 
 package org.openecomp.sdc.vendorsoftwareproduct.dao.type;
 
+import java.util.List;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
 import org.openecomp.sdc.versioning.dao.types.Version;
 import org.openecomp.sdc.versioning.dao.types.VersionableEntity;
 
-import java.util.List;
-
-
+@Getter
+@Setter
+@NoArgsConstructor
 public class VspDetails implements VersionableEntity {
-  public static final String ENTITY_TYPE = "Vendor Software Product";
-
-  private String id;
-
-  private Version version;
-
-  private String name;
-  private String description;
-
-  private String category;
-
-  private String subCategory;
-
-  private String icon;
-
-  private String vendorName;
-
-  private String vendorId;
-
-  private Version vlmVersion;
-
-  private String licenseAgreement;
-
-  private List<String> featureGroups;
-
-  private String onboardingMethod;
-
-  public VspDetails() {
-  }
-
-  public VspDetails(String id, Version version) {
-    this.id = id;
-    this.version = version;
-  }
-
-  @Override
-  public String getEntityType() {
-    return ENTITY_TYPE;
-  }
-
-  @Override
-  public String getFirstClassCitizenId() {
-    return getId();
-  }
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  @Override
-  public Version getVersion() {
-    return version;
-  }
-
-  @Override
-  public void setVersion(Version version) {
-    this.version = version;
-  }
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public String getCategory() {
-    return category;
-  }
-
-  public void setCategory(String category) {
-    this.category = category;
-  }
-
-  public String getSubCategory() {
-    return subCategory;
-  }
-
-  public void setSubCategory(String subCategory) {
-    this.subCategory = subCategory;
-  }
-
-  public String getIcon() {
-    return icon;
-  }
-
-  public void setIcon(String icon) {
-    this.icon = icon;
-  }
-
-  public String getVendorName() {
-    return vendorName;
-  }
-
-  public void setVendorName(String vendorName) {
-    this.vendorName = vendorName;
-  }
-
-  public String getVendorId() {
-    return vendorId;
-  }
-
-  public void setVendorId(String vendorId) {
-    this.vendorId = vendorId;
-  }
-
-  public Version getVlmVersion() {
-    return vlmVersion;
-  }
-
-  public void setVlmVersion(Version vlmVersion) {
-    this.vlmVersion = vlmVersion;
-  }
-
-  public String getLicenseAgreement() {
-    return licenseAgreement;
-  }
-
-  public void setLicenseAgreement(String licenseAgreement) {
-    this.licenseAgreement = licenseAgreement;
-  }
-
-  public List<String> getFeatureGroups() {
-    return featureGroups;
-  }
-
-  public void setFeatureGroups(List<String> featureGroups) {
-    this.featureGroups = featureGroups;
-  }
-
-  public String getOnboardingMethod() {
-    return onboardingMethod;
-  }
-
-  public void setOnboardingMethod(String onboardingMethod) {
-    this.onboardingMethod = onboardingMethod;
-  }
 
-  @Override
-  public String toString() {
-    return String.format(
-        "Vsp id = '%s', Version = %s', Name = %s', Category = %s', Description = %s', Vendor = %s'",
-        this.id, this.version, this.name, this.category, this.description, this.vendorName);
-  }
+    public static final String ENTITY_TYPE = "Vendor Software Product";
+
+    private String id;
+    private Version version;
+    private String name;
+    private String description;
+    private String category;
+    private String subCategory;
+    private String icon;
+    private String vendorName;
+    private String vendorId;
+    private Version vlmVersion;
+    private String licenseAgreement;
+    private List<String> featureGroups;
+    private String onboardingMethod;
+
+    public VspDetails(String id, Version version) {
+        this.id = id;
+        this.version = version;
+    }
+
+    @Override
+    public String getEntityType() {
+        return ENTITY_TYPE;
+    }
+
+    @Override
+    public String getFirstClassCitizenId() {
+        return getId();
+    }
+
+    @Override
+    public String toString() {
+        return String.format(
+            "Vsp id = '%s', Version = %s', Name = %s', Category = %s', Description = %s', Vendor = %s'",
+            this.id, this.version, this.name, this.category, this.description, this.vendorName);
+    }
 }
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/VspQuestionnaireEntity.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/VspQuestionnaireEntity.java
index da41ab28ba..e463605d39 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/VspQuestionnaireEntity.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/VspQuestionnaireEntity.java
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,84 +20,57 @@
 
 package org.openecomp.sdc.vendorsoftwareproduct.dao.type;
 
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
 import org.openecomp.sdc.vendorsoftwareproduct.types.composition.CompositionEntityId;
 import org.openecomp.sdc.vendorsoftwareproduct.types.composition.CompositionEntityType;
 import org.openecomp.sdc.versioning.dao.types.Version;
 
-
-
+@Getter
+@Setter
+@NoArgsConstructor
 public class VspQuestionnaireEntity implements CompositionEntity {
-  private static final String ENTITY_TYPE = "Vendor Software Product";
-
-  private String id;
-  private Version version;
-  private String questionnaireData;
-
-  public VspQuestionnaireEntity() {
-
-  }
-
-  public VspQuestionnaireEntity(String vspId, Version version) {
-    this.id = vspId;
-    this.version = version;
-  }
-
-  @Override
-  public String getEntityType() {
-    return ENTITY_TYPE;
-  }
-
-  @Override
-  public String getFirstClassCitizenId() {
-    return getId();
-  }
-
-  @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;
-  }
-
-  @Override
-  public CompositionEntityType getType() {
-    return CompositionEntityType.vsp;
-  }
-
-  @Override
-  public CompositionEntityId getCompositionEntityId() {
-    return new CompositionEntityId(getId(), null);
-  }
-
-  @Override
-  public String getCompositionData() {
-    return null; //none
-  }
-
-  @Override
-  public void setCompositionData(String compositionData) {
-    //none
-  }
-
-  public String getQuestionnaireData() {
-    return questionnaireData;
-  }
 
-  public void setQuestionnaireData(String questionnaireData) {
-    this.questionnaireData = questionnaireData;
-  }
+    private static final String ENTITY_TYPE = "Vendor Software Product";
+
+    private String id;
+    private Version version;
+    private String questionnaireData;
+
+    public VspQuestionnaireEntity(String vspId, Version version) {
+        this.id = vspId;
+        this.version = version;
+    }
+
+    @Override
+    public String getEntityType() {
+        return ENTITY_TYPE;
+    }
+
+    @Override
+    public String getFirstClassCitizenId() {
+        return getId();
+    }
+
+    @Override
+    public CompositionEntityType getType() {
+        return CompositionEntityType.vsp;
+    }
+
+    @Override
+    public CompositionEntityId getCompositionEntityId() {
+        return new CompositionEntityId(getId(), null);
+    }
+
+    @Override
+    public String getCompositionData() {
+        return null; //none
+    }
+
+    @Override
+    public void setCompositionData(String compositionData) {
+        //none
+    }
 
 }
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/informationArtifact/InformationArtifactData.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/informationArtifact/InformationArtifactData.java
index 2bf11b03d6..8f68f1088b 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/informationArtifact/InformationArtifactData.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/informationArtifact/InformationArtifactData.java
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,64 +20,25 @@
 
 package org.openecomp.sdc.vendorsoftwareproduct.informationArtifact;
 
-
+import java.util.List;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
 import org.openecomp.sdc.vendorsoftwareproduct.dao.type.VspDetails;
 import org.openecomp.sdc.vendorsoftwareproduct.types.questionnaire.component.ComponentQuestionnaire;
 import org.openecomp.sdc.vendorsoftwareproduct.types.questionnaire.nic.NicQuestionnaire;
 import org.openecomp.sdc.vendorsoftwareproduct.types.questionnaire.vsp.VspQuestionnaire;
 
-import java.util.List;
-
-/**
- * Created by TALIO on 11/22/2016
- */
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
 public class InformationArtifactData {
+
     private VspDetails vspDetails;
     private VspQuestionnaire vspQuestionnaire;
     private List<ComponentQuestionnaire> componentQuestionnaires;
     private List<NicQuestionnaire> nicQuestionnaires;
 
-
-    public InformationArtifactData(VspDetails vspDetails, VspQuestionnaire vspQuestionnaire, List<ComponentQuestionnaire> componentQuestionnaires, List<NicQuestionnaire> nicQuestionnaires) {
-        this.vspDetails = vspDetails;
-        this.vspQuestionnaire = vspQuestionnaire;
-        this.componentQuestionnaires = componentQuestionnaires;
-        this.nicQuestionnaires = nicQuestionnaires;
-    }
-
-  public InformationArtifactData() {
-
-  }
-
-  public VspQuestionnaire getVspQuestionnaire() {
-        return vspQuestionnaire;
-    }
-
-    public void setVspQuestionnaire(VspQuestionnaire vspQuestionnaire) {
-        this.vspQuestionnaire = vspQuestionnaire;
-    }
-
-    public List<ComponentQuestionnaire> getComponentQuestionnaires() {
-        return componentQuestionnaires;
-    }
-
-    public void setComponentQuestionnaires(List<ComponentQuestionnaire> componentQuestionnaires) {
-        this.componentQuestionnaires = componentQuestionnaires;
-    }
-
-    public List<NicQuestionnaire> getNicQuestionnaires() {
-        return nicQuestionnaires;
-    }
-
-    public void setNicQuestionnaires(List<NicQuestionnaire> nicQuestionnaires) {
-        this.nicQuestionnaires = nicQuestionnaires;
-    }
-
-    public VspDetails getVspDetails() {
-        return vspDetails;
-    }
-
-    public void setVspDetails(VspDetails vspDetails) {
-        this.vspDetails = vspDetails;
-    }
 }