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

29 files changed, 140 insertions, 1005 deletions

diff --git a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiGetResponse.java b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiGetResponse.java
index 89b15b9cb..61dde9270 100644
--- a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiGetResponse.java
+++ b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiGetResponse.java
@@ -21,21 +21,14 @@
 
 package org.onap.policy.aai;
 
-import com.google.gson.annotations.SerializedName;
 import java.io.Serializable;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 
+@Data
+@NoArgsConstructor
 public class AaiGetResponse implements Serializable {
     private static final long serialVersionUID = 7311418432051756162L;
 
-    @SerializedName("requestError")
     private AaiNqRequestError requestError;
-
-    public AaiNqRequestError getRequestError() {
-        return requestError;
-    }
-
-    public void setRequestError(AaiNqRequestError requestError) {
-        this.requestError = requestError;
-    }
-
 }
diff --git a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiGetVnfResponse.java b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiGetVnfResponse.java
index 666f68d64..dc587f2c7 100644
--- a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiGetVnfResponse.java
+++ b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiGetVnfResponse.java
@@ -23,7 +23,13 @@ package org.onap.policy.aai;
 
 import com.google.gson.annotations.SerializedName;
 import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
 
+@Data
+@EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor
 public class AaiGetVnfResponse extends AaiGetResponse implements Serializable {
 
     private static final long serialVersionUID = -6247505944905898871L;
@@ -60,92 +66,4 @@ public class AaiGetVnfResponse extends AaiGetResponse implements Serializable {
 
     @SerializedName("relationship-list")
     private RelationshipList relationshipList;
-
-    public String getVnfId() {
-        return vnfId;
-    }
-
-    public String getVnfName() {
-        return vnfName;
-    }
-
-    public String getVnfType() {
-        return vnfType;
-    }
-
-    public String getServiceId() {
-        return serviceId;
-    }
-
-    public String getOrchestrationStatus() {
-        return orchestrationStatus;
-    }
-
-    public boolean getInMaint() {
-        return inMaint;
-    }
-
-    public boolean getIsClosedLoopDisabled() {
-        return isClosedLoopDisabled;
-    }
-
-    public String getModelInvariantId() {
-        return modelInvariantId;
-    }
-
-    public String getProvStatus() {
-        return provStatus;
-    }
-
-    public String getResourceVersion() {
-        return resourceVersion;
-    }
-
-    public RelationshipList getRelationshipList() {
-        return relationshipList;
-    }
-
-    public void setVnfId(String vnfId) {
-        this.vnfId = vnfId;
-    }
-
-    public void setVnfName(String vnfName) {
-        this.vnfName = vnfName;
-    }
-
-    public void setVnfType(String vnfType) {
-        this.vnfType = vnfType;
-    }
-
-    public void setServiceId(String serviceId) {
-        this.serviceId = serviceId;
-    }
-
-    public void setOrchestrationStatus(String orchestrationStatus) {
-        this.orchestrationStatus = orchestrationStatus;
-    }
-
-    public void setInMaint(boolean inMaint) {
-        this.inMaint = inMaint;
-    }
-
-    public void setIsClosedLoopDisabled(boolean isClosedLoopDisabled) {
-        this.isClosedLoopDisabled = isClosedLoopDisabled;
-    }
-
-    public void setModelInvariantId(String modelInvariantId) {
-        this.modelInvariantId = modelInvariantId;
-    }
-
-    public void setProvStatus(String provStatus) {
-        this.provStatus = provStatus;
-    }
-
-    public void setResourceVersion(String resourceVersion) {
-        this.resourceVersion = resourceVersion;
-    }
-
-    public void setRelationshipList(RelationshipList relationshipList) {
-        this.relationshipList = relationshipList;
-    }
 }
diff --git a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiGetVserverResponse.java b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiGetVserverResponse.java
index 0b68d5bee..c79f72c9f 100644
--- a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiGetVserverResponse.java
+++ b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiGetVserverResponse.java
@@ -21,24 +21,19 @@
 
 package org.onap.policy.aai;
 
-import com.google.gson.annotations.SerializedName;
-
 import java.io.Serializable;
 import java.util.LinkedList;
 import java.util.List;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
 
+@Data
+@EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor
 public class AaiGetVserverResponse extends AaiGetResponse implements Serializable {
 
     private static final long serialVersionUID = -6247505944905898871L;
 
-    @SerializedName("vserver")
     private List<AaiNqVServer> vserver = new LinkedList<>();
-
-    public List<AaiNqVServer> getVserver() {
-        return vserver;
-    }
-
-    public void setVserver(List<AaiNqVServer> vserver) {
-        this.vserver = vserver;
-    }
 }
diff --git a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqCloudRegion.java b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqCloudRegion.java
index faaca5d04..851c4f6af 100644
--- a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqCloudRegion.java
+++ b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqCloudRegion.java
@@ -24,7 +24,11 @@ package org.onap.policy.aai;
 import com.google.gson.annotations.SerializedName;
 
 import java.io.Serializable;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 
+@Data
+@NoArgsConstructor
 public class AaiNqCloudRegion implements Serializable {
 
     private static final long serialVersionUID = -897231529157222683L;
@@ -43,44 +47,4 @@ public class AaiNqCloudRegion implements Serializable {
 
     @SerializedName("resource-version")
     private String resourceVersion;
-
-    public String getCloudOwner() {
-        return cloudOwner;
-    }
-
-    public String getCloudRegionId() {
-        return cloudRegionId;
-    }
-
-    public String getCloudRegionVersion() {
-        return cloudRegionVersion;
-    }
-
-    public String getComplexName() {
-        return complexName;
-    }
-
-    public String getResourceVersion() {
-        return resourceVersion;
-    }
-
-    public void setCloudOwner(String cloudOwner) {
-        this.cloudOwner = cloudOwner;
-    }
-
-    public void setCloudRegionId(String cloudRegionId) {
-        this.cloudRegionId = cloudRegionId;
-    }
-
-    public void setCloudRegionVersion(String cloudRegionVersion) {
-        this.cloudRegionVersion = cloudRegionVersion;
-    }
-
-    public void setComplexName(String complexName) {
-        this.complexName = complexName;
-    }
-
-    public void setResourceVersion(String resourceVersion) {
-        this.resourceVersion = resourceVersion;
-    }
 }
diff --git a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqExtraProperties.java b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqExtraProperties.java
index 7cf43cd3c..f33d10ca9 100644
--- a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqExtraProperties.java
+++ b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqExtraProperties.java
@@ -26,18 +26,14 @@ import com.google.gson.annotations.SerializedName;
 import java.io.Serializable;
 import java.util.LinkedList;
 import java.util.List;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 
+@Data
+@NoArgsConstructor
 public class AaiNqExtraProperties implements Serializable {
     private static final long serialVersionUID = 4109625574744702319L;
 
     @SerializedName("extra-property")
     private List<AaiNqExtraProperty> extraProperty = new LinkedList<>();
-
-    public List<AaiNqExtraProperty> getExtraProperty() {
-        return extraProperty;
-    }
-
-    public void setExtraProperty(List<AaiNqExtraProperty> extraProperty) {
-        this.extraProperty = extraProperty;
-    }
 }
diff --git a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqExtraProperty.java b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqExtraProperty.java
index 29a687a4d..acab811d0 100644
--- a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqExtraProperty.java
+++ b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqExtraProperty.java
@@ -24,7 +24,13 @@ package org.onap.policy.aai;
 import com.google.gson.annotations.SerializedName;
 
 import java.io.Serializable;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
 public class AaiNqExtraProperty implements Serializable {
 
     private static final long serialVersionUID = -3861240617222397736L;
@@ -34,27 +40,4 @@ public class AaiNqExtraProperty implements Serializable {
 
     @SerializedName("property-value")
     private String propertyValue;
-
-    public AaiNqExtraProperty() {}
-
-    public AaiNqExtraProperty(String propertyName, String propertyValue) {
-        this.propertyName = propertyName;
-        this.propertyValue = propertyValue;
-    }
-
-    public String getPropertyName() {
-        return propertyName;
-    }
-
-    public String getPropertyValue() {
-        return propertyValue;
-    }
-
-    public void setPropertyName(String propertyName) {
-        this.propertyName = propertyName;
-    }
-
-    public void setPropertyValue(String propertyValue) {
-        this.propertyValue = propertyValue;
-    }
 }
diff --git a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqGenericVnf.java b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqGenericVnf.java
index d67d02443..72b27779f 100644
--- a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqGenericVnf.java
+++ b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqGenericVnf.java
@@ -23,7 +23,11 @@ package org.onap.policy.aai;
 
 import com.google.gson.annotations.SerializedName;
 import java.io.Serializable;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 
+@Data
+@NoArgsConstructor
 public class AaiNqGenericVnf implements Serializable {
 
     private static final long serialVersionUID = 834322706248060560L;
@@ -81,148 +85,4 @@ public class AaiNqGenericVnf implements Serializable {
 
     @SerializedName("model-customization-id")
     private String modelCustomizationId = null;
-
-    public String getVnfId() {
-        return vnfId;
-    }
-
-    public String getVnfName() {
-        return vnfName;
-    }
-
-    public String getVnfName2() {
-        return vnfName2;
-    }
-
-    public String getVnfType() {
-        return vnfType;
-    }
-
-    public String getServiceId() {
-        return serviceId;
-    }
-
-    public String getProvStatus() {
-        return provStatus;
-    }
-
-    public String getOperationalState() {
-        return operationalState;
-    }
-
-    public String getIpv4OamAddress() {
-        return ipv4OamAddress;
-    }
-
-    public String getIpv4Loopback0Address() {
-        return ipv4Loopback0Address;
-    }
-
-    public Boolean getInMaint() {
-        return inMaint;
-    }
-
-    public Boolean getIsClosedLoopDisabled() {
-        return isClosedLoopDisabled;
-    }
-
-    public String getResourceVersion() {
-        return resourceVersion;
-    }
-
-    public Boolean getEncrypedAccessFlag() {
-        return encrypedAccessFlag;
-    }
-
-    public String getPersonaModelId() {
-        return personaModelId;
-    }
-
-    public String getPersonaModelVersion() {
-        return personaModelVersion;
-    }
-
-    public String getModelInvariantId() {
-        return modelInvariantId;
-    }
-
-    public String getModelVersionId() {
-        return modelVersionId;
-    }
-
-    public String getModelCustomizationId() {
-        return modelCustomizationId;
-    }
-
-    public void setVnfId(String vnfId) {
-        this.vnfId = vnfId;
-    }
-
-    public void setVnfName(String vnfName) {
-        this.vnfName = vnfName;
-    }
-
-    public void setVnfName2(String vnfName2) {
-        this.vnfName2 = vnfName2;
-    }
-
-    public void setVnfType(String vnfType) {
-        this.vnfType = vnfType;
-    }
-
-    public void setServiceId(String serviceId) {
-        this.serviceId = serviceId;
-    }
-
-    public void setProvStatus(String provStatus) {
-        this.provStatus = provStatus;
-    }
-
-    public void setOperationalState(String operationalState) {
-        this.operationalState = operationalState;
-    }
-
-    public void setIpv4OamAddress(String ipv4OamAddress) {
-        this.ipv4OamAddress = ipv4OamAddress;
-    }
-
-    public void setIpv4Loopback0Address(String ipv4Loopback0Address) {
-        this.ipv4Loopback0Address = ipv4Loopback0Address;
-    }
-
-    public void setInMaint(Boolean inMaint) {
-        this.inMaint = inMaint;
-    }
-
-    public void setIsClosedLoopDisabled(Boolean isClosedLoopDisabled) {
-        this.isClosedLoopDisabled = isClosedLoopDisabled;
-    }
-
-    public void setResourceVersion(String resourceVersion) {
-        this.resourceVersion = resourceVersion;
-    }
-
-    public void setEncrypedAccessFlag(Boolean encrypedAccessFlag) {
-        this.encrypedAccessFlag = encrypedAccessFlag;
-    }
-
-    public void setPersonaModelId(String personaModelId) {
-        this.personaModelId = personaModelId;
-    }
-
-    public void setPersonaModelVersion(String personaModelVersion) {
-        this.personaModelVersion = personaModelVersion;
-    }
-
-    public void setModelInvariantId(String modelInvariantId) {
-        this.modelInvariantId = modelInvariantId;
-    }
-
-    public void setModelVersionId(String modelVersionId) {
-        this.modelVersionId = modelVersionId;
-    }
-
-    public void setModelCustomizationId(String modelCustomizationId) {
-        this.modelCustomizationId = modelCustomizationId;
-    }
 }
diff --git a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqInstanceFilters.java b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqInstanceFilters.java
index ae313723d..90e0668b4 100644
--- a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqInstanceFilters.java
+++ b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqInstanceFilters.java
@@ -27,19 +27,15 @@ import java.io.Serializable;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 
+@Data
+@NoArgsConstructor
 public class AaiNqInstanceFilters implements Serializable {
 
     private static final long serialVersionUID = 8993824591338121185L;
 
     @SerializedName("instance-filter")
     private List<Map<String, Map<String, String>>> instanceFilter = new LinkedList<>();
-
-    public List<Map<String, Map<String, String>>> getInstanceFilter() {
-        return instanceFilter;
-    }
-
-    public void setInstanceFilter(List<Map<String, Map<String, String>>> instanceFilter) {
-        this.instanceFilter = instanceFilter;
-    }
 }
diff --git a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqInventoryResponseItem.java b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqInventoryResponseItem.java
index ef8f38e37..50f101e27 100644
--- a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqInventoryResponseItem.java
+++ b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqInventoryResponseItem.java
@@ -24,7 +24,11 @@ package org.onap.policy.aai;
 import com.google.gson.annotations.SerializedName;
 
 import java.io.Serializable;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 
+@Data
+@NoArgsConstructor
 public class AaiNqInventoryResponseItem implements Serializable {
 
     private static final long serialVersionUID = 7142072567154675183L;
@@ -55,76 +59,4 @@ public class AaiNqInventoryResponseItem implements Serializable {
 
     @SerializedName("inventory-response-items")
     private AaiNqInventoryResponseItems items;
-
-    public String getModelName() {
-        return modelName;
-    }
-
-    public AaiNqVfModule getVfModule() {
-        return vfModule;
-    }
-
-    public AaiNqServiceInstance getServiceInstance() {
-        return serviceInstance;
-    }
-
-    public AaiNqVServer getVserver() {
-        return vserver;
-    }
-
-    public AaiNqTenant getTenant() {
-        return tenant;
-    }
-
-    public AaiNqCloudRegion getCloudRegion() {
-        return cloudRegion;
-    }
-
-    public AaiNqGenericVnf getGenericVnf() {
-        return genericVnf;
-    }
-
-    public AaiNqExtraProperties getExtraProperties() {
-        return extraProperties;
-    }
-
-    public AaiNqInventoryResponseItems getItems() {
-        return items;
-    }
-
-    public void setModelName(String modelName) {
-        this.modelName = modelName;
-    }
-
-    public void setVfModule(AaiNqVfModule vfModule) {
-        this.vfModule = vfModule;
-    }
-
-    public void setServiceInstance(AaiNqServiceInstance serviceInstance) {
-        this.serviceInstance = serviceInstance;
-    }
-
-    public void setVserver(AaiNqVServer vserver) {
-        this.vserver = vserver;
-    }
-
-    public void setTenant(AaiNqTenant tenant) {
-        this.tenant = tenant;
-    }
-
-    public void setCloudRegion(AaiNqCloudRegion cloudRegion) {
-        this.cloudRegion = cloudRegion;
-    }
-
-    public void setGenericVnf(AaiNqGenericVnf genericVnf) {
-        this.genericVnf = genericVnf;
-    }
-
-    public void setExtraProperties(AaiNqExtraProperties extraProperties) {
-        this.extraProperties = extraProperties;
-    }
-
-    public void setItems(AaiNqInventoryResponseItems items) {
-        this.items = items;
-    }
 }
diff --git a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqInventoryResponseItems.java b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqInventoryResponseItems.java
index 0bcffc4fd..51b3e9067 100644
--- a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqInventoryResponseItems.java
+++ b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqInventoryResponseItems.java
@@ -26,18 +26,14 @@ import com.google.gson.annotations.SerializedName;
 import java.io.Serializable;
 import java.util.LinkedList;
 import java.util.List;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 
+@Data
+@NoArgsConstructor
 public class AaiNqInventoryResponseItems implements Serializable {
     private static final long serialVersionUID = 7602807659381179004L;
 
     @SerializedName("inventory-response-item")
     private List<AaiNqInventoryResponseItem> inventoryResponseItems = new LinkedList<>();
-
-    public List<AaiNqInventoryResponseItem> getInventoryResponseItems() {
-        return inventoryResponseItems;
-    }
-
-    public void setInventoryResponseItems(List<AaiNqInventoryResponseItem> inventoryResponseItems) {
-        this.inventoryResponseItems = inventoryResponseItems;
-    }
 }
diff --git a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqNamedQuery.java b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqNamedQuery.java
index fa56efae6..3847dcf6e 100644
--- a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqNamedQuery.java
+++ b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqNamedQuery.java
@@ -25,18 +25,14 @@ import com.google.gson.annotations.SerializedName;
 
 import java.io.Serializable;
 import java.util.UUID;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 
+@Data
+@NoArgsConstructor
 public class AaiNqNamedQuery implements Serializable {
     private static final long serialVersionUID = -3277980060302645333L;
 
     @SerializedName("named-query-uuid")
     private UUID namedQueryUuid;
-
-    public UUID getNamedQueryUuid() {
-        return namedQueryUuid;
-    }
-
-    public void setNamedQueryUuid(UUID namedQueryUuid) {
-        this.namedQueryUuid = namedQueryUuid;
-    }
 }
diff --git a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqQueryParameters.java b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqQueryParameters.java
index 59ec77338..873f836eb 100644
--- a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqQueryParameters.java
+++ b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqQueryParameters.java
@@ -24,18 +24,14 @@ package org.onap.policy.aai;
 import com.google.gson.annotations.SerializedName;
 
 import java.io.Serializable;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 
+@Data
+@NoArgsConstructor
 public class AaiNqQueryParameters implements Serializable {
     private static final long serialVersionUID = -4291227193197126982L;
 
     @SerializedName("named-query")
     private AaiNqNamedQuery namedQuery;
-
-    public AaiNqNamedQuery getNamedQuery() {
-        return namedQuery;
-    }
-
-    public void setNamedQuery(AaiNqNamedQuery namedQuery) {
-        this.namedQuery = namedQuery;
-    }
 }
diff --git a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqRequest.java b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqRequest.java
index cdea359a8..d99244782 100644
--- a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqRequest.java
+++ b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqRequest.java
@@ -24,7 +24,11 @@ package org.onap.policy.aai;
 import com.google.gson.annotations.SerializedName;
 
 import java.io.Serializable;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 
+@Data
+@NoArgsConstructor
 public class AaiNqRequest implements Serializable {
     private static final long serialVersionUID = -3283942659786236032L;
 
@@ -33,20 +37,4 @@ public class AaiNqRequest implements Serializable {
 
     @SerializedName("instance-filters")
     private AaiNqInstanceFilters instanceFilters;
-
-    public AaiNqQueryParameters getQueryParameters() {
-        return queryParameters;
-    }
-
-    public AaiNqInstanceFilters getInstanceFilters() {
-        return instanceFilters;
-    }
-
-    public void setQueryParameters(AaiNqQueryParameters queryParameters) {
-        this.queryParameters = queryParameters;
-    }
-
-    public void setInstanceFilters(AaiNqInstanceFilters instanceFilters) {
-        this.instanceFilters = instanceFilters;
-    }
 }
diff --git a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqRequestError.java b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqRequestError.java
index aaad2bdf7..c4222b422 100644
--- a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqRequestError.java
+++ b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqRequestError.java
@@ -24,18 +24,14 @@ package org.onap.policy.aai;
 import com.google.gson.annotations.SerializedName;
 
 import java.io.Serializable;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 
+@Data
+@NoArgsConstructor
 public class AaiNqRequestError implements Serializable {
     private static final long serialVersionUID = -7742674155387022932L;
 
     @SerializedName("serviceException")
     private AaiNqServiceExcept serviceExcept;
-
-    public AaiNqServiceExcept getServiceExcept() {
-        return serviceExcept;
-    }
-
-    public void setServiceExcept(AaiNqServiceExcept serviceExcept) {
-        this.serviceExcept = serviceExcept;
-    }
 }
diff --git a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqResponse.java b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqResponse.java
index 00904ee37..3c42a0d96 100644
--- a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqResponse.java
+++ b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqResponse.java
@@ -26,7 +26,11 @@ import com.google.gson.annotations.SerializedName;
 import java.io.Serializable;
 import java.util.LinkedList;
 import java.util.List;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 
+@Data
+@NoArgsConstructor
 public class AaiNqResponse implements Serializable {
     private static final long serialVersionUID = 8411407444051746101L;
 
@@ -35,20 +39,4 @@ public class AaiNqResponse implements Serializable {
 
     @SerializedName("requestError")
     private AaiNqRequestError requestError;
-
-    public List<AaiNqInventoryResponseItem> getInventoryResponseItems() {
-        return inventoryResponseItems;
-    }
-
-    public AaiNqRequestError getRequestError() {
-        return requestError;
-    }
-
-    public void setRequestError(AaiNqRequestError requestError) {
-        this.requestError = requestError;
-    }
-
-    public void setInventoryResponseItems(List<AaiNqInventoryResponseItem> inventoryResponseItems) {
-        this.inventoryResponseItems = inventoryResponseItems;
-    }
 }
diff --git a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqServiceExcept.java b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqServiceExcept.java
index 86c565261..27751e776 100644
--- a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqServiceExcept.java
+++ b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqServiceExcept.java
@@ -24,7 +24,11 @@ package org.onap.policy.aai;
 import com.google.gson.annotations.SerializedName;
 
 import java.io.Serializable;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 
+@Data
+@NoArgsConstructor
 public class AaiNqServiceExcept implements Serializable {
     private static final long serialVersionUID = 2858343404484338546L;
 
@@ -36,16 +40,4 @@ public class AaiNqServiceExcept implements Serializable {
 
     @SerializedName("variables")
     private String[] variables;
-
-    public String getMessageId() {
-        return messageId;
-    }
-
-    public String getText() {
-        return text;
-    }
-
-    public String[] getVariables() {
-        return variables;
-    }
 }
diff --git a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqServiceInstance.java b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqServiceInstance.java
index cdc0658cb..79213c354 100644
--- a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqServiceInstance.java
+++ b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqServiceInstance.java
@@ -24,7 +24,11 @@ package org.onap.policy.aai;
 import com.google.gson.annotations.SerializedName;
 
 import java.io.Serializable;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 
+@Data
+@NoArgsConstructor
 public class AaiNqServiceInstance implements Serializable {
     private static final long serialVersionUID = -8000944396593889586L;
 
@@ -51,68 +55,4 @@ public class AaiNqServiceInstance implements Serializable {
 
     @SerializedName("model-version-id")
     private String modelVersionId;
-
-    public String getServiceInstanceId() {
-        return serviceInstanceId;
-    }
-
-    public String getServiceInstanceName() {
-        return serviceInstanceName;
-    }
-
-    public String getPersonaModelId() {
-        return personaModelId;
-    }
-
-    public String getPersonaModelVersion() {
-        return personaModelVersion;
-    }
-
-    public String getServiceInstanceLocationId() {
-        return serviceInstanceLocationId;
-    }
-
-    public String getResourceVersion() {
-        return resourceVersion;
-    }
-
-    public String getModelInvariantId() {
-        return modelInvariantId;
-    }
-
-    public String getModelVersionId() {
-        return modelVersionId;
-    }
-
-    public void setServiceInstanceId(String serviceInstanceId) {
-        this.serviceInstanceId = serviceInstanceId;
-    }
-
-    public void setServiceInstanceName(String serviceInstanceName) {
-        this.serviceInstanceName = serviceInstanceName;
-    }
-
-    public void setPersonaModelId(String personaModelId) {
-        this.personaModelId = personaModelId;
-    }
-
-    public void setPersonaModelVersion(String personaModelVersion) {
-        this.personaModelVersion = personaModelVersion;
-    }
-
-    public void setServiceInstanceLocationId(String serviceInstanceLocationId) {
-        this.serviceInstanceLocationId = serviceInstanceLocationId;
-    }
-
-    public void setResourceVersion(String resourceVersion) {
-        this.resourceVersion = resourceVersion;
-    }
-
-    public void setModelInvariantId(String modelInvariantId) {
-        this.modelInvariantId = modelInvariantId;
-    }
-
-    public void setModelVersionId(String modelVersionId) {
-        this.modelVersionId = modelVersionId;
-    }
 }
diff --git a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqTenant.java b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqTenant.java
index e409d990f..5e68f4109 100644
--- a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqTenant.java
+++ b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqTenant.java
@@ -24,7 +24,11 @@ package org.onap.policy.aai;
 import com.google.gson.annotations.SerializedName;
 
 import java.io.Serializable;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 
+@Data
+@NoArgsConstructor
 public class AaiNqTenant implements Serializable {
     private static final long serialVersionUID = 4702784101671984364L;
 
@@ -36,30 +40,4 @@ public class AaiNqTenant implements Serializable {
 
     @SerializedName("resource-version")
     private String resourceVersion;
-
-    public String getTenantId() {
-        return tenantId;
-    }
-
-    public String getTenantName() {
-        return tenantName;
-    }
-
-    public String getResourceVersion() {
-        return resourceVersion;
-    }
-
-    public void setTenantId(String tenantId) {
-        this.tenantId = tenantId;
-    }
-
-    public void setTenantName(String tenantName) {
-        this.tenantName = tenantName;
-    }
-
-    public void setResourceVersion(String resourceVersion) {
-        this.resourceVersion = resourceVersion;
-    }
-
-
 }
diff --git a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqVServer.java b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqVServer.java
index 2ccdabd8a..68917137c 100644
--- a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqVServer.java
+++ b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqVServer.java
@@ -24,7 +24,11 @@ package org.onap.policy.aai;
 import com.google.gson.annotations.SerializedName;
 
 import java.io.Serializable;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 
+@Data
+@NoArgsConstructor
 public class AaiNqVServer implements Serializable {
     private static final long serialVersionUID = -6718526692734215643L;
 
@@ -54,77 +58,4 @@ public class AaiNqVServer implements Serializable {
 
     @SerializedName("relationship-list")
     private RelationshipList relationshipList;
-
-    public String getVserverId() {
-        return vserverId;
-    }
-
-    public String getVserverName() {
-        return vserverName;
-    }
-
-    public String getVserverName2() {
-        return vserverName2;
-    }
-
-    public String getProvStatus() {
-        return provStatus;
-    }
-
-    public String getVserverSelflink() {
-        return vserverSelflink;
-    }
-
-    public Boolean getInMaint() {
-        return inMaint;
-    }
-
-    public Boolean getIsClosedLoopDisabled() {
-        return isClosedLoopDisabled;
-    }
-
-    public String getResourceVersion() {
-        return resourceVersion;
-    }
-
-    public RelationshipList getRelationshipList() {
-        return relationshipList;
-    }
-
-    public void setVserverId(String vserverId) {
-        this.vserverId = vserverId;
-    }
-
-    public void setVserverName(String vserverName) {
-        this.vserverName = vserverName;
-    }
-
-    public void setVserverName2(String vserverName2) {
-        this.vserverName2 = vserverName2;
-    }
-
-    public void setProvStatus(String provStatus) {
-        this.provStatus = provStatus;
-    }
-
-    public void setVserverSelflink(String vserverSelflink) {
-        this.vserverSelflink = vserverSelflink;
-    }
-
-    public void setInMaint(Boolean inMaint) {
-        this.inMaint = inMaint;
-    }
-
-    public void setIsClosedLoopDisabled(Boolean isClosedLoopDisabled) {
-        this.isClosedLoopDisabled = isClosedLoopDisabled;
-    }
-
-    public void setResourceVersion(String resourceVersion) {
-        this.resourceVersion = resourceVersion;
-    }
-
-    public void setRelationshipList(RelationshipList relationshipList) {
-        this.relationshipList = relationshipList;
-    }
-
 }
diff --git a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqVfModule.java b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqVfModule.java
index 9080c486e..ce38a3e3b 100644
--- a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqVfModule.java
+++ b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiNqVfModule.java
@@ -23,7 +23,11 @@ package org.onap.policy.aai;
 
 import com.google.gson.annotations.SerializedName;
 import java.io.Serializable;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 
+@Data
+@NoArgsConstructor
 public class AaiNqVfModule implements Serializable {
     private static final long serialVersionUID = 8019133081429638232L;
 
@@ -68,116 +72,4 @@ public class AaiNqVfModule implements Serializable {
 
     @SerializedName("model-customization-id")
     private String modelCustomizationId = null;
-
-    public String getVfModuleId() {
-        return vfModuleId;
-    }
-
-    public String getVfModuleName() {
-        return vfModuleName;
-    }
-
-    public String getHeatStackId() {
-        return heatStackId;
-    }
-
-    public String getOrchestrationStatus() {
-        return orchestrationStatus;
-    }
-
-    public Boolean getIsBaseVfModule() {
-        return isBaseVfModule;
-    }
-
-    public String getResourceVersion() {
-        return resourceVersion;
-    }
-
-    public String getPersonaModelId() {
-        return personaModelId;
-    }
-
-    public String getPersonaModelVersion() {
-        return personaModelVersion;
-    }
-
-    public String getWidgetModelId() {
-        return widgetModelId;
-    }
-
-    public String getWidgetModelVersion() {
-        return widgetModelVersion;
-    }
-
-    public String getContrailServiceInstanceFqdn() {
-        return contrailServiceInstanceFqdn;
-    }
-
-    public String getModelInvariantId() {
-        return modelInvariantId;
-    }
-
-    public String getModelVersionId() {
-        return modelVersionId;
-    }
-
-    public String getModelCustomizationId() {
-        return modelCustomizationId;
-    }
-
-    public void setVfModuleId(String vfModuleId) {
-        this.vfModuleId = vfModuleId;
-    }
-
-    public void setVfModuleName(String vfModuleName) {
-        this.vfModuleName = vfModuleName;
-    }
-
-    public void setHeatStackId(String heatStackId) {
-        this.heatStackId = heatStackId;
-    }
-
-    public void setOrchestrationStatus(String orchestrationStatus) {
-        this.orchestrationStatus = orchestrationStatus;
-    }
-
-    public void setIsBaseVfModule(Boolean isBaseVfModule) {
-        this.isBaseVfModule = isBaseVfModule;
-    }
-
-    public void setResourceVersion(String resourceVersion) {
-        this.resourceVersion = resourceVersion;
-    }
-
-    public void setPersonaModelId(String personaModelId) {
-        this.personaModelId = personaModelId;
-    }
-
-    public void setPersonaModelVersion(String personaModelVersion) {
-        this.personaModelVersion = personaModelVersion;
-    }
-
-    public void setWidgetModelId(String widgetModelId) {
-        this.widgetModelId = widgetModelId;
-    }
-
-    public void setWidgetModelVersion(String widgetModelVersion) {
-        this.widgetModelVersion = widgetModelVersion;
-    }
-
-    public void setContrailServiceInstanceFqdn(String contrailServiceInstanceFqdn) {
-        this.contrailServiceInstanceFqdn = contrailServiceInstanceFqdn;
-    }
-
-    public void setModelInvariantId(String modelInvariantId) {
-        this.modelInvariantId = modelInvariantId;
-    }
-
-    public void setModelVersionId(String modelVersionId) {
-        this.modelVersionId = modelVersionId;
-    }
-
-    public void setModelCustomizationId(String modelCustomizationId) {
-        this.modelCustomizationId = modelCustomizationId;
-    }
 }
diff --git a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/Pnf.java b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/Pnf.java
index 1757e9237..ae6b97970 100644
--- a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/Pnf.java
+++ b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/Pnf.java
@@ -22,71 +22,19 @@
 package org.onap.policy.aai;
 
 import java.io.Serializable;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 
+@Data
+@NoArgsConstructor
 public class Pnf implements Serializable {
     private static final long serialVersionUID = -3535108358668248501L;
 
     private String pnfName;
     private PnfType pnfType;
 
-    public Pnf() {
-
-    }
-
     public Pnf(Pnf pnf) {
         this.pnfName = pnf.pnfName;
         this.pnfType = pnf.pnfType;
     }
-
-    public String getPnfName() {
-        return pnfName;
-    }
-
-    public void setPnfName(String pnfName) {
-        this.pnfName = pnfName;
-    }
-
-    public PnfType getPnfType() {
-        return pnfType;
-    }
-
-    public void setPnfType(PnfType pnfType) {
-        this.pnfType = pnfType;
-    }
-
-    @Override
-    public String toString() {
-        return "PNF [PNFName=" + pnfName + ", PNFType=" + pnfType + "]";
-    }
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((pnfName == null) ? 0 : pnfName.hashCode());
-        result = prime * result + ((pnfType == null) ? 0 : pnfType.hashCode());
-        return result;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        Pnf other = (Pnf) obj;
-        if (pnfName == null) {
-            if (other.pnfName != null) {
-                return false;
-            }
-        } else if (!pnfName.equals(other.pnfName)) {
-            return false;
-        }
-        return pnfType == other.pnfType;
-    }
 }
diff --git a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/PnfInstance.java b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/PnfInstance.java
index 74e69be99..6a7ad83c5 100644
--- a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/PnfInstance.java
+++ b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/PnfInstance.java
@@ -22,7 +22,11 @@
 package org.onap.policy.aai;
 
 import java.io.Serializable;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 
+@Data
+@NoArgsConstructor
 public class PnfInstance implements Serializable {
 
     private static final long serialVersionUID = -3694152433472165034L;
@@ -32,10 +36,6 @@ public class PnfInstance implements Serializable {
     private PnfType pnfType;
     private String pnfSerial;
 
-    public PnfInstance() {
-
-    }
-
     /**
      * Create an instance from a given instance.
      *
@@ -50,89 +50,4 @@ public class PnfInstance implements Serializable {
         this.pnfType = instance.pnfType;
         this.pnfSerial = instance.pnfSerial;
     }
-
-    public String getPnfName() {
-        return pnfName;
-    }
-
-    public void setPnfName(String pnfName) {
-        this.pnfName = pnfName;
-    }
-
-    public String getPnfInstanceName() {
-        return pnfInstanceName;
-    }
-
-    public void setPnfInstanceName(String pnfInstanceName) {
-        this.pnfInstanceName = pnfInstanceName;
-    }
-
-    public PnfType getPnfType() {
-        return pnfType;
-    }
-
-    public void setPnfType(PnfType pnfType) {
-        this.pnfType = pnfType;
-    }
-
-    public String getPnfSerial() {
-        return pnfSerial;
-    }
-
-    public void setPnfSerial(String pnfSerial) {
-        this.pnfSerial = pnfSerial;
-    }
-
-    @Override
-    public String toString() {
-        return "PNFInstance [PNFName=" + pnfName + ", PNFInstanceName=" + pnfInstanceName + ", PNFType=" + pnfType
-                + ", PNFSerial=" + pnfSerial + "]";
-    }
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((pnfInstanceName == null) ? 0 : pnfInstanceName.hashCode());
-        result = prime * result + ((pnfName == null) ? 0 : pnfName.hashCode());
-        result = prime * result + ((pnfSerial == null) ? 0 : pnfSerial.hashCode());
-        result = prime * result + ((pnfType == null) ? 0 : pnfType.hashCode());
-        return result;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        PnfInstance other = (PnfInstance) obj;
-        if (pnfInstanceName == null) {
-            if (other.pnfInstanceName != null) {
-                return false;
-            }
-        } else if (!pnfInstanceName.equals(other.pnfInstanceName)) {
-            return false;
-        }
-        if (pnfName == null) {
-            if (other.pnfName != null) {
-                return false;
-            }
-        } else if (!pnfName.equals(other.pnfName)) {
-            return false;
-        }
-        if (pnfSerial == null) {
-            if (other.pnfSerial != null) {
-                return false;
-            }
-        } else if (!pnfSerial.equals(other.pnfSerial)) {
-            return false;
-        }
-        return pnfType == other.pnfType;
-    }
 }
diff --git a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/RelatedToProperty.java b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/RelatedToProperty.java
index cc0e34c9c..f65b642ed 100644
--- a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/RelatedToProperty.java
+++ b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/RelatedToProperty.java
@@ -24,7 +24,11 @@ package org.onap.policy.aai;
 import com.google.gson.annotations.SerializedName;
 
 import java.io.Serializable;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 
+@Data
+@NoArgsConstructor
 public class RelatedToProperty implements Serializable {
     private static final long serialVersionUID = 5644372985092588638L;
 
@@ -32,20 +36,4 @@ public class RelatedToProperty implements Serializable {
     private String propertyKey;
     @SerializedName("property-value")
     private String propertyValue;
-
-    public String getPropertyKey() {
-        return propertyKey;
-    }
-
-    public String getPropertyValue() {
-        return propertyValue;
-    }
-
-    public void setPropertyKey(String propertyKey) {
-        this.propertyKey = propertyKey;
-    }
-
-    public void setPropertyValue(String propertyValue) {
-        this.propertyValue = propertyValue;
-    }
 }
diff --git a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/Relationship.java b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/Relationship.java
index e4c6bcce4..78421b0f2 100644
--- a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/Relationship.java
+++ b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/Relationship.java
@@ -26,7 +26,11 @@ import com.google.gson.annotations.SerializedName;
 import java.io.Serializable;
 import java.util.LinkedList;
 import java.util.List;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 
+@Data
+@NoArgsConstructor
 public class Relationship implements Serializable {
     private static final long serialVersionUID = -68508443869003055L;
 
@@ -41,36 +45,4 @@ public class Relationship implements Serializable {
 
     @SerializedName("related-to-property")
     private List<RelatedToProperty> relatedToProperty = new LinkedList<>();
-
-    public String getRelatedTo() {
-        return relatedTo;
-    }
-
-    public String getRelatedLink() {
-        return relatedLink;
-    }
-
-    public List<RelationshipData> getRelationshipData() {
-        return relationshipData;
-    }
-
-    public List<RelatedToProperty> getRelatedToProperty() {
-        return relatedToProperty;
-    }
-
-    public void setRelatedTo(String relatedTo) {
-        this.relatedTo = relatedTo;
-    }
-
-    public void setRelatedLink(String relatedLink) {
-        this.relatedLink = relatedLink;
-    }
-
-    public void setRelationshipData(List<RelationshipData> relationshipData) {
-        this.relationshipData = relationshipData;
-    }
-
-    public void setRelatedToProperty(List<RelatedToProperty> relatedToProperty) {
-        this.relatedToProperty = relatedToProperty;
-    }
 }
diff --git a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/RelationshipData.java b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/RelationshipData.java
index 848897f87..9119bf6ac 100644
--- a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/RelationshipData.java
+++ b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/RelationshipData.java
@@ -24,7 +24,11 @@ package org.onap.policy.aai;
 import com.google.gson.annotations.SerializedName;
 
 import java.io.Serializable;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 
+@Data
+@NoArgsConstructor
 public class RelationshipData implements Serializable {
     private static final long serialVersionUID = 550450041634939768L;
 
@@ -32,20 +36,4 @@ public class RelationshipData implements Serializable {
     private String relationshipKey;
     @SerializedName("relationship-value")
     private String relationshipValue;
-
-    public String getRelationshipKey() {
-        return relationshipKey;
-    }
-
-    public String getRelationshipValue() {
-        return relationshipValue;
-    }
-
-    public void setRelationshipKey(String relationshipKey) {
-        this.relationshipKey = relationshipKey;
-    }
-
-    public void setRelationshipValue(String relationshipValue) {
-        this.relationshipValue = relationshipValue;
-    }
 }
diff --git a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/RelationshipList.java b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/RelationshipList.java
index 89c5f320a..91bc32844 100644
--- a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/RelationshipList.java
+++ b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/RelationshipList.java
@@ -26,20 +26,14 @@ import com.google.gson.annotations.SerializedName;
 import java.io.Serializable;
 import java.util.LinkedList;
 import java.util.List;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 
+@Data
+@NoArgsConstructor
 public class RelationshipList implements Serializable {
     private static final long serialVersionUID = 6115655704973981990L;
 
     @SerializedName("relationship")
     private List<Relationship> relationships = new LinkedList<>();
-
-    public List<Relationship> getRelationships() {
-        return relationships;
-    }
-
-    public void setRelationships(List<Relationship> relationships) {
-        this.relationships = relationships;
-    }
-
-
 }
diff --git a/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/AaiGetVnfResponseTest.java b/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/AaiGetVnfResponseTest.java
index d74308d26..47ee5ba6f 100644
--- a/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/AaiGetVnfResponseTest.java
+++ b/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/AaiGetVnfResponseTest.java
@@ -22,7 +22,9 @@
 package org.onap.policy.aai;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 import java.io.File;
 import java.nio.file.Files;
@@ -47,8 +49,8 @@ public class AaiGetVnfResponseTest {
         assertEquals("vLoadBalancerMS-Vnf-0809-2", resp.getVnfName());
         assertEquals("vLoadBalancerMS/vLoadBalancerMS 0", resp.getVnfType());
         assertEquals("1533850960381", resp.getResourceVersion());
-        assertEquals(false, resp.getInMaint());
-        assertEquals(true, resp.getIsClosedLoopDisabled());
+        assertFalse(resp.isInMaint());
+        assertTrue(resp.isClosedLoopDisabled());
         assertEquals("53638a85-361a-437d-8830-4b0d5329225e", resp.getModelInvariantId());
         assertEquals("PROV", resp.getProvStatus());
         assertEquals("Active", resp.getOrchestrationStatus());
@@ -71,7 +73,7 @@ public class AaiGetVnfResponseTest {
         relationshipList = new RelationshipList();
 
         resp.setInMaint(true);
-        resp.setIsClosedLoopDisabled(false);
+        resp.setClosedLoopDisabled(false);
         resp.setModelInvariantId("modiv");
         resp.setOrchestrationStatus("orch");
         resp.setProvStatus("mystatus");
@@ -86,8 +88,8 @@ public class AaiGetVnfResponseTest {
         assertEquals("vnfname", resp.getVnfName());
         assertEquals("vnftype", resp.getVnfType());
         assertEquals("vers", resp.getResourceVersion());
-        assertEquals(true, resp.getInMaint());
-        assertEquals(false, resp.getIsClosedLoopDisabled());
+        assertTrue(resp.isInMaint());
+        assertFalse(resp.isClosedLoopDisabled());
         assertEquals("modiv", resp.getModelInvariantId());
         assertEquals("mystatus", resp.getProvStatus());
         assertEquals("orch", resp.getOrchestrationStatus());
diff --git a/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/PnfInstanceTest.java b/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/PnfInstanceTest.java
index 8cf839110..db3e90ed0 100644
--- a/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/PnfInstanceTest.java
+++ b/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/PnfInstanceTest.java
@@ -56,8 +56,7 @@ public class PnfInstanceTest {
         assertEquals(PnfType.ENODEB, pnfInstanceClone.getPnfType());
         assertEquals("pnf-serial-test", pnfInstanceClone.getPnfSerial());
 
-        assertEquals("PNFInstance [PNFName=pnf-name-test, PNFInstanceName=pnf-instance-name-test, PNFType=eNodeB, "
-                + "PNFSerial=pnf-serial-test]", pnfInstanceClone.toString());
+        assertNotNull(pnfInstanceClone.toString());
         assertNotEquals(0, pnfInstanceClone.hashCode());
         assertNotEquals(0, new Pnf().hashCode());
 
@@ -79,19 +78,19 @@ public class PnfInstanceTest {
         PnfInstance pnfInstanceOther5 = new PnfInstance(pnfInstance);
         pnfInstanceOther5.setPnfSerial("pnf-serial-test-diff");
 
-        assertTrue(pnfInstance.equals(pnfInstance));
-        assertFalse(pnfInstance.equals(null));
-        assertFalse(pnfInstance.equals("hello"));
-        assertTrue(pnfInstance.equals(pnfInstanceClone));
-        assertFalse(pnfInstance.equals(new Pnf()));
-        assertFalse(new Pnf().equals(pnfInstance));
-        assertFalse(new Pnf().equals(pnfInstanceOther0));
-        assertFalse(pnfInstanceOther0.equals(pnfInstance));
-        assertFalse(pnfInstanceOther1.equals(pnfInstance));
-        assertFalse(pnfInstanceOther2.equals(pnfInstance));
-        assertFalse(pnfInstanceOther3.equals(pnfInstance));
-        assertFalse(pnfInstanceOther4.equals(pnfInstance));
-        assertFalse(pnfInstanceOther5.equals(pnfInstance));
+        assertEquals(pnfInstance, pnfInstance);
+        assertNotEquals(null, pnfInstance);
+        assertNotEquals("hello", pnfInstance);
+        assertEquals(pnfInstance, pnfInstanceClone);
+        assertNotEquals(pnfInstance, new Pnf());
+        assertNotEquals(new Pnf(), pnfInstance);
+        assertNotEquals(new Pnf(), pnfInstanceOther0);
+        assertNotEquals(pnfInstanceOther0, pnfInstance);
+        assertNotEquals(pnfInstanceOther1, pnfInstance);
+        assertNotEquals(pnfInstanceOther2, pnfInstance);
+        assertNotEquals(pnfInstanceOther3, pnfInstance);
+        assertNotEquals(pnfInstanceOther4, pnfInstance);
+        assertNotEquals(pnfInstanceOther5, pnfInstance);
 
         logger.info(Serialization.gsonPretty.toJson(pnfInstance));
     }
diff --git a/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/PnfTest.java b/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/PnfTest.java
index 54cf4735b..d7fc0d2b7 100644
--- a/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/PnfTest.java
+++ b/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/PnfTest.java
@@ -49,23 +49,22 @@ public class PnfTest {
         assertEquals(PNF_NAME_TEST, pnfClone.getPnfName());
         assertEquals(PnfType.ENODEB, pnfClone.getPnfType());
 
-        assertEquals("PNF [PNFName=pnf-name-test, PNFType=eNodeB]", pnfClone.toString());
+        assertNotNull(pnfClone.toString());
         assertNotEquals(0, pnfClone.hashCode());
         assertNotEquals(0, new Pnf().hashCode());
 
         Pnf pnfOther = new Pnf();
         pnfOther.setPnfName(PNF_NAME_TEST);
 
-        assertTrue(pnf.equals(pnf));
-        assertFalse(pnf.equals(null));
-        assertFalse(pnf.equals("hello"));
-        assertTrue(pnf.equals(pnfClone));
-        assertFalse(pnf.equals(new Pnf()));
-        assertFalse(new Pnf().equals(pnf));
-        assertFalse(new Pnf().equals(pnfOther));
-        assertFalse(pnfOther.equals(pnf));
+        assertEquals(pnf, pnf);
+        assertNotNull(pnf);
+        assertNotEquals("hello", pnf);
+        assertEquals(pnf, pnfClone);
+        assertNotEquals(pnf, new Pnf());
+        assertNotEquals(new Pnf(), pnf);
+        assertNotEquals(new Pnf(), pnfOther);
+        assertNotEquals(pnfOther, pnf);
 
         logger.info(Serialization.gsonPretty.toJson(pnf));
     }
-
 }