3 files changed, 15 insertions, 74 deletions
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/UploadCapInfo.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/UploadCapInfo.java
index 82c1bdd8a7..9516e84ed6 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/UploadCapInfo.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/UploadCapInfo.java
@@ -20,7 +20,11 @@
 package org.openecomp.sdc.be.model;
 
 import java.util.List;
+import lombok.Getter;
+import lombok.Setter;
 
+@Getter
+@Setter
 public class UploadCapInfo extends UploadInfo {
 
     /**
@@ -30,27 +34,4 @@ public class UploadCapInfo extends UploadInfo {
     private List<UploadPropInfo> properties;
     private String node;
 
-    public String getNode() {
-        return node;
-    }
-
-    public void setNode(String node) {
-        this.node = node;
-    }
-
-    public List<String> getValidSourceTypes() {
-        return validSourceTypes;
-    }
-
-    public void setValidSourceTypes(List<String> validSourceTypes) {
-        this.validSourceTypes = validSourceTypes;
-    }
-
-    public List<UploadPropInfo> getProperties() {
-        return properties;
-    }
-
-    public void setProperties(List<UploadPropInfo> properties) {
-        this.properties = properties;
-    }
 }
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/UploadInfo.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/UploadInfo.java
index 6b48e4fe2f..eb16d449b5 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/UploadInfo.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/UploadInfo.java
@@ -19,33 +19,15 @@
  */
 package org.openecomp.sdc.be.model;
 
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
 public abstract class UploadInfo {
 
     private String key;
     private String type;
     private String name;
 
-    public String getKey() {
-        return key;
-    }
-
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
 }
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/UploadInterfaceInfo.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/UploadInterfaceInfo.java
index 1a05ace4f1..582afabcb2 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/UploadInterfaceInfo.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/UploadInterfaceInfo.java
@@ -20,11 +20,16 @@
  */
 package org.openecomp.sdc.be.model;
 
-import org.openecomp.sdc.be.datatypes.elements.OperationDataDefinition;
 import java.util.HashMap;
 import java.util.Map;
+import lombok.Getter;
+import lombok.Setter;
+import org.openecomp.sdc.be.datatypes.elements.OperationDataDefinition;
 
+@Getter
+@Setter
 public class UploadInterfaceInfo extends UploadInfo {
+
     private Object value;
     private String description;
     private String type;
@@ -37,31 +42,4 @@ public class UploadInterfaceInfo extends UploadInfo {
         return operations;
     }
 
-    public void setOperations(Map<String, OperationDataDefinition> operations) {
-        this.operations = operations;
-    }
-
-    public Object getValue() {
-        return value;
-    }
-
-    public void setValue(Object value) {
-        this.value = value;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
 }