3 files changed, 35 insertions, 65 deletions
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 7d1df0e91b..184704b094 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
@@ -20,10 +20,9 @@
 
 package org.openecomp.core.model.types;
 
+import lombok.NoArgsConstructor;
 
+@NoArgsConstructor
 public class ServiceArtifact extends ServiceElement {
 
-  public ServiceArtifact() {
-    super();
-  }
 }
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 541a66f77d..817cfa9d44 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
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,59 +20,33 @@
 
 package org.openecomp.core.model.types;
 
-import org.openecomp.sdc.versioning.dao.types.Version;
-
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import org.openecomp.sdc.versioning.dao.types.Version;
 
-
+@Getter
+@Setter
+@NoArgsConstructor
 public class ServiceElement {
 
-  private String vspId;
-  private Version version;
-  private String name;
-  private byte[] contentData;
-
-  public ServiceElement() {
-  }
-
-  public String getVspId() {
-    return vspId;
-  }
-
-  public void setVspId(String vspId) {
-    this.vspId = vspId;
-  }
-
-  public Version getVersion() {
-    return version;
-  }
-
-  public void setVersion(Version version) {
-    this.version = version;
-  }
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  /**
-   * Gets content.
-   *
-   * @return the content
-   */
-  public InputStream getContent() {
-    if (this.contentData == null) {
-      return null;
+    private String vspId;
+    private Version version;
+    private String name;
+    private byte[] contentData;
+
+    /**
+     * Gets content.
+     *
+     * @return the content
+     */
+    public InputStream getContent() {
+        if (this.contentData == null) {
+            return null;
+        }
+        return new ByteArrayInputStream(contentData);
     }
-    return new ByteArrayInputStream(contentData);
-  }
 
-  public void setContentData(byte[] contentData) {
-    this.contentData = contentData;
-  }
 }
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 9560ba306c..479502e8f9 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
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,18 +20,15 @@
 
 package org.openecomp.core.model.types;
 
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
 
+@Getter
+@Setter
+@NoArgsConstructor
 public class ServiceTemplate extends ServiceElement {
-  private String baseName;
 
-  public ServiceTemplate() {
-  }
+    private String baseName;
 
-  public String getBaseName() {
-    return baseName;
-  }
-
-  public void setBaseName(String baseName) {
-    this.baseName = baseName;
-  }
 }