Use lombok annotations for objects in models-interaction/models-impl module

Issue-ID: POLICY-1896
Signed-off-by: Rashmi Pujar <rashmi.pujar@bell.ca>
Change-Id: I425afe25876cea91908391418582ef584e6fe6fc

15 files changed, 60 insertions, 235 deletions

diff --git a/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealNetworkInfo.java b/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealNetworkInfo.java
index be26f8775..99fed29a3 100644
--- a/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealNetworkInfo.java
+++ b/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealNetworkInfo.java
@@ -22,7 +22,11 @@ package org.onap.policy.sdnc;
 import com.google.gson.annotations.SerializedName;
 
 import java.io.Serializable;
+import lombok.Getter;
+import lombok.Setter;
 
+@Getter
+@Setter
 public class SdncHealNetworkInfo implements Serializable {
 
     private static final long serialVersionUID = 3208673205100673119L;
@@ -33,12 +37,4 @@ public class SdncHealNetworkInfo implements Serializable {
     public SdncHealNetworkInfo() {
         // Default constructor for SdncHealActionVmInfo
     }
-
-    public String getNetworkId() {
-        return networkId;
-    }
-
-    public void setNetworkId(String networkId) {
-        this.networkId = networkId;
-    }
 }
diff --git a/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealRequest.java b/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealRequest.java
index a490d0cd7..00a6b96f6 100644
--- a/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealRequest.java
+++ b/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealRequest.java
@@ -22,7 +22,11 @@ package org.onap.policy.sdnc;
 import com.google.gson.annotations.SerializedName;
 
 import java.io.Serializable;
+import lombok.Getter;
+import lombok.Setter;
 
+@Getter
+@Setter
 public class SdncHealRequest implements Serializable {
 
     private static final long serialVersionUID = -7341931593089709247L;
@@ -59,52 +63,4 @@ public class SdncHealRequest implements Serializable {
     public void setRequestHeaderInfo(SdncHealRequestHeaderInfo requestHeaderInfo) {
         this.requestHeaderInfo = requestHeaderInfo;
     }
-
-    public SdncHealRequestInfo getRequestInfo() {
-        return requestInfo;
-    }
-
-    public void setRequestInfo(SdncHealRequestInfo requestInfo) {
-        this.requestInfo = requestInfo;
-    }
-
-    public SdncHealServiceInfo getServiceInfo() {
-        return serviceInfo;
-    }
-
-    public void setServiceInfo(SdncHealServiceInfo serviceInfo) {
-        this.serviceInfo = serviceInfo;
-    }
-
-    public SdncHealNetworkInfo getNetworkInfo() {
-        return networkInfo;
-    }
-
-    public void setNetworkInfo(SdncHealNetworkInfo networkInfo) {
-        this.networkInfo = networkInfo;
-    }
-
-    public SdncHealVnfInfo getVnfInfo() {
-        return vnfInfo;
-    }
-
-    public void setVnfInfo(SdncHealVnfInfo vnfInfo) {
-        this.vnfInfo = vnfInfo;
-    }
-
-    public SdncHealVfModuleRequestInput getVfModuleRequestInput() {
-        return vfModuleRequestInput;
-    }
-
-    public void setVfModuleRequestInput(SdncHealVfModuleRequestInput input) {
-        this.vfModuleRequestInput = input;
-    }
-
-    public SdncHealVfModuleInfo getVfModuleInfo() {
-        return vfModuleInfo;
-    }
-
-    public void setVfModuleInfo(SdncHealVfModuleInfo vfModuleInfo) {
-        this.vfModuleInfo = vfModuleInfo;
-    }
 }
diff --git a/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealRequestHeaderInfo.java b/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealRequestHeaderInfo.java
index 0cdbb294e..a029f115c 100644
--- a/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealRequestHeaderInfo.java
+++ b/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealRequestHeaderInfo.java
@@ -22,7 +22,11 @@ package org.onap.policy.sdnc;
 import com.google.gson.annotations.SerializedName;
 
 import java.io.Serializable;
+import lombok.Getter;
+import lombok.Setter;
 
+@Getter
+@Setter
 public class SdncHealRequestHeaderInfo implements Serializable {
 
     private static final long serialVersionUID = 3208673205100673119L;
@@ -36,20 +40,4 @@ public class SdncHealRequestHeaderInfo implements Serializable {
     public SdncHealRequestHeaderInfo() {
         // Default constructor for SdncHealActionVmInfo
     }
-
-    public String getSvcRequestId() {
-        return svcRequestId;
-    }
-
-    public void setSvcRequestId(String svcRequestId) {
-        this.svcRequestId = svcRequestId;
-    }
-
-    public String getSvcAction() {
-        return svcAction;
-    }
-
-    public void setSvcAction(String svcAction) {
-        this.svcAction = svcAction;
-    }
 }
diff --git a/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealRequestInfo.java b/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealRequestInfo.java
index fa449a013..477c0b32f 100644
--- a/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealRequestInfo.java
+++ b/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealRequestInfo.java
@@ -22,7 +22,11 @@ package org.onap.policy.sdnc;
 import com.google.gson.annotations.SerializedName;
 
 import java.io.Serializable;
+import lombok.Getter;
+import lombok.Setter;
 
+@Getter
+@Setter
 public class SdncHealRequestInfo implements Serializable {
 
     private static final long serialVersionUID = 3208673205100673119L;
@@ -33,12 +37,4 @@ public class SdncHealRequestInfo implements Serializable {
     public SdncHealRequestInfo() {
         // Default constructor for SdncHealActionVmInfo
     }
-
-    public String getRequestAction() {
-        return requestAction;
-    }
-
-    public void setRequestAction(String requestAction) {
-        this.requestAction = requestAction;
-    }
 }
diff --git a/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealServiceInfo.java b/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealServiceInfo.java
index 5b03db3ca..cce6c2c5e 100644
--- a/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealServiceInfo.java
+++ b/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealServiceInfo.java
@@ -22,7 +22,11 @@ package org.onap.policy.sdnc;
 import com.google.gson.annotations.SerializedName;
 
 import java.io.Serializable;
+import lombok.Getter;
+import lombok.Setter;
 
+@Getter
+@Setter
 public class SdncHealServiceInfo implements Serializable {
 
     private static final long serialVersionUID = 3208673205100673119L;
@@ -33,12 +37,4 @@ public class SdncHealServiceInfo implements Serializable {
     public SdncHealServiceInfo() {
         // Default constructor for SdncHealActionVmInfo
     }
-
-    public String getServiceInstanceId() {
-        return serviceInstanceId;
-    }
-
-    public void setServiceInstanceId(String serviceInstanceId) {
-        this.serviceInstanceId = serviceInstanceId;
-    }
 }
diff --git a/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealVfModuleInfo.java b/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealVfModuleInfo.java
index f70e57096..08d3aa2db 100644
--- a/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealVfModuleInfo.java
+++ b/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealVfModuleInfo.java
@@ -22,7 +22,11 @@ package org.onap.policy.sdnc;
 import com.google.gson.annotations.SerializedName;
 
 import java.io.Serializable;
+import lombok.Getter;
+import lombok.Setter;
 
+@Getter
+@Setter
 public class SdncHealVfModuleInfo implements Serializable {
 
     private static final long serialVersionUID = 3208673205100673119L;
@@ -33,12 +37,4 @@ public class SdncHealVfModuleInfo implements Serializable {
     public SdncHealVfModuleInfo() {
         // Default constructor for SdncHealVfModuleInfo
     }
-
-    public String getVfModuleId() {
-        return vfModuleId;
-    }
-
-    public void setVfModuleId(String vfModuleId) {
-        this.vfModuleId = vfModuleId;
-    }
 }
diff --git a/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealVfModuleParameter.java b/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealVfModuleParameter.java
index 0fe82bb44..16151f628 100644
--- a/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealVfModuleParameter.java
+++ b/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealVfModuleParameter.java
@@ -22,7 +22,11 @@ package org.onap.policy.sdnc;
 import com.google.gson.annotations.SerializedName;
 
 import java.io.Serializable;
+import lombok.Getter;
+import lombok.Setter;
 
+@Getter
+@Setter
 public class SdncHealVfModuleParameter implements Serializable {
 
     private static final long serialVersionUID = 3208673205100673119L;
@@ -36,20 +40,4 @@ public class SdncHealVfModuleParameter implements Serializable {
     public SdncHealVfModuleParameter() {
         // Default constructor for SdncHealVfModuleParameter
     }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    public void setValue(String value) {
-        this.value = value;
-    }
 }
diff --git a/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealVfModuleParametersInfo.java b/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealVfModuleParametersInfo.java
index 4515b9790..0152853bd 100644
--- a/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealVfModuleParametersInfo.java
+++ b/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealVfModuleParametersInfo.java
@@ -24,7 +24,11 @@ import com.google.gson.annotations.SerializedName;
 import java.io.Serializable;
 import java.util.LinkedList;
 import java.util.List;
+import lombok.Getter;
+import lombok.Setter;
 
+@Getter
+@Setter
 public class SdncHealVfModuleParametersInfo implements Serializable {
 
     private static final long serialVersionUID = 3208673205100673119L;
@@ -37,14 +41,6 @@ public class SdncHealVfModuleParametersInfo implements Serializable {
         parameters = new LinkedList<>();
     }
 
-    public List<SdncHealVfModuleParameter> getParameters() {
-        return parameters;
-    }
-
-    public void setParameters(List<SdncHealVfModuleParameter> parameters) {
-        this.parameters = parameters;
-    }
-
     public void addParameters(SdncHealVfModuleParameter parameter) {
         parameters.add(parameter);
     }
diff --git a/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealVfModuleRequestInput.java b/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealVfModuleRequestInput.java
index c903c77fa..6d61cf272 100644
--- a/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealVfModuleRequestInput.java
+++ b/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealVfModuleRequestInput.java
@@ -22,7 +22,11 @@ package org.onap.policy.sdnc;
 import com.google.gson.annotations.SerializedName;
 
 import java.io.Serializable;
+import lombok.Getter;
+import lombok.Setter;
 
+@Getter
+@Setter
 public class SdncHealVfModuleRequestInput implements Serializable {
 
     private static final long serialVersionUID = 3208673205100673119L;
@@ -33,12 +37,4 @@ public class SdncHealVfModuleRequestInput implements Serializable {
     public SdncHealVfModuleRequestInput() {
         // Default constructor for SdncHealVfModuleRequestInput
     }
-
-    public SdncHealVfModuleParametersInfo getVfModuleParametersInfo() {
-        return vfModuleParametersInfo;
-    }
-
-    public void setVfModuleParametersInfo(SdncHealVfModuleParametersInfo info) {
-        this.vfModuleParametersInfo = info;
-    }
 }
diff --git a/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealVnfInfo.java b/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealVnfInfo.java
index 67eaa3b93..b81c083a4 100644
--- a/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealVnfInfo.java
+++ b/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncHealVnfInfo.java
@@ -22,7 +22,11 @@ package org.onap.policy.sdnc;
 import com.google.gson.annotations.SerializedName;
 
 import java.io.Serializable;
+import lombok.Getter;
+import lombok.Setter;
 
+@Getter
+@Setter
 public class SdncHealVnfInfo implements Serializable {
 
     private static final long serialVersionUID = 3208673205100673119L;
@@ -33,12 +37,4 @@ public class SdncHealVnfInfo implements Serializable {
     public SdncHealVnfInfo() {
         // Default constructor for SdncHealVnfInfo
     }
-
-    public String getVnfId() {
-        return vnfId;
-    }
-
-    public void setVnfId(String vnfId) {
-        this.vnfId = vnfId;
-    }
 }
diff --git a/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncRequest.java b/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncRequest.java
index b2be02035..7d293d05c 100644
--- a/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncRequest.java
+++ b/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncRequest.java
@@ -24,7 +24,11 @@ import com.google.gson.annotations.SerializedName;
 
 import java.io.Serializable;
 import java.util.UUID;
+import lombok.Getter;
+import lombok.Setter;
 
+@Getter
+@Setter
 public class SdncRequest implements Serializable {
 
     private static final long serialVersionUID = 3736300970326332512L;
@@ -39,36 +43,4 @@ public class SdncRequest implements Serializable {
     public SdncRequest() {
             // Default constructor for SdncRequest
     }
-
-    public String getNsInstanceId() {
-        return nsInstanceId;
-    }
-
-    public void setNsInstanceId(String nsInstanceId) {
-        this.nsInstanceId = nsInstanceId;
-    }
-
-    public UUID getRequestId() {
-        return requestId;
-    }
-
-    public void setRequestId(UUID requestId) {
-        this.requestId = requestId;
-    }
-
-    public SdncHealRequest getHealRequest() {
-        return healRequest;
-    }
-
-    public void setHealRequest(SdncHealRequest healRequest) {
-        this.healRequest = healRequest;
-    }
-
-    public String getUrl() {
-        return url;
-    }
-
-    public void setUrl(String url) {
-        this.url = url;
-    }
 }
diff --git a/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncResponse.java b/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncResponse.java
index 496bf10a7..8d28832da 100644
--- a/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncResponse.java
+++ b/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncResponse.java
@@ -22,7 +22,11 @@ package org.onap.policy.sdnc;
 import com.google.gson.annotations.SerializedName;
 
 import java.io.Serializable;
+import lombok.Getter;
+import lombok.Setter;
 
+@Getter
+@Setter
 public class SdncResponse implements Serializable {
 
     private static final long serialVersionUID = 9151443891238218455L;
@@ -35,21 +39,4 @@ public class SdncResponse implements Serializable {
     public SdncResponse() {
         // Default constructor for SdncResponse
     }
-
-    public String getRequestId() {
-        return requestId;
-    }
-
-    public void setRequestId(String requestId) {
-        this.requestId = requestId;
-    }
-
-    public SdncResponseOutput getResponseOutput() {
-        return responseOutput;
-    }
-
-    public void setResponseOutput(SdncResponseOutput responseOutput) {
-        this.responseOutput = responseOutput;
-    }
-
 }
diff --git a/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncResponseNetworkInfo.java b/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncResponseNetworkInfo.java
index 094b2641b..e887c033a 100644
--- a/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncResponseNetworkInfo.java
+++ b/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncResponseNetworkInfo.java
@@ -22,7 +22,11 @@ package org.onap.policy.sdnc;
 import com.google.gson.annotations.SerializedName;
 
 import java.io.Serializable;
+import lombok.Getter;
+import lombok.Setter;
 
+@Getter
+@Setter
 public class SdncResponseNetworkInfo implements Serializable {
 
     private static final long serialVersionUID = 6827782899144150158L;
@@ -36,20 +40,4 @@ public class SdncResponseNetworkInfo implements Serializable {
     public SdncResponseNetworkInfo() {
         // Default constructor for SdncResponseNetworkInfo
     }
-
-    public String getInstanceId() {
-        return instanceId;
-    }
-
-    public void setInstanceId(String instanceId) {
-        this.instanceId = instanceId;
-    }
-
-    public String getObjectPath() {
-        return objectPath;
-    }
-
-    public void setObjectPath(String objectPath) {
-        this.objectPath = objectPath;
-    }
 }
diff --git a/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncResponseOutput.java b/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncResponseOutput.java
index 144e36322..c7f4b5f89 100644
--- a/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncResponseOutput.java
+++ b/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncResponseOutput.java
@@ -22,7 +22,11 @@ package org.onap.policy.sdnc;
 import com.google.gson.annotations.SerializedName;
 
 import java.io.Serializable;
+import lombok.Getter;
+import lombok.Setter;
 
+@Getter
+@Setter
 public class SdncResponseOutput implements Serializable {
 
     private static final long serialVersionUID = 6827782899144150158L;
@@ -39,29 +43,4 @@ public class SdncResponseOutput implements Serializable {
     public SdncResponseOutput() {
         // Default constructor for SdncResponseDescriptor
     }
-
-    public String getSvcRequestId() {
-        return svcRequestId;
-    }
-
-    public void setSvcRequestId(String svcRequestId) {
-        this.svcRequestId = svcRequestId;
-    }
-
-    public String getResponseCode() {
-        return responseCode;
-    }
-
-    public void setResponseCode(String responseCode) {
-        this.responseCode = responseCode;
-    }
-
-    public String getAckFinalIndicator() {
-        return ackFinalIndicator;
-    }
-
-    public void setAckFinalIndicator(String ackFinalIndicator) {
-        this.ackFinalIndicator = ackFinalIndicator;
-    }
-
 }
diff --git a/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncResponseServiceInfo.java b/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncResponseServiceInfo.java
index 05b854418..2ee9201b2 100644
--- a/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncResponseServiceInfo.java
+++ b/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncResponseServiceInfo.java
@@ -22,7 +22,11 @@ package org.onap.policy.sdnc;
 import com.google.gson.annotations.SerializedName;
 
 import java.io.Serializable;
+import lombok.Getter;
+import lombok.Setter;
 
+@Getter
+@Setter
 public class SdncResponseServiceInfo implements Serializable {
 
     private static final long serialVersionUID = 6827782899144150158L;
@@ -33,13 +37,4 @@ public class SdncResponseServiceInfo implements Serializable {
     public SdncResponseServiceInfo() {
         // Default constructor for SdncResponseServiceInfo
     }
-
-    public String getInstanceId() {
-        return instanceId;
-    }
-
-    public void setInstanceId(String instanceId) {
-        this.instanceId = instanceId;
-    }
-
 }