Reformat openecomp-be

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

131 files changed, 1507 insertions, 1856 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/VendorSoftwareProductConstants.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/VendorSoftwareProductConstants.java
index 220d7f4d15..86c1bd1895 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/VendorSoftwareProductConstants.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/VendorSoftwareProductConstants.java
@@ -17,26 +17,27 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct;
 
 public final class VendorSoftwareProductConstants {
-  public static final String VENDOR_SOFTWARE_PRODUCT_VERSIONABLE_TYPE = "VendorSoftwareProduct";
-  public static final String VSP_PACKAGE_ZIP = "VSPPackage.zip";
-  public static final String CSAR = "CSAR";
-  public static final String INFORMATION_ARTIFACT_NAME = "VSP_%s_Information.txt";
-  public static final String NAME_PATTERN = "^[a-zA-Z0-9_]*$";
 
-  public final class UniqueValues {
-    public static final String VENDOR_SOFTWARE_PRODUCT_NAME = "Vendor Software Product name";
-    public static final String PROCESS_NAME = "Process name";
-    public static final String NETWORK_NAME = "Network name";
-    public static final String COMPONENT_NAME = "ComponentData name";
-    public static final String NIC_NAME = "NIC name";
-    public static final String COMPUTE_NAME = "Compute name";
-    public static final String ORCHESTRATION_CANDIDATE_NAME = "Orchestration Candidate name";
-    //public static final String COMPONENT_ARTIFACT_NAME = "ComponentArtifact name";
-    public static final String DEPLOYMENT_FLAVOR_NAME = "Deployment Flavor name";
-    public static final String IMAGE_NAME = "Image name";
-  }
+    public static final String VENDOR_SOFTWARE_PRODUCT_VERSIONABLE_TYPE = "VendorSoftwareProduct";
+    public static final String VSP_PACKAGE_ZIP = "VSPPackage.zip";
+    public static final String CSAR = "CSAR";
+    public static final String INFORMATION_ARTIFACT_NAME = "VSP_%s_Information.txt";
+    public static final String NAME_PATTERN = "^[a-zA-Z0-9_]*$";
+
+    public final class UniqueValues {
+
+        public static final String VENDOR_SOFTWARE_PRODUCT_NAME = "Vendor Software Product name";
+        public static final String PROCESS_NAME = "Process name";
+        public static final String NETWORK_NAME = "Network name";
+        public static final String COMPONENT_NAME = "ComponentData name";
+        public static final String NIC_NAME = "NIC name";
+        public static final String COMPUTE_NAME = "Compute name";
+        public static final String ORCHESTRATION_CANDIDATE_NAME = "Orchestration Candidate name";
+        //public static final String COMPONENT_ARTIFACT_NAME = "ComponentArtifact name";
+        public static final String DEPLOYMENT_FLAVOR_NAME = "Deployment Flavor name";
+        public static final String IMAGE_NAME = "Image name";
+    }
 }
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/ComponentArtifactDao.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/ComponentArtifactDao.java
index 88b5964114..55df02e29a 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/ComponentArtifactDao.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/ComponentArtifactDao.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.
@@ -17,28 +17,24 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.dao;
 
-import org.openecomp.sdc.vendorsoftwareproduct.dao.type.ComponentMonitoringUploadEntity;
-import org.openecomp.sdc.versioning.dao.VersionableDao;
-
 import java.util.Collection;
 import java.util.Optional;
-
+import org.openecomp.sdc.vendorsoftwareproduct.dao.type.ComponentMonitoringUploadEntity;
+import org.openecomp.sdc.versioning.dao.VersionableDao;
 
 public interface ComponentArtifactDao extends VersionableDao {
 
-  Optional<ComponentMonitoringUploadEntity> getByType(ComponentMonitoringUploadEntity entity);
+    Optional<ComponentMonitoringUploadEntity> getByType(ComponentMonitoringUploadEntity entity);
 
-  void create(ComponentMonitoringUploadEntity entity);
+    void create(ComponentMonitoringUploadEntity entity);
 
-  void delete(ComponentMonitoringUploadEntity entity);
+    void delete(ComponentMonitoringUploadEntity entity);
 
-  Collection<ComponentMonitoringUploadEntity> list(ComponentMonitoringUploadEntity entity);
+    Collection<ComponentMonitoringUploadEntity> list(ComponentMonitoringUploadEntity entity);
 
-  void deleteAll(ComponentMonitoringUploadEntity entity);
+    void deleteAll(ComponentMonitoringUploadEntity entity);
 
-  Collection<ComponentMonitoringUploadEntity> listArtifacts(
-      ComponentMonitoringUploadEntity entity);
+    Collection<ComponentMonitoringUploadEntity> listArtifacts(ComponentMonitoringUploadEntity entity);
 }
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/ComponentDao.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/ComponentDao.java
index ef3f2f131d..acc2dbf46d 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/ComponentDao.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/ComponentDao.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.
@@ -17,26 +17,23 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.dao;
 
+import java.util.Collection;
 import org.openecomp.core.dao.BaseDao;
 import org.openecomp.sdc.vendorsoftwareproduct.dao.type.ComponentEntity;
 import org.openecomp.sdc.versioning.dao.VersionableDao;
 import org.openecomp.sdc.versioning.dao.types.Version;
 
-import java.util.Collection;
-
 public interface ComponentDao extends VersionableDao, BaseDao<ComponentEntity> {
 
-  ComponentEntity getQuestionnaireData(String vspId, Version version, String componentId);
+    ComponentEntity getQuestionnaireData(String vspId, Version version, String componentId);
 
-  void updateQuestionnaireData(String vspId, Version version, String componentId,
-                               String questionnaireData);
+    void updateQuestionnaireData(String vspId, Version version, String componentId, String questionnaireData);
 
-  Collection<ComponentEntity> listQuestionnaires(String vspId, Version version);
+    Collection<ComponentEntity> listQuestionnaires(String vspId, Version version);
 
-  Collection<ComponentEntity> listCompositionAndQuestionnaire(String vspId, Version version);
+    Collection<ComponentEntity> listCompositionAndQuestionnaire(String vspId, Version version);
 
-  void deleteAll(String vspId, Version version);
+    void deleteAll(String vspId, Version version);
 }
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/ComponentDaoFactory.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/ComponentDaoFactory.java
index e1cf30bfb1..81fc4724eb 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/ComponentDaoFactory.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/ComponentDaoFactory.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.
@@ -17,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.dao;
 
 import org.openecomp.core.factory.api.AbstractComponentFactory;
@@ -25,7 +24,7 @@ import org.openecomp.core.factory.api.AbstractFactory;
 
 public abstract class ComponentDaoFactory extends AbstractComponentFactory<ComponentDao> {
 
-  public static ComponentDaoFactory getInstance() {
-    return AbstractFactory.getInstance(ComponentDaoFactory.class);
-  }
+    public static ComponentDaoFactory getInstance() {
+        return AbstractFactory.getInstance(ComponentDaoFactory.class);
+    }
 }
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/ComponentDependencyModelDao.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/ComponentDependencyModelDao.java
index a35c8b0000..4d0de55b90 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/ComponentDependencyModelDao.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/ComponentDependencyModelDao.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.
@@ -17,13 +17,12 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.dao;
 
 import org.openecomp.core.dao.BaseDao;
 import org.openecomp.sdc.vendorsoftwareproduct.dao.type.ComponentDependencyModelEntity;
 import org.openecomp.sdc.versioning.dao.VersionableDao;
 
-public interface ComponentDependencyModelDao extends VersionableDao,
-    BaseDao<ComponentDependencyModelEntity> {
+public interface ComponentDependencyModelDao extends VersionableDao, BaseDao<ComponentDependencyModelEntity> {
+
 }
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/ComponentDependencyModelDaoFactory.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/ComponentDependencyModelDaoFactory.java
index d347426c86..09c5db22b6 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/ComponentDependencyModelDaoFactory.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/ComponentDependencyModelDaoFactory.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.
@@ -17,17 +17,14 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.dao;
 
-
 import org.openecomp.core.factory.api.AbstractComponentFactory;
 import org.openecomp.core.factory.api.AbstractFactory;
 
-public abstract class ComponentDependencyModelDaoFactory extends
-    AbstractComponentFactory<ComponentDependencyModelDao> {
+public abstract class ComponentDependencyModelDaoFactory extends AbstractComponentFactory<ComponentDependencyModelDao> {
 
-  public static ComponentDependencyModelDaoFactory getInstance() {
-    return AbstractFactory.getInstance(ComponentDependencyModelDaoFactory.class);
-  }
+    public static ComponentDependencyModelDaoFactory getInstance() {
+        return AbstractFactory.getInstance(ComponentDependencyModelDaoFactory.class);
+    }
 }
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/ComputeDao.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/ComputeDao.java
index 1ddb0129d2..4f7f5fdde7 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/ComputeDao.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/ComputeDao.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.
@@ -17,25 +17,21 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.dao;
 
+import java.util.Collection;
 import org.openecomp.core.dao.BaseDao;
 import org.openecomp.sdc.vendorsoftwareproduct.dao.type.ComputeEntity;
 import org.openecomp.sdc.versioning.dao.VersionableDao;
 import org.openecomp.sdc.versioning.dao.types.Version;
 
-import java.util.Collection;
-
 public interface ComputeDao extends VersionableDao, BaseDao<ComputeEntity> {
 
-  Collection<ComputeEntity> listByVsp(String vspId, Version version);
+    Collection<ComputeEntity> listByVsp(String vspId, Version version);
 
+    void updateQuestionnaireData(String vspId, Version version, String componentId, String computeId, String questionnaireData);
 
-  void updateQuestionnaireData(String vspId, Version version, String componentId, String computeId,
-                               String questionnaireData);
-  void deleteAll(String vspId, Version version);
+    void deleteAll(String vspId, Version version);
 
-  ComputeEntity getQuestionnaireData(String vspId, Version version, String componentId,
-                                 String computeId);
+    ComputeEntity getQuestionnaireData(String vspId, Version version, String componentId, String computeId);
 }
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/ComputeDaoFactory.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/ComputeDaoFactory.java
index 951ae00c95..78a5cddcf0 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/ComputeDaoFactory.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/ComputeDaoFactory.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.
@@ -17,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.dao;
 
 import org.openecomp.core.factory.api.AbstractComponentFactory;
@@ -25,8 +24,7 @@ import org.openecomp.core.factory.api.AbstractFactory;
 
 public abstract class ComputeDaoFactory extends AbstractComponentFactory<ComputeDao> {
 
-
-  public static ComputeDaoFactory getInstance() {
-    return AbstractFactory.getInstance(ComputeDaoFactory.class);
-  }
+    public static ComputeDaoFactory getInstance() {
+        return AbstractFactory.getInstance(ComputeDaoFactory.class);
+    }
 }
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/DeploymentFlavorDao.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/DeploymentFlavorDao.java
index 1a3313ae60..ef96dc98e6 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/DeploymentFlavorDao.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/DeploymentFlavorDao.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.
@@ -17,16 +17,14 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.dao;
 
-
 import org.openecomp.core.dao.BaseDao;
 import org.openecomp.sdc.vendorsoftwareproduct.dao.type.DeploymentFlavorEntity;
 import org.openecomp.sdc.versioning.dao.VersionableDao;
 import org.openecomp.sdc.versioning.dao.types.Version;
 
 public interface DeploymentFlavorDao extends VersionableDao, BaseDao<DeploymentFlavorEntity> {
-  void deleteAll(String vspId, Version version);
-}
 
+    void deleteAll(String vspId, Version version);
+}
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/DeploymentFlavorDaoFactory.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/DeploymentFlavorDaoFactory.java
index a94afa2eae..9d70e594b1 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/DeploymentFlavorDaoFactory.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/DeploymentFlavorDaoFactory.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.
@@ -17,14 +17,13 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.dao;
 
-
 import org.openecomp.core.factory.api.AbstractComponentFactory;
 import org.openecomp.core.factory.api.AbstractFactory;
 
 public abstract class DeploymentFlavorDaoFactory extends AbstractComponentFactory<DeploymentFlavorDao> {
+
     public static DeploymentFlavorDaoFactory getInstance() {
         return AbstractFactory.getInstance(DeploymentFlavorDaoFactory.class);
     }
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/ImageDao.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/ImageDao.java
index ab1efd3b66..d707cecae7 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/ImageDao.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/ImageDao.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.
@@ -17,27 +17,21 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.dao;
 
-
+import java.util.Collection;
 import org.openecomp.core.dao.BaseDao;
 import org.openecomp.sdc.vendorsoftwareproduct.dao.type.ImageEntity;
 import org.openecomp.sdc.versioning.dao.VersionableDao;
 import org.openecomp.sdc.versioning.dao.types.Version;
 
-import java.util.Collection;
-
 public interface ImageDao extends VersionableDao, BaseDao<ImageEntity> {
 
-  void updateQuestionnaireData(String vspId, Version version, String componentId, String imageId,
-                               String questionnaireData);
-
+    void updateQuestionnaireData(String vspId, Version version, String componentId, String imageId, String questionnaireData);
 
-  void deleteByVspId(String vspId, Version version);
+    void deleteByVspId(String vspId, Version version);
 
-  Collection<ImageEntity> listByVsp(String vspId, Version version);
+    Collection<ImageEntity> listByVsp(String vspId, Version version);
 
-  ImageEntity getQuestionnaireData(String vspId, Version version, String componentId,
-                                     String imageId);
+    ImageEntity getQuestionnaireData(String vspId, Version version, String componentId, String imageId);
 }
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/ImageDaoFactory.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/ImageDaoFactory.java
index e6eda24450..f49169b785 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/ImageDaoFactory.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/ImageDaoFactory.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.
@@ -17,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.dao;
 
 import org.openecomp.core.factory.api.AbstractComponentFactory;
@@ -25,7 +24,7 @@ import org.openecomp.core.factory.api.AbstractFactory;
 
 public abstract class ImageDaoFactory extends AbstractComponentFactory<ImageDao> {
 
-  public static ImageDaoFactory getInstance() {
-    return AbstractFactory.getInstance(ImageDaoFactory.class);
-  }
+    public static ImageDaoFactory getInstance() {
+        return AbstractFactory.getInstance(ImageDaoFactory.class);
+    }
 }
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/MonitoringUploadDaoFactory.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/MonitoringUploadDaoFactory.java
index b70b1a5245..9493295333 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/MonitoringUploadDaoFactory.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/MonitoringUploadDaoFactory.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.
@@ -17,16 +17,14 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.dao;
 
 import org.openecomp.core.factory.api.AbstractComponentFactory;
 import org.openecomp.core.factory.api.AbstractFactory;
 
-public abstract class MonitoringUploadDaoFactory
-    extends AbstractComponentFactory<ComponentArtifactDao> {
+public abstract class MonitoringUploadDaoFactory extends AbstractComponentFactory<ComponentArtifactDao> {
 
-  public static MonitoringUploadDaoFactory getInstance() {
-    return AbstractFactory.getInstance(MonitoringUploadDaoFactory.class);
-  }
+    public static MonitoringUploadDaoFactory getInstance() {
+        return AbstractFactory.getInstance(MonitoringUploadDaoFactory.class);
+    }
 }
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/NetworkDao.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/NetworkDao.java
index da57b0a2b4..1736727ed3 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/NetworkDao.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/NetworkDao.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.
@@ -17,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.dao;
 
 import org.openecomp.core.dao.BaseDao;
@@ -27,15 +26,5 @@ import org.openecomp.sdc.versioning.dao.types.Version;
 
 public interface NetworkDao extends VersionableDao, BaseDao<NetworkEntity> {
 
-
-
-  void deleteAll(String vspId, Version version);
-
-
-
-
-
-
-
-
+    void deleteAll(String vspId, Version version);
 }
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/NetworkDaoFactory.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/NetworkDaoFactory.java
index 8db3d605e4..547cf037fc 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/NetworkDaoFactory.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/NetworkDaoFactory.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.
@@ -17,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.dao;
 
 import org.openecomp.core.factory.api.AbstractComponentFactory;
@@ -25,7 +24,7 @@ import org.openecomp.core.factory.api.AbstractFactory;
 
 public abstract class NetworkDaoFactory extends AbstractComponentFactory<NetworkDao> {
 
-  public static NetworkDaoFactory getInstance() {
-    return AbstractFactory.getInstance(NetworkDaoFactory.class);
-  }
+    public static NetworkDaoFactory getInstance() {
+        return AbstractFactory.getInstance(NetworkDaoFactory.class);
+    }
 }
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/NicDao.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/NicDao.java
index 3205fcdb1f..83f6f3954e 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/NicDao.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/NicDao.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.
@@ -17,27 +17,23 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.dao;
 
+import java.util.Collection;
 import org.openecomp.core.dao.BaseDao;
 import org.openecomp.sdc.vendorsoftwareproduct.dao.type.NicEntity;
 import org.openecomp.sdc.versioning.dao.VersionableDao;
 import org.openecomp.sdc.versioning.dao.types.Version;
 
-import java.util.Collection;
-
 public interface NicDao extends VersionableDao, BaseDao<NicEntity> {
 
-  NicEntity getQuestionnaireData(String vspId, Version version, String componentId,
-                                 String nicId);
+    NicEntity getQuestionnaireData(String vspId, Version version, String componentId, String nicId);
 
-  void updateQuestionnaireData(String vspId, Version version, String componentId, String nicId,
-                               String questionnaireData);
+    void updateQuestionnaireData(String vspId, Version version, String componentId, String nicId, String questionnaireData);
 
-  Collection<NicEntity> listByVsp(String vspId, Version version);
+    Collection<NicEntity> listByVsp(String vspId, Version version);
 
-  void deleteByComponentId(String vspId, Version version, String componentId);
+    void deleteByComponentId(String vspId, Version version, String componentId);
 
-  void deleteByVspId(String vspId, Version version);
+    void deleteByVspId(String vspId, Version version);
 }
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/NicDaoFactory.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/NicDaoFactory.java
index b61ad6a3ca..24ebc22d12 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/NicDaoFactory.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/NicDaoFactory.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.
@@ -17,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.dao;
 
 import org.openecomp.core.factory.api.AbstractComponentFactory;
@@ -25,7 +24,7 @@ import org.openecomp.core.factory.api.AbstractFactory;
 
 public abstract class NicDaoFactory extends AbstractComponentFactory<NicDao> {
 
-  public static NicDaoFactory getInstance() {
-    return AbstractFactory.getInstance(NicDaoFactory.class);
-  }
+    public static NicDaoFactory getInstance() {
+        return AbstractFactory.getInstance(NicDaoFactory.class);
+    }
 }
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/OrchestrationTemplateCandidateDao.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/OrchestrationTemplateCandidateDao.java
index c44ee307b4..8049717cd5 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/OrchestrationTemplateCandidateDao.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/OrchestrationTemplateCandidateDao.java
@@ -13,32 +13,28 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.dao;
 
+import java.util.Optional;
 import org.openecomp.sdc.heat.datatypes.structure.ValidationStructureList;
 import org.openecomp.sdc.vendorsoftwareproduct.dao.type.OrchestrationTemplateCandidateData;
 import org.openecomp.sdc.vendorsoftwareproduct.types.candidateheat.FilesDataStructure;
 import org.openecomp.sdc.versioning.dao.VersionableDao;
 import org.openecomp.sdc.versioning.dao.types.Version;
 
-import java.util.Optional;
-
 public interface OrchestrationTemplateCandidateDao extends VersionableDao {
 
-  Optional<OrchestrationTemplateCandidateData> get(String vspId, Version version);
+    Optional<OrchestrationTemplateCandidateData> get(String vspId, Version version);
 
-  Optional<OrchestrationTemplateCandidateData> getInfo(String vspId, Version version);
+    Optional<OrchestrationTemplateCandidateData> getInfo(String vspId, Version version);
 
-  void delete(String vspId, Version version);
+    void delete(String vspId, Version version);
 
-  void update(String vspId, Version version, OrchestrationTemplateCandidateData candidateData);
+    void update(String vspId, Version version, OrchestrationTemplateCandidateData candidateData);
 
-  void updateStructure(String vspId, Version version, FilesDataStructure fileDataStructure);
+    void updateStructure(String vspId, Version version, FilesDataStructure fileDataStructure);
 
-  Optional<String> getStructure(String vspId, Version version);
+    Optional<String> getStructure(String vspId, Version version);
 
-  void updateValidationData(String vspId, Version version, ValidationStructureList
-      validationData);
+    void updateValidationData(String vspId, Version version, ValidationStructureList validationData);
 }
-
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/OrchestrationTemplateCandidateDaoFactory.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/OrchestrationTemplateCandidateDaoFactory.java
index 5624da018a..f8c91a9652 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/OrchestrationTemplateCandidateDaoFactory.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/OrchestrationTemplateCandidateDaoFactory.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.
@@ -17,16 +17,14 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.dao;
 
 import org.openecomp.core.factory.api.AbstractComponentFactory;
 import org.openecomp.core.factory.api.AbstractFactory;
 
-public abstract class OrchestrationTemplateCandidateDaoFactory
-    extends AbstractComponentFactory<OrchestrationTemplateCandidateDao> {
+public abstract class OrchestrationTemplateCandidateDaoFactory extends AbstractComponentFactory<OrchestrationTemplateCandidateDao> {
 
-  public static OrchestrationTemplateCandidateDaoFactory getInstance() {
-    return AbstractFactory.getInstance(OrchestrationTemplateCandidateDaoFactory.class);
-  }
+    public static OrchestrationTemplateCandidateDaoFactory getInstance() {
+        return AbstractFactory.getInstance(OrchestrationTemplateCandidateDaoFactory.class);
+    }
 }
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/OrchestrationTemplateDao.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/OrchestrationTemplateDao.java
index ddee436331..22eae51af7 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/OrchestrationTemplateDao.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/OrchestrationTemplateDao.java
@@ -13,23 +13,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.dao;
 
+import java.util.Optional;
 import org.openecomp.sdc.vendorsoftwareproduct.dao.type.OrchestrationTemplateEntity;
 import org.openecomp.sdc.versioning.dao.VersionableDao;
 import org.openecomp.sdc.versioning.dao.types.Version;
 
-import java.util.Optional;
-
 public interface OrchestrationTemplateDao extends VersionableDao {
 
-  OrchestrationTemplateEntity getInfo(String vspId, Version version);
+    OrchestrationTemplateEntity getInfo(String vspId, Version version);
 
-  OrchestrationTemplateEntity get(String vspId, Version version);
+    OrchestrationTemplateEntity get(String vspId, Version version);
 
-  void update(String vspId, Version version, OrchestrationTemplateEntity uploadData);
+    void update(String vspId, Version version, OrchestrationTemplateEntity uploadData);
 
-  Optional<String> getOrchestrationTemplateStructure(String vspId, Version version);
+    Optional<String> getOrchestrationTemplateStructure(String vspId, Version version);
 }
-
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/OrchestrationTemplateDaoFactory.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/OrchestrationTemplateDaoFactory.java
index be3c849a20..a73355bebe 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/OrchestrationTemplateDaoFactory.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/OrchestrationTemplateDaoFactory.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.
@@ -17,16 +17,14 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.dao;
 
 import org.openecomp.core.factory.api.AbstractComponentFactory;
 import org.openecomp.core.factory.api.AbstractFactory;
 
-public abstract class OrchestrationTemplateDaoFactory
-    extends AbstractComponentFactory<OrchestrationTemplateDao> {
+public abstract class OrchestrationTemplateDaoFactory extends AbstractComponentFactory<OrchestrationTemplateDao> {
 
-  public static OrchestrationTemplateDaoFactory getInstance() {
-    return AbstractFactory.getInstance(OrchestrationTemplateDaoFactory.class);
-  }
+    public static OrchestrationTemplateDaoFactory getInstance() {
+        return AbstractFactory.getInstance(OrchestrationTemplateDaoFactory.class);
+    }
 }
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/PackageInfoDao.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/PackageInfoDao.java
index 36fff1e534..a2b1c9c8ae 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/PackageInfoDao.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/PackageInfoDao.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.
@@ -17,14 +17,13 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.dao;
 
+import java.util.List;
 import org.openecomp.core.dao.BaseDao;
 import org.openecomp.sdc.vendorsoftwareproduct.dao.type.PackageInfo;
 
-import java.util.List;
-
 public interface PackageInfoDao extends BaseDao<PackageInfo> {
-  List<PackageInfo> listByCategory(String category, String subCategory);
+
+    List<PackageInfo> listByCategory(String category, String subCategory);
 }
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/PackageInfoDaoFactory.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/PackageInfoDaoFactory.java
index a8e3d6563d..6f617ddd0c 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/PackageInfoDaoFactory.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/PackageInfoDaoFactory.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.
@@ -17,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.dao;
 
 import org.openecomp.core.factory.api.AbstractComponentFactory;
@@ -25,7 +24,7 @@ import org.openecomp.core.factory.api.AbstractFactory;
 
 public abstract class PackageInfoDaoFactory extends AbstractComponentFactory<PackageInfoDao> {
 
-  public static PackageInfoDaoFactory getInstance() {
-    return AbstractFactory.getInstance(PackageInfoDaoFactory.class);
-  }
+    public static PackageInfoDaoFactory getInstance() {
+        return AbstractFactory.getInstance(PackageInfoDaoFactory.class);
+    }
 }
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/ProcessDao.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/ProcessDao.java
index 83eab91ea6..8e1a826d8b 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/ProcessDao.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/ProcessDao.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.
@@ -17,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.dao;
 
 import org.openecomp.core.dao.BaseDao;
@@ -30,13 +29,14 @@ import org.openecomp.sdc.versioning.dao.types.Version;
  * @since March 23, 2017
  */
 public interface ProcessDao extends VersionableDao, BaseDao<ProcessEntity> {
-  void deleteAll(ProcessEntity entity);
 
-  void deleteVspAll(String vspId, Version version);
+    void deleteAll(ProcessEntity entity);
+
+    void deleteVspAll(String vspId, Version version);
 
-  ProcessEntity getArtifact(ProcessEntity entity);
+    ProcessEntity getArtifact(ProcessEntity entity);
 
-  void uploadArtifact(ProcessEntity entity);
+    void uploadArtifact(ProcessEntity entity);
 
-  void deleteArtifact(ProcessEntity entity);
+    void deleteArtifact(ProcessEntity entity);
 }
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/ProcessDaoFactory.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/ProcessDaoFactory.java
index f661a0ccda..59105981f5 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/ProcessDaoFactory.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/ProcessDaoFactory.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.
@@ -17,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.dao;
 
 import org.openecomp.core.factory.api.AbstractComponentFactory;
@@ -25,7 +24,7 @@ import org.openecomp.core.factory.api.AbstractFactory;
 
 public abstract class ProcessDaoFactory extends AbstractComponentFactory<ProcessDao> {
 
-  public static ProcessDaoFactory getInstance() {
-    return AbstractFactory.getInstance(ProcessDaoFactory.class);
-  }
+    public static ProcessDaoFactory getInstance() {
+        return AbstractFactory.getInstance(ProcessDaoFactory.class);
+    }
 }
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/VendorSoftwareProductInfoDao.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/VendorSoftwareProductInfoDao.java
index c44a9cd89e..442b6043d5 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/VendorSoftwareProductInfoDao.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/VendorSoftwareProductInfoDao.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.
@@ -17,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.dao;
 
 import org.openecomp.core.dao.BaseDao;
@@ -28,9 +27,9 @@ import org.openecomp.sdc.versioning.dao.types.Version;
 
 public interface VendorSoftwareProductInfoDao extends VersionableDao, BaseDao<VspDetails> {
 
-  void updateQuestionnaireData(String vspId, Version version, String questionnaireData);
+    void updateQuestionnaireData(String vspId, Version version, String questionnaireData);
 
-  VspQuestionnaireEntity getQuestionnaire(String vspId, Version version);
+    VspQuestionnaireEntity getQuestionnaire(String vspId, Version version);
 
-  boolean isManual(String vspId, Version version);
+    boolean isManual(String vspId, Version version);
 }
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/VendorSoftwareProductInfoDaoFactory.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/VendorSoftwareProductInfoDaoFactory.java
index 570ddc496e..0c10698f0b 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/VendorSoftwareProductInfoDaoFactory.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/VendorSoftwareProductInfoDaoFactory.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.
@@ -17,16 +17,14 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.dao;
 
 import org.openecomp.core.factory.api.AbstractComponentFactory;
 import org.openecomp.core.factory.api.AbstractFactory;
 
-public abstract class VendorSoftwareProductInfoDaoFactory
-    extends AbstractComponentFactory<VendorSoftwareProductInfoDao> {
+public abstract class VendorSoftwareProductInfoDaoFactory extends AbstractComponentFactory<VendorSoftwareProductInfoDao> {
 
-  public static VendorSoftwareProductInfoDaoFactory getInstance() {
-    return AbstractFactory.getInstance(VendorSoftwareProductInfoDaoFactory.class);
-  }
+    public static VendorSoftwareProductInfoDaoFactory getInstance() {
+        return AbstractFactory.getInstance(VendorSoftwareProductInfoDaoFactory.class);
+    }
 }
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/VspMergeDao.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/VspMergeDao.java
index fbe99b7a79..4c7b1340e6 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/VspMergeDao.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/VspMergeDao.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.
@@ -17,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.dao;
 
 import com.amdocs.zusammen.datatypes.item.Resolution;
@@ -25,14 +24,14 @@ import org.openecomp.sdc.versioning.dao.types.Version;
 
 public interface VspMergeDao {
 
-  boolean isConflicted(String vspId, Version version);
+    boolean isConflicted(String vspId, Version version);
 
-  void updateHint(String vspId, Version version);
+    void updateHint(String vspId, Version version);
 
-  void deleteHint(String vspId, Version version);
+    void deleteHint(String vspId, Version version);
 
-  // TODO: 11/7/2017 change to sdc Resolution
-  void updateConflictResolution(String vspId, Version version, Resolution resolution);
+    // TODO: 11/7/2017 change to sdc Resolution
+    void updateConflictResolution(String vspId, Version version, Resolution resolution);
 
-  void applyConflictResolution(String vspId, Version version);
+    void applyConflictResolution(String vspId, Version version);
 }
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/VspMergeDaoFactory.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/VspMergeDaoFactory.java
index 84f021c9e3..92ddee756b 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/VspMergeDaoFactory.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/VspMergeDaoFactory.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.
@@ -17,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.dao;
 
 import org.openecomp.core.factory.api.AbstractComponentFactory;
@@ -25,7 +24,7 @@ import org.openecomp.core.factory.api.AbstractFactory;
 
 public abstract class VspMergeDaoFactory extends AbstractComponentFactory<VspMergeDao> {
 
-  public static VspMergeDaoFactory getInstance() {
-    return AbstractFactory.getInstance(VspMergeDaoFactory.class);
-  }
+    public static VspMergeDaoFactory getInstance() {
+        return AbstractFactory.getInstance(VspMergeDaoFactory.class);
+    }
 }
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/VspQuestionnaireDao.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/VspQuestionnaireDao.java
index 4658f71d2a..dbac6f398c 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/VspQuestionnaireDao.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/VspQuestionnaireDao.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.
@@ -17,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.dao;
 
 import org.openecomp.sdc.vendorsoftwareproduct.dao.type.VspQuestionnaireEntity;
@@ -26,7 +25,7 @@ import org.openecomp.sdc.versioning.dao.types.Version;
 
 public interface VspQuestionnaireDao extends VersionableDao {
 
-  VspQuestionnaireEntity get(VspQuestionnaireEntity entity);
+    VspQuestionnaireEntity get(VspQuestionnaireEntity entity);
 
-  void updateQuestionnaireData(String id, Version version, String questionnaireData);
+    void updateQuestionnaireData(String id, Version version, String questionnaireData);
 }
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/VspQuestionnaireDaoFactory.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/VspQuestionnaireDaoFactory.java
index afc3dc9649..90d0d448b1 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/VspQuestionnaireDaoFactory.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/VspQuestionnaireDaoFactory.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.
@@ -17,16 +17,14 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.dao;
 
 import org.openecomp.core.factory.api.AbstractComponentFactory;
 import org.openecomp.core.factory.api.AbstractFactory;
 
-public abstract class VspQuestionnaireDaoFactory
-    extends AbstractComponentFactory<VspQuestionnaireDao> {
+public abstract class VspQuestionnaireDaoFactory extends AbstractComponentFactory<VspQuestionnaireDao> {
 
-  public static VspQuestionnaireDaoFactory getInstance() {
-    return AbstractFactory.getInstance(VspQuestionnaireDaoFactory.class);
-  }
+    public static VspQuestionnaireDaoFactory getInstance() {
+        return AbstractFactory.getInstance(VspQuestionnaireDaoFactory.class);
+    }
 }
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/Action.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/Action.java
index be78e78f5a..905c094c72 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/Action.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/Action.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.
@@ -17,12 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.dao.type;
 
-
-public enum Action {
-  CREATE_PACKAGE,
-  CHECK_IN,
-  CHECK_OUT
-}
+public enum Action {CREATE_PACKAGE, CHECK_IN, CHECK_OUT}
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/ComponentDependencyModelEntity.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/ComponentDependencyModelEntity.java
index dfdc0bc0c6..ce08ce6e14 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/ComponentDependencyModelEntity.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/ComponentDependencyModelEntity.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.
@@ -17,10 +17,13 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.dao.type;
 
-import com.datastax.driver.mapping.annotations.*;
+import com.datastax.driver.mapping.annotations.ClusteringColumn;
+import com.datastax.driver.mapping.annotations.Column;
+import com.datastax.driver.mapping.annotations.Frozen;
+import com.datastax.driver.mapping.annotations.PartitionKey;
+import com.datastax.driver.mapping.annotations.Table;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -35,44 +38,43 @@ import org.openecomp.sdc.versioning.dao.types.VersionableEntity;
 @Table(keyspace = "dox", name = "vsp_component_dependency_model")
 public class ComponentDependencyModelEntity implements VersionableEntity {
 
-  public static final String ENTITY_TYPE = "Vendor Software Product Component Dependency Model";
-  @PartitionKey
-  @Column(name = "vsp_id")
-  private String vspId;
-  @PartitionKey(value = 1)
-  @Frozen
-  private Version version;
-  @ClusteringColumn
-  @Column(name = "dependency_id")
-  private String id;
-  @Column(name = "sourcecomponent_id")
-  private String sourceComponentId;
-  @Column(name = "targetcomponent_id")
-  private String targetComponentId;
-  @Column(name = "relation")
-  private String relation;
-
+    public static final String ENTITY_TYPE = "Vendor Software Product Component Dependency Model";
+    @PartitionKey
+    @Column(name = "vsp_id")
+    private String vspId;
+    @PartitionKey(value = 1)
+    @Frozen
+    private Version version;
+    @ClusteringColumn
+    @Column(name = "dependency_id")
+    private String id;
+    @Column(name = "sourcecomponent_id")
+    private String sourceComponentId;
+    @Column(name = "targetcomponent_id")
+    private String targetComponentId;
+    @Column(name = "relation")
+    private String relation;
 
-  /**
-   * Instantiates a new ComponentDependencyModelEntity entity.
-   *
-   * @param vspId   the vsp id
-   * @param version the version
-   * @param dependencyId      the dependencyId
-   */
-  public ComponentDependencyModelEntity(String vspId, Version version, String dependencyId) {
-    this.vspId = vspId;
-    this.version = version;
-    this.id = dependencyId;
-  }
+    /**
+     * Instantiates a new ComponentDependencyModelEntity entity.
+     *
+     * @param vspId        the vsp id
+     * @param version      the version
+     * @param dependencyId the dependencyId
+     */
+    public ComponentDependencyModelEntity(String vspId, Version version, String dependencyId) {
+        this.vspId = vspId;
+        this.version = version;
+        this.id = dependencyId;
+    }
 
-  @Override
-  public String getEntityType() {
-    return ENTITY_TYPE;
-  }
+    @Override
+    public String getEntityType() {
+        return ENTITY_TYPE;
+    }
 
-  @Override
-  public String getFirstClassCitizenId() {
-    return getVspId();
-  }
+    @Override
+    public String getFirstClassCitizenId() {
+        return getVspId();
+    }
 }
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/ComponentEntity.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/ComponentEntity.java
index 18c4d949ab..7a69cff27d 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/ComponentEntity.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/ComponentEntity.java
@@ -17,10 +17,16 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.dao.type;
 
-import com.datastax.driver.mapping.annotations.*;
+import com.datastax.driver.mapping.annotations.ClusteringColumn;
+import com.datastax.driver.mapping.annotations.Column;
+import com.datastax.driver.mapping.annotations.Frozen;
+import com.datastax.driver.mapping.annotations.PartitionKey;
+import com.datastax.driver.mapping.annotations.Table;
+import com.datastax.driver.mapping.annotations.Transient;
+import java.util.ArrayList;
+import java.util.List;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -31,72 +37,68 @@ import org.openecomp.sdc.vendorsoftwareproduct.types.composition.CompositionEnti
 import org.openecomp.sdc.vendorsoftwareproduct.types.composition.CompositionEntityType;
 import org.openecomp.sdc.versioning.dao.types.Version;
 
-import java.util.ArrayList;
-import java.util.List;
-
 @EqualsAndHashCode
 @Getter
 @Setter
 @NoArgsConstructor
 @Table(keyspace = "dox", name = "vsp_component")
 public class ComponentEntity implements CompositionEntity {
-  public static final String ENTITY_TYPE = "Vendor Software Product Component";
 
-  @PartitionKey
-  @Column(name = "vsp_id")
-  private String vspId;
-  @PartitionKey(value = 1)
-  @Frozen
-  private Version version;
-  @ClusteringColumn
-  @Column(name = "component_id")
-  private String id;
-  @Column(name = "composition_data")
-  private String compositionData;
-  @Column(name = "questionnaire_data")
-  private String questionnaireData;
-  @Transient
-  private List<NicEntity> nics = new ArrayList<>();
+    public static final String ENTITY_TYPE = "Vendor Software Product Component";
+    @PartitionKey
+    @Column(name = "vsp_id")
+    private String vspId;
+    @PartitionKey(value = 1)
+    @Frozen
+    private Version version;
+    @ClusteringColumn
+    @Column(name = "component_id")
+    private String id;
+    @Column(name = "composition_data")
+    private String compositionData;
+    @Column(name = "questionnaire_data")
+    private String questionnaireData;
+    @Transient
+    private List<NicEntity> nics = new ArrayList<>();
 
-  /**
-   * Instantiates a new Component entity.
-   *
-   * @param vspId   the vsp id
-   * @param version the version
-   * @param id      the id
-   */
-  public ComponentEntity(String vspId, Version version, String id) {
-    this.vspId = vspId;
-    this.version = version;
-    this.id = id;
-  }
+    /**
+     * Instantiates a new Component entity.
+     *
+     * @param vspId   the vsp id
+     * @param version the version
+     * @param id      the id
+     */
+    public ComponentEntity(String vspId, Version version, String id) {
+        this.vspId = vspId;
+        this.version = version;
+        this.id = id;
+    }
 
-  @Override
-  public CompositionEntityType getType() {
-    return CompositionEntityType.component;
-  }
+    @Override
+    public CompositionEntityType getType() {
+        return CompositionEntityType.component;
+    }
 
-  @Override
-  public CompositionEntityId getCompositionEntityId() {
-    return new CompositionEntityId(getId(), new CompositionEntityId(getVspId(), null));
-  }
+    @Override
+    public CompositionEntityId getCompositionEntityId() {
+        return new CompositionEntityId(getId(), new CompositionEntityId(getVspId(), null));
+    }
 
-  @Override
-  public String getEntityType() {
-    return ENTITY_TYPE;
-  }
+    @Override
+    public String getEntityType() {
+        return ENTITY_TYPE;
+    }
 
-  @Override
-  public String getFirstClassCitizenId() {
-    return getVspId();
-  }
+    @Override
+    public String getFirstClassCitizenId() {
+        return getVspId();
+    }
 
-  public ComponentData getComponentCompositionData() {
-    return compositionData == null ? null
-        : JsonUtil.json2Object(compositionData, ComponentData.class);
-  }
+    public ComponentData getComponentCompositionData() {
+        return compositionData == null ? null : JsonUtil.json2Object(compositionData, ComponentData.class);
+    }
 
-  public void setComponentCompositionData(ComponentData component) {
-    this.compositionData = component == null ? null : JsonUtil.object2Json(component);
-  }
+    public void setComponentCompositionData(ComponentData component) {
+        this.compositionData = component == null ? null : JsonUtil.object2Json(component);
+    }
 }
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/ComponentMonitoringUploadEntity.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/ComponentMonitoringUploadEntity.java
index b8329a850b..69de3fb7ed 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/ComponentMonitoringUploadEntity.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/ComponentMonitoringUploadEntity.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.
@@ -17,138 +17,134 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.dao.type;
 
-import com.datastax.driver.mapping.annotations.*;
+import com.datastax.driver.mapping.annotations.ClusteringColumn;
+import com.datastax.driver.mapping.annotations.Column;
+import com.datastax.driver.mapping.annotations.Frozen;
+import com.datastax.driver.mapping.annotations.PartitionKey;
+import com.datastax.driver.mapping.annotations.Table;
+import java.nio.ByteBuffer;
 import org.openecomp.core.enrichment.types.MonitoringUploadType;
 import org.openecomp.sdc.versioning.dao.types.Version;
 import org.openecomp.sdc.versioning.dao.types.VersionableEntity;
 
-import java.nio.ByteBuffer;
-
 @Table(keyspace = "dox", name = "vsp_component_artifact")
 public class ComponentMonitoringUploadEntity implements VersionableEntity {
-  public static final String ENTITY_TYPE = "Vendor Software Product Component Artifact";
-  @PartitionKey
-  @Column(name = "vsp_id")
-  private String vspId;
-  @PartitionKey(value = 1)
-  @Frozen
-  private Version version;
-  @ClusteringColumn
-  @Column(name = "component_id")
-  private String componentId;
-  @ClusteringColumn(value = 1)
-  @Column(name = "artifact_type")
-  private MonitoringUploadType type;
-  @ClusteringColumn(value = 2)
-  @Column(name = "artifact_id")
-  private String id;
-  @Column(name = "name")
-  private String artifactName;
-  private ByteBuffer artifact;
-
-  /**
-   * 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 ComponentMonitoringUploadEntity() {
-    // Don't delete! Default constructor is required by DataStax driver
-  }
-
-  /**
-   * Instantiates a new Component artifact entity.
-   *
-   * @param vspId       the vsp id
-   * @param version     the version
-   * @param componentId the component id
-   * @param id          the id
-   */
-  public ComponentMonitoringUploadEntity(String vspId, Version version, String componentId,
-                                         String id) {
-    this.vspId = vspId;
-    this.version = version;
-    this.componentId = componentId;
-    this.id = id;
-  }
-
-  public String getVspId() {
-    return vspId;
-  }
-
-  public void setVspId(String vspId) {
-    this.vspId = vspId;
-  }
-
-  public String getComponentId() {
-    return componentId;
-  }
-
-  public void setComponentId(String componentId) {
-    this.componentId = componentId;
-  }
-
-  @Override
-  public String getEntityType() {
-    return ENTITY_TYPE;
-  }
-
-  @Override
-  public String getFirstClassCitizenId() {
-    return getVspId();
-  }
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public Version getVersion() {
-    return version;
-  }
-
-  public void setVersion(Version version) {
-    this.version = version;
-  }
-
-  public String getArtifactName() {
-    return artifactName;
-  }
-
-  public void setArtifactName(String artifactName) {
-    this.artifactName = artifactName;
-  }
-
-  public ByteBuffer getArtifact() {
-    return artifact;
-  }
-
-  public void setArtifact(ByteBuffer artifact) {
-    this.artifact = artifact;
-  }
-
-  public MonitoringUploadType getType() {
-    return type;
-  }
-
-  public void setType(MonitoringUploadType type) {
-    this.type = type;
-  }
-
-  @Override
-  public String toString() {
-    return "ComponentMonitoringUploadEntity{" +
-        "vspId='" + vspId + '\'' +
-        ", version=" + version +
-        ", componentId='" + componentId + '\'' +
-        ", type=" + type +
-        ", id='" + id + '\'' +
-        ", artifactName='" + artifactName + '\'' +
-        '}';
-  }
+
+    public static final String ENTITY_TYPE = "Vendor Software Product Component Artifact";
+    @PartitionKey
+    @Column(name = "vsp_id")
+    private String vspId;
+    @PartitionKey(value = 1)
+    @Frozen
+    private Version version;
+    @ClusteringColumn
+    @Column(name = "component_id")
+    private String componentId;
+    @ClusteringColumn(value = 1)
+    @Column(name = "artifact_type")
+    private MonitoringUploadType type;
+    @ClusteringColumn(value = 2)
+    @Column(name = "artifact_id")
+    private String id;
+    @Column(name = "name")
+    private String artifactName;
+    private ByteBuffer artifact;
+
+    /**
+     * 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 ComponentMonitoringUploadEntity() {
+        // Don't delete! Default constructor is required by DataStax driver
+    }
+
+    /**
+     * Instantiates a new Component artifact entity.
+     *
+     * @param vspId       the vsp id
+     * @param version     the version
+     * @param componentId the component id
+     * @param id          the id
+     */
+    public ComponentMonitoringUploadEntity(String vspId, Version version, String componentId, String id) {
+        this.vspId = vspId;
+        this.version = version;
+        this.componentId = componentId;
+        this.id = id;
+    }
+
+    public String getVspId() {
+        return vspId;
+    }
+
+    public void setVspId(String vspId) {
+        this.vspId = vspId;
+    }
+
+    public String getComponentId() {
+        return componentId;
+    }
+
+    public void setComponentId(String componentId) {
+        this.componentId = componentId;
+    }
+
+    @Override
+    public String getEntityType() {
+        return ENTITY_TYPE;
+    }
+
+    @Override
+    public String getFirstClassCitizenId() {
+        return getVspId();
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public Version getVersion() {
+        return version;
+    }
+
+    public void setVersion(Version version) {
+        this.version = version;
+    }
+
+    public String getArtifactName() {
+        return artifactName;
+    }
+
+    public void setArtifactName(String artifactName) {
+        this.artifactName = artifactName;
+    }
+
+    public ByteBuffer getArtifact() {
+        return artifact;
+    }
+
+    public void setArtifact(ByteBuffer artifact) {
+        this.artifact = artifact;
+    }
+
+    public MonitoringUploadType getType() {
+        return type;
+    }
+
+    public void setType(MonitoringUploadType type) {
+        this.type = type;
+    }
+
+    @Override
+    public String toString() {
+        return "ComponentMonitoringUploadEntity{" + "vspId='" + vspId + '\'' + ", version=" + version + ", componentId='" + componentId + '\''
+            + ", type=" + type + ", id='" + id + '\'' + ", artifactName='" + artifactName + '\'' + '}';
+    }
 }
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/CompositionEntity.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/CompositionEntity.java
index b3e8eef3f2..46283a06e0 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/CompositionEntity.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/CompositionEntity.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.
@@ -17,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.dao.type;
 
 import org.openecomp.sdc.vendorsoftwareproduct.types.composition.CompositionEntityId;
@@ -26,15 +25,15 @@ import org.openecomp.sdc.versioning.dao.types.VersionableEntity;
 
 public interface CompositionEntity extends VersionableEntity {
 
-  CompositionEntityType getType();
+    CompositionEntityType getType();
 
-  CompositionEntityId getCompositionEntityId();
+    CompositionEntityId getCompositionEntityId();
 
-  String getCompositionData();
+    String getCompositionData();
 
-  void setCompositionData(String compositionData);
+    void setCompositionData(String compositionData);
 
-  String getQuestionnaireData();
+    String getQuestionnaireData();
 
-  void setQuestionnaireData(String questionnaireData);
+    void setQuestionnaireData(String questionnaireData);
 }
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/ComputeEntity.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/ComputeEntity.java
index 590fca602e..d73258f036 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/ComputeEntity.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/ComputeEntity.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.
@@ -17,10 +17,13 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.dao.type;
 
-import com.datastax.driver.mapping.annotations.*;
+import com.datastax.driver.mapping.annotations.ClusteringColumn;
+import com.datastax.driver.mapping.annotations.Column;
+import com.datastax.driver.mapping.annotations.Frozen;
+import com.datastax.driver.mapping.annotations.PartitionKey;
+import com.datastax.driver.mapping.annotations.Table;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
@@ -35,61 +38,57 @@ import org.openecomp.sdc.versioning.dao.types.Version;
 @NoArgsConstructor
 @Table(keyspace = "dox", name = "vsp_component_compute")
 public class ComputeEntity implements CompositionEntity {
-  public static final String ENTITY_TYPE = "Vendor Software Product Component Compute Flavor";
-
-  @PartitionKey
-  @Column(name = "vsp_id")
-  private String vspId;
-  @PartitionKey(value = 1)
-  @Frozen
-  private Version version;
-  @ClusteringColumn
-  @Column(name = "component_id")
-  private String componentId;
-  @ClusteringColumn(value = 1)
-  @Column(name = "compute_id")
-  private String id;
-  @Column(name = "composition_data")
-  private String compositionData;
-  @Column(name = "questionnaire_data")
-  private String questionnaireData;
-
-  public ComputeEntity(String vspId, Version version, String componentId, String id) {
-    this.vspId = vspId;
-    this.version = version;
-    this.componentId = componentId;
-    this.id = id;
-  }
 
-  @Override
-  public String getEntityType() {
-    return ENTITY_TYPE;
-  }
+    public static final String ENTITY_TYPE = "Vendor Software Product Component Compute Flavor";
+    @PartitionKey
+    @Column(name = "vsp_id")
+    private String vspId;
+    @PartitionKey(value = 1)
+    @Frozen
+    private Version version;
+    @ClusteringColumn
+    @Column(name = "component_id")
+    private String componentId;
+    @ClusteringColumn(value = 1)
+    @Column(name = "compute_id")
+    private String id;
+    @Column(name = "composition_data")
+    private String compositionData;
+    @Column(name = "questionnaire_data")
+    private String questionnaireData;
 
-  @Override
-  public String getFirstClassCitizenId() {
-    return getVspId();
-  }
+    public ComputeEntity(String vspId, Version version, String componentId, String id) {
+        this.vspId = vspId;
+        this.version = version;
+        this.componentId = componentId;
+        this.id = id;
+    }
 
-  @Override
-  public CompositionEntityType getType() {
-    return CompositionEntityType.compute;
-  }
+    @Override
+    public String getEntityType() {
+        return ENTITY_TYPE;
+    }
 
-  @Override
-  public CompositionEntityId getCompositionEntityId() {
-    return new CompositionEntityId(getId(),
-        new CompositionEntityId(getComponentId(), new CompositionEntityId(getVspId(), null)));
-  }
+    @Override
+    public String getFirstClassCitizenId() {
+        return getVspId();
+    }
 
-  public ComputeData getComputeCompositionData() {
-    return compositionData == null ? null
-        : JsonUtil.json2Object(compositionData, ComputeData.class);
-  }
+    @Override
+    public CompositionEntityType getType() {
+        return CompositionEntityType.compute;
+    }
 
-  public void setComputeCompositionData(ComputeData computeData){
-    this.compositionData = computeData == null ? null : JsonUtil.object2Json(computeData);
-  }
+    @Override
+    public CompositionEntityId getCompositionEntityId() {
+        return new CompositionEntityId(getId(), new CompositionEntityId(getComponentId(), new CompositionEntityId(getVspId(), null)));
+    }
 
+    public ComputeData getComputeCompositionData() {
+        return compositionData == null ? null : JsonUtil.json2Object(compositionData, ComputeData.class);
+    }
 
+    public void setComputeCompositionData(ComputeData computeData) {
+        this.compositionData = computeData == null ? null : JsonUtil.object2Json(computeData);
+    }
 }
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 dd145b1f54..03f464b564 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
@@ -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.
@@ -17,10 +17,13 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.dao.type;
 
-import com.datastax.driver.mapping.annotations.*;
+import com.datastax.driver.mapping.annotations.ClusteringColumn;
+import com.datastax.driver.mapping.annotations.Column;
+import com.datastax.driver.mapping.annotations.Frozen;
+import com.datastax.driver.mapping.annotations.PartitionKey;
+import com.datastax.driver.mapping.annotations.Table;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -36,9 +39,9 @@ import org.openecomp.sdc.versioning.dao.types.Version;
 @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";
+public class DeploymentFlavorEntity implements CompositionEntity {
 
+    private static final String ENTITY_TYPE = "Vendor Software Product Deployment Flavor";
     @PartitionKey
     @Column(name = "vsp_id")
     private String vspId;
@@ -65,6 +68,7 @@ public class DeploymentFlavorEntity implements CompositionEntity{
         this.version = version;
         this.id = id;
     }
+
     @Override
     public CompositionEntityType getType() {
         return CompositionEntityType.deployment;
@@ -85,7 +89,7 @@ public class DeploymentFlavorEntity implements CompositionEntity{
         return getVspId();
     }
 
-   public DeploymentFlavor getDeploymentFlavorCompositionData() {
+    public DeploymentFlavor getDeploymentFlavorCompositionData() {
         return compositionData == null ? null : JsonUtil.json2Object(compositionData, DeploymentFlavor.class);
     }
 
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/ImageEntity.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/ImageEntity.java
index b85fd6c76c..55252cde8a 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/ImageEntity.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/ImageEntity.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.
@@ -17,10 +17,13 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.dao.type;
 
-import com.datastax.driver.mapping.annotations.*;
+import com.datastax.driver.mapping.annotations.ClusteringColumn;
+import com.datastax.driver.mapping.annotations.Column;
+import com.datastax.driver.mapping.annotations.Frozen;
+import com.datastax.driver.mapping.annotations.PartitionKey;
+import com.datastax.driver.mapping.annotations.Table;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -38,65 +41,63 @@ import org.openecomp.sdc.versioning.dao.types.Version;
 @Table(keyspace = "dox", name = "vsp_component_image")
 public class ImageEntity implements CompositionEntity {
 
-  private static final String ENTITY_TYPE = "Vendor Software Product Component Image";
-
-  @PartitionKey
-  @Column(name = "vsp_id")
-  private String vspId;
-  @PartitionKey(value = 1)
-  @Frozen
-  private Version version;
-  @ClusteringColumn
-  @Column(name = "component_id")
-  private String componentId;
-  @ClusteringColumn(value = 1)
-  @Column(name = "image_id")
-  private String id;
-  @Column(name = "composition_data")
-  private String compositionData;
-  @Column(name = "questionnaire_data")
-  private String questionnaireData;
+    private static final String ENTITY_TYPE = "Vendor Software Product Component Image";
+    @PartitionKey
+    @Column(name = "vsp_id")
+    private String vspId;
+    @PartitionKey(value = 1)
+    @Frozen
+    private Version version;
+    @ClusteringColumn
+    @Column(name = "component_id")
+    private String componentId;
+    @ClusteringColumn(value = 1)
+    @Column(name = "image_id")
+    private String id;
+    @Column(name = "composition_data")
+    private String compositionData;
+    @Column(name = "questionnaire_data")
+    private String questionnaireData;
 
-  /**
-   * Instantiates a new Image entity.
-   *
-   * @param vspId       the vsp id
-   * @param version     the version
-   * @param id          the id
-   */
-  public ImageEntity(String vspId, Version version, String componentId, String id) {
-    this.vspId = vspId;
-    this.version = version;
-    this.componentId = componentId;
-    this.id = id;
-  }
+    /**
+     * Instantiates a new Image entity.
+     *
+     * @param vspId   the vsp id
+     * @param version the version
+     * @param id      the id
+     */
+    public ImageEntity(String vspId, Version version, String componentId, String id) {
+        this.vspId = vspId;
+        this.version = version;
+        this.componentId = componentId;
+        this.id = id;
+    }
 
-  @Override
-  public String getEntityType() {
-    return ENTITY_TYPE;
-  }
+    @Override
+    public String getEntityType() {
+        return ENTITY_TYPE;
+    }
 
-  @Override
-  public String getFirstClassCitizenId() {
-    return getVspId();
-  }
+    @Override
+    public String getFirstClassCitizenId() {
+        return getVspId();
+    }
 
-  @Override
-  public CompositionEntityType getType() {
-    return CompositionEntityType.image;
-  }
+    @Override
+    public CompositionEntityType getType() {
+        return CompositionEntityType.image;
+    }
 
-  @Override
-  public CompositionEntityId getCompositionEntityId() {
-    return new CompositionEntityId(getId(),
-        new CompositionEntityId(getComponentId(), new CompositionEntityId(getVspId(), null)));
-  }
+    @Override
+    public CompositionEntityId getCompositionEntityId() {
+        return new CompositionEntityId(getId(), new CompositionEntityId(getComponentId(), new CompositionEntityId(getVspId(), null)));
+    }
 
-  public Image getImageCompositionData() {
-    return compositionData == null ? null : JsonUtil.json2Object(compositionData, Image.class);
-  }
+    public Image getImageCompositionData() {
+        return compositionData == null ? null : JsonUtil.json2Object(compositionData, Image.class);
+    }
 
-  public void setImageCompositionData(Image image) {
-    this.compositionData = image == null ? null : JsonUtil.object2Json(image);
-  }
+    public void setImageCompositionData(Image image) {
+        this.compositionData = image == null ? null : JsonUtil.object2Json(image);
+    }
 }
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/LicenseType.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/LicenseType.java
index 35dfda4568..2cd7b05f1e 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/LicenseType.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/LicenseType.java
@@ -17,11 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
-
 package org.openecomp.sdc.vendorsoftwareproduct.dao.type;
 
-public enum LicenseType {
-    EXTERNAL,
-    INTERNAL
-}
+public enum LicenseType {EXTERNAL, INTERNAL}
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/NetworkEntity.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/NetworkEntity.java
index 4c02fd4723..0b6fae46ea 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/NetworkEntity.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/NetworkEntity.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.
@@ -17,10 +17,13 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.dao.type;
 
-import com.datastax.driver.mapping.annotations.*;
+import com.datastax.driver.mapping.annotations.ClusteringColumn;
+import com.datastax.driver.mapping.annotations.Column;
+import com.datastax.driver.mapping.annotations.Frozen;
+import com.datastax.driver.mapping.annotations.PartitionKey;
+import com.datastax.driver.mapping.annotations.Table;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -37,61 +40,60 @@ import org.openecomp.sdc.versioning.dao.types.Version;
 @NoArgsConstructor
 @Table(keyspace = "dox", name = "vsp_network")
 public class NetworkEntity implements CompositionEntity {
-  private static final String ENTITY_TYPE = "Vendor Software Product Network";
-
-  @PartitionKey
-  @Column(name = "vsp_id")
-  private String vspId;
-  @PartitionKey(value = 1)
-  @Frozen
-  private Version version;
-  @ClusteringColumn
-  @Column(name = "network_id")
-  private String id;
-  @Column(name = "composition_data")
-  private String compositionData;
-  @Column(name = "questionnaire_data")
-  private String questionnaireData;
 
+    private static final String ENTITY_TYPE = "Vendor Software Product Network";
+    @PartitionKey
+    @Column(name = "vsp_id")
+    private String vspId;
+    @PartitionKey(value = 1)
+    @Frozen
+    private Version version;
+    @ClusteringColumn
+    @Column(name = "network_id")
+    private String id;
+    @Column(name = "composition_data")
+    private String compositionData;
+    @Column(name = "questionnaire_data")
+    private String questionnaireData;
 
-  /**
-   * Instantiates a new Network entity.
-   *
-   * @param vspId   the vsp id
-   * @param version the version
-   * @param id      the id
-   */
-  public NetworkEntity(String vspId, Version version, String id) {
-    this.vspId = vspId;
-    this.version = version;
-    this.id = id;
-  }
+    /**
+     * Instantiates a new Network entity.
+     *
+     * @param vspId   the vsp id
+     * @param version the version
+     * @param id      the id
+     */
+    public NetworkEntity(String vspId, Version version, String id) {
+        this.vspId = vspId;
+        this.version = version;
+        this.id = id;
+    }
 
-  @Override
-  public CompositionEntityType getType() {
-    return CompositionEntityType.network;
-  }
+    @Override
+    public CompositionEntityType getType() {
+        return CompositionEntityType.network;
+    }
 
-  @Override
-  public CompositionEntityId getCompositionEntityId() {
-    return new CompositionEntityId(getId(), new CompositionEntityId(getVspId(), null));
-  }
+    @Override
+    public CompositionEntityId getCompositionEntityId() {
+        return new CompositionEntityId(getId(), new CompositionEntityId(getVspId(), null));
+    }
 
-  @Override
-  public String getEntityType() {
-    return ENTITY_TYPE;
-  }
+    @Override
+    public String getEntityType() {
+        return ENTITY_TYPE;
+    }
 
-  @Override
-  public String getFirstClassCitizenId() {
-    return getVspId();
-  }
+    @Override
+    public String getFirstClassCitizenId() {
+        return getVspId();
+    }
 
-  public Network getNetworkCompositionData() {
-    return compositionData == null ? null : JsonUtil.json2Object(compositionData, Network.class);
-  }
+    public Network getNetworkCompositionData() {
+        return compositionData == null ? null : JsonUtil.json2Object(compositionData, Network.class);
+    }
 
-  public void setNetworkCompositionData(Network network) {
-    this.compositionData = network == null ? null : JsonUtil.object2Json(network);
-  }
+    public void setNetworkCompositionData(Network network) {
+        this.compositionData = network == null ? null : JsonUtil.object2Json(network);
+    }
 }
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/NicEntity.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/NicEntity.java
index 59e94ce62a..0a3cc41000 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/NicEntity.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/NicEntity.java
@@ -17,10 +17,13 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.dao.type;
 
-import com.datastax.driver.mapping.annotations.*;
+import com.datastax.driver.mapping.annotations.ClusteringColumn;
+import com.datastax.driver.mapping.annotations.Column;
+import com.datastax.driver.mapping.annotations.Frozen;
+import com.datastax.driver.mapping.annotations.PartitionKey;
+import com.datastax.driver.mapping.annotations.Table;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -37,66 +40,65 @@ import org.openecomp.sdc.versioning.dao.types.Version;
 @NoArgsConstructor
 @Table(keyspace = "dox", name = "vsp_component_nic")
 public class NicEntity implements CompositionEntity {
-  private static final String ENTITY_TYPE = "Vendor Software Product NIC";
 
-  @PartitionKey
-  @Column(name = "vsp_id")
-  private String vspId;
-  @PartitionKey(value = 1)
-  @Frozen
-  private Version version;
-  @ClusteringColumn
-  @Column(name = "component_id")
-  private String componentId;
-  @ClusteringColumn(value = 1)
-  @Column(name = "nic_id")
-  private String id;
-  @Column(name = "composition_data")
-  private String compositionData;
-  @Column(name = "questionnaire_data")
-  private String questionnaireData;
+    private static final String ENTITY_TYPE = "Vendor Software Product NIC";
+    @PartitionKey
+    @Column(name = "vsp_id")
+    private String vspId;
+    @PartitionKey(value = 1)
+    @Frozen
+    private Version version;
+    @ClusteringColumn
+    @Column(name = "component_id")
+    private String componentId;
+    @ClusteringColumn(value = 1)
+    @Column(name = "nic_id")
+    private String id;
+    @Column(name = "composition_data")
+    private String compositionData;
+    @Column(name = "questionnaire_data")
+    private String questionnaireData;
 
-  /**
-   * Instantiates a new Nic entity.
-   *
-   * @param vspId       the vsp id
-   * @param version     the version
-   * @param componentId the component id
-   * @param id          the id
-   */
-  public NicEntity(String vspId, Version version, String componentId, String id) {
-    this.vspId = vspId;
-    this.version = version;
-    this.componentId = componentId;
-    this.id = id;
-  }
+    /**
+     * Instantiates a new Nic entity.
+     *
+     * @param vspId       the vsp id
+     * @param version     the version
+     * @param componentId the component id
+     * @param id          the id
+     */
+    public NicEntity(String vspId, Version version, String componentId, String id) {
+        this.vspId = vspId;
+        this.version = version;
+        this.componentId = componentId;
+        this.id = id;
+    }
 
-  @Override
-  public CompositionEntityType getType() {
-    return CompositionEntityType.nic;
-  }
+    @Override
+    public CompositionEntityType getType() {
+        return CompositionEntityType.nic;
+    }
 
-  @Override
-  public CompositionEntityId getCompositionEntityId() {
-    return new CompositionEntityId(getId(),
-        new CompositionEntityId(getComponentId(), new CompositionEntityId(getVspId(), null)));
-  }
+    @Override
+    public CompositionEntityId getCompositionEntityId() {
+        return new CompositionEntityId(getId(), new CompositionEntityId(getComponentId(), new CompositionEntityId(getVspId(), null)));
+    }
 
-  @Override
-  public String getEntityType() {
-    return ENTITY_TYPE;
-  }
+    @Override
+    public String getEntityType() {
+        return ENTITY_TYPE;
+    }
 
-  @Override
-  public String getFirstClassCitizenId() {
-    return getVspId();
-  }
+    @Override
+    public String getFirstClassCitizenId() {
+        return getVspId();
+    }
 
-  public Nic getNicCompositionData() {
-    return compositionData == null ? null : JsonUtil.json2Object(compositionData, Nic.class);
-  }
+    public Nic getNicCompositionData() {
+        return compositionData == null ? null : JsonUtil.json2Object(compositionData, Nic.class);
+    }
 
-  public void setNicCompositionData(Nic nic) {
-    this.compositionData = nic == null ? null : JsonUtil.object2Json(nic);
-  }
+    public void setNicCompositionData(Nic nic) {
+        this.compositionData = nic == null ? null : JsonUtil.object2Json(nic);
+    }
 }
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/OnboardingMethod.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/OnboardingMethod.java
index 137ada4838..33d58b93ad 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/OnboardingMethod.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/OnboardingMethod.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.
@@ -17,10 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.dao.type;
 
-public enum OnboardingMethod {
-  NetworkPackage,
-  Manual;
-}
+public enum OnboardingMethod {NetworkPackage, Manual;}
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 c5e470e9c6..fdd143d1d2 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
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.dao.type;
 
 import java.nio.ByteBuffer;
@@ -37,11 +36,8 @@ public class OrchestrationTemplateCandidateData {
     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,
+    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;
@@ -53,8 +49,6 @@ public class OrchestrationTemplateCandidateData {
     }
 
     public ValidationStructureList getValidationDataStructure() {
-        return validationData == null ? null
-            : JsonUtil.json2Object(validationData, ValidationStructureList.class);
+        return validationData == null ? null : JsonUtil.json2Object(validationData, ValidationStructureList.class);
     }
-
 }
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/OrchestrationTemplateCandidateDataEntity.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/OrchestrationTemplateCandidateDataEntity.java
index e342e0b3bf..571c3ae914 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/OrchestrationTemplateCandidateDataEntity.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/OrchestrationTemplateCandidateDataEntity.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.
@@ -17,116 +17,107 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.dao.type;
 
 import com.datastax.driver.mapping.annotations.Column;
 import com.datastax.driver.mapping.annotations.Frozen;
 import com.datastax.driver.mapping.annotations.PartitionKey;
 import com.datastax.driver.mapping.annotations.Table;
+import java.nio.ByteBuffer;
 import org.openecomp.sdc.versioning.dao.types.Version;
 import org.openecomp.sdc.versioning.dao.types.VersionableEntity;
 
-import java.nio.ByteBuffer;
-
 @Table(keyspace = "dox", name = "vsp_orchestration_template_candidate")
 public class OrchestrationTemplateCandidateDataEntity implements VersionableEntity {
-  private static final String ENTITY_TYPE =
-      "Vendor Software Product Upload Orchestration_candidate data";
-
-  @PartitionKey
-  @Column(name = "vsp_id")
-  private String id;
-
-  @PartitionKey(value = 1)
-  @Frozen
-  private Version version;
-
-  @Column(name = "content_data")
-  private ByteBuffer contentData;
-
-  @Column(name = "files_data_structure")
-  private String filesDataStructure;
-
-  /**
-   * 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 OrchestrationTemplateCandidateDataEntity() {
-    // Don't delete! Default constructor is required by DataStax driver
-  }
-
-  /**
-   * Instantiates a new OrchestrationTemplateCandidateDataEntity.
-   *
-   * @param id       the id
-   * @param version     the Version
-
-   */
-  public OrchestrationTemplateCandidateDataEntity(String id, Version version) {
-    this.id = id;
-    this.version = version;
-  }
-
-  /**
-   * Instantiates a new OrchestrationTemplateCandidateDataEntity.
-   *
-   * @param filesDataStructure       the files data Structure
-   * @param version     the version
-   * @param contentData the contentData
-   * @param id          the id
-   */
-  public OrchestrationTemplateCandidateDataEntity(String id, Version version,
-                                                  ByteBuffer contentData,
-                                                  String filesDataStructure) {
-    this.id = id;
-    this.contentData = contentData;
-    this.filesDataStructure = filesDataStructure;
-    this.version = version;
-  }
-
-  @Override
-  public String getEntityType() {
-    return ENTITY_TYPE;
-  }
-
-  @Override
-  public String getFirstClassCitizenId() {
-    return null;
-  }
-
-  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 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;
-  }
+
+    private static final String ENTITY_TYPE = "Vendor Software Product Upload Orchestration_candidate data";
+    @PartitionKey
+    @Column(name = "vsp_id")
+    private String id;
+    @PartitionKey(value = 1)
+    @Frozen
+    private Version version;
+    @Column(name = "content_data")
+    private ByteBuffer contentData;
+    @Column(name = "files_data_structure")
+    private String filesDataStructure;
+
+    /**
+     * 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 OrchestrationTemplateCandidateDataEntity() {
+        // Don't delete! Default constructor is required by DataStax driver
+    }
+
+    /**
+     * Instantiates a new OrchestrationTemplateCandidateDataEntity.
+     *
+     * @param id      the id
+     * @param version the Version
+     */
+    public OrchestrationTemplateCandidateDataEntity(String id, Version version) {
+        this.id = id;
+        this.version = version;
+    }
+
+    /**
+     * Instantiates a new OrchestrationTemplateCandidateDataEntity.
+     *
+     * @param filesDataStructure the files data Structure
+     * @param version            the version
+     * @param contentData        the contentData
+     * @param id                 the id
+     */
+    public OrchestrationTemplateCandidateDataEntity(String id, Version version, ByteBuffer contentData, String filesDataStructure) {
+        this.id = id;
+        this.contentData = contentData;
+        this.filesDataStructure = filesDataStructure;
+        this.version = version;
+    }
+
+    @Override
+    public String getEntityType() {
+        return ENTITY_TYPE;
+    }
+
+    @Override
+    public String getFirstClassCitizenId() {
+        return null;
+    }
+
+    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 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;
+    }
 }
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/OrchestrationTemplateEntity.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/OrchestrationTemplateEntity.java
index 1bbe1b0ddf..105fb743e8 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/OrchestrationTemplateEntity.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/OrchestrationTemplateEntity.java
@@ -13,131 +13,127 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.dao.type;
 
+import java.nio.ByteBuffer;
 import org.openecomp.core.utilities.json.JsonUtil;
 import org.openecomp.sdc.heat.datatypes.structure.ValidationStructureList;
 import org.openecomp.sdc.versioning.dao.types.Version;
 import org.openecomp.sdc.versioning.dao.types.VersionableEntity;
 
-import java.nio.ByteBuffer;
-
 public class OrchestrationTemplateEntity implements VersionableEntity {
-  private static final String ENTITY_TYPE = "Vendor Software Product Orchestration Template";
-
-  private String id;
-  private Version version;
-  private String fileSuffix;
-  private String fileName;
-  private String packageName;
-  private String packageVersion;
-  private String validationData;
-  private ByteBuffer contentData;
-  private String filesDataStructure;
-
-  public OrchestrationTemplateEntity() {
-    //default constructor implementation is not provided for OrchestrationTemplateEntity
-  }
-
-  public OrchestrationTemplateEntity(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 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 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 getPackageName() {
-    return packageName;
-  }
-
-  public void setPackageName(String packageName) {
-    this.packageName = packageName;
-  }
-
-  public String getPackageVersion() {
-    return packageVersion;
-  }
-
-  public void setPackageVersion(String packageVersion) {
-    this.packageVersion = packageVersion;
-  }
-
-  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 getContentData() {
-    return contentData;
-  }
-
-  public void setContentData(ByteBuffer contentData) {
-    this.contentData = contentData;
-  }
-
-  public String getFilesDataStructure() {
-    return filesDataStructure;
-  }
-
-  public void setFilesDataStructure(String filesDataStructure) {
-    this.filesDataStructure = filesDataStructure;
-  }
+
+    private static final String ENTITY_TYPE = "Vendor Software Product Orchestration Template";
+    private String id;
+    private Version version;
+    private String fileSuffix;
+    private String fileName;
+    private String packageName;
+    private String packageVersion;
+    private String validationData;
+    private ByteBuffer contentData;
+    private String filesDataStructure;
+
+    public OrchestrationTemplateEntity() {
+        //default constructor implementation is not provided for OrchestrationTemplateEntity
+    }
+
+    public OrchestrationTemplateEntity(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 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 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 getPackageName() {
+        return packageName;
+    }
+
+    public void setPackageName(String packageName) {
+        this.packageName = packageName;
+    }
+
+    public String getPackageVersion() {
+        return packageVersion;
+    }
+
+    public void setPackageVersion(String packageVersion) {
+        this.packageVersion = packageVersion;
+    }
+
+    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 getContentData() {
+        return contentData;
+    }
+
+    public void setContentData(ByteBuffer contentData) {
+        this.contentData = contentData;
+    }
+
+    public String getFilesDataStructure() {
+        return filesDataStructure;
+    }
+
+    public void setFilesDataStructure(String filesDataStructure) {
+        this.filesDataStructure = filesDataStructure;
+    }
 }
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/PackageInfo.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/PackageInfo.java
index 6aac77acfa..9c751a239d 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/PackageInfo.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/PackageInfo.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.
@@ -17,67 +17,51 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.dao.type;
 
 import com.datastax.driver.mapping.annotations.Column;
 import com.datastax.driver.mapping.annotations.PartitionKey;
 import com.datastax.driver.mapping.annotations.Table;
-import lombok.NoArgsConstructor;
+import java.nio.ByteBuffer;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
 import org.openecomp.sdc.versioning.dao.types.Version;
 
-import java.nio.ByteBuffer;
-
-
 @Data
 @NoArgsConstructor
 @Table(keyspace = "dox", name = "package_details")
 public class PackageInfo {
 
-
-  @PartitionKey
-  @Column(name = "vsp_id")
-  private String vspId;
-
-  @PartitionKey(value = 1)
-  private String version;
-
-  @Column(name = "display_name")
-  private String displayName;
-
-  @Column(name = "vsp_name")
-  private String vspName;
-
-  @Column(name = "vsp_description")
-  private String vspDescription;
-
-  @Column(name = "vendor_name")
-  private String vendorName;
-
-  private String category;
-
-  @Column(name = "sub_category")
-  private String subCategory;
-
-  @Column(name = "vendor_release")
-  private String vendorRelease;
-
-  @Column(name = "package_checksum")
-  private String packageChecksum;
-
-  @Column(name = "package_type")
-  private String packageType;
-
-  @Column(name = "translate_content")
-  private ByteBuffer translatedFile;
-
-  @Column(name = "resource_type")
-  private String resourceType = ResourceTypeEnum.VF.name();
-
-  public PackageInfo(String packageId, Version version) {
-    this.vspId = packageId;
-    this.version = version.getName();
-  }
+    @PartitionKey
+    @Column(name = "vsp_id")
+    private String vspId;
+    @PartitionKey(value = 1)
+    private String version;
+    @Column(name = "display_name")
+    private String displayName;
+    @Column(name = "vsp_name")
+    private String vspName;
+    @Column(name = "vsp_description")
+    private String vspDescription;
+    @Column(name = "vendor_name")
+    private String vendorName;
+    private String category;
+    @Column(name = "sub_category")
+    private String subCategory;
+    @Column(name = "vendor_release")
+    private String vendorRelease;
+    @Column(name = "package_checksum")
+    private String packageChecksum;
+    @Column(name = "package_type")
+    private String packageType;
+    @Column(name = "translate_content")
+    private ByteBuffer translatedFile;
+    @Column(name = "resource_type")
+    private String resourceType = ResourceTypeEnum.VF.name();
+
+    public PackageInfo(String packageId, Version version) {
+        this.vspId = packageId;
+        this.version = version.getName();
+    }
 }
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/ProcessEntity.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/ProcessEntity.java
index 6e2c371adb..2ed8a535a3 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/ProcessEntity.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/ProcessEntity.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.
@@ -17,213 +17,203 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.dao.type;
 
-import com.datastax.driver.mapping.annotations.*;
+import com.datastax.driver.mapping.annotations.ClusteringColumn;
+import com.datastax.driver.mapping.annotations.Column;
+import com.datastax.driver.mapping.annotations.Frozen;
+import com.datastax.driver.mapping.annotations.PartitionKey;
+import com.datastax.driver.mapping.annotations.Table;
+import java.nio.ByteBuffer;
 import org.openecomp.sdc.versioning.dao.types.Version;
 import org.openecomp.sdc.versioning.dao.types.VersionableEntity;
 
-import java.nio.ByteBuffer;
-
 @Table(keyspace = "dox", name = "vsp_process")
 public class ProcessEntity implements VersionableEntity {
-  public static final String ENTITY_TYPE = "Vendor Software Product Process";
-  @PartitionKey
-  @Column(name = "vsp_id")
-  private String vspId;
-  @PartitionKey(value = 1)
-  @Frozen
-  private Version version;
-  @ClusteringColumn
-  @Column(name = "component_id")
-  private String componentId;
-  @ClusteringColumn(value = 1)
-  @Column(name = "process_id")
-  private String id;
-  private String name;
-  private String description;
-  @Column(name = "type")
-  private ProcessType type;
-  @Column(name = "artifact_name")
-  private String artifactName;
-  private ByteBuffer artifact;
-
-  /**
-   * 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 ProcessEntity() {
-    // Don't delete! Default constructor is required by DataStax driver
-  }
-
-  /**
-   * Instantiates a new Process entity.
-   *
-   * @param vspId       the vsp id
-   * @param version     the version
-   * @param componentId the component id
-   * @param id          the id
-   */
-  public ProcessEntity(String vspId, Version version, String componentId, String id) {
-    this.vspId = vspId;
-    this.version = version;
-    this.componentId = componentId;
-    this.id = id;
-  }
-
-  public String getVspId() {
-    return vspId;
-  }
-
-  public void setVspId(String vspId) {
-    this.vspId = vspId;
-  }
-
-  public String getComponentId() {
-    return componentId;
-  }
-
-  public void setComponentId(String componentId) {
-    this.componentId = componentId;
-  }
-
-  @Override
-  public String getEntityType() {
-    return ENTITY_TYPE;
-  }
-
-  @Override
-  public String getFirstClassCitizenId() {
-    return getVspId();
-  }
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public Version getVersion() {
-    return version;
-  }
-
-  public void setVersion(Version version) {
-    this.version = version;
-  }
-
-  public String getName() {
-    return name == null ? "" : name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public ProcessType getType() {
-    return type;
-  }
-
-  public void setType(ProcessType type) {
-    this.type = type;
-  }
-
-  public String getArtifactName() {
-    return artifactName;
-  }
-
-  public void setArtifactName(String artifactName) {
-    this.artifactName = artifactName;
-  }
-
-  public ByteBuffer getArtifact() {
-    return artifact;
-  }
-
-  public void setArtifact(ByteBuffer artifact) {
-    this.artifact = artifact;
-  }
-
-  @Override
-  public boolean equals(Object other) {
-    if (this == other) {
-      return true;
-    }
-    if (other == null || getClass() != other.getClass()) {
-      return false;
-    }
-
-    ProcessEntity that = (ProcessEntity) other;
-
-    if (vspId != null ? !vspId.equals(that.vspId) : that.vspId != null) {
-      return false;
-    }
-    if (version != null ? !version.equals(that.version) : that.version != null) {
-      return false;
+
+    public static final String ENTITY_TYPE = "Vendor Software Product Process";
+    @PartitionKey
+    @Column(name = "vsp_id")
+    private String vspId;
+    @PartitionKey(value = 1)
+    @Frozen
+    private Version version;
+    @ClusteringColumn
+    @Column(name = "component_id")
+    private String componentId;
+    @ClusteringColumn(value = 1)
+    @Column(name = "process_id")
+    private String id;
+    private String name;
+    private String description;
+    @Column(name = "type")
+    private ProcessType type;
+    @Column(name = "artifact_name")
+    private String artifactName;
+    private ByteBuffer artifact;
+
+    /**
+     * 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 ProcessEntity() {
+        // Don't delete! Default constructor is required by DataStax driver
+    }
+
+    /**
+     * Instantiates a new Process entity.
+     *
+     * @param vspId       the vsp id
+     * @param version     the version
+     * @param componentId the component id
+     * @param id          the id
+     */
+    public ProcessEntity(String vspId, Version version, String componentId, String id) {
+        this.vspId = vspId;
+        this.version = version;
+        this.componentId = componentId;
+        this.id = id;
+    }
+
+    public String getVspId() {
+        return vspId;
+    }
+
+    public void setVspId(String vspId) {
+        this.vspId = vspId;
+    }
+
+    public String getComponentId() {
+        return componentId;
+    }
+
+    public void setComponentId(String componentId) {
+        this.componentId = componentId;
+    }
+
+    @Override
+    public String getEntityType() {
+        return ENTITY_TYPE;
+    }
+
+    @Override
+    public String getFirstClassCitizenId() {
+        return getVspId();
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
     }
-    if (componentId != null ? !componentId.equals(that.componentId) : that.componentId != null) {
-      return false;
-    }
-    if (id != null ? !id.equals(that.id) : that.id != null) {
-      return false;
-    }
-    if (name != null ? !name.equals(that.name) : that.name != null) {
-      return false;
+
+    public Version getVersion() {
+        return version;
+    }
+
+    public void setVersion(Version version) {
+        this.version = version;
+    }
+
+    public String getName() {
+        return name == null ? "" : name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
     }
-    if (description != null ? !description.equals(that.description) : that.description != null) {
-      return false;
+
+    public String getDescription() {
+        return description;
     }
-    if (artifactName != null ? !artifactName.equals(that.artifactName)
-        : that.artifactName != null) {
-      return false;
-    }
-    if (artifact != null ? !artifact.equals(that.artifact) : that.artifact != null) {
-      return false;
+
+    public void setDescription(String description) {
+        this.description = description;
     }
 
-    if (type != null ? !type.equals(that.type) : that.type != null) {
-      return false;
-    }
+    public ProcessType getType() {
+        return type;
+    }
 
-    return true;
-  }
+    public void setType(ProcessType type) {
+        this.type = type;
+    }
 
-  @Override
-  public int hashCode() {
-    int result = vspId != null ? vspId.hashCode() : 0;
-    result = 31 * result + (version != null ? version.hashCode() : 0);
-    result = 31 * result + (componentId != null ? componentId.hashCode() : 0);
-    result = 31 * result + (id != null ? id.hashCode() : 0);
-    result = 31 * result + (name != null ? name.hashCode() : 0);
-    result = 31 * result + (description != null ? description.hashCode() : 0);
-    result = 31 * result + (type != null ? type.hashCode() : 0);
-    result = 31 * result + (artifactName != null ? artifactName.hashCode() : 0);
-    result = 31 * result + (artifact != null ? artifact.hashCode() : 0);
-    return result;
-  }
+    public String getArtifactName() {
+        return artifactName;
+    }
 
-  @Override
-  public String toString() {
-    return "ProcessEntity{" +
-        "vspId='" + vspId + '\'' +
-        ", version=" + version +
-        ", componentId='" + componentId + '\'' +
-        ", id='" + id + '\'' +
-        ", name='" + name + '\'' +
-        ", description='" + description + '\'' +
-        ", type=" + type +
-        ", artifactName='" + artifactName + '\'' +
-        '}';
-  }
+    public void setArtifactName(String artifactName) {
+        this.artifactName = artifactName;
+    }
+
+    public ByteBuffer getArtifact() {
+        return artifact;
+    }
+
+    public void setArtifact(ByteBuffer artifact) {
+        this.artifact = artifact;
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        if (this == other) {
+            return true;
+        }
+        if (other == null || getClass() != other.getClass()) {
+            return false;
+        }
+        ProcessEntity that = (ProcessEntity) other;
+        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 (componentId != null ? !componentId.equals(that.componentId) : that.componentId != null) {
+            return false;
+        }
+        if (id != null ? !id.equals(that.id) : that.id != null) {
+            return false;
+        }
+        if (name != null ? !name.equals(that.name) : that.name != null) {
+            return false;
+        }
+        if (description != null ? !description.equals(that.description) : that.description != null) {
+            return false;
+        }
+        if (artifactName != null ? !artifactName.equals(that.artifactName) : that.artifactName != null) {
+            return false;
+        }
+        if (artifact != null ? !artifact.equals(that.artifact) : that.artifact != null) {
+            return false;
+        }
+        if (type != null ? !type.equals(that.type) : that.type != null) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = vspId != null ? vspId.hashCode() : 0;
+        result = 31 * result + (version != null ? version.hashCode() : 0);
+        result = 31 * result + (componentId != null ? componentId.hashCode() : 0);
+        result = 31 * result + (id != null ? id.hashCode() : 0);
+        result = 31 * result + (name != null ? name.hashCode() : 0);
+        result = 31 * result + (description != null ? description.hashCode() : 0);
+        result = 31 * result + (type != null ? type.hashCode() : 0);
+        result = 31 * result + (artifactName != null ? artifactName.hashCode() : 0);
+        result = 31 * result + (artifact != null ? artifact.hashCode() : 0);
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "ProcessEntity{" + "vspId='" + vspId + '\'' + ", version=" + version + ", componentId='" + componentId + '\'' + ", id='" + id + '\''
+            + ", name='" + name + '\'' + ", description='" + description + '\'' + ", type=" + type + ", artifactName='" + artifactName + '\'' + '}';
+    }
 }
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/ProcessType.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/ProcessType.java
index d49386c3bf..09cdc95a29 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/ProcessType.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/ProcessType.java
@@ -17,11 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
-
 package org.openecomp.sdc.vendorsoftwareproduct.dao.type;
 
-public enum ProcessType {
-    Lifecycle_Operations,
-    Other
-}
+public enum ProcessType {Lifecycle_Operations, Other}
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 0dc3ac25a6..6a392cd44f 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
@@ -17,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.dao.type;
 
 import lombok.Getter;
@@ -37,5 +36,4 @@ public class TranslatedFileData {
     private String vendorRelease;
     private String packageChecksum;
     private String 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 8f4aed8c71..88b020b673 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
@@ -17,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.dao.type;
 
 import java.util.List;
@@ -33,7 +32,6 @@ import org.openecomp.sdc.versioning.dao.types.VersionableEntity;
 public class VspDetails implements VersionableEntity {
 
     public static final String ENTITY_TYPE = "Vendor Software Product";
-
     private String id;
     private Version version;
     private String name;
@@ -66,8 +64,8 @@ public class VspDetails implements VersionableEntity {
 
     @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);
+        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 e463605d39..1b3dec0a59 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
@@ -17,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.dao.type;
 
 import lombok.Getter;
@@ -33,7 +32,6 @@ import org.openecomp.sdc.versioning.dao.types.Version;
 public class VspQuestionnaireEntity implements CompositionEntity {
 
     private static final String ENTITY_TYPE = "Vendor Software Product";
-
     private String id;
     private Version version;
     private String questionnaireData;
@@ -72,5 +70,4 @@ public class VspQuestionnaireEntity implements CompositionEntity {
     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/errors/utils/ErrorsUtil.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/errors/utils/ErrorsUtil.java
index fc23a77bef..cce965b874 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/errors/utils/ErrorsUtil.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/errors/utils/ErrorsUtil.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.
@@ -17,14 +17,12 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.errors.utils;
 
-import org.openecomp.sdc.datatypes.error.ErrorMessage;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import org.openecomp.sdc.datatypes.error.ErrorMessage;
 
 /**
  * Created by Talio on 11/30/2016.
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/factory/CandidateServiceFactory.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/factory/CandidateServiceFactory.java
index f16d8d4ebe..d728ff3bad 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/factory/CandidateServiceFactory.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/factory/CandidateServiceFactory.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.
@@ -17,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.factory;
 
 import org.openecomp.core.factory.api.AbstractComponentFactory;
@@ -29,7 +28,7 @@ import org.openecomp.sdc.vendorsoftwareproduct.services.filedatastructuremodule.
  */
 public abstract class CandidateServiceFactory extends AbstractComponentFactory<CandidateService> {
 
-  public static CandidateServiceFactory getInstance(){
-    return AbstractFactory.getInstance(CandidateServiceFactory.class);
-  }
+    public static CandidateServiceFactory getInstance() {
+        return AbstractFactory.getInstance(CandidateServiceFactory.class);
+    }
 }
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/factory/CompositionDataExtractorFactory.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/factory/CompositionDataExtractorFactory.java
index d10b8b715d..e811df829a 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/factory/CompositionDataExtractorFactory.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/factory/CompositionDataExtractorFactory.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.
@@ -17,17 +17,15 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.factory;
 
 import org.openecomp.core.factory.api.AbstractComponentFactory;
 import org.openecomp.core.factory.api.AbstractFactory;
 import org.openecomp.sdc.vendorsoftwareproduct.services.composition.CompositionDataExtractor;
 
-public abstract class CompositionDataExtractorFactory extends
-    AbstractComponentFactory<CompositionDataExtractor> {
+public abstract class CompositionDataExtractorFactory extends AbstractComponentFactory<CompositionDataExtractor> {
 
-  public static CompositionDataExtractorFactory getInstance() {
-    return AbstractFactory.getInstance(CompositionDataExtractorFactory.class);
-  }
+    public static CompositionDataExtractorFactory getInstance() {
+        return AbstractFactory.getInstance(CompositionDataExtractorFactory.class);
+    }
 }
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/factory/InformationArtifactGeneratorFactory.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/factory/InformationArtifactGeneratorFactory.java
index 7e6e7db5dc..f9fb58a20c 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/factory/InformationArtifactGeneratorFactory.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/factory/InformationArtifactGeneratorFactory.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.
@@ -17,17 +17,15 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.factory;
 
 import org.openecomp.core.factory.api.AbstractComponentFactory;
 import org.openecomp.core.factory.api.AbstractFactory;
 import org.openecomp.sdc.vendorsoftwareproduct.informationArtifact.InformationArtifactGenerator;
 
-
 public abstract class InformationArtifactGeneratorFactory extends AbstractComponentFactory<InformationArtifactGenerator> {
 
-  public static InformationArtifactGeneratorFactory getInstance() {
-    return AbstractFactory.getInstance(InformationArtifactGeneratorFactory.class);
-  }
+    public static InformationArtifactGeneratorFactory getInstance() {
+        return AbstractFactory.getInstance(InformationArtifactGeneratorFactory.class);
+    }
 }
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/factory/ManifestCreatorFactory.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/factory/ManifestCreatorFactory.java
index 9189ffce6d..6c1ec911b0 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/factory/ManifestCreatorFactory.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/factory/ManifestCreatorFactory.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.
@@ -17,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.factory;
 
 import org.openecomp.core.factory.api.AbstractComponentFactory;
@@ -27,9 +26,9 @@ import org.openecomp.sdc.vendorsoftwareproduct.services.filedatastructuremodule.
 /**
  * Created by Talio on 12/15/2016.
  */
-public abstract class ManifestCreatorFactory  extends AbstractComponentFactory<ManifestCreator>{
+public abstract class ManifestCreatorFactory extends AbstractComponentFactory<ManifestCreator> {
 
-  public static ManifestCreatorFactory getInstance(){
-    return AbstractFactory.getInstance(ManifestCreatorFactory.class);
-  }
+    public static ManifestCreatorFactory getInstance() {
+        return AbstractFactory.getInstance(ManifestCreatorFactory.class);
+    }
 }
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/factory/QuestionnnaireDataServiceFactory.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/factory/QuestionnnaireDataServiceFactory.java
index a45eb3db6f..2a46aabe11 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/factory/QuestionnnaireDataServiceFactory.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/factory/QuestionnnaireDataServiceFactory.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.
@@ -17,17 +17,15 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.factory;
 
 import org.openecomp.core.factory.api.AbstractComponentFactory;
 import org.openecomp.core.factory.api.AbstractFactory;
 import org.openecomp.sdc.vendorsoftwareproduct.questionnaire.QuestionnaireDataService;
 
-
 public abstract class QuestionnnaireDataServiceFactory extends AbstractComponentFactory<QuestionnaireDataService> {
 
-  public static QuestionnnaireDataServiceFactory getInstance() {
-    return AbstractFactory.getInstance(QuestionnnaireDataServiceFactory.class);
-  }
+    public static QuestionnnaireDataServiceFactory getInstance() {
+        return AbstractFactory.getInstance(QuestionnnaireDataServiceFactory.class);
+    }
 }
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 8f68f1088b..f3db4d3a88 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
@@ -17,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.informationArtifact;
 
 import java.util.List;
@@ -40,5 +39,4 @@ public class InformationArtifactData {
     private VspQuestionnaire vspQuestionnaire;
     private List<ComponentQuestionnaire> componentQuestionnaires;
     private List<NicQuestionnaire> nicQuestionnaires;
-
 }
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/InformationArtifactGenerator.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/InformationArtifactGenerator.java
index 5813a18bd7..abc3f5ca19 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/InformationArtifactGenerator.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/InformationArtifactGenerator.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.
@@ -17,18 +17,16 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.informationArtifact;
 
-import org.openecomp.sdc.versioning.dao.types.Version;
-
 import java.io.IOException;
+import org.openecomp.sdc.versioning.dao.types.Version;
 
 /**
  * @author katyr
  * @since November 29, 2016
  */
-
 public interface InformationArtifactGenerator {
+
     String generate(String vspId, Version version) throws IOException;
 }
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/questionnaire/QuestionnaireDataService.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/questionnaire/QuestionnaireDataService.java
index 0bf10c09e8..e339f49f7f 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/questionnaire/QuestionnaireDataService.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/questionnaire/QuestionnaireDataService.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.
@@ -17,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.questionnaire;
 
 import org.openecomp.sdc.vendorsoftwareproduct.informationArtifact.InformationArtifactData;
@@ -27,7 +26,7 @@ import org.openecomp.sdc.versioning.dao.types.Version;
  * @author katyr
  * @since November 29, 2016
  */
-
 public interface QuestionnaireDataService {
+
     InformationArtifactData generateQuestionnaireDataForInformationArtifact(String vspId, Version version);
 }
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/services/HeatFileAnalyzer.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/services/HeatFileAnalyzer.java
index 533f041621..a1b85daa8c 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/services/HeatFileAnalyzer.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/services/HeatFileAnalyzer.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.
@@ -17,13 +17,11 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.services;
 
-import org.openecomp.sdc.vendorsoftwareproduct.types.candidateheat.AnalyzedZipHeatFiles;
-
 import java.io.IOException;
 import java.util.Map;
+import org.openecomp.sdc.vendorsoftwareproduct.types.candidateheat.AnalyzedZipHeatFiles;
 
 /**
  * @author Avrahamg
@@ -31,17 +29,17 @@ import java.util.Map;
  */
 public interface HeatFileAnalyzer {
 
-  static boolean isEnvFile(String fileName) {
-    return fileName.endsWith(".env");
-  }
+    static boolean isEnvFile(String fileName) {
+        return fileName.endsWith(".env");
+    }
 
-  static boolean isYamlFile(String fileName) {
-    return fileName.endsWith(".yml") || fileName.endsWith(".yaml");
-  }
+    static boolean isYamlFile(String fileName) {
+        return fileName.endsWith(".yml") || fileName.endsWith(".yaml");
+    }
 
-  static boolean isYamlOrEnvFile(String fileName) {
-    return isYamlFile(fileName) || isEnvFile(fileName);
-  }
+    static boolean isYamlOrEnvFile(String fileName) {
+        return isYamlFile(fileName) || isEnvFile(fileName);
+    }
 
-  AnalyzedZipHeatFiles analyzeFilesNotEligibleForModulesFromFileAnalyzer(Map<String, byte[]> files) throws IOException;
+    AnalyzedZipHeatFiles analyzeFilesNotEligibleForModulesFromFileAnalyzer(Map<String, byte[]> files) throws IOException;
 }
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/services/composition/CompositionDataExtractor.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/services/composition/CompositionDataExtractor.java
index 0b82638277..3696bd33fd 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/services/composition/CompositionDataExtractor.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/services/composition/CompositionDataExtractor.java
@@ -17,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.services.composition;
 
 import org.openecomp.sdc.tosca.datatypes.ToscaServiceModel;
@@ -25,7 +24,7 @@ import org.openecomp.sdc.vendorsoftwareproduct.types.composition.CompositionData
 
 public interface CompositionDataExtractor {
 
-  CompositionData extractServiceCompositionData(ToscaServiceModel toscaServiceModel);
+    CompositionData extractServiceCompositionData(ToscaServiceModel toscaServiceModel);
 
-  String getComponentDisplayName(String componentName);
+    String getComponentDisplayName(String componentName);
 }
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/services/filedatastructuremodule/CandidateService.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/services/filedatastructuremodule/CandidateService.java
index d33533a7d0..7467d59c04 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/services/filedatastructuremodule/CandidateService.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/services/filedatastructuremodule/CandidateService.java
@@ -15,9 +15,15 @@
  *
  * Modifications copyright (c) 2021 Nokia
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.services.filedatastructuremodule;
 
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.ByteBuffer;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 import org.openecomp.core.utilities.file.FileContentHandler;
 import org.openecomp.core.utilities.orchestration.OnboardingTypesEnum;
 import org.openecomp.sdc.datatypes.error.ErrorMessage;
@@ -30,61 +36,42 @@ import org.openecomp.sdc.vendorsoftwareproduct.types.candidateheat.AnalyzedZipHe
 import org.openecomp.sdc.vendorsoftwareproduct.types.candidateheat.FilesDataStructure;
 import org.openecomp.sdc.versioning.dao.types.Version;
 
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.ByteBuffer;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-
 public interface CandidateService {
-  Optional<ErrorMessage> validateNonEmptyFileToUpload(InputStream heatFileToUpload,
-                                                      String fileSuffix);
 
-  Optional<ErrorMessage> validateRawZipData(String fileSuffix, byte[] uploadedFileData);
+    Optional<ErrorMessage> validateNonEmptyFileToUpload(InputStream heatFileToUpload, String fileSuffix);
+
+    Optional<ErrorMessage> validateRawZipData(String fileSuffix, byte[] uploadedFileData);
 
-  OrchestrationTemplateCandidateData createCandidateDataEntity(
-      CandidateDataEntityTo candidateDataEntityTo, InputStream zipFileManifest,
-      AnalyzedZipHeatFiles analyzedZipHeatFiles);
+    OrchestrationTemplateCandidateData createCandidateDataEntity(CandidateDataEntityTo candidateDataEntityTo, InputStream zipFileManifest,
+                                                                 AnalyzedZipHeatFiles analyzedZipHeatFiles);
 
-  void updateCandidateUploadData(String vspId, Version version,
-                                 OrchestrationTemplateCandidateData uploadData);
+    void updateCandidateUploadData(String vspId, Version version, OrchestrationTemplateCandidateData uploadData);
 
-  Optional<FilesDataStructure> getOrchestrationTemplateCandidateFileDataStructure(String vspId,
-                                                                                  Version version);
+    Optional<FilesDataStructure> getOrchestrationTemplateCandidateFileDataStructure(String vspId, Version version);
 
-  void updateOrchestrationTemplateCandidateFileDataStructure(String vspId, Version version,
-                                                             FilesDataStructure fileDataStructure);
+    void updateOrchestrationTemplateCandidateFileDataStructure(String vspId, Version version, FilesDataStructure fileDataStructure);
 
-  Optional<OrchestrationTemplateCandidateData> getOrchestrationTemplateCandidate(String vspId,
-                                                                                 Version version);
+    Optional<OrchestrationTemplateCandidateData> getOrchestrationTemplateCandidate(String vspId, Version version);
 
-  Optional<OrchestrationTemplateCandidateData> getOrchestrationTemplateCandidateInfo(String vspId,
-                                                                                     Version version);
+    Optional<OrchestrationTemplateCandidateData> getOrchestrationTemplateCandidateInfo(String vspId, Version version);
 
-  byte[] getZipData(ByteBuffer contentData) throws IOException;
+    byte[] getZipData(ByteBuffer contentData) throws IOException;
 
-  void deleteOrchestrationTemplateCandidate(String vspId, Version version);
+    void deleteOrchestrationTemplateCandidate(String vspId, Version version);
 
-  Optional<ByteArrayInputStream> fetchZipFileByteArrayInputStream(String vspId,
-                                                                  OrchestrationTemplateCandidateData candidateDataEntity,
-                                                                  String manifest,
-                                                                  OnboardingTypesEnum type,
-                                                                  Map<String, List<ErrorMessage>> uploadErrors);
+    Optional<ByteArrayInputStream> fetchZipFileByteArrayInputStream(String vspId, OrchestrationTemplateCandidateData candidateDataEntity,
+                                                                    String manifest, OnboardingTypesEnum type,
+                                                                    Map<String, List<ErrorMessage>> uploadErrors);
 
-  byte[] replaceManifestInZip(ByteBuffer contentData, String manifest,
-                              OnboardingTypesEnum type) throws IOException;
+    byte[] replaceManifestInZip(ByteBuffer contentData, String manifest, OnboardingTypesEnum type) throws IOException;
 
-  Optional<ManifestContent> createManifest(VspDetails vspDetails,
-                                           FileContentHandler fileContentHandler,
-                                           AnalyzedZipHeatFiles analyzedZipHeatFiles);
+    Optional<ManifestContent> createManifest(VspDetails vspDetails, FileContentHandler fileContentHandler, AnalyzedZipHeatFiles analyzedZipHeatFiles);
 
-  String createManifest(VspDetails vspDetails, FilesDataStructure structure);
+    String createManifest(VspDetails vspDetails, FilesDataStructure structure);
 
-  String createManifestFromExisting(VspDetails vspDetails, FilesDataStructure structure, ManifestContent existingManifest);
+    String createManifestFromExisting(VspDetails vspDetails, FilesDataStructure structure, ManifestContent existingManifest);
 
-  Optional<List<ErrorMessage>> validateFileDataStructure(FilesDataStructure filesDataStructure);
+    Optional<List<ErrorMessage>> validateFileDataStructure(FilesDataStructure filesDataStructure);
 
-  void updateValidationData(String vspId, Version version, ValidationStructureList validationData);
+    void updateValidationData(String vspId, Version version, ValidationStructureList validationData);
 }
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/services/filedatastructuremodule/ManifestCreator.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/services/filedatastructuremodule/ManifestCreator.java
index 90490e7153..22ec1c3f79 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/services/filedatastructuremodule/ManifestCreator.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/services/filedatastructuremodule/ManifestCreator.java
@@ -8,9 +8,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.
@@ -18,24 +18,23 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.services.filedatastructuremodule;
 
+import java.util.Optional;
 import org.openecomp.core.utilities.file.FileContentHandler;
 import org.openecomp.sdc.heat.datatypes.manifest.ManifestContent;
 import org.openecomp.sdc.vendorsoftwareproduct.dao.type.VspDetails;
 import org.openecomp.sdc.vendorsoftwareproduct.types.candidateheat.AnalyzedZipHeatFiles;
 import org.openecomp.sdc.vendorsoftwareproduct.types.candidateheat.FilesDataStructure;
 
-import java.util.Optional;
-
 public interface ManifestCreator {
-  Optional<ManifestContent> createManifest(VspDetails vspDetails, FilesDataStructure filesDataStructure);
 
-  Optional<ManifestContent> createManifestFromExisting(VspDetails vspDetails, FilesDataStructure filesDataStructure, ManifestContent existingManifest);
+    Optional<ManifestContent> createManifest(VspDetails vspDetails, FilesDataStructure filesDataStructure);
+
+    Optional<ManifestContent> createManifestFromExisting(VspDetails vspDetails, FilesDataStructure filesDataStructure,
+                                                         ManifestContent existingManifest);
 
-  Optional<ManifestContent> createManifest(VspDetails vspDetails, FileContentHandler
-      fileContentHandler, AnalyzedZipHeatFiles analyzedZipHeatFiles);
+    Optional<ManifestContent> createManifest(VspDetails vspDetails, FileContentHandler fileContentHandler, AnalyzedZipHeatFiles analyzedZipHeatFiles);
 
-  boolean isFileBaseFile(String fileName);
+    boolean isFileBaseFile(String fileName);
 }
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/services/impl/HeatFileAnalyzerRowDataImpl.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/services/impl/HeatFileAnalyzerRowDataImpl.java
index 04d240a8e6..fffdaef75a 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/services/impl/HeatFileAnalyzerRowDataImpl.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/services/impl/HeatFileAnalyzerRowDataImpl.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.
@@ -17,134 +17,126 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.services.impl;
 
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.regex.Pattern;
 import org.openecomp.sdc.vendorsoftwareproduct.services.HeatFileAnalyzer;
 import org.openecomp.sdc.vendorsoftwareproduct.types.candidateheat.AnalyzedZipHeatFiles;
 
-import java.io.*;
-import java.util.*;
-import java.util.regex.Pattern;
-
 public class HeatFileAnalyzerRowDataImpl implements HeatFileAnalyzer {
-  private static final String HEAT_IDENTIFIER_REGEX = "^heat_template_version:.*";
-  private static final String HEAT_RESOURCES_REGEX = "^resources:\\s*$";
-  private static final String HEAT_PARAMETERS_REGEX = "^parameters:\\s*$";
-  private static final String HEAT_CONDITIONS_REGEX = "^conditions:\\s*$";
-  private static final String HEAT_OUTPUTS_REGEX = "^outputs:\\s*$";
-  private static final String HEAT_PARAMETER_GROUP_REGEX = "^parameter_groups:\\s*$";
-  private static final String HEAT_DESCRIPTION_REGEX = "^description:\\s*$";
-  //allowing spaces at start followed by 'type:' + spaces + any characters + ('.yml' or '.yaml')+
-  // spaces
-  private static final String HEAT_NESTED_RESOURCE_REGEX = "\\s*type:\\s*\\S*.(yml|yaml)\\s*$";
-
-
-  private static final String IDENTIFIER = "IDENTIFIER";
-  private static final String RESOURCES = "RESOURCES";
-  private static final String PARAMETERS = "PARAMETERS";
-  private static final String CONDITIONS = "CONDITIONS";
-  private static final String OUTPUTS = "OUTPUTS";
-  private static final String PARAMETER_GROUP = "PARAMETER_GROUP";
-  private static final String DESCRIPTION = "DESCRIPTION";
-  private static final String NESTED_PATTERN = "NESTED_PATTERN";
-
-  private final Map<String, Pattern> patterns;
-
-  public HeatFileAnalyzerRowDataImpl() {
-    patterns = new HashMap<>();
-    patterns.put(IDENTIFIER, Pattern.compile(HEAT_IDENTIFIER_REGEX));
-    patterns.put(RESOURCES, Pattern.compile(HEAT_RESOURCES_REGEX));
-    patterns.put(PARAMETERS, Pattern.compile(HEAT_PARAMETERS_REGEX));
-    patterns.put(CONDITIONS, Pattern.compile(HEAT_CONDITIONS_REGEX));
-    patterns.put(OUTPUTS, Pattern.compile(HEAT_OUTPUTS_REGEX));
-    patterns.put(PARAMETER_GROUP, Pattern.compile(HEAT_PARAMETER_GROUP_REGEX));
-    patterns.put(DESCRIPTION, Pattern.compile(HEAT_DESCRIPTION_REGEX));
-    patterns.put(NESTED_PATTERN, Pattern.compile(HEAT_NESTED_RESOURCE_REGEX));
-  }
-
-  @Override
-  public AnalyzedZipHeatFiles analyzeFilesNotEligibleForModulesFromFileAnalyzer(Map<String, byte[]> files)
-      throws IOException {
-    AnalyzedZipHeatFiles analyzedZipHeatFiles = new AnalyzedZipHeatFiles();
 
-    for (Map.Entry<String, byte[]> fileData : files.entrySet()) {
-      String fileName = fileData.getKey();
-      if (!HeatFileAnalyzer.isYamlFile(fileName)) {
-        analyzedZipHeatFiles.addOtherNonModuleFile(fileName);
-        continue;
-      }
-
-      boolean foundHeatIdentifier = false;
-      try (InputStream is = new ByteArrayInputStream(fileData.getValue());
-           BufferedReader bfReader = new BufferedReader(new InputStreamReader(is))) {
+    private static final String HEAT_IDENTIFIER_REGEX = "^heat_template_version:.*";
+    private static final String HEAT_RESOURCES_REGEX = "^resources:\\s*$";
+    private static final String HEAT_PARAMETERS_REGEX = "^parameters:\\s*$";
+    private static final String HEAT_CONDITIONS_REGEX = "^conditions:\\s*$";
+    private static final String HEAT_OUTPUTS_REGEX = "^outputs:\\s*$";
+    private static final String HEAT_PARAMETER_GROUP_REGEX = "^parameter_groups:\\s*$";
+    private static final String HEAT_DESCRIPTION_REGEX = "^description:\\s*$";
+    //allowing spaces at start followed by 'type:' + spaces + any characters + ('.yml' or '.yaml')+
+
+    // spaces
+    private static final String HEAT_NESTED_RESOURCE_REGEX = "\\s*type:\\s*\\S*.(yml|yaml)\\s*$";
+    private static final String IDENTIFIER = "IDENTIFIER";
+    private static final String RESOURCES = "RESOURCES";
+    private static final String PARAMETERS = "PARAMETERS";
+    private static final String CONDITIONS = "CONDITIONS";
+    private static final String OUTPUTS = "OUTPUTS";
+    private static final String PARAMETER_GROUP = "PARAMETER_GROUP";
+    private static final String DESCRIPTION = "DESCRIPTION";
+    private static final String NESTED_PATTERN = "NESTED_PATTERN";
+    private final Map<String, Pattern> patterns;
+
+    public HeatFileAnalyzerRowDataImpl() {
+        patterns = new HashMap<>();
+        patterns.put(IDENTIFIER, Pattern.compile(HEAT_IDENTIFIER_REGEX));
+        patterns.put(RESOURCES, Pattern.compile(HEAT_RESOURCES_REGEX));
+        patterns.put(PARAMETERS, Pattern.compile(HEAT_PARAMETERS_REGEX));
+        patterns.put(CONDITIONS, Pattern.compile(HEAT_CONDITIONS_REGEX));
+        patterns.put(OUTPUTS, Pattern.compile(HEAT_OUTPUTS_REGEX));
+        patterns.put(PARAMETER_GROUP, Pattern.compile(HEAT_PARAMETER_GROUP_REGEX));
+        patterns.put(DESCRIPTION, Pattern.compile(HEAT_DESCRIPTION_REGEX));
+        patterns.put(NESTED_PATTERN, Pattern.compile(HEAT_NESTED_RESOURCE_REGEX));
+    }
 
-        String line;
-        boolean isResourcesSection = false;
-        Set<String> nestedFilesNames = new HashSet<>();
-        while ((line = bfReader.readLine()) != null) {
-          if (!foundHeatIdentifier && isMatch(patterns.get(IDENTIFIER), line)) {
-            foundHeatIdentifier = true;
-            analyzedZipHeatFiles.addModuleFile(fileName);
-            if (isResourcesSection) // it means the identifier is located after the resources
-            // section
-            {
-              break;
+    @Override
+    public AnalyzedZipHeatFiles analyzeFilesNotEligibleForModulesFromFileAnalyzer(Map<String, byte[]> files) throws IOException {
+        AnalyzedZipHeatFiles analyzedZipHeatFiles = new AnalyzedZipHeatFiles();
+        for (Map.Entry<String, byte[]> fileData : files.entrySet()) {
+            String fileName = fileData.getKey();
+            if (!HeatFileAnalyzer.isYamlFile(fileName)) {
+                analyzedZipHeatFiles.addOtherNonModuleFile(fileName);
+                continue;
             }
-          } else if (isMatch(patterns.get(RESOURCES), line)) {
-            isResourcesSection = true;
-          } else if (isResourceSectionEnd(line, isResourcesSection)) {
-            if (foundHeatIdentifier) {
-              break;
+            boolean foundHeatIdentifier = false;
+            try (InputStream is = new ByteArrayInputStream(fileData.getValue()); BufferedReader bfReader = new BufferedReader(
+                new InputStreamReader(is))) {
+                String line;
+                boolean isResourcesSection = false;
+                Set<String> nestedFilesNames = new HashSet<>();
+                while ((line = bfReader.readLine()) != null) {
+                    if (!foundHeatIdentifier && isMatch(patterns.get(IDENTIFIER), line)) {
+                        foundHeatIdentifier = true;
+                        analyzedZipHeatFiles.addModuleFile(fileName);
+                        if (isResourcesSection) // it means the identifier is located after the resources
+
+                        // section
+                        {
+                            break;
+                        }
+                    } else if (isMatch(patterns.get(RESOURCES), line)) {
+                        isResourcesSection = true;
+                    } else if (isResourceSectionEnd(line, isResourcesSection)) {
+                        if (foundHeatIdentifier) {
+                            break;
+                        }
+                    } else if (isResourcesSection) {
+                        Optional<String> optionalNestedFileName = fetchNestedFileName(line);
+                        optionalNestedFileName.ifPresent(nestedFilesNames::add);
+                    }
+                }
+                analyzedZipHeatFiles.addNestedFiles(fetchFileNamesToReturn(nestedFilesNames, foundHeatIdentifier));
             }
-          } else if (isResourcesSection) {
-            Optional<String> optionalNestedFileName = fetchNestedFileName(line);
-            optionalNestedFileName
-                .ifPresent(nestedFilesNames::add);
-          }
         }
-        analyzedZipHeatFiles.addNestedFiles(fetchFileNamesToReturn(nestedFilesNames,
-            foundHeatIdentifier));
-      }
+        return analyzedZipHeatFiles;
     }
 
-    return analyzedZipHeatFiles;
-  }
-
-  private Optional<String> fetchNestedFileName(String line) {
-    if (isMatch(patterns.get(NESTED_PATTERN), line)) {
-      String trimmedLine = line.trim();
-      String nestedFileName = trimmedLine
-          .substring(trimmedLine.indexOf("type:") + "type:".length(), trimmedLine.length())
-          .trim();
-      return Optional.of(nestedFileName);
+    private Optional<String> fetchNestedFileName(String line) {
+        if (isMatch(patterns.get(NESTED_PATTERN), line)) {
+            String trimmedLine = line.trim();
+            String nestedFileName = trimmedLine.substring(trimmedLine.indexOf("type:") + "type:".length(), trimmedLine.length()).trim();
+            return Optional.of(nestedFileName);
+        }
+        return Optional.empty();
     }
-    return Optional.empty();
-  }
 
-  private Set<String> fetchFileNamesToReturn(Set<String> filesNamesToReturn,
-                                             boolean foundHeatIdentifier) {
-    if (!foundHeatIdentifier) {
-      return new HashSet<>();
-    } else {
-      return filesNamesToReturn;
+    private Set<String> fetchFileNamesToReturn(Set<String> filesNamesToReturn, boolean foundHeatIdentifier) {
+        if (!foundHeatIdentifier) {
+            return new HashSet<>();
+        } else {
+            return filesNamesToReturn;
+        }
     }
-  }
 
-  private boolean isResourceSectionEnd(String line, boolean isResourcesSection) {
-    return isResourcesSection && isStartOfNonResourcesHeatSection(line);
-  }
-
-  private boolean isStartOfNonResourcesHeatSection(String line) {
-    return isMatch(patterns.get(PARAMETERS), line) ||
-        isMatch(patterns.get(CONDITIONS), line) ||
-        isMatch(patterns.get(OUTPUTS), line) ||
-        isMatch(patterns.get(PARAMETER_GROUP), line) ||
-        isMatch(patterns.get(DESCRIPTION), line);
-  }
+    private boolean isResourceSectionEnd(String line, boolean isResourcesSection) {
+        return isResourcesSection && isStartOfNonResourcesHeatSection(line);
+    }
 
-  private boolean isMatch(Pattern pattern, String line) {
-    return pattern.matcher(line).matches();
-  }
+    private boolean isStartOfNonResourcesHeatSection(String line) {
+        return isMatch(patterns.get(PARAMETERS), line) || isMatch(patterns.get(CONDITIONS), line) || isMatch(patterns.get(OUTPUTS), line) || isMatch(
+            patterns.get(PARAMETER_GROUP), line) || isMatch(patterns.get(DESCRIPTION), line);
+    }
 
+    private boolean isMatch(Pattern pattern, String line) {
+        return pattern.matcher(line).matches();
+    }
 }
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/services/impl/etsi/ETSIService.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/services/impl/etsi/ETSIService.java
index 8b56b3fbc0..dad05b64f2 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/services/impl/etsi/ETSIService.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/services/impl/etsi/ETSIService.java
@@ -17,27 +17,23 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.services.impl.etsi;
 
+import com.vdurmont.semver4j.Semver;
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.Map;
 import java.util.Optional;
-
 import org.openecomp.core.utilities.file.FileContentHandler;
 import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
 import org.openecomp.sdc.tosca.csar.Manifest;
 import org.openecomp.sdc.tosca.datatypes.ToscaServiceModel;
 
-import com.vdurmont.semver4j.Semver;
-
-
 public interface ETSIService {
 
     /**
-     * Checks package structure is CSAR with TOSCA-Metadata directory according to SOL004 v2.5.1
-     * and contains mandatory Entries in Tosca.meta
+     * Checks package structure is CSAR with TOSCA-Metadata directory according to SOL004 v2.5.1 and contains mandatory Entries in Tosca.meta
+     *
      * @param handler contains csar artifacts
      * @return true if all condition matched, false otherwise
      * @throws IOException when TOSCA.meta file is invalid
@@ -50,20 +46,19 @@ public interface ETSIService {
      * @param handler The file handler containing the artifacts to move.
      * @return A Map with pairs of from and to path of the moved artifacts.
      */
-    Optional<Map<String, Path>> moveNonManoFileToArtifactFolder(final FileContentHandler handler)
-        throws IOException;
+    Optional<Map<String, Path>> moveNonManoFileToArtifactFolder(final FileContentHandler handler) throws IOException;
 
     /**
      * Updates the main descriptor paths referring the artifacts that were moved.
      *
-     * @param toscaServiceModel The tosca service model containing the main descriptor.
+     * @param toscaServiceModel      The tosca service model containing the main descriptor.
      * @param fromToMovedArtifactMap A Map representing the from and to artifacts path changes.
      */
-    void updateMainDescriptorPaths(final ToscaServiceModel toscaServiceModel,
-                                   final Map<String, Path> fromToMovedArtifactMap);
+    void updateMainDescriptorPaths(final ToscaServiceModel toscaServiceModel, final Map<String, Path> fromToMovedArtifactMap);
 
     /**
      * Retrieves the manifest file from the CSAR
+     *
      * @param handler contains csar artifacts
      * @throws IOException when TOSCA.meta file or manifest file is invalid
      */
@@ -71,6 +66,7 @@ public interface ETSIService {
 
     /**
      * Determines the type of resource that the CSAR represents
+     *
      * @param handler contains csar artifacts
      * @throws IOException when TOSCA.meta file or manifest file is invalid
      */
@@ -78,6 +74,7 @@ public interface ETSIService {
 
     /**
      * Determines the type of resource that the CSAR represents
+     *
      * @param manifest contains manifest content
      * @throws IOException when TOSCA.meta file or manifest file is invalid
      */
@@ -85,9 +82,9 @@ public interface ETSIService {
 
     Path getOriginalManifestPath(final FileContentHandler handler) throws IOException;
 
-
     /**
      * Determines the highest compatible specification version based on ETSI manifest file
+     *
      * @param handler contains csar artifacts
      * @return Semver representing highest compatible specification version
      */
@@ -95,6 +92,7 @@ public interface ETSIService {
 
     /**
      * Verifies if SOL004 3.3.1 manifest file has onap_cnf_helm non mano entry
+     *
      * @return true if manifest files has onap_cnf_helm non mano entry
      */
     boolean hasCnfEnhancements(final FileContentHandler fileContentHandler) throws IOException;
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/services/schemagenerator/SchemaGenerator.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/services/schemagenerator/SchemaGenerator.java
index 4aaa9a8a03..35bed3852b 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/services/schemagenerator/SchemaGenerator.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/services/schemagenerator/SchemaGenerator.java
@@ -12,12 +12,14 @@
  * 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.
-*/
-
+ */
 package org.openecomp.sdc.vendorsoftwareproduct.services.schemagenerator;
 
 import freemarker.template.Template;
 import freemarker.template.TemplateException;
+import java.io.IOException;
+import java.io.StringWriter;
+import java.io.Writer;
 import org.openecomp.sdc.common.errors.CoreException;
 import org.openecomp.sdc.common.errors.ErrorCategory;
 import org.openecomp.sdc.common.errors.ErrorCode;
@@ -25,39 +27,34 @@ import org.openecomp.sdc.vendorsoftwareproduct.types.composition.CompositionEnti
 import org.openecomp.sdc.vendorsoftwareproduct.types.schemagenerator.SchemaTemplateContext;
 import org.openecomp.sdc.vendorsoftwareproduct.types.schemagenerator.SchemaTemplateInput;
 
-import java.io.IOException;
-import java.io.StringWriter;
-import java.io.Writer;
-
 public class SchemaGenerator {
-  public static final String SCHEMA_GENERATION_ERROR = "SCHEMA_GENERATION_ERROR";
-  private SchemaGenerator() {
-    // Utility classes, which are a collection of static members, are not meant to be instantiated
-  }
 
-  /**
-   * Generate string.
-   *
-   * @param schemaTemplateContext the schema template context
-   * @param entityType            the entity type
-   * @param input                 the input
-   * @return the string
-   */
-  public static String generate(SchemaTemplateContext schemaTemplateContext,
-                                CompositionEntityType entityType, SchemaTemplateInput input) {
-    Template schemaTemplate =
-        SchemaGeneratorConfig.getSchemaTemplate(schemaTemplateContext, entityType);
-    return processTemplate(input, schemaTemplate);
-  }
+    public static final String SCHEMA_GENERATION_ERROR = "SCHEMA_GENERATION_ERROR";
+
+    private SchemaGenerator() {
+        // Utility classes, which are a collection of static members, are not meant to be instantiated
+    }
+
+    /**
+     * Generate string.
+     *
+     * @param schemaTemplateContext the schema template context
+     * @param entityType            the entity type
+     * @param input                 the input
+     * @return the string
+     */
+    public static String generate(SchemaTemplateContext schemaTemplateContext, CompositionEntityType entityType, SchemaTemplateInput input) {
+        Template schemaTemplate = SchemaGeneratorConfig.getSchemaTemplate(schemaTemplateContext, entityType);
+        return processTemplate(input, schemaTemplate);
+    }
 
-  private static String processTemplate(SchemaTemplateInput input, Template schemaTemplate) {
-    try (Writer writer = new StringWriter(1024)) {
-      schemaTemplate.process(input, writer);
-      return writer.toString();
-    } catch (IOException | TemplateException exception) {
-      throw new CoreException(
-          new ErrorCode.ErrorCodeBuilder().withCategory(ErrorCategory.APPLICATION)
-              .withId(SCHEMA_GENERATION_ERROR).withMessage(exception.getMessage()).build(), exception);
+    private static String processTemplate(SchemaTemplateInput input, Template schemaTemplate) {
+        try (Writer writer = new StringWriter(1024)) {
+            schemaTemplate.process(input, writer);
+            return writer.toString();
+        } catch (IOException | TemplateException exception) {
+            throw new CoreException(new ErrorCode.ErrorCodeBuilder().withCategory(ErrorCategory.APPLICATION).withId(SCHEMA_GENERATION_ERROR)
+                .withMessage(exception.getMessage()).build(), exception);
+        }
     }
-  }
 }
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/services/schemagenerator/SchemaGeneratorConfig.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/services/schemagenerator/SchemaGeneratorConfig.java
index 3937ca2f2e..9d00e45bc5 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/services/schemagenerator/SchemaGeneratorConfig.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/services/schemagenerator/SchemaGeneratorConfig.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.
@@ -17,13 +17,16 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.services.schemagenerator;
 
 import freemarker.cache.StringTemplateLoader;
 import freemarker.template.Configuration;
 import freemarker.template.Template;
 import freemarker.template.TemplateExceptionHandler;
+import java.io.File;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
 import org.openecomp.core.utilities.applicationconfig.ApplicationConfig;
 import org.openecomp.core.utilities.applicationconfig.ApplicationConfigFactory;
 import org.openecomp.core.utilities.applicationconfig.type.ConfigurationData;
@@ -33,122 +36,106 @@ import org.openecomp.sdc.common.errors.ErrorCode;
 import org.openecomp.sdc.vendorsoftwareproduct.types.composition.CompositionEntityType;
 import org.openecomp.sdc.vendorsoftwareproduct.types.schemagenerator.SchemaTemplateContext;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
 public class SchemaGeneratorConfig {
-  public static final String SCHEMA_GENERATOR_INITIALIZATION_ERROR =
-      "SCHEMA_GENERATOR_INITIALIZATION_ERROR";
-  public static final String SCHEMA_GENERATOR_INITIALIZATION_ERROR_MSG =
-      "Error occurred while loading questionnaire schema schemaTemplates";
-  private static final String CONFIGURATION_NAMESPACE = "vsp.schemaTemplates";
-  private static Map<SchemaTemplateId, SchemaTemplate> schemaTemplates = new HashMap<>();
-  private static ApplicationConfig applicationConfig =
-      ApplicationConfigFactory.getInstance().createInterface();
 
-  private static Configuration configuration = new Configuration(Configuration.VERSION_2_3_23);
-  private static StringTemplateLoader stringLoader = new StringTemplateLoader();
-
-  static {
-    configuration.setClassLoaderForTemplateLoading(SchemaGenerator.class.getClassLoader(),
-        File.pathSeparator);
-    configuration.setDefaultEncoding("UTF-8");
-    configuration.setTemplateExceptionHandler(TemplateExceptionHandler.RETHROW_HANDLER);
-    configuration.setLogTemplateExceptions(true);
-    configuration.setTemplateLoader(stringLoader);
-  }
-
-  public static void insertSchemaTemplate(SchemaTemplateContext schemaTemplateContext,
-                                          CompositionEntityType entityType,
-                                          String schemaTemplateString) {
-    applicationConfig.insertValue(CONFIGURATION_NAMESPACE,
-        new SchemaTemplateId(schemaTemplateContext, entityType).toString(), schemaTemplateString);
-  }
-
-  /**
-   * Gets schema template.
-   *
-   * @param schemaTemplateContext the schema template context
-   * @param entityType            the entity type
-   * @return the schema template
-   */
-  public static Template getSchemaTemplate(SchemaTemplateContext schemaTemplateContext,
-                                           CompositionEntityType entityType) {
-    SchemaTemplateId id = new SchemaTemplateId(schemaTemplateContext, entityType);
-    ConfigurationData configurationData =
-        applicationConfig.getConfigurationData(CONFIGURATION_NAMESPACE, id.toString());
-
-    SchemaTemplate schemaTemplate = schemaTemplates.get(id);
-    if (schemaTemplate == null || schemaTemplate.timestamp != configurationData.getTimeStamp()) {
-      stringLoader.putTemplate(id.toString(), configurationData.getValue());
-      Template template;
-      try {
-        template = configuration.getTemplate(id.toString());
-      } catch (IOException exception) {
-        throw new CoreException(
-            new ErrorCode.ErrorCodeBuilder().withCategory(ErrorCategory.APPLICATION)
-                .withId(SCHEMA_GENERATOR_INITIALIZATION_ERROR)
-                .withMessage(SCHEMA_GENERATOR_INITIALIZATION_ERROR_MSG).build(), exception);
-      }
-      schemaTemplate = new SchemaTemplate(template, configurationData.getTimeStamp());
-      schemaTemplates.put(id, schemaTemplate);
+    public static final String SCHEMA_GENERATOR_INITIALIZATION_ERROR = "SCHEMA_GENERATOR_INITIALIZATION_ERROR";
+    public static final String SCHEMA_GENERATOR_INITIALIZATION_ERROR_MSG = "Error occurred while loading questionnaire schema schemaTemplates";
+    private static final String CONFIGURATION_NAMESPACE = "vsp.schemaTemplates";
+    private static Map<SchemaTemplateId, SchemaTemplate> schemaTemplates = new HashMap<>();
+    private static ApplicationConfig applicationConfig = ApplicationConfigFactory.getInstance().createInterface();
+    private static Configuration configuration = new Configuration(Configuration.VERSION_2_3_23);
+    private static StringTemplateLoader stringLoader = new StringTemplateLoader();
+
+    static {
+        configuration.setClassLoaderForTemplateLoading(SchemaGenerator.class.getClassLoader(), File.pathSeparator);
+        configuration.setDefaultEncoding("UTF-8");
+        configuration.setTemplateExceptionHandler(TemplateExceptionHandler.RETHROW_HANDLER);
+        configuration.setLogTemplateExceptions(true);
+        configuration.setTemplateLoader(stringLoader);
     }
-    return schemaTemplate.template;
-  }
-
-  private static class SchemaTemplateId {
-    private SchemaTemplateContext context;
-    private CompositionEntityType entityType;
 
-    public SchemaTemplateId(SchemaTemplateContext context, CompositionEntityType entityType) {
-      this.context = context;
-      this.entityType = entityType;
+    public static void insertSchemaTemplate(SchemaTemplateContext schemaTemplateContext, CompositionEntityType entityType,
+                                            String schemaTemplateString) {
+        applicationConfig
+            .insertValue(CONFIGURATION_NAMESPACE, new SchemaTemplateId(schemaTemplateContext, entityType).toString(), schemaTemplateString);
     }
 
-    @Override
-    public String toString() {
-      return context + "." + entityType;
+    /**
+     * Gets schema template.
+     *
+     * @param schemaTemplateContext the schema template context
+     * @param entityType            the entity type
+     * @return the schema template
+     */
+    public static Template getSchemaTemplate(SchemaTemplateContext schemaTemplateContext, CompositionEntityType entityType) {
+        SchemaTemplateId id = new SchemaTemplateId(schemaTemplateContext, entityType);
+        ConfigurationData configurationData = applicationConfig.getConfigurationData(CONFIGURATION_NAMESPACE, id.toString());
+        SchemaTemplate schemaTemplate = schemaTemplates.get(id);
+        if (schemaTemplate == null || schemaTemplate.timestamp != configurationData.getTimeStamp()) {
+            stringLoader.putTemplate(id.toString(), configurationData.getValue());
+            Template template;
+            try {
+                template = configuration.getTemplate(id.toString());
+            } catch (IOException exception) {
+                throw new CoreException(
+                    new ErrorCode.ErrorCodeBuilder().withCategory(ErrorCategory.APPLICATION).withId(SCHEMA_GENERATOR_INITIALIZATION_ERROR)
+                        .withMessage(SCHEMA_GENERATOR_INITIALIZATION_ERROR_MSG).build(), exception);
+            }
+            schemaTemplate = new SchemaTemplate(template, configurationData.getTimeStamp());
+            schemaTemplates.put(id, schemaTemplate);
+        }
+        return schemaTemplate.template;
     }
 
-    @Override
-    public boolean equals(Object obj) {
-      if (this == obj) {
-        return true;
-      }
-      if (obj == null || getClass() != obj.getClass()) {
-        return false;
-      }
-
-      SchemaTemplateId that = (SchemaTemplateId) obj;
-
-      if (entityType != that.entityType) {
-        return false;
-      }
-      if (context != that.context) {
-        return false;
-      }
-
-      return true;
+    private static class SchemaTemplateId {
+
+        private SchemaTemplateContext context;
+        private CompositionEntityType entityType;
+
+        public SchemaTemplateId(SchemaTemplateContext context, CompositionEntityType entityType) {
+            this.context = context;
+            this.entityType = entityType;
+        }
+
+        @Override
+        public String toString() {
+            return context + "." + entityType;
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            if (this == obj) {
+                return true;
+            }
+            if (obj == null || getClass() != obj.getClass()) {
+                return false;
+            }
+            SchemaTemplateId that = (SchemaTemplateId) obj;
+            if (entityType != that.entityType) {
+                return false;
+            }
+            if (context != that.context) {
+                return false;
+            }
+            return true;
+        }
+
+        @Override
+        public int hashCode() {
+            int result = entityType != null ? entityType.hashCode() : 0;
+            result = 31 * result + (context != null ? context.hashCode() : 0);
+            return result;
+        }
     }
 
-    @Override
-    public int hashCode() {
-      int result = entityType != null ? entityType.hashCode() : 0;
-      result = 31 * result + (context != null ? context.hashCode() : 0);
-      return result;
-    }
-  }
+    private static class SchemaTemplate {
 
-  private static class SchemaTemplate {
-    private Template template;
-    private long timestamp;
+        private Template template;
+        private long timestamp;
 
-    public SchemaTemplate(Template template, long timestamp) {
-      this.template = template;
-      this.timestamp = timestamp;
+        public SchemaTemplate(Template template, long timestamp) {
+            this.template = template;
+            this.timestamp = timestamp;
+        }
     }
-  }
-
 }
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/services/utils/CandidateEntityBuilder.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/services/utils/CandidateEntityBuilder.java
index eb4b29d742..726fcbf21f 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/services/utils/CandidateEntityBuilder.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/services/utils/CandidateEntityBuilder.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.
@@ -17,9 +17,14 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.services.utils;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
 import org.openecomp.core.utilities.file.FileContentHandler;
 import org.openecomp.core.utilities.json.JsonUtil;
 import org.openecomp.sdc.common.errors.Messages;
@@ -37,70 +42,52 @@ import org.openecomp.sdc.vendorsoftwareproduct.services.impl.HeatFileAnalyzerRow
 import org.openecomp.sdc.vendorsoftwareproduct.types.CandidateDataEntityTo;
 import org.openecomp.sdc.vendorsoftwareproduct.types.candidateheat.AnalyzedZipHeatFiles;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-
 public class CandidateEntityBuilder {
-  private final CandidateService candidateService;
-
-  public CandidateEntityBuilder(CandidateService candidateService) {
-    this.candidateService = candidateService;
-  }
 
-  public OrchestrationTemplateCandidateData buildCandidateEntityFromZip(
-      VspDetails vspDetails, byte[] uploadedFileData, FileContentHandler contentMap,
-      Map<String, List<ErrorMessage>> uploadErrors) throws Exception {
-    //mdcDataDebugMessage.debugEntryMessage("VSP Id", vspDetails.getId());
+    private final CandidateService candidateService;
 
-    try (InputStream zipFileManifest = contentMap.getFileContentAsStream(SdcCommon.MANIFEST_NAME)) {
-      HeatFileAnalyzer heatFileAnalyzer = new HeatFileAnalyzerRowDataImpl();
-      AnalyzedZipHeatFiles analyzedZipHeatFiles =
-          heatFileAnalyzer.analyzeFilesNotEligibleForModulesFromFileAnalyzer(contentMap.getFiles());
-      HeatStructureTree tree = getHeatStructureTree(vspDetails, contentMap, analyzedZipHeatFiles);
-
-      CandidateDataEntityTo candidateDataEntityTo =
-          new CandidateDataEntityTo(vspDetails.getId(), vspDetails.getVersion(), uploadedFileData,
-              tree, contentMap);
-      candidateDataEntityTo.setErrors(uploadErrors);
-      OrchestrationTemplateCandidateData candidateDataEntity =
-          candidateService.createCandidateDataEntity(candidateDataEntityTo, zipFileManifest,
-              analyzedZipHeatFiles);
-      return candidateDataEntity;
+    public CandidateEntityBuilder(CandidateService candidateService) {
+        this.candidateService = candidateService;
     }
-  }
 
-  private HeatStructureTree getHeatStructureTree(VspDetails vspDetails,
-                                                 FileContentHandler contentMap,
-                                                 AnalyzedZipHeatFiles analyzedZipHeatFiles)
-      throws IOException {
-    addManifestToFileContentMapIfNotExist(vspDetails, contentMap, analyzedZipHeatFiles);
-    HeatTreeManager heatTreeManager = HeatTreeManagerUtil.initHeatTreeManager(contentMap);
-    heatTreeManager.createTree();
-    return heatTreeManager.getTree();
-  }
+    public OrchestrationTemplateCandidateData buildCandidateEntityFromZip(VspDetails vspDetails, byte[] uploadedFileData,
+                                                                          FileContentHandler contentMap, Map<String, List<ErrorMessage>> uploadErrors)
+        throws Exception {
+        //mdcDataDebugMessage.debugEntryMessage("VSP Id", vspDetails.getId());
+        try (InputStream zipFileManifest = contentMap.getFileContentAsStream(SdcCommon.MANIFEST_NAME)) {
+            HeatFileAnalyzer heatFileAnalyzer = new HeatFileAnalyzerRowDataImpl();
+            AnalyzedZipHeatFiles analyzedZipHeatFiles = heatFileAnalyzer.analyzeFilesNotEligibleForModulesFromFileAnalyzer(contentMap.getFiles());
+            HeatStructureTree tree = getHeatStructureTree(vspDetails, contentMap, analyzedZipHeatFiles);
+            CandidateDataEntityTo candidateDataEntityTo = new CandidateDataEntityTo(vspDetails.getId(), vspDetails.getVersion(), uploadedFileData,
+                tree, contentMap);
+            candidateDataEntityTo.setErrors(uploadErrors);
+            OrchestrationTemplateCandidateData candidateDataEntity = candidateService
+                .createCandidateDataEntity(candidateDataEntityTo, zipFileManifest, analyzedZipHeatFiles);
+            return candidateDataEntity;
+        }
+    }
 
-  private void addManifestToFileContentMapIfNotExist(VspDetails vspDetails,
-                                                     FileContentHandler fileContentHandler,
-                                                     AnalyzedZipHeatFiles analyzedZipHeatFiles)
-      throws IOException {
-    try (InputStream manifest = fileContentHandler.getFileContentAsStream(SdcCommon.MANIFEST_NAME)) {
+    private HeatStructureTree getHeatStructureTree(VspDetails vspDetails, FileContentHandler contentMap, AnalyzedZipHeatFiles analyzedZipHeatFiles)
+        throws IOException {
+        addManifestToFileContentMapIfNotExist(vspDetails, contentMap, analyzedZipHeatFiles);
+        HeatTreeManager heatTreeManager = HeatTreeManagerUtil.initHeatTreeManager(contentMap);
+        heatTreeManager.createTree();
+        return heatTreeManager.getTree();
+    }
 
-      if (Objects.isNull(manifest)) {
-        Optional<ManifestContent> manifestContentOptional =
-            candidateService.createManifest(vspDetails, fileContentHandler, analyzedZipHeatFiles);
-        if (!manifestContentOptional.isPresent()) {
-          throw new RuntimeException(Messages.CREATE_MANIFEST_FROM_ZIP.getErrorMessage());
+    private void addManifestToFileContentMapIfNotExist(VspDetails vspDetails, FileContentHandler fileContentHandler,
+                                                       AnalyzedZipHeatFiles analyzedZipHeatFiles) throws IOException {
+        try (InputStream manifest = fileContentHandler.getFileContentAsStream(SdcCommon.MANIFEST_NAME)) {
+            if (Objects.isNull(manifest)) {
+                Optional<ManifestContent> manifestContentOptional = candidateService
+                    .createManifest(vspDetails, fileContentHandler, analyzedZipHeatFiles);
+                if (!manifestContentOptional.isPresent()) {
+                    throw new RuntimeException(Messages.CREATE_MANIFEST_FROM_ZIP.getErrorMessage());
+                }
+                ManifestContent manifestContent = manifestContentOptional.get();
+                fileContentHandler.addFile(SdcCommon.MANIFEST_NAME, String.valueOf(JsonUtil.sbObject2Json(manifestContent)).getBytes());
+            }
+        } finally {
         }
-        ManifestContent manifestContent = manifestContentOptional.get();
-        fileContentHandler.addFile(
-            SdcCommon.MANIFEST_NAME,
-            String.valueOf(JsonUtil.sbObject2Json(manifestContent)).getBytes());
-      }
-    } finally {
     }
-  }
 }
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/types/CandidateDataEntityTo.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/CandidateDataEntityTo.java
index 3a535e125e..89090aaeb4 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/CandidateDataEntityTo.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/CandidateDataEntityTo.java
@@ -17,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.types;
 
 import java.util.HashMap;
@@ -49,13 +48,11 @@ public class CandidateDataEntityTo {
      * @param tree             the tree
      * @param contentMap       the content map
      */
-    public CandidateDataEntityTo(String vspId, Version version, byte[] uploadedFileData,
-                                 HeatStructureTree tree, FileContentHandler contentMap) {
+    public CandidateDataEntityTo(String vspId, Version version, byte[] uploadedFileData, HeatStructureTree tree, FileContentHandler contentMap) {
         this.vspId = vspId;
         this.version = version;
         this.uploadedFileData = uploadedFileData;
         this.tree = tree;
         this.contentMap = contentMap;
     }
-
 }
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/types/candidateheat/AnalyzedZipHeatFiles.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/candidateheat/AnalyzedZipHeatFiles.java
index 63067e3ede..d4d658b67e 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/candidateheat/AnalyzedZipHeatFiles.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/candidateheat/AnalyzedZipHeatFiles.java
@@ -17,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.types.candidateheat;
 
 import java.util.Collection;
@@ -62,5 +61,4 @@ public class AnalyzedZipHeatFiles {
     public Collection<String> getFilesNotEligbleForModules() {
         return CollectionUtils.union(this.getNestedFiles(), this.getOtherNonModuleFiles());
     }
-
 }
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/types/candidateheat/Constants.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/candidateheat/Constants.java
index 4e19dd67e9..c834fccae5 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/candidateheat/Constants.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/candidateheat/Constants.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.
@@ -17,11 +17,11 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.types.candidateheat;
 
 public class Constants {
-  public static final String BASE_HEAT_REGEX = "(^base_.*\\.|.*_base\\.|.*_base_.*\\.|^base\\.)(yaml|yml)$";
-  public static final String VOL_FILE_NAME_SUFFIX = "_volume";
-  public static final String ENV_FILE_EXTENSION = ".env";
+
+    public static final String BASE_HEAT_REGEX = "(^base_.*\\.|.*_base\\.|.*_base_.*\\.|^base\\.)(yaml|yml)$";
+    public static final String VOL_FILE_NAME_SUFFIX = "_volume";
+    public static final String ENV_FILE_EXTENSION = ".env";
 }
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/types/candidateheat/FilesDataStructure.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/candidateheat/FilesDataStructure.java
index 22c4534b6c..3c0bf8eb3e 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/candidateheat/FilesDataStructure.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/candidateheat/FilesDataStructure.java
@@ -17,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.types.candidateheat;
 
 import java.util.ArrayList;
@@ -35,5 +34,4 @@ public class FilesDataStructure {
     private List<String> unassigned = new ArrayList<>();
     private List<String> artifacts = new ArrayList<>();
     private List<String> nested = new ArrayList<>();
-
 }
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/types/candidateheat/Module.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/candidateheat/Module.java
index 25a004e890..30c8e0796a 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/candidateheat/Module.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/candidateheat/Module.java
@@ -17,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.types.candidateheat;
 
 import lombok.Getter;
@@ -37,5 +36,4 @@ public class Module {
     private String vol;
     private String volEnv;
     private FileData.Type type;
-
 }
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/types/composition/Component.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/Component.java
index de15c64433..7ae20c6975 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/Component.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/Component.java
@@ -17,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.types.composition;
 
 import java.util.List;
@@ -34,5 +33,4 @@ public class Component {
     private List<Nic> nics;
     private List<Image> images;
     private List<ComputeData> compute;
-
 }
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/types/composition/ComponentComputeAssociation.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/ComponentComputeAssociation.java
index c58a1df163..0130b708bd 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/ComponentComputeAssociation.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/ComponentComputeAssociation.java
@@ -17,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.types.composition;
 
 import lombok.Getter;
@@ -31,5 +30,4 @@ public class ComponentComputeAssociation {
 
     private String componentId;
     private String computeFlavorId;
-
 }
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/types/composition/ComponentData.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/ComponentData.java
index 8e0d1874c2..cfc97bdf74 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/ComponentData.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/ComponentData.java
@@ -17,7 +17,6 @@
  * Modifications copyright (c) 2019 Nokia
  * ================================================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.types.composition;
 
 import lombok.EqualsAndHashCode;
@@ -34,5 +33,4 @@ public class ComponentData implements CompositionDataEntity {
     private String name;
     private String description;
     private String displayName;
-
 }
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/types/composition/CompositionData.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/CompositionData.java
index 7809cf5949..c0b239533e 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/CompositionData.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/CompositionData.java
@@ -17,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.types.composition;
 
 import java.util.List;
@@ -32,5 +31,4 @@ public class CompositionData {
 
     private List<Network> networks;
     private List<Component> components;
-
 }
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/types/composition/CompositionDataEntity.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/CompositionDataEntity.java
index 9c09b0ded4..0194c57477 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/CompositionDataEntity.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/CompositionDataEntity.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.
@@ -17,8 +17,8 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.types.composition;
 
 public interface CompositionDataEntity {
+
 }
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/types/composition/CompositionEntityId.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/CompositionEntityId.java
index c361179a50..ec026436f8 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/CompositionEntityId.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/CompositionEntityId.java
@@ -19,7 +19,6 @@
  * Modifications copyright (c) 2019 Nokia
  * ================================================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.types.composition;
 
 import lombok.EqualsAndHashCode;
@@ -36,9 +35,6 @@ public class CompositionEntityId {
 
     @Override
     public String toString() {
-        return parentId == null
-            ? id
-            : parentId + "/" + id;
+        return parentId == null ? id : parentId + "/" + id;
     }
-
 }
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/types/composition/CompositionEntityType.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/CompositionEntityType.java
index 2b1ea16889..3c92977040 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/CompositionEntityType.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/CompositionEntityType.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.
@@ -17,16 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.types.composition;
 
-
-public enum CompositionEntityType {
-  vsp,
-  network,
-  component,
-  deployment,
-  image,
-  nic,
-  compute
-}
+public enum CompositionEntityType {vsp, network, component, deployment, image, nic, compute}
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/types/composition/CompositionEntityValidationData.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/CompositionEntityValidationData.java
index 8bb0881fa7..b3116ce0a5 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/CompositionEntityValidationData.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/CompositionEntityValidationData.java
@@ -19,7 +19,6 @@
  * Modifications copyright (c) 2019 Nokia
  * ================================================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.types.composition;
 
 import java.util.ArrayList;
@@ -57,5 +56,4 @@ public class CompositionEntityValidationData {
         }
         subEntitiesValidationData.add(subEntityValidationData);
     }
-
 }
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/types/composition/ComputeData.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/ComputeData.java
index bff5df6b08..a78d62ca4d 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/ComputeData.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/ComputeData.java
@@ -19,7 +19,6 @@
  * Modifications copyright (c) 2019 Nokia
  * ================================================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.types.composition;
 
 import lombok.EqualsAndHashCode;
@@ -39,5 +38,4 @@ public class ComputeData implements CompositionDataEntity {
     public ComputeData(String name) {
         this.name = name;
     }
-
 }
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/types/composition/DeploymentFlavor.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/DeploymentFlavor.java
index 6357799e65..6d802a3ef4 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/DeploymentFlavor.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/DeploymentFlavor.java
@@ -17,10 +17,8 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.types.composition;
 
-
 import java.util.List;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -35,5 +33,4 @@ public class DeploymentFlavor implements CompositionDataEntity {
     private String description;
     private String featureGroupId;
     private List<ComponentComputeAssociation> componentComputeAssociations;
-
 }
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/types/composition/ExtractCompositionDataContext.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/ExtractCompositionDataContext.java
index ef202d013d..b5ac61fc36 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/ExtractCompositionDataContext.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/ExtractCompositionDataContext.java
@@ -17,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.types.composition;
 
 import java.util.ArrayList;
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/types/composition/Image.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/Image.java
index 2c624721cb..e3e19bea49 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/Image.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/Image.java
@@ -17,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.types.composition;
 
 import lombok.Getter;
@@ -35,5 +34,4 @@ public class Image implements CompositionDataEntity {
     public Image(String fileName) {
         this.fileName = fileName;
     }
-
 }
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/types/composition/ImageData.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/ImageData.java
index 191a454091..0c4346bcd5 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/ImageData.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/ImageData.java
@@ -17,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.types.composition;
 
 import lombok.AllArgsConstructor;
@@ -33,5 +32,4 @@ public class ImageData implements CompositionDataEntity {
 
     private String fileName;
     private String description;
-
 }
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/types/composition/ImageFormat.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/ImageFormat.java
index a9de3483ef..d12ca6739d 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/ImageFormat.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/ImageFormat.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.
@@ -17,17 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.types.composition;
 
-public enum ImageFormat {
-  aki,
-  ami,
-  ari,
-  iso,
-  qcow2,
-  raw,
-  vdi,
-  vhd,
-  vmdk
-}
+public enum ImageFormat {aki, ami, ari, iso, qcow2, raw, vdi, vhd, vmdk}
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/types/composition/Network.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/Network.java
index cc5a5afbae..b0cf064d9b 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/Network.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/Network.java
@@ -19,7 +19,6 @@
  * Modifications copyright (c) 2019 Nokia
  * ================================================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.types.composition;
 
 import lombok.EqualsAndHashCode;
@@ -35,5 +34,4 @@ public class Network implements CompositionDataEntity {
 
     private String name;
     private boolean dhcp;
-
 }
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/types/composition/NetworkType.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/NetworkType.java
index d90135a205..c8c60c861a 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/NetworkType.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/NetworkType.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.
@@ -17,10 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.types.composition;
 
-public enum NetworkType {
-  Internal,
-  External
-}
+public enum NetworkType {Internal, External}
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/types/composition/Nic.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/Nic.java
index cc23d24407..96beed2c3e 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/Nic.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/Nic.java
@@ -17,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.types.composition;
 
 import lombok.EqualsAndHashCode;
@@ -37,5 +36,4 @@ public class Nic implements CompositionDataEntity {
     private String networkName;
     private NetworkType networkType;
     private String networkDescription;
-
 }
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/types/questionnaire/component/ComponentQuestionnaire.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/ComponentQuestionnaire.java
index 6699671d61..5c61b8f787 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/ComponentQuestionnaire.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/ComponentQuestionnaire.java
@@ -17,10 +17,8 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.types.questionnaire.component;
 
-
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
@@ -40,5 +38,4 @@ public class ComponentQuestionnaire {
     private HighAvailabilityAndLoadBalancing highAvailabilityAndLoadBalancing;
     private Network network;
     private Storage storage;
-
 }
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/types/questionnaire/component/compute/Compute.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/compute/Compute.java
index dd5fb9057c..60fe72ada6 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/compute/Compute.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/compute/Compute.java
@@ -17,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.types.questionnaire.component.compute;
 
 import lombok.Getter;
@@ -32,5 +31,4 @@ public class Compute {
     private GuestOS guestOS;
     private NumOfVMs numOfVMs;
     private VmSizing vmSizing;
-
 }
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/types/questionnaire/component/compute/GuestOS.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/compute/GuestOS.java
index 54de06b1c4..16aef5866d 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/compute/GuestOS.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/compute/GuestOS.java
@@ -17,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.types.questionnaire.component.compute;
 
 import lombok.Getter;
@@ -32,5 +31,4 @@ public class GuestOS {
     private String name;
     private String tools;
     private Number bitSize;
-
 }
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/types/questionnaire/component/compute/NumOfVMs.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/compute/NumOfVMs.java
index f135ba78ff..37bb2573b8 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/compute/NumOfVMs.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/compute/NumOfVMs.java
@@ -17,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.types.questionnaire.component.compute;
 
 import lombok.Getter;
@@ -33,6 +32,4 @@ public class NumOfVMs {
     private int maximum;
     private String CpuOverSubscriptionRatio;
     private String MemoryRAM;
-
-
 }
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/types/questionnaire/component/compute/VmSizing.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/compute/VmSizing.java
index 0f72d03d10..9bf3ff4c6b 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/compute/VmSizing.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/compute/VmSizing.java
@@ -17,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.types.questionnaire.component.compute;
 
 import lombok.Getter;
@@ -35,5 +34,4 @@ public class VmSizing {
     private Number IOOperationsPerSec;
     private String cpuOverSubscriptionRatio;
     private String memoryRAM;
-
 }
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/types/questionnaire/component/general/General.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/general/General.java
index 328715b90e..6482faff8a 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/general/General.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/general/General.java
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.types.questionnaire.component.general;
 
 import lombok.Getter;
@@ -25,12 +24,11 @@ import lombok.Setter;
 @NoArgsConstructor
 public class General {
 
+    protected Recovery recovery;
     private Hypervisor hypervisor;
     private Image image;
-    protected Recovery recovery;
     private String dnsConfiguration;
     private String vmCloneUsage;
     private String nfcNamingCode;
     private String nfcFunction;
-
 }
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/types/questionnaire/component/general/Hypervisor.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/general/Hypervisor.java
index d2ef0456a9..7ae9cb3ccd 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/general/Hypervisor.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/general/Hypervisor.java
@@ -17,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.types.questionnaire.component.general;
 
 import lombok.Getter;
@@ -32,5 +31,4 @@ public class Hypervisor {
     private String hypervisor;
     private String drivers;
     private String containerFeaturesDescription;
-
 }
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/types/questionnaire/component/general/Image.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/general/Image.java
index e00d022532..989914a1df 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/general/Image.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/general/Image.java
@@ -17,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.types.questionnaire.component.general;
 
 import lombok.Getter;
@@ -33,5 +32,4 @@ public class Image {
     private String providedBy;
     private Number bootDiskSizePerVM;
     private Number ephemeralDiskSizePerVM;
-
 }
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/types/questionnaire/component/general/Recovery.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/general/Recovery.java
index 255e9f9235..84d253999d 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/general/Recovery.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/general/Recovery.java
@@ -17,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.types.questionnaire.component.general;
 
 import lombok.Getter;
@@ -32,5 +31,4 @@ public class Recovery {
     private Number pointObjective;
     private Number timeObjective;
     private String vmProcessFailuresHandling;
-
 }
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/types/questionnaire/component/highAvailability/HighAvailabilityAndLoadBalancing.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/highAvailability/HighAvailabilityAndLoadBalancing.java
index 75c4e31b15..61ba8b1e00 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/highAvailability/HighAvailabilityAndLoadBalancing.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/highAvailability/HighAvailabilityAndLoadBalancing.java
@@ -17,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.types.questionnaire.component.highAvailability;
 
 import lombok.Getter;
@@ -37,5 +36,4 @@ public class HighAvailabilityAndLoadBalancing {
     private String loadDistributionMechanism;
     private String isComponentMandatory;
     private String highAvailabilityMode;
-
 }
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/types/questionnaire/component/image/ImageDetails.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/image/ImageDetails.java
index 9d136a167f..25aa9abe37 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/image/ImageDetails.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/image/ImageDetails.java
@@ -17,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.types.questionnaire.component.image;
 
 import lombok.Getter;
@@ -32,5 +31,4 @@ public class ImageDetails {
     private String version;
     private String format;
     private String md5;
-
 }
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/types/questionnaire/component/network/Network.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/network/Network.java
index 197df1c277..665d69ed56 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/network/Network.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/network/Network.java
@@ -17,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.types.questionnaire.component.network;
 
 import lombok.Getter;
@@ -30,5 +29,4 @@ import lombok.Setter;
 public class Network {
 
     private NetworkCapacity networkCapacity;
-
 }
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/types/questionnaire/component/network/NetworkCapacity.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/network/NetworkCapacity.java
index 8976d8298e..2175000040 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/network/NetworkCapacity.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/network/NetworkCapacity.java
@@ -17,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.types.questionnaire.component.network;
 
 import lombok.Getter;
@@ -31,5 +30,4 @@ public class NetworkCapacity {
 
     private String protocolWithHighestTrafficProfileAcrossAllNICs;
     private int networkTransactionsPerSecond;
-
 }
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/types/questionnaire/component/storage/Backup.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/storage/Backup.java
index 01b6f7fe1f..bd280bc868 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/storage/Backup.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/storage/Backup.java
@@ -17,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.types.questionnaire.component.storage;
 
 import lombok.Getter;
@@ -33,5 +32,4 @@ public class Backup {
     private String backupSolution;
     private String backupNIC;
     private Number backupStorageSize;
-
 }
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/types/questionnaire/component/storage/LogBackup.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/storage/LogBackup.java
index ff46e6f095..a266ab9939 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/storage/LogBackup.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/storage/LogBackup.java
@@ -17,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.types.questionnaire.component.storage;
 
 import lombok.Getter;
@@ -33,5 +32,4 @@ public class LogBackup {
     private Number logBackupFrequency;
     private int logRetentionPeriod;
     private String logFileLocation;
-
 }
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/types/questionnaire/component/storage/SnapshotBackup.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/storage/SnapshotBackup.java
index 4266ffbdf8..a9d49ccbc4 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/storage/SnapshotBackup.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/storage/SnapshotBackup.java
@@ -17,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.types.questionnaire.component.storage;
 
 import lombok.Getter;
@@ -30,5 +29,4 @@ import lombok.Setter;
 public class SnapshotBackup {
 
     private int snapshotFrequency;
-
 }
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/types/questionnaire/component/storage/Storage.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/storage/Storage.java
index b41536b720..80fd9c76ff 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/storage/Storage.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/storage/Storage.java
@@ -17,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.types.questionnaire.component.storage;
 
 import lombok.Getter;
@@ -32,5 +31,4 @@ public class Storage {
     private Backup backup;
     private LogBackup logBackup;
     private SnapshotBackup snapshotBackup;
-
 }
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/types/questionnaire/nic/AcceptableJitter.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/nic/AcceptableJitter.java
index 0a6b993bde..0fc4c64a15 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/nic/AcceptableJitter.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/nic/AcceptableJitter.java
@@ -17,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.types.questionnaire.nic;
 
 import lombok.Getter;
@@ -32,5 +31,4 @@ public class AcceptableJitter {
     private int mean;
     private int max;
     private int variable;
-
 }
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/types/questionnaire/nic/IpConfiguration.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/nic/IpConfiguration.java
index 355fafbc6e..f031f29331 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/nic/IpConfiguration.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/nic/IpConfiguration.java
@@ -17,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.types.questionnaire.nic;
 
 import lombok.Getter;
@@ -31,5 +30,4 @@ public class IpConfiguration {
 
     private boolean ipv4Required;
     private boolean ipv6Required;
-
 }
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/types/questionnaire/nic/Network.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/nic/Network.java
index af0ad1f7f6..3892fcb635 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/nic/Network.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/nic/Network.java
@@ -17,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.types.questionnaire.nic;
 
 import lombok.Getter;
@@ -32,5 +31,4 @@ import lombok.ToString;
 public class Network {
 
     private String networkDescription;
-
 }
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/types/questionnaire/nic/NicQuestionnaire.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/nic/NicQuestionnaire.java
index d41c85506e..9b5dd396d5 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/nic/NicQuestionnaire.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/nic/NicQuestionnaire.java
@@ -17,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.types.questionnaire.nic;
 
 import lombok.Getter;
@@ -33,5 +32,4 @@ public class NicQuestionnaire {
     private IpConfiguration ipConfiguration;
     private Network network;
     private Sizing sizing;
-
 }
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/types/questionnaire/nic/PacketsAndBytes.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/nic/PacketsAndBytes.java
index 9eddf3bf6c..2f8788646b 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/nic/PacketsAndBytes.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/nic/PacketsAndBytes.java
@@ -17,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.types.questionnaire.nic;
 
 import lombok.Getter;
@@ -31,5 +30,4 @@ public class PacketsAndBytes {
 
     private PeakAndAvg packets;
     private PeakAndAvg bytes;
-
 }
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/types/questionnaire/nic/PeakAndAvg.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/nic/PeakAndAvg.java
index 6e50f3b29b..811c35b89f 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/nic/PeakAndAvg.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/nic/PeakAndAvg.java
@@ -17,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.types.questionnaire.nic;
 
 import lombok.Getter;
@@ -31,5 +30,4 @@ public class PeakAndAvg {
 
     private int peak;
     private Number avg;
-
 }
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/types/questionnaire/nic/Protocols.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/nic/Protocols.java
index f50d909fbb..2e9c923227 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/nic/Protocols.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/nic/Protocols.java
@@ -17,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.types.questionnaire.nic;
 
 import java.util.ArrayList;
@@ -35,5 +34,4 @@ public class Protocols {
 
     private List<String> protocols = new ArrayList<>();
     private String protocolWithHighestTrafficProfile;
-
 }
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/types/questionnaire/nic/Sizing.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/nic/Sizing.java
index c77d25903d..45797b8d70 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/nic/Sizing.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/nic/Sizing.java
@@ -17,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.types.questionnaire.nic;
 
 import lombok.Getter;
@@ -35,5 +34,4 @@ public class Sizing {
     private PacketsAndBytes outflowTrafficPerSecond;
     private PacketsAndBytes flowLength;
     private AcceptableJitter acceptableJitter;
-
 }
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/types/questionnaire/vsp/VspQuestionnaire.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/vsp/VspQuestionnaire.java
index ab416d47d3..1919fb0fe5 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/vsp/VspQuestionnaire.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/vsp/VspQuestionnaire.java
@@ -17,10 +17,8 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.types.questionnaire.vsp;
 
-
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
@@ -32,5 +30,4 @@ import org.openecomp.sdc.vendorsoftwareproduct.types.questionnaire.vsp.general.G
 public class VspQuestionnaire {
 
     private General general;
-
 }
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/types/questionnaire/vsp/general/Availability.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/vsp/general/Availability.java
index 1c457c546c..5130342bba 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/vsp/general/Availability.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/vsp/general/Availability.java
@@ -17,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.types.questionnaire.vsp.general;
 
 import lombok.Getter;
@@ -30,5 +29,4 @@ import lombok.Setter;
 public class Availability {
 
     private boolean useAvailabilityZonesForHighAvailability;
-
 }
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/types/questionnaire/vsp/general/General.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/vsp/general/General.java
index 1aaba93f8e..eb38ce14d4 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/vsp/general/General.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/vsp/general/General.java
@@ -17,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.types.questionnaire.vsp.general;
 
 import lombok.Getter;
@@ -33,5 +32,4 @@ public class General {
     private Availability availability;
     private RegionsData regionsData;
     private StorageDataReplication storageDataReplication;
-
 }
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/types/questionnaire/vsp/general/RegionsData.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/vsp/general/RegionsData.java
index 093abcd652..bacbff4799 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/vsp/general/RegionsData.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/vsp/general/RegionsData.java
@@ -17,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.types.questionnaire.vsp.general;
 
 import java.util.ArrayList;
@@ -33,5 +32,4 @@ public class RegionsData {
 
     private boolean multiRegion;
     private List<String> regions = new ArrayList<>();
-
 }
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/types/questionnaire/vsp/general/StorageDataReplication.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/vsp/general/StorageDataReplication.java
index 766b3bb1f9..bea4cf3ab8 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/vsp/general/StorageDataReplication.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/vsp/general/StorageDataReplication.java
@@ -17,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.types.questionnaire.vsp.general;
 
 import lombok.Getter;
@@ -34,5 +33,4 @@ public class StorageDataReplication {
     private Number storageReplicationFrequency;
     private String storageReplicationSource;
     private String storageReplicationDestination;
-
 }
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/types/schemagenerator/ComponentCompositionSchemaInput.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/schemagenerator/ComponentCompositionSchemaInput.java
index d20d3efb93..fab11e7d8b 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/schemagenerator/ComponentCompositionSchemaInput.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/schemagenerator/ComponentCompositionSchemaInput.java
@@ -17,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.types.schemagenerator;
 
 import lombok.Getter;
@@ -32,5 +31,4 @@ public class ComponentCompositionSchemaInput implements SchemaTemplateInput {
 
     private boolean manual;
     private ComponentData component;
-
 }
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/types/schemagenerator/ComponentQuestionnaireSchemaInput.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/schemagenerator/ComponentQuestionnaireSchemaInput.java
index b0c2b89536..c2e6478389 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/schemagenerator/ComponentQuestionnaireSchemaInput.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/schemagenerator/ComponentQuestionnaireSchemaInput.java
@@ -14,7 +14,6 @@
  * limitations under the License.
  * Modifications copyright (c) 2019 Nokia
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.types.schemagenerator;
 
 import java.util.List;
@@ -30,5 +29,4 @@ public class ComponentQuestionnaireSchemaInput implements SchemaTemplateInput {
     private Map componentQuestionnaireData;
     private String componentDisplayName;
     private boolean manual;
-
 }
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/types/schemagenerator/ComputeCompositionSchemaInput.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/schemagenerator/ComputeCompositionSchemaInput.java
index 5d87dd82c1..2410838b5e 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/schemagenerator/ComputeCompositionSchemaInput.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/schemagenerator/ComputeCompositionSchemaInput.java
@@ -17,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.types.schemagenerator;
 
 import lombok.Getter;
@@ -32,5 +31,4 @@ public class ComputeCompositionSchemaInput implements SchemaTemplateInput {
 
     private boolean manual;
     private ComputeData compute;
-
 }
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/types/schemagenerator/DeploymentFlavorCompositionSchemaInput.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/schemagenerator/DeploymentFlavorCompositionSchemaInput.java
index ce8d51cac2..81f3922a5e 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/schemagenerator/DeploymentFlavorCompositionSchemaInput.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/schemagenerator/DeploymentFlavorCompositionSchemaInput.java
@@ -17,10 +17,8 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.types.schemagenerator;
 
-
 import java.util.Collection;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -35,5 +33,4 @@ public class DeploymentFlavorCompositionSchemaInput implements SchemaTemplateInp
     private boolean manual;
     private DeploymentFlavor deploymentFlavor;
     private Collection<String> featureGroupIds;
-
 }
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/types/schemagenerator/ImageCompositionSchemaInput.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/schemagenerator/ImageCompositionSchemaInput.java
index a9ab142cc1..f603a981ec 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/schemagenerator/ImageCompositionSchemaInput.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/schemagenerator/ImageCompositionSchemaInput.java
@@ -17,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.types.schemagenerator;
 
 import lombok.Getter;
@@ -32,5 +31,4 @@ public class ImageCompositionSchemaInput implements SchemaTemplateInput {
 
     private boolean manual;
     private Image image;
-
 }
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/types/schemagenerator/NetworkCompositionSchemaInput.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/schemagenerator/NetworkCompositionSchemaInput.java
index d652e0af44..c6970a3a01 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/schemagenerator/NetworkCompositionSchemaInput.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/schemagenerator/NetworkCompositionSchemaInput.java
@@ -17,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.types.schemagenerator;
 
 import lombok.Getter;
@@ -32,5 +31,4 @@ public class NetworkCompositionSchemaInput implements SchemaTemplateInput {
 
     private boolean manual;
     private Network network;
-
 }
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/types/schemagenerator/NicCompositionSchemaInput.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/schemagenerator/NicCompositionSchemaInput.java
index 3cf729bec7..e5b9392f51 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/schemagenerator/NicCompositionSchemaInput.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/schemagenerator/NicCompositionSchemaInput.java
@@ -17,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.types.schemagenerator;
 
 import java.util.Collection;
@@ -34,5 +33,4 @@ public class NicCompositionSchemaInput implements SchemaTemplateInput {
     private boolean manual;
     private Nic nic;
     private Collection<String> networkIds;
-
 }
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/types/schemagenerator/SchemaTemplateContext.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/schemagenerator/SchemaTemplateContext.java
index 3ee3e4a5e6..511cfb2f27 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/schemagenerator/SchemaTemplateContext.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/schemagenerator/SchemaTemplateContext.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.
@@ -17,10 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.types.schemagenerator;
 
-public enum SchemaTemplateContext {
-  composition,
-  questionnaire
-}
+public enum SchemaTemplateContext {composition, questionnaire}
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/types/schemagenerator/SchemaTemplateInput.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/schemagenerator/SchemaTemplateInput.java
index 93e614f98b..fd13f2daeb 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/schemagenerator/SchemaTemplateInput.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/schemagenerator/SchemaTemplateInput.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.
@@ -17,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.types.schemagenerator;
 
 public interface SchemaTemplateInput {