Reformat openecomp-be

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

14 files changed, 85 insertions, 116 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/dao/EnrichedServiceModelDao.java b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/dao/EnrichedServiceModelDao.java
index 3e5975dd13..033c4ee11c 100644
--- a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/dao/EnrichedServiceModelDao.java
+++ b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/dao/EnrichedServiceModelDao.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.core.model.dao;
 
 import org.openecomp.core.model.types.ServiceArtifact;
 import org.openecomp.sdc.versioning.dao.VersionableDao;
 
-public interface EnrichedServiceModelDao<M, E> extends VersionableDao,ServiceModelDao<M, E>{
-
-  void storeExternalArtifact(ServiceArtifact serviceArtifact);
+public interface EnrichedServiceModelDao<M, E> extends VersionableDao, ServiceModelDao<M, E> {
 
-  //List<ServiceArtifact> getExternalArtifacts(String vspId, Version version);
+    void storeExternalArtifact(ServiceArtifact serviceArtifact);
+    //List<ServiceArtifact> getExternalArtifacts(String vspId, Version version);
 
-  //List<String> getServiceModelContentNames();
-}
+    //List<String> getServiceModelContentNames();
+} 
diff --git a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/dao/EnrichedServiceModelDaoFactory.java b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/dao/EnrichedServiceModelDaoFactory.java
index 9d18d6c9cf..5ff24263c8 100644
--- a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/dao/EnrichedServiceModelDaoFactory.java
+++ b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/dao/EnrichedServiceModelDaoFactory.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.core.model.dao;
 
 import org.openecomp.core.factory.api.AbstractComponentFactory;
 import org.openecomp.core.factory.api.AbstractFactory;
 
-public abstract class EnrichedServiceModelDaoFactory
-    extends AbstractComponentFactory<EnrichedServiceModelDao> {
+public abstract class EnrichedServiceModelDaoFactory extends AbstractComponentFactory<EnrichedServiceModelDao> {
 
-  public static EnrichedServiceModelDaoFactory getInstance() {
-    return AbstractFactory.getInstance(EnrichedServiceModelDaoFactory.class);
-  }
+    public static EnrichedServiceModelDaoFactory getInstance() {
+        return AbstractFactory.getInstance(EnrichedServiceModelDaoFactory.class);
+    }
 }
diff --git a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/dao/ServiceArtifactDaoInter.java b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/dao/ServiceArtifactDaoInter.java
index 30677b70a3..020c51cb77 100644
--- a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/dao/ServiceArtifactDaoInter.java
+++ b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/dao/ServiceArtifactDaoInter.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,30 +17,28 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.core.model.dao;
 
+import java.util.Collection;
 import org.openecomp.core.model.types.ServiceArtifact;
 import org.openecomp.sdc.versioning.dao.VersionableDao;
 import org.openecomp.sdc.versioning.dao.types.Version;
 
-import java.util.Collection;
-
 public interface ServiceArtifactDaoInter extends VersionableDao {
 
-  Collection<ServiceArtifact> list(String vspId, Version version);
+    Collection<ServiceArtifact> list(String vspId, Version version);
 
-  void create(ServiceArtifact entity);
+    void create(ServiceArtifact entity);
 
-  void update(ServiceArtifact entity);
+    void update(ServiceArtifact entity);
 
-  ServiceArtifact get(String vspId, Version version);
+    ServiceArtifact get(String vspId, Version version);
 
-  void delete(String vspId, Version version);
+    void delete(String vspId, Version version);
 
-  Object[] getKeys(String vspId, Version version);
+    Object[] getKeys(String vspId, Version version);
 
-  ServiceArtifact getArtifactInfo(String vspId, Version version, String name);
+    ServiceArtifact getArtifactInfo(String vspId, Version version, String name);
 
-  void deleteAll(String vspId, Version version);
+    void deleteAll(String vspId, Version version);
 }
diff --git a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/dao/ServiceModelDao.java b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/dao/ServiceModelDao.java
index 0fb80b1835..7908711023 100644
--- a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/dao/ServiceModelDao.java
+++ b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/dao/ServiceModelDao.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.core.model.dao;
 
 import org.openecomp.sdc.versioning.dao.VersionableDao;
@@ -25,17 +24,16 @@ import org.openecomp.sdc.versioning.dao.types.Version;
 
 public interface ServiceModelDao<M, E> extends VersionableDao {
 
-  M getServiceModel(String vspId, Version version);
+    M getServiceModel(String vspId, Version version);
 
-  void storeServiceModel(String vspId, Version version, M serviceModel);
+    void storeServiceModel(String vspId, Version version, M serviceModel);
 
-  E getServiceModelInfo(String vspId, Version version, String name);
+    E getServiceModelInfo(String vspId, Version version, String name);
 
-  void deleteAll(String vspId, Version version);
+    void deleteAll(String vspId, Version version);
 
-  /**
-   * This method gets used in healing, in order to replace the healed service model with the
-   * existing one without creating any conflicts
-   **/
-  void overrideServiceModel(String vspId, Version version, M serviceModel);
+    /**
+     * This method gets used in healing, in order to replace the healed service model with the existing one without creating any conflicts
+     **/
+    void overrideServiceModel(String vspId, Version version, M serviceModel);
 }
diff --git a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/dao/ServiceModelDaoFactory.java b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/dao/ServiceModelDaoFactory.java
index 19f6cb5c8c..3567ba3ae7 100644
--- a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/dao/ServiceModelDaoFactory.java
+++ b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/dao/ServiceModelDaoFactory.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.core.model.dao;
 
 import org.openecomp.core.factory.api.AbstractComponentFactory;
@@ -25,7 +24,7 @@ import org.openecomp.core.factory.api.AbstractFactory;
 
 public abstract class ServiceModelDaoFactory extends AbstractComponentFactory<ServiceModelDao> {
 
-  public static ServiceModelDaoFactory getInstance() {
-    return AbstractFactory.getInstance(ServiceModelDaoFactory.class);
-  }
+    public static ServiceModelDaoFactory getInstance() {
+        return AbstractFactory.getInstance(ServiceModelDaoFactory.class);
+    }
 }
diff --git a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/errors/RetrieveServiceTemplateFromDbErrorBuilder.java b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/errors/RetrieveServiceTemplateFromDbErrorBuilder.java
index 036acb2bf0..b9c4245640 100644
--- a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/errors/RetrieveServiceTemplateFromDbErrorBuilder.java
+++ b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/errors/RetrieveServiceTemplateFromDbErrorBuilder.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,22 +17,18 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.core.model.errors;
 
 import org.openecomp.sdc.common.errors.BaseErrorBuilder;
 import org.openecomp.sdc.common.errors.ErrorCategory;
 
 public class RetrieveServiceTemplateFromDbErrorBuilder extends BaseErrorBuilder {
-  private static final String CANT_RETRIEVE_SERVICE_TEMPLATE = "Could not retrirve service " +
-      "template named %s. Reason - %s";
-  private static final String CREATE_SERVICE_TEMPLATE = "CREATE_SERVICE_TEMPLATE";
 
-  public RetrieveServiceTemplateFromDbErrorBuilder(String serviceTemplateName,
-                                                   String reason){
-    this.getErrorCodeBuilder()
-        .withCategory(ErrorCategory.APPLICATION)
-        .withId(CREATE_SERVICE_TEMPLATE)
-        .withMessage(String.format(CANT_RETRIEVE_SERVICE_TEMPLATE, serviceTemplateName, reason));
-  }
+    private static final String CANT_RETRIEVE_SERVICE_TEMPLATE = "Could not retrirve service " + "template named %s. Reason - %s";
+    private static final String CREATE_SERVICE_TEMPLATE = "CREATE_SERVICE_TEMPLATE";
+
+    public RetrieveServiceTemplateFromDbErrorBuilder(String serviceTemplateName, String reason) {
+        this.getErrorCodeBuilder().withCategory(ErrorCategory.APPLICATION).withId(CREATE_SERVICE_TEMPLATE)
+            .withMessage(String.format(CANT_RETRIEVE_SERVICE_TEMPLATE, serviceTemplateName, reason));
+    }
 }
diff --git a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/types/EnrichedServiceArtifactEntity.java b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/types/EnrichedServiceArtifactEntity.java
index fbe0bb5362..d47ec10f2c 100644
--- a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/types/EnrichedServiceArtifactEntity.java
+++ b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/types/EnrichedServiceArtifactEntity.java
@@ -13,16 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.openecomp.core.model.types;
 
-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.google.common.io.ByteStreams;
-import org.openecomp.sdc.common.errors.SdcRuntimeException;
-import org.openecomp.sdc.versioning.dao.types.Version;
-
 import java.io.IOException;
 import java.nio.ByteBuffer;
+import org.openecomp.sdc.common.errors.SdcRuntimeException;
+import org.openecomp.sdc.versioning.dao.types.Version;
 
 @Table(keyspace = "dox", name = "vsp_enriched_service_artifact")
 public class EnrichedServiceArtifactEntity implements ServiceElementEntity {
@@ -36,15 +38,12 @@ public class EnrichedServiceArtifactEntity implements ServiceElementEntity {
     @PartitionKey
     @Column(name = "vsp_id")
     public String id;
-
     @PartitionKey(value = 1)
     @Frozen
     public Version version;
-
     @ClusteringColumn
     @Column(name = "name")
     public String name;
-
     @Column(name = "content_data")
     public ByteBuffer contentData;
 
@@ -66,13 +65,11 @@ public class EnrichedServiceArtifactEntity implements ServiceElementEntity {
         this.id = entity.getVspId();
         this.version = entity.getVersion();
         this.name = entity.getName();
-
         try {
             this.contentData = ByteBuffer.wrap(ByteStreams.toByteArray(entity.getContent()));
         } catch (IOException ioException) {
             throw new SdcRuntimeException(ioException);
         }
-
     }
 
     @Override
diff --git a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/types/EnrichedServiceTemplateEntity.java b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/types/EnrichedServiceTemplateEntity.java
index aa6abbed75..8301df73c7 100644
--- a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/types/EnrichedServiceTemplateEntity.java
+++ b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/types/EnrichedServiceTemplateEntity.java
@@ -13,16 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.openecomp.core.model.types;
 
-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.google.common.io.ByteStreams;
-import org.openecomp.sdc.common.errors.SdcRuntimeException;
-import org.openecomp.sdc.versioning.dao.types.Version;
-
 import java.io.IOException;
 import java.nio.ByteBuffer;
+import org.openecomp.sdc.common.errors.SdcRuntimeException;
+import org.openecomp.sdc.versioning.dao.types.Version;
 
 @Table(keyspace = "dox", name = "vsp_enriched_service_template")
 public class EnrichedServiceTemplateEntity implements ServiceElementEntity {
@@ -36,18 +38,14 @@ public class EnrichedServiceTemplateEntity implements ServiceElementEntity {
     @PartitionKey
     @Column(name = "vsp_id")
     public String id;
-
     @PartitionKey(value = 1)
     @Frozen
     public Version version;
-
     @ClusteringColumn
     @Column(name = "name")
     public String name;
-
     @Column(name = "content_data")
     public ByteBuffer contentData;
-
     @Column(name = "base_name")
     private String baseName;
 
@@ -75,7 +73,6 @@ public class EnrichedServiceTemplateEntity implements ServiceElementEntity {
         } catch (IOException ioException) {
             throw new SdcRuntimeException(ioException);
         }
-
     }
 
     public String getBaseName() {
diff --git a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/types/ServiceArtifact.java b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/types/ServiceArtifact.java
index 184704b094..bb6f4b5574 100644
--- a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/types/ServiceArtifact.java
+++ b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/types/ServiceArtifact.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.core.model.types;
 
 import lombok.NoArgsConstructor;
diff --git a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/types/ServiceArtifactEntity.java b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/types/ServiceArtifactEntity.java
index 0709371d94..bfab42f8ee 100644
--- a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/types/ServiceArtifactEntity.java
+++ b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/types/ServiceArtifactEntity.java
@@ -13,19 +13,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.openecomp.core.model.types;
 
-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.google.common.io.ByteStreams;
-import org.openecomp.sdc.common.errors.SdcRuntimeException;
-import org.openecomp.sdc.versioning.dao.types.Version;
-
 import java.io.IOException;
 import java.nio.ByteBuffer;
+import org.openecomp.sdc.common.errors.SdcRuntimeException;
+import org.openecomp.sdc.versioning.dao.types.Version;
 
 @Table(keyspace = "dox", name = "vsp_service_artifact")
 public class ServiceArtifactEntity implements ServiceElementEntity {
+
     private static final String ENTITY_TYPE;
 
     static {
@@ -35,15 +38,12 @@ public class ServiceArtifactEntity implements ServiceElementEntity {
     @PartitionKey
     @Column(name = "vsp_id")
     public String id;
-
     @PartitionKey(value = 1)
     @Frozen
     public Version version;
-
     @ClusteringColumn
     @Column(name = "name")
     public String name;
-
     @Column(name = "content_data")
     public ByteBuffer contentData;
 
@@ -65,13 +65,11 @@ public class ServiceArtifactEntity implements ServiceElementEntity {
         this.id = entity.getVspId();
         this.version = entity.getVersion();
         this.name = entity.getName();
-
         try {
             this.contentData = ByteBuffer.wrap(ByteStreams.toByteArray(entity.getContent()));
         } catch (IOException ioException) {
             throw new SdcRuntimeException(ioException);
         }
-
     }
 
     @Override
@@ -130,5 +128,4 @@ public class ServiceArtifactEntity implements ServiceElementEntity {
         serviceArtifact.setVspId(this.getId());
         return serviceArtifact;
     }
-
 }
diff --git a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/types/ServiceElement.java b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/types/ServiceElement.java
index 817cfa9d44..f598c4b225 100644
--- a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/types/ServiceElement.java
+++ b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/types/ServiceElement.java
@@ -17,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.core.model.types;
 
 import java.io.ByteArrayInputStream;
@@ -48,5 +47,4 @@ public class ServiceElement {
         }
         return new ByteArrayInputStream(contentData);
     }
-
 }
diff --git a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/types/ServiceElementEntity.java b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/types/ServiceElementEntity.java
index 02249039f8..716e140fc8 100644
--- a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/types/ServiceElementEntity.java
+++ b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/types/ServiceElementEntity.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,15 +17,14 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.core.model.types;
 
-import org.openecomp.sdc.versioning.dao.types.VersionableEntity;
-
 import java.nio.ByteBuffer;
+import org.openecomp.sdc.versioning.dao.types.VersionableEntity;
 
 public interface ServiceElementEntity extends VersionableEntity {
-  String getName();
 
-  ByteBuffer getContentData();
+    String getName();
+
+    ByteBuffer getContentData();
 }
diff --git a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/types/ServiceTemplate.java b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/types/ServiceTemplate.java
index 479502e8f9..14bdb0869f 100644
--- a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/types/ServiceTemplate.java
+++ b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/types/ServiceTemplate.java
@@ -17,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.core.model.types;
 
 import lombok.Getter;
@@ -30,5 +29,4 @@ import lombok.Setter;
 public class ServiceTemplate extends ServiceElement {
 
     private String baseName;
-
 }
diff --git a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/types/ServiceTemplateEntity.java b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/types/ServiceTemplateEntity.java
index 80f0cfb371..48b539ec5f 100644
--- a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/types/ServiceTemplateEntity.java
+++ b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-api/src/main/java/org/openecomp/core/model/types/ServiceTemplateEntity.java
@@ -13,16 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.openecomp.core.model.types;
 
-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.google.common.io.ByteStreams;
-import org.openecomp.sdc.common.errors.SdcRuntimeException;
-import org.openecomp.sdc.versioning.dao.types.Version;
-
 import java.io.IOException;
 import java.nio.ByteBuffer;
+import org.openecomp.sdc.common.errors.SdcRuntimeException;
+import org.openecomp.sdc.versioning.dao.types.Version;
 
 @Table(keyspace = "dox", name = "vsp_service_template")
 public class ServiceTemplateEntity implements ServiceElementEntity {
@@ -36,18 +38,14 @@ public class ServiceTemplateEntity implements ServiceElementEntity {
     @PartitionKey
     @Column(name = "vsp_id")
     public String id;
-
     @PartitionKey(value = 1)
     @Frozen
     public Version version;
-
     @ClusteringColumn
     @Column(name = "name")
     public String name;
-
     @Column(name = "content_data")
     public ByteBuffer contentData;
-
     @Column(name = "base_name")
     private String baseName;
 
@@ -75,7 +73,6 @@ public class ServiceTemplateEntity implements ServiceElementEntity {
         } catch (IOException ioException) {
             throw new SdcRuntimeException(ioException);
         }
-
     }
 
     public String getBaseName() {