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

6 files changed, 24 insertions, 181 deletions

diff --git a/models-interactions/model-impl/vfc/src/main/java/org/onap/policy/vfc/VfcHealActionVmInfo.java b/models-interactions/model-impl/vfc/src/main/java/org/onap/policy/vfc/VfcHealActionVmInfo.java
index 8ca08beb2..1485b6a04 100644
--- a/models-interactions/model-impl/vfc/src/main/java/org/onap/policy/vfc/VfcHealActionVmInfo.java
+++ b/models-interactions/model-impl/vfc/src/main/java/org/onap/policy/vfc/VfcHealActionVmInfo.java
@@ -23,34 +23,19 @@ package org.onap.policy.vfc;
 import com.google.gson.annotations.SerializedName;
 
 import java.io.Serializable;
+import lombok.Getter;
+import lombok.Setter;
 
+@Getter
+@Setter
 public class VfcHealActionVmInfo implements Serializable {
 
     private static final long serialVersionUID = 3208673205100673119L;
 
-    @SerializedName("vmid")
     private String vmid;
-
-    @SerializedName("vmname")
     private String vmname;
 
     public VfcHealActionVmInfo() {
         // Default constructor
     }
-
-    public String getVmid() {
-        return vmid;
-    }
-
-    public void setVmid(String vmid) {
-        this.vmid = vmid;
-    }
-
-    public String getVmname() {
-        return vmname;
-    }
-
-    public void setVmname(String vmname) {
-        this.vmname = vmname;
-    }
 }
diff --git a/models-interactions/model-impl/vfc/src/main/java/org/onap/policy/vfc/VfcHealAdditionalParams.java b/models-interactions/model-impl/vfc/src/main/java/org/onap/policy/vfc/VfcHealAdditionalParams.java
index f722beeea..237b827cb 100644
--- a/models-interactions/model-impl/vfc/src/main/java/org/onap/policy/vfc/VfcHealAdditionalParams.java
+++ b/models-interactions/model-impl/vfc/src/main/java/org/onap/policy/vfc/VfcHealAdditionalParams.java
@@ -23,12 +23,15 @@ package org.onap.policy.vfc;
 import com.google.gson.annotations.SerializedName;
 
 import java.io.Serializable;
+import lombok.Getter;
+import lombok.Setter;
 
+@Getter
+@Setter
 public class VfcHealAdditionalParams implements Serializable {
 
     private static final long serialVersionUID = 2656694137285096191L;
 
-    @SerializedName("action")
     private String action;
 
     @SerializedName("actionvminfo")
@@ -37,20 +40,4 @@ public class VfcHealAdditionalParams implements Serializable {
     public VfcHealAdditionalParams() {
         // Default constructor
     }
-
-    public String getAction() {
-        return action;
-    }
-
-    public void setAction(String action) {
-        this.action = action;
-    }
-
-    public VfcHealActionVmInfo getActionInfo() {
-        return actionInfo;
-    }
-
-    public void setActionInfo(VfcHealActionVmInfo actionInfo) {
-        this.actionInfo = actionInfo;
-    }
 }
diff --git a/models-interactions/model-impl/vfc/src/main/java/org/onap/policy/vfc/VfcHealRequest.java b/models-interactions/model-impl/vfc/src/main/java/org/onap/policy/vfc/VfcHealRequest.java
index 0d4b03821..1acaddfcb 100644
--- a/models-interactions/model-impl/vfc/src/main/java/org/onap/policy/vfc/VfcHealRequest.java
+++ b/models-interactions/model-impl/vfc/src/main/java/org/onap/policy/vfc/VfcHealRequest.java
@@ -20,48 +20,21 @@
 
 package org.onap.policy.vfc;
 
-import com.google.gson.annotations.SerializedName;
-
 import java.io.Serializable;
+import lombok.Getter;
+import lombok.Setter;
 
+@Getter
+@Setter
 public class VfcHealRequest implements Serializable {
 
     private static final long serialVersionUID = -7341931593089709247L;
 
-    @SerializedName("vnfInstanceId")
     private String vnfInstanceId;
-
-    @SerializedName("cause")
     private String cause;
-
-    @SerializedName("additionalParams")
     private VfcHealAdditionalParams additionalParams;
 
     public VfcHealRequest() {
         // Default constructor
     }
-
-    public String getVnfInstanceId() {
-        return vnfInstanceId;
-    }
-
-    public void setVnfInstanceId(String vnfInstanceId) {
-        this.vnfInstanceId = vnfInstanceId;
-    }
-
-    public String getCause() {
-        return cause;
-    }
-
-    public void setCause(String cause) {
-        this.cause = cause;
-    }
-
-    public VfcHealAdditionalParams getAdditionalParams() {
-        return additionalParams;
-    }
-
-    public void setAdditionalParams(VfcHealAdditionalParams additionalParams) {
-        this.additionalParams = additionalParams;
-    }
 }
diff --git a/models-interactions/model-impl/vfc/src/main/java/org/onap/policy/vfc/VfcRequest.java b/models-interactions/model-impl/vfc/src/main/java/org/onap/policy/vfc/VfcRequest.java
index cf0d95065..e5f96f4d6 100644
--- a/models-interactions/model-impl/vfc/src/main/java/org/onap/policy/vfc/VfcRequest.java
+++ b/models-interactions/model-impl/vfc/src/main/java/org/onap/policy/vfc/VfcRequest.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 VfcRequest implements Serializable {
 
     private static final long serialVersionUID = 3736300970326332512L;
@@ -38,28 +42,4 @@ public class VfcRequest implements Serializable {
     public VfcRequest() {
         // Default constructor
     }
-
-    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 VfcHealRequest getHealRequest() {
-        return healRequest;
-    }
-
-    public void setHealRequest(VfcHealRequest healRequest) {
-        this.healRequest = healRequest;
-    }
 }
diff --git a/models-interactions/model-impl/vfc/src/main/java/org/onap/policy/vfc/VfcResponse.java b/models-interactions/model-impl/vfc/src/main/java/org/onap/policy/vfc/VfcResponse.java
index d13e14bec..11ee49b98 100644
--- a/models-interactions/model-impl/vfc/src/main/java/org/onap/policy/vfc/VfcResponse.java
+++ b/models-interactions/model-impl/vfc/src/main/java/org/onap/policy/vfc/VfcResponse.java
@@ -20,18 +20,17 @@
 
 package org.onap.policy.vfc;
 
-import com.google.gson.annotations.SerializedName;
-
 import java.io.Serializable;
+import lombok.Getter;
+import lombok.Setter;
 
+@Getter
+@Setter
 public class VfcResponse implements Serializable {
 
     private static final long serialVersionUID = 9151443891238218455L;
 
-    @SerializedName("jobId")
     private String jobId;
-
-    @SerializedName("responseDescriptor")
     private VfcResponseDescriptor responseDescriptor;
 
     private transient String requestId;
@@ -39,28 +38,4 @@ public class VfcResponse implements Serializable {
     public VfcResponse() {
         // Default constructor
     }
-
-    public String getJobId() {
-        return jobId;
-    }
-
-    public void setJobId(String jobId) {
-        this.jobId = jobId;
-    }
-
-    public VfcResponseDescriptor getResponseDescriptor() {
-        return responseDescriptor;
-    }
-
-    public void setResponseDescriptor(VfcResponseDescriptor responseDescriptor) {
-        this.responseDescriptor = responseDescriptor;
-    }
-
-    public String getRequestId() {
-        return requestId;
-    }
-
-    public void setRequestId(String requestId) {
-        this.requestId = requestId;
-    }
 }
diff --git a/models-interactions/model-impl/vfc/src/main/java/org/onap/policy/vfc/VfcResponseDescriptor.java b/models-interactions/model-impl/vfc/src/main/java/org/onap/policy/vfc/VfcResponseDescriptor.java
index 8fff683b6..d11aad815 100644
--- a/models-interactions/model-impl/vfc/src/main/java/org/onap/policy/vfc/VfcResponseDescriptor.java
+++ b/models-interactions/model-impl/vfc/src/main/java/org/onap/policy/vfc/VfcResponseDescriptor.java
@@ -20,82 +20,25 @@
 
 package org.onap.policy.vfc;
 
-import com.google.gson.annotations.SerializedName;
-
 import java.io.Serializable;
 import java.util.List;
+import lombok.Getter;
+import lombok.Setter;
 
+@Getter
+@Setter
 public class VfcResponseDescriptor implements Serializable {
 
     private static final long serialVersionUID = 6827782899144150158L;
 
-    @SerializedName("progress")
     private String progress;
-
-    @SerializedName("status")
     private String status;
-
-    @SerializedName("statusDescription")
     private String statusDescription;
-
-    @SerializedName("errorCode")
     private String errorCode;
-
-    @SerializedName("responseId")
     private String responseId;
-
-    @SerializedName("responseHistoryList")
     private List<VfcResponseDescriptor> responseHistoryList;
 
     public VfcResponseDescriptor() {
         // Default constructor
     }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public String getProgress() {
-        return progress;
-    }
-
-    public void setProgress(String progress) {
-        this.progress = progress;
-    }
-
-    public String getStatusDescription() {
-        return statusDescription;
-    }
-
-    public void setStatusDescription(String statusDescription) {
-        this.statusDescription = statusDescription;
-    }
-
-    public String getErrorCode() {
-        return errorCode;
-    }
-
-    public void setErrorCode(String errorCode) {
-        this.errorCode = errorCode;
-    }
-
-    public String getResponseId() {
-        return responseId;
-    }
-
-    public void setResponseId(String responseId) {
-        this.responseId = responseId;
-    }
-
-    public List<VfcResponseDescriptor> getResponseHistoryList() {
-        return responseHistoryList;
-    }
-
-    public void setResponseHistoryList(List<VfcResponseDescriptor> responseHistoryList) {
-        this.responseHistoryList = responseHistoryList;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
 }