diff options
90 files changed, 466 insertions, 3219 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)); } - } diff --git a/models-interactions/model-impl/appc/src/main/java/org/onap/policy/appc/CommonHeader.java b/models-interactions/model-impl/appc/src/main/java/org/onap/policy/appc/CommonHeader.java index a3859b4ae..05507e60e 100644 --- a/models-interactions/model-impl/appc/src/main/java/org/onap/policy/appc/CommonHeader.java +++ b/models-interactions/model-impl/appc/src/main/java/org/onap/policy/appc/CommonHeader.java @@ -29,7 +29,11 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Map; import java.util.UUID; +import lombok.Getter; +import lombok.Setter; +@Getter +@Setter public class CommonHeader implements Serializable { private static final long serialVersionUID = -3581658269910980336L; @@ -65,6 +69,8 @@ public class CommonHeader implements Serializable { this.originatorId = commonHeader.originatorId; this.requestId = commonHeader.requestId; this.subRequestId = commonHeader.subRequestId; + this.timeStamp = commonHeader.getTimeStamp(); + this.apiVer = commonHeader.getApiVer(); if (commonHeader.requestTrack != null) { this.requestTrack.addAll(commonHeader.requestTrack); } @@ -73,62 +79,6 @@ public class CommonHeader implements Serializable { } } - public Instant getTimeStamp() { - return timeStamp; - } - - public void setTimeStamp(Instant timeStamp) { - this.timeStamp = timeStamp; - } - - public String getApiVer() { - return apiVer; - } - - public void setApiVer(String apiVer) { - this.apiVer = apiVer; - } - - public String getOriginatorId() { - return originatorId; - } - - public void setOriginatorId(String originatorId) { - this.originatorId = originatorId; - } - - public UUID getRequestId() { - return requestId; - } - - public void setRequestId(UUID requestId) { - this.requestId = requestId; - } - - public String getSubRequestId() { - return subRequestId; - } - - public void setSubRequestId(String subRequestId) { - this.subRequestId = subRequestId; - } - - public Collection<String> getRequestTrack() { - return requestTrack; - } - - public void setRequestTrack(Collection<String> requestTrack) { - this.requestTrack = requestTrack; - } - - public Collection<Map<String, String>> getFlags() { - return flags; - } - - public void setFlags(Collection<Map<String, String>> flags) { - this.flags = flags; - } - @Override public String toString() { return "CommonHeader [TimeStamp=" + timeStamp + ", APIver=" + apiVer + ", OriginatorId=" + originatorId @@ -205,13 +155,9 @@ public class CommonHeader implements Serializable { return false; } if (timeStamp == null) { - if (other.timeStamp != null) { - return false; - } - } else if (!timeStamp.equals(other.timeStamp)) { - return false; + return other.timeStamp == null; + } else { + return timeStamp.equals(other.timeStamp); } - return true; } - } diff --git a/models-interactions/model-impl/appc/src/main/java/org/onap/policy/appc/Request.java b/models-interactions/model-impl/appc/src/main/java/org/onap/policy/appc/Request.java index a9ad6d8da..e340360af 100644 --- a/models-interactions/model-impl/appc/src/main/java/org/onap/policy/appc/Request.java +++ b/models-interactions/model-impl/appc/src/main/java/org/onap/policy/appc/Request.java @@ -26,7 +26,11 @@ import com.google.gson.annotations.SerializedName; import java.io.Serializable; import java.util.HashMap; import java.util.Map; +import lombok.Getter; +import lombok.Setter; +@Getter +@Setter public class Request implements Serializable { private static final long serialVersionUID = -3912323643990646431L; @@ -43,52 +47,12 @@ public class Request implements Serializable { private String objectId; @SerializedName("Payload") - private HashMap<String, Object> payload = new HashMap<>(); + private Map<String, Object> payload = new HashMap<>(); public Request() { // Initiate an empty Request instance } - public CommonHeader getCommonHeader() { - return commonHeader; - } - - public Map<String, Object> getPayload() { - return payload; - } - - public String getAction() { - return action; - } - - public void setAction(String action) { - this.action = action; - } - - public String getTargetId() { - return targetId; - } - - public void setTargetId(String targetId) { - this.targetId = targetId; - } - - public String getObjectId() { - return objectId; - } - - public void setObjectId(String objectId) { - this.objectId = objectId; - } - - public void setCommonHeader(CommonHeader commonHeader) { - this.commonHeader = commonHeader; - } - - public void setPayload(Map<String, Object> payload) { - this.payload = new HashMap<>(payload); - } - @Override public int hashCode() { final int prime = 31; diff --git a/models-interactions/model-impl/appc/src/main/java/org/onap/policy/appc/Response.java b/models-interactions/model-impl/appc/src/main/java/org/onap/policy/appc/Response.java index d5fc66e5d..ae8b76423 100644 --- a/models-interactions/model-impl/appc/src/main/java/org/onap/policy/appc/Response.java +++ b/models-interactions/model-impl/appc/src/main/java/org/onap/policy/appc/Response.java @@ -26,7 +26,11 @@ import com.google.gson.annotations.SerializedName; import java.io.Serializable; import java.util.HashMap; import java.util.Map; +import lombok.Getter; +import lombok.Setter; +@Getter +@Setter public class Response implements Serializable { private static final long serialVersionUID = 434953706339865151L; @@ -38,7 +42,7 @@ public class Response implements Serializable { private ResponseStatus status = new ResponseStatus(); @SerializedName("Payload") - private HashMap<String, Object> payload = new HashMap<>(); + private Map<String, Object> payload = new HashMap<>(); public Response() { @@ -58,30 +62,6 @@ public class Response implements Serializable { } } - public CommonHeader getCommonHeader() { - return commonHeader; - } - - public void setCommonHeader(CommonHeader commonHeader) { - this.commonHeader = commonHeader; - } - - public ResponseStatus getStatus() { - return status; - } - - public void setStatus(ResponseStatus status) { - this.status = status; - } - - public Map<String, Object> getPayload() { - return payload; - } - - public void setPayload(Map<String, Object> payload) { - this.payload = new HashMap<>(payload); - } - @Override public String toString() { return "Response [CommonHeader=" + commonHeader + ", Status=" + status + ", Payload=" + payload + "]"; @@ -124,14 +104,9 @@ public class Response implements Serializable { return false; } if (status == null) { - if (other.status != null) { - return false; - } - } else if (!status.equals(other.status)) { - return false; + return other.status == null; + } else { + return status.equals(other.status); } - return true; } - - } diff --git a/models-interactions/model-impl/appc/src/main/java/org/onap/policy/appc/ResponseStatus.java b/models-interactions/model-impl/appc/src/main/java/org/onap/policy/appc/ResponseStatus.java index 68c059ca8..54589830f 100644 --- a/models-interactions/model-impl/appc/src/main/java/org/onap/policy/appc/ResponseStatus.java +++ b/models-interactions/model-impl/appc/src/main/java/org/onap/policy/appc/ResponseStatus.java @@ -24,7 +24,11 @@ package org.onap.policy.appc; import com.google.gson.annotations.SerializedName; import java.io.Serializable; +import lombok.Getter; +import lombok.Setter; +@Getter +@Setter public class ResponseStatus implements Serializable { private static final long serialVersionUID = 2421770469587860452L; @@ -42,30 +46,6 @@ public class ResponseStatus implements Serializable { return "ResponseStatus [Code=" + code + ", Value=" + value + ", Description=" + description + "]"; } - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - @Override public int hashCode() { final int prime = 31; diff --git a/models-interactions/model-impl/appc/src/test/java/org/onap/policy/appc/RequestTest.java b/models-interactions/model-impl/appc/src/test/java/org/onap/policy/appc/RequestTest.java index 560a7d8d5..00ac99de5 100644 --- a/models-interactions/model-impl/appc/src/test/java/org/onap/policy/appc/RequestTest.java +++ b/models-interactions/model-impl/appc/src/test/java/org/onap/policy/appc/RequestTest.java @@ -75,54 +75,54 @@ public class RequestTest { copiedRequest.setPayload(request.getPayload()); copiedRequest.setTargetId(request.getTargetId()); - assertTrue(request.equals(request)); - assertTrue(request.equals(copiedRequest)); - assertFalse(request.equals(null)); - assertFalse(request.equals("Hello")); + assertEquals(request, request); + assertEquals(request, copiedRequest); + assertNotEquals(null, request); + assertNotEquals("Hello", request); request.setCommonHeader(null); - assertFalse(request.equals(copiedRequest)); + assertNotEquals(request, copiedRequest); copiedRequest.setCommonHeader(null); - assertTrue(request.equals(copiedRequest)); + assertEquals(request, copiedRequest); request.setCommonHeader(commonHeader); - assertFalse(request.equals(copiedRequest)); + assertNotEquals(request, copiedRequest); copiedRequest.setCommonHeader(commonHeader); - assertTrue(request.equals(copiedRequest)); + assertEquals(request, copiedRequest); request.setAction(null); - assertFalse(request.equals(copiedRequest)); + assertNotEquals(request, copiedRequest); copiedRequest.setAction(null); - assertTrue(request.equals(copiedRequest)); + assertEquals(request, copiedRequest); request.setAction(GO_TO_OZ); - assertFalse(request.equals(copiedRequest)); + assertNotEquals(request, copiedRequest); copiedRequest.setAction(GO_TO_OZ); - assertTrue(request.equals(copiedRequest)); + assertEquals(request, copiedRequest); request.setObjectId(null); - assertFalse(request.equals(copiedRequest)); + assertNotEquals(request, copiedRequest); copiedRequest.setObjectId(null); - assertTrue(request.equals(copiedRequest)); + assertEquals(request, copiedRequest); request.setObjectId(WIZARD); - assertFalse(request.equals(copiedRequest)); + assertNotEquals(request, copiedRequest); copiedRequest.setObjectId(WIZARD); - assertTrue(request.equals(copiedRequest)); + assertEquals(request, copiedRequest); request.setTargetId(null); - assertFalse(request.equals(copiedRequest)); + assertNotEquals(request, copiedRequest); copiedRequest.setTargetId(null); - assertTrue(request.equals(copiedRequest)); + assertEquals(request, copiedRequest); request.setTargetId("Oz"); - assertFalse(request.equals(copiedRequest)); + assertNotEquals(request, copiedRequest); copiedRequest.setTargetId("Oz"); - assertTrue(request.equals(copiedRequest)); + assertEquals(request, copiedRequest); - request.setPayload(new HashMap<String, Object>()); - assertFalse(request.equals(copiedRequest)); - copiedRequest.setPayload(new HashMap<String, Object>()); - assertTrue(request.equals(copiedRequest)); + request.setPayload(new HashMap<>()); + assertNotEquals(request, copiedRequest); + copiedRequest.setPayload(new HashMap<>()); + assertEquals(request, copiedRequest); request.setPayload(payload); - assertFalse(request.equals(copiedRequest)); + assertNotEquals(request, copiedRequest); copiedRequest.setPayload(payload); - assertTrue(request.equals(copiedRequest)); + assertEquals(request, copiedRequest); } } diff --git a/models-interactions/model-impl/events/src/main/java/org/onap/policy/controlloop/ControlLoopEvent.java b/models-interactions/model-impl/events/src/main/java/org/onap/policy/controlloop/ControlLoopEvent.java index 3ff7aa256..bbe902ac2 100644 --- a/models-interactions/model-impl/events/src/main/java/org/onap/policy/controlloop/ControlLoopEvent.java +++ b/models-interactions/model-impl/events/src/main/java/org/onap/policy/controlloop/ControlLoopEvent.java @@ -25,11 +25,11 @@ import com.google.gson.annotations.SerializedName; import java.io.Serializable; import java.util.Map; import java.util.UUID; -import lombok.Getter; -import lombok.Setter; +import lombok.Data; +import lombok.NoArgsConstructor; -@Getter -@Setter +@Data +@NoArgsConstructor public abstract class ControlLoopEvent implements Serializable { private static final long serialVersionUID = 2391252138583119195L; @@ -49,10 +49,6 @@ public abstract class ControlLoopEvent implements Serializable { private ControlLoopEventStatus closedLoopEventStatus; private Map<String, String> additionalEventParams; - public ControlLoopEvent() { - - } - /** * Construct an instance from an existing instance. * diff --git a/models-interactions/model-impl/events/src/main/java/org/onap/policy/controlloop/ControlLoopNotification.java b/models-interactions/model-impl/events/src/main/java/org/onap/policy/controlloop/ControlLoopNotification.java index 924291709..c4c46d30a 100644 --- a/models-interactions/model-impl/events/src/main/java/org/onap/policy/controlloop/ControlLoopNotification.java +++ b/models-interactions/model-impl/events/src/main/java/org/onap/policy/controlloop/ControlLoopNotification.java @@ -27,11 +27,11 @@ import java.time.ZonedDateTime; import java.util.LinkedList; import java.util.List; import java.util.UUID; -import lombok.Getter; -import lombok.Setter; +import lombok.Data; +import lombok.NoArgsConstructor; -@Getter -@Setter +@Data +@NoArgsConstructor public abstract class ControlLoopNotification implements Serializable { private static final long serialVersionUID = 7538596984567127915L; @@ -52,10 +52,6 @@ public abstract class ControlLoopNotification implements Serializable { private Integer opsClTimer; private List<ControlLoopOperation> history = new LinkedList<>(); - public ControlLoopNotification() { - - } - /** * Construct an instance. * diff --git a/models-interactions/model-impl/events/src/main/java/org/onap/policy/controlloop/ControlLoopOperation.java b/models-interactions/model-impl/events/src/main/java/org/onap/policy/controlloop/ControlLoopOperation.java index 85bf95a9f..10457de51 100644 --- a/models-interactions/model-impl/events/src/main/java/org/onap/policy/controlloop/ControlLoopOperation.java +++ b/models-interactions/model-impl/events/src/main/java/org/onap/policy/controlloop/ControlLoopOperation.java @@ -23,7 +23,11 @@ package org.onap.policy.controlloop; import java.io.Serializable; import java.time.Instant; +import lombok.Data; +import lombok.NoArgsConstructor; +@Data +@NoArgsConstructor public class ControlLoopOperation implements Serializable { private static final long serialVersionUID = 8662706581293017099L; @@ -37,10 +41,6 @@ public class ControlLoopOperation implements Serializable { private String outcome; private String message; - public ControlLoopOperation() { - - } - /** * Construct an instance from an existing instance. * @@ -70,161 +70,10 @@ public class ControlLoopOperation implements Serializable { + ",subRequestId=" + subRequestId + ",outcome=" + outcome + ",message=" + message; } - public String getActor() { - return actor; - } - - public void setActor(String actor) { - this.actor = actor; - } - - public String getOperation() { - return operation; - } - - public void setOperation(String operation) { - this.operation = operation; - } - - public String getTarget() { - return target; - } - - public void setTarget(String target) { - this.target = target; - } - - public Instant getStart() { - return start; - } - - public void setStart(Instant start) { - this.start = start; - } - - public Instant getEnd() { - return end; - } - - public void setEnd(Instant end) { - this.end = end; - } - - public String getSubRequestId() { - return subRequestId; - } - - public void setSubRequestId(String subRequestId) { - this.subRequestId = subRequestId; - } - - public String getOutcome() { - return outcome; - } - - public void setOutcome(String outcome) { - this.outcome = outcome; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - @Override public String toString() { return "ControlLoopOperation [actor=" + actor + ", operation=" + operation + ", target=" + target + ", start=" + start + ", end=" + end + ", subRequestId=" + subRequestId + ", outcome=" + outcome + ", message=" + message + "]"; } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((actor == null) ? 0 : actor.hashCode()); - result = prime * result + ((end == null) ? 0 : end.hashCode()); - result = prime * result + ((message == null) ? 0 : message.hashCode()); - result = prime * result + ((operation == null) ? 0 : operation.hashCode()); - result = prime * result + ((outcome == null) ? 0 : outcome.hashCode()); - result = prime * result + ((start == null) ? 0 : start.hashCode()); - result = prime * result + ((subRequestId == null) ? 0 : subRequestId.hashCode()); - result = prime * result + ((target == null) ? 0 : target.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; - } - ControlLoopOperation other = (ControlLoopOperation) obj; - if (actor == null) { - if (other.actor != null) { - return false; - } - } else if (!actor.equals(other.actor)) { - return false; - } - if (end == null) { - if (other.end != null) { - return false; - } - } else if (!end.equals(other.end)) { - return false; - } - if (message == null) { - if (other.message != null) { - return false; - } - } else if (!message.equals(other.message)) { - return false; - } - if (operation == null) { - if (other.operation != null) { - return false; - } - } else if (!operation.equals(other.operation)) { - return false; - } - if (outcome == null) { - if (other.outcome != null) { - return false; - } - } else if (!outcome.equals(other.outcome)) { - return false; - } - if (start == null) { - if (other.start != null) { - return false; - } - } else if (!start.equals(other.start)) { - return false; - } - if (subRequestId == null) { - if (other.subRequestId != null) { - return false; - } - } else if (!subRequestId.equals(other.subRequestId)) { - return false; - } - if (target == null) { - if (other.target != null) { - return false; - } - } else if (!target.equals(other.target)) { - return false; - } - return true; - } - } diff --git a/models-interactions/model-impl/events/src/main/java/org/onap/policy/controlloop/ControlLoopOperationWrapper.java b/models-interactions/model-impl/events/src/main/java/org/onap/policy/controlloop/ControlLoopOperationWrapper.java index 1d1a9676a..7195c9de4 100644 --- a/models-interactions/model-impl/events/src/main/java/org/onap/policy/controlloop/ControlLoopOperationWrapper.java +++ b/models-interactions/model-impl/events/src/main/java/org/onap/policy/controlloop/ControlLoopOperationWrapper.java @@ -22,34 +22,15 @@ package org.onap.policy.controlloop; import java.util.UUID; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +@Data +@NoArgsConstructor +@AllArgsConstructor public class ControlLoopOperationWrapper { private UUID requestId; private ControlLoopOperation operation; - - public ControlLoopOperationWrapper() { - - } - - public ControlLoopOperationWrapper(UUID requestId, ControlLoopOperation operation) { - this.requestId = requestId; - this.operation = operation; - } - - public UUID getRequestId() { - return requestId; - } - - public void setRequestId(UUID requestId) { - this.requestId = requestId; - } - - public ControlLoopOperation getOperation() { - return operation; - } - - public void setOperation(ControlLoopOperation operation) { - this.operation = operation; - } } diff --git a/models-interactions/model-impl/events/src/main/java/org/onap/policy/controlloop/ControlLoopResponse.java b/models-interactions/model-impl/events/src/main/java/org/onap/policy/controlloop/ControlLoopResponse.java index a73d47744..1067b3ff7 100644 --- a/models-interactions/model-impl/events/src/main/java/org/onap/policy/controlloop/ControlLoopResponse.java +++ b/models-interactions/model-impl/events/src/main/java/org/onap/policy/controlloop/ControlLoopResponse.java @@ -25,41 +25,27 @@ import com.google.gson.annotations.SerializedName; import java.io.Serializable; import java.util.UUID; +import lombok.Data; +import lombok.NoArgsConstructor; +@Data +@NoArgsConstructor public class ControlLoopResponse implements Serializable { private static final long serialVersionUID = 2391252138583119195L; - @SerializedName("closedLoopControlName") - private String closedLoopControlName; - - @SerializedName("version") - private String version = "1.0.0"; - @SerializedName("requestID") private UUID requestId; - - @SerializedName("target") + private String closedLoopControlName; + private String version = "1.0.0"; private String target; - - @SerializedName("from") private String from; - - @SerializedName("policyName") private String policyName; - - @SerializedName("policyVersion") private String policyVersion; - - @SerializedName("payload") private String payload; - public ControlLoopResponse() { - - } - /** - * Construct an instace from an existing instance. + * Construct an instance from an existing instance. * * @param response * the existing instance @@ -75,69 +61,6 @@ public class ControlLoopResponse implements Serializable { this.policyName = response.policyName; this.policyVersion = response.policyVersion; this.payload = response.payload; - } - - public String getClosedLoopControlName() { - return closedLoopControlName; - } - - public void setClosedLoopControlName(String closedLoopControlName) { - this.closedLoopControlName = closedLoopControlName; - } - - public String getVersion() { - return version; - } - - public void setVersion(String version) { - this.version = version; - } - - public UUID getRequestId() { - return requestId; - } - - public void setRequestId(UUID requestId) { - this.requestId = requestId; - } - - public String getTarget() { - return target; - } - - public void setTarget(String target) { - this.target = target; - } - - public String getFrom() { - return from; - } - - public void setFrom(String from) { - this.from = from; - } - - public String getPolicyName() { - return policyName; - } - - public void setPolicyName(String policyName) { - this.policyName = policyName; - } - - public String getPolicyVersion() { - return policyVersion; - } - - public void setPolicyVersion(String policyVersion) { - this.policyVersion = policyVersion; - } - - public String getPayload() { - return payload; - } - - public void setPayload(String payload) { - this.payload = payload; + this.version = response.version; } } diff --git a/models-interactions/model-impl/events/src/main/java/org/onap/policy/controlloop/VirtualControlLoopEvent.java b/models-interactions/model-impl/events/src/main/java/org/onap/policy/controlloop/VirtualControlLoopEvent.java index 43026a202..24cc81dcd 100644 --- a/models-interactions/model-impl/events/src/main/java/org/onap/policy/controlloop/VirtualControlLoopEvent.java +++ b/models-interactions/model-impl/events/src/main/java/org/onap/policy/controlloop/VirtualControlLoopEvent.java @@ -26,30 +26,23 @@ import com.google.gson.annotations.SerializedName; import java.time.Instant; import java.util.HashMap; import java.util.Map; -import lombok.Getter; -import lombok.Setter; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; -@Getter -@Setter +@Data +@EqualsAndHashCode(callSuper = true) +@NoArgsConstructor public class VirtualControlLoopEvent extends ControlLoopEvent { private static final long serialVersionUID = -5752405682246066226L; - @SerializedName("payload") + @SerializedName("AAI") + private Map<String, String> aai = new HashMap<>(); private String payload; - - @SerializedName("closedLoopAlarmStart") private Instant closedLoopAlarmStart; - - @SerializedName("closedLoopAlarmEnd") private Instant closedLoopAlarmEnd; - @SerializedName("AAI") - private Map<String, String> aai = new HashMap<>(); - - public VirtualControlLoopEvent() {} - - /** * Construct an instance from an existing instance. * diff --git a/models-interactions/model-impl/events/src/main/java/org/onap/policy/controlloop/VirtualControlLoopNotification.java b/models-interactions/model-impl/events/src/main/java/org/onap/policy/controlloop/VirtualControlLoopNotification.java index 857bdf0c0..1fcda16d0 100644 --- a/models-interactions/model-impl/events/src/main/java/org/onap/policy/controlloop/VirtualControlLoopNotification.java +++ b/models-interactions/model-impl/events/src/main/java/org/onap/policy/controlloop/VirtualControlLoopNotification.java @@ -26,22 +26,22 @@ import com.google.gson.annotations.SerializedName; import java.time.Instant; import java.util.HashMap; import java.util.Map; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +@Data +@EqualsAndHashCode(callSuper = true) +@NoArgsConstructor public class VirtualControlLoopNotification extends ControlLoopNotification { private static final long serialVersionUID = 5354756047932144017L; @SerializedName("AAI") private Map<String, String> aai = new HashMap<>(); - - @SerializedName("closedLoopAlarmStart") private Instant closedLoopAlarmStart; - - @SerializedName("closedLoopAlarmEnd") private Instant closedLoopAlarmEnd; - public VirtualControlLoopNotification() {} - /** * Construct an instance. * @@ -58,28 +58,4 @@ public class VirtualControlLoopNotification extends ControlLoopNotification { this.closedLoopAlarmStart = event.getClosedLoopAlarmStart(); this.closedLoopAlarmEnd = event.getClosedLoopAlarmEnd(); } - - public Map<String, String> getAai() { - return aai; - } - - public void setAai(Map<String, String> aai) { - this.aai = aai; - } - - public Instant getClosedLoopAlarmStart() { - return closedLoopAlarmStart; - } - - public void setClosedLoopAlarmStart(Instant closedLoopAlarmStart) { - this.closedLoopAlarmStart = closedLoopAlarmStart; - } - - public Instant getClosedLoopAlarmEnd() { - return closedLoopAlarmEnd; - } - - public void setClosedLoopAlarmEnd(Instant closedLoopAlarmEnd) { - this.closedLoopAlarmEnd = closedLoopAlarmEnd; - } } diff --git a/models-interactions/model-impl/events/src/main/java/org/onap/policy/controlloop/params/ControlLoopParams.java b/models-interactions/model-impl/events/src/main/java/org/onap/policy/controlloop/params/ControlLoopParams.java index 11b90af99..36f804f6e 100644 --- a/models-interactions/model-impl/events/src/main/java/org/onap/policy/controlloop/params/ControlLoopParams.java +++ b/models-interactions/model-impl/events/src/main/java/org/onap/policy/controlloop/params/ControlLoopParams.java @@ -22,7 +22,13 @@ package org.onap.policy.controlloop.params; import java.io.Serializable; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +@Data +@AllArgsConstructor +@NoArgsConstructor public class ControlLoopParams implements Serializable { private static final long serialVersionUID = 970755684770982776L; @@ -33,10 +39,6 @@ public class ControlLoopParams implements Serializable { private String policyScope; private String policyVersion; - public ControlLoopParams() { - super(); - } - /** * Construct an instance from an existing instance. * @@ -49,45 +51,4 @@ public class ControlLoopParams implements Serializable { this.policyScope = params.policyScope; this.policyVersion = params.policyVersion; } - - public String getClosedLoopControlName() { - return closedLoopControlName; - } - - public void setClosedLoopControlName(String closedLoopControlName) { - this.closedLoopControlName = closedLoopControlName; - } - - public String getControlLoopYaml() { - return controlLoopYaml; - } - - public void setControlLoopYaml(String controlLoopYaml) { - this.controlLoopYaml = controlLoopYaml; - } - - public String getPolicyName() { - return policyName; - } - - public void setPolicyName(String policyName) { - this.policyName = policyName; - } - - public String getPolicyScope() { - return policyScope; - } - - public void setPolicyScope(String policyScope) { - this.policyScope = policyScope; - } - - public String getPolicyVersion() { - return policyVersion; - } - - public void setPolicyVersion(String policyVersion) { - this.policyVersion = policyVersion; - } - } diff --git a/models-interactions/model-impl/sdc/src/main/java/org/onap/policy/sdc/Service.java b/models-interactions/model-impl/sdc/src/main/java/org/onap/policy/sdc/Service.java index 709abf9e8..7ab2f9322 100644 --- a/models-interactions/model-impl/sdc/src/main/java/org/onap/policy/sdc/Service.java +++ b/models-interactions/model-impl/sdc/src/main/java/org/onap/policy/sdc/Service.java @@ -23,7 +23,11 @@ package org.onap.policy.sdc; import java.io.Serializable; import java.util.UUID; +import lombok.Getter; +import lombok.Setter; +@Getter +@Setter public class Service implements Serializable { private static final long serialVersionUID = -1249276698549996806L; @@ -72,38 +76,6 @@ public class Service implements Serializable { this.serviceVersion = service.serviceVersion; } - public UUID getServiceUUID() { - return serviceUUID; - } - - public void setServiceUUID(UUID serviceUUID) { - this.serviceUUID = serviceUUID; - } - - public UUID getServiceInvariantUUID() { - return serviceInvariantUUID; - } - - public void setServiceInvariantUUID(UUID serviceInvariantUUID) { - this.serviceInvariantUUID = serviceInvariantUUID; - } - - public String getServiceName() { - return serviceName; - } - - public void setServiceName(String serviceName) { - this.serviceName = serviceName; - } - - public String getServiceVersion() { - return serviceVersion; - } - - public void setServiceVersion(String serviceVersion) { - this.serviceVersion = serviceVersion; - } - @Override public String toString() { return "Service [serviceUUID=" + serviceUUID + ", serviceInvariantUUID=" + serviceInvariantUUID @@ -155,13 +127,9 @@ public class Service implements Serializable { return false; } if (serviceVersion == null) { - if (other.serviceVersion != null) { - return false; - } - } else if (!serviceVersion.equals(other.serviceVersion)) { - return false; + return other.serviceVersion == null; + } else { + return serviceVersion.equals(other.serviceVersion); } - return true; } - } diff --git a/models-interactions/model-impl/sdc/src/main/java/org/onap/policy/sdc/ServiceInstance.java b/models-interactions/model-impl/sdc/src/main/java/org/onap/policy/sdc/ServiceInstance.java index d5f74d4d0..e02952219 100644 --- a/models-interactions/model-impl/sdc/src/main/java/org/onap/policy/sdc/ServiceInstance.java +++ b/models-interactions/model-impl/sdc/src/main/java/org/onap/policy/sdc/ServiceInstance.java @@ -23,7 +23,11 @@ package org.onap.policy.sdc; import java.io.Serializable; import java.util.UUID; +import lombok.Getter; +import lombok.Setter; +@Getter +@Setter public class ServiceInstance implements Serializable { private static final long serialVersionUID = 6285260780966679625L; @@ -58,62 +62,6 @@ public class ServiceInstance implements Serializable { this.serviceInstanceName = instance.serviceInstanceName; } - public UUID getPersonaModelUUID() { - return personaModelUUID; - } - - public void setPersonaModelUUID(UUID personaModelUUID) { - this.personaModelUUID = personaModelUUID; - } - - public UUID getServiceUUID() { - return serviceUUID; - } - - public void setServiceUUID(UUID serviceUUID) { - this.serviceUUID = serviceUUID; - } - - public UUID getServiceInstanceUUID() { - return serviceInstanceUUID; - } - - public void setServiceInstanceUUID(UUID serviceInstanceUUID) { - this.serviceInstanceUUID = serviceInstanceUUID; - } - - public UUID getWidgetModelUUID() { - return widgetModelUUID; - } - - public void setWidgetModelUUID(UUID widgetModelUUID) { - this.widgetModelUUID = widgetModelUUID; - } - - public String getWidgetModelVersion() { - return widgetModelVersion; - } - - public void setWidgetModelVersion(String widgetModelVersion) { - this.widgetModelVersion = widgetModelVersion; - } - - public String getServiceName() { - return serviceName; - } - - public void setServiceName(String serviceName) { - this.serviceName = serviceName; - } - - public String getServiceInstanceName() { - return serviceInstanceName; - } - - public void setServiceInstanceName(String serviceInstanceName) { - this.serviceInstanceName = serviceInstanceName; - } - @Override public String toString() { return "ServiceInstance [personaModelUUID=" + personaModelUUID + ", serviceUUID=" + serviceUUID @@ -191,13 +139,9 @@ public class ServiceInstance implements Serializable { return false; } if (widgetModelVersion == null) { - if (other.widgetModelVersion != null) { - return false; - } - } else if (!widgetModelVersion.equals(other.widgetModelVersion)) { - return false; + return other.widgetModelVersion == null; + } else { + return widgetModelVersion.equals(other.widgetModelVersion); } - return true; } - } 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; - } - } diff --git a/models-interactions/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/PciCommonHeader.java b/models-interactions/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/PciCommonHeader.java index 8552bb23c..cdafa6858 100644 --- a/models-interactions/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/PciCommonHeader.java +++ b/models-interactions/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/PciCommonHeader.java @@ -29,7 +29,11 @@ import java.time.Instant; import java.util.HashMap; import java.util.Map; import java.util.UUID; +import lombok.Getter; +import lombok.Setter; +@Getter +@Setter public class PciCommonHeader implements Serializable { private static final long serialVersionUID = 5435363539127062114L; @@ -66,6 +70,7 @@ public class PciCommonHeader implements Serializable { this.timeStamp = commonHeader.timeStamp; this.requestId = commonHeader.requestId; this.subRequestId = commonHeader.subRequestId; + this.apiVer = commonHeader.getApiVer(); if (commonHeader.requestTrack != null) { this.requestTrack.putAll(commonHeader.requestTrack); } @@ -74,120 +79,6 @@ public class PciCommonHeader implements Serializable { } } - /** - * Get the timestamp. - * - * @return the timeStamp - */ - public Instant getTimeStamp() { - return timeStamp; - } - - /** - * Set the timestamp. - * - * @param timeStamp - * the timeStamp to set - */ - public void setTimeStamp(Instant timeStamp) { - this.timeStamp = timeStamp; - } - - /** - * Get the API version. - * - * @return the apiVer - */ - public String getApiVer() { - return apiVer; - } - - /** - * Set the API version. - * - * @param apiVer - * the apiVer to set - */ - public void setApiVer(String apiVer) { - this.apiVer = apiVer; - } - - /** - * Get the request Id. - * - * @return the requestId - */ - public UUID getRequestId() { - return requestId; - } - - /** - * Set the request Id. - * - * @param requestId - * the requestId to set - */ - public void setRequestId(UUID requestId) { - this.requestId = requestId; - } - - /** - * Get the sub request Id. - * - * @return the subRequestId - */ - public String getSubRequestId() { - return subRequestId; - } - - /** - * Set the sub request Id. - * - * @param subRequestId - * the subRequestId to set - */ - public void setSubRequestId(String subRequestId) { - this.subRequestId = subRequestId; - } - - /** - * Set the request track. - * - * @param requestTrack - * the requestTrack to set - */ - public void setRequestTrack(Map<String, String> requestTrack) { - this.requestTrack = requestTrack; - } - - /** - * Get the request track. - * - * @return the requestTrack - */ - public Map<String, String> getRequestTrack() { - return requestTrack; - } - - /** - * Get the flags. - * - * @return the flags - */ - public Map<String, String> getFlags() { - return flags; - } - - /** - * Set the flags. - * - * @param flags - * the flags to set - */ - public void setFlags(Map<String, String> flags) { - this.flags = flags; - } - @Override public String toString() { return "CommonHeader [timeStamp=" + timeStamp + ", apiVer=" + apiVer @@ -256,13 +147,9 @@ public class PciCommonHeader implements Serializable { return false; } if (timeStamp == null) { - if (other.timeStamp != null) { - return false; - } - } else if (!timeStamp.equals(other.timeStamp)) { - return false; + return other.timeStamp == null; + } else { + return timeStamp.equals(other.timeStamp); } - return true; } - } diff --git a/models-interactions/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/PciRequest.java b/models-interactions/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/PciRequest.java index d76dd88b5..d1430a7dc 100644 --- a/models-interactions/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/PciRequest.java +++ b/models-interactions/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/PciRequest.java @@ -25,7 +25,11 @@ package org.onap.policy.sdnr; import com.google.gson.annotations.SerializedName; import java.io.Serializable; +import lombok.Getter; +import lombok.Setter; +@Getter +@Setter public class PciRequest implements Serializable { private static final long serialVersionUID = 323235565922846624L; @@ -133,13 +137,9 @@ public class PciRequest implements Serializable { return false; } if (payload == null) { - if (other.payload != null) { - return false; - } - } else if (!payload.equals(other.payload)) { - return false; + return other.payload == null; + } else { + return payload.equals(other.payload); } - return true; } - } diff --git a/models-interactions/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/PciRequestWrapper.java b/models-interactions/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/PciRequestWrapper.java index b762b5032..4de3a0d30 100644 --- a/models-interactions/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/PciRequestWrapper.java +++ b/models-interactions/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/PciRequestWrapper.java @@ -21,15 +21,16 @@ package org.onap.policy.sdnr; -import com.google.gson.annotations.SerializedName; - import java.io.Serializable; +import lombok.Getter; +import lombok.Setter; +@Getter +@Setter public class PciRequestWrapper extends PciWrapper implements Serializable { private static final long serialVersionUID = 879766924715980798L; - @SerializedName(value = "body") private PciRequest body; public PciRequestWrapper() { @@ -40,25 +41,6 @@ public class PciRequestWrapper extends PciWrapper implements Serializable { body = request; } - /** - * Get the body. - * - * @return the body - */ - public PciRequest getBody() { - return body; - } - - /** - * Set the body. - * - * @param body - * the body to set - */ - public void setBody(PciRequest body) { - this.body = body; - } - @Override public String toString() { return "RequestWrapper [body=" + body + ", toString()=" + super.toString() + "]"; @@ -85,13 +67,9 @@ public class PciRequestWrapper extends PciWrapper implements Serializable { } PciRequestWrapper other = (PciRequestWrapper) obj; if (body == null) { - if (other.body != null) { - return false; - } - } else if (!body.equals(other.body)) { - return false; + return other.body == null; + } else { + return body.equals(other.body); } - return true; } - } diff --git a/models-interactions/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/PciResponse.java b/models-interactions/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/PciResponse.java index b9b8f9b44..0bc2eb4cf 100644 --- a/models-interactions/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/PciResponse.java +++ b/models-interactions/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/PciResponse.java @@ -24,7 +24,11 @@ package org.onap.policy.sdnr; import com.google.gson.annotations.SerializedName; import java.io.Serializable; +import lombok.Getter; +import lombok.Setter; +@Getter +@Setter public class PciResponse implements Serializable { private static final long serialVersionUID = 8375708697287669750L; @@ -51,59 +55,6 @@ public class PciResponse implements Serializable { */ public PciResponse(PciRequest request) { this.commonHeader = new PciCommonHeader(request.getCommonHeader()); - - } - - /** - * Get the common header. - * - * @return the commonHeader - */ - public PciCommonHeader getCommonHeader() { - return commonHeader; - } - - /** - * Set the common header. - * - * @param commonHeader - * the commonHeader to set - */ - public void setCommonHeader(PciCommonHeader commonHeader) { - this.commonHeader = commonHeader; - } - - /** - * Get the status. - * - * @return the status - */ - public Status getStatus() { - return status; - } - - /** - * Set the status. - * - * @param status - * the status to set - */ - public void setStatus(Status status) { - this.status = status; - } - - /** - * Get the payload. - * - * @return the payload - */ - - public String getPayload() { - return payload; - } - - public void setPayload(String payload) { - this.payload = payload; } @Override @@ -149,12 +100,9 @@ public class PciResponse implements Serializable { return false; } if (status == null) { - if (other.status != null) { - return false; - } - } else if (!status.equals(other.status)) { - return false; + return other.status == null; + } else { + return status.equals(other.status); } - return true; } } diff --git a/models-interactions/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/PciResponseWrapper.java b/models-interactions/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/PciResponseWrapper.java index cf2e1e32b..e1613645d 100644 --- a/models-interactions/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/PciResponseWrapper.java +++ b/models-interactions/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/PciResponseWrapper.java @@ -21,40 +21,22 @@ package org.onap.policy.sdnr; -import com.google.gson.annotations.SerializedName; - import java.io.Serializable; +import lombok.Getter; +import lombok.Setter; +@Getter +@Setter public class PciResponseWrapper extends PciWrapper implements Serializable { private static final long serialVersionUID = 109837814781086802L; - @SerializedName(value = "body") private PciResponse body; public PciResponseWrapper() { super(); } - /** - * Get the body. - * - * @return the body - */ - public PciResponse getBody() { - return body; - } - - /** - * Set the body. - * - * @param body - * the body to set - */ - public void setBody(PciResponse body) { - this.body = body; - } - @Override public String toString() { return "ResponseWrapper [body=" + body + ", toString()=" + super.toString() + "]"; @@ -81,12 +63,9 @@ public class PciResponseWrapper extends PciWrapper implements Serializable { } PciResponseWrapper other = (PciResponseWrapper) obj; if (body == null) { - if (other.body != null) { - return false; - } - } else if (!body.equals(other.body)) { - return false; + return other.body == null; + } else { + return body.equals(other.body); } - return true; } } diff --git a/models-interactions/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/PciWrapper.java b/models-interactions/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/PciWrapper.java index fd9bb937f..cf0a8a711 100644 --- a/models-interactions/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/PciWrapper.java +++ b/models-interactions/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/PciWrapper.java @@ -24,12 +24,15 @@ package org.onap.policy.sdnr; import com.google.gson.annotations.SerializedName; import java.io.Serializable; +import lombok.Getter; +import lombok.Setter; +@Getter +@Setter public class PciWrapper implements Serializable { private static final long serialVersionUID = 375215806432396532L; - @SerializedName(value = "version") private String version; @SerializedName(value = "cambria-partition") @@ -41,103 +44,12 @@ public class PciWrapper implements Serializable { @SerializedName(value = "correlation-id") private String correlationId; - @SerializedName(value = "type") private String type; public PciWrapper() { // Create a default PciWrapper instance } - /** - * Get the version. - * - * @return the version - */ - public String getVersion() { - return version; - } - - /** - * Set the version. - * - * @param version the version to set - */ - public void setVersion(String version) { - this.version = version; - } - - /** - * Get the cambria partition. - * - * @return the cambriaPartition - */ - public String getCambriaPartition() { - return cambriaPartition; - } - - /** - * Set the cambria partition. - * - * @param cambriaPartition the cambriaPartition to set - */ - public void setCambriaPartition(String cambriaPartition) { - this.cambriaPartition = cambriaPartition; - } - - /** - * Get the RPN name. - * - * @return the rpcName - */ - public String getRpcName() { - return rpcName; - } - - /** - * Set the RPC name. - * - * @param rpcName the rpcName to set - */ - public void setRpcName(String rpcName) { - this.rpcName = rpcName; - } - - /** - * Get the correlation Id. - * - * @return the correlationId - */ - public String getCorrelationId() { - return correlationId; - } - - /** - * Set the correclation Id. - * - * @param correlationId the correlationId to set - */ - public void setCorrelationId(String correlationId) { - this.correlationId = correlationId; - } - - /** - * Get the type. - * - * @return the type - */ - public String getType() { - return type; - } - - /** - * Set the type. - * - * @param type the type to set - */ - public void setType(String type) { - this.type = type; - } - @Override public String toString() { return "Wrapper [version=" + version + ", cambriaPartition=" + cambriaPartition + ", rpcName=" + rpcName @@ -197,13 +109,9 @@ public class PciWrapper implements Serializable { return false; } if (version == null) { - if (other.version != null) { - return false; - } - } else if (!version.equals(other.version)) { - return false; + return other.version == null; + } else { + return version.equals(other.version); } - return true; } - } diff --git a/models-interactions/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/Status.java b/models-interactions/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/Status.java index 7b975cf65..a8fe379e7 100644 --- a/models-interactions/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/Status.java +++ b/models-interactions/model-impl/sdnr/src/main/java/org/onap/policy/sdnr/Status.java @@ -24,7 +24,11 @@ package org.onap.policy.sdnr; import com.google.gson.annotations.SerializedName; import java.io.Serializable; +import lombok.Getter; +import lombok.Setter; +@Getter +@Setter public class Status implements Serializable { private static final long serialVersionUID = 877641506135467199L; @@ -49,22 +53,6 @@ public class Status implements Serializable { this.value = value; } - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - @Override public String toString() { return "Status [code = " + code + ", value = " + value + "]"; @@ -95,13 +83,9 @@ public class Status implements Serializable { return false; } if (value == null) { - if (other.value != null) { - return false; - } - } else if (!value.equals(other.value)) { - return false; + return other.value == null; + } else { + return value.equals(other.value); } - return true; } - } diff --git a/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoAsyncRequestStatus.java b/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoAsyncRequestStatus.java index e3139667c..7475c8ad4 100644 --- a/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoAsyncRequestStatus.java +++ b/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoAsyncRequestStatus.java @@ -21,106 +21,27 @@ package org.onap.policy.so; -import com.google.gson.annotations.SerializedName; - import java.io.Serializable; import java.time.LocalDateTime; +import lombok.Getter; +import lombok.Setter; +@Getter +@Setter public class SoAsyncRequestStatus implements Serializable { private static final long serialVersionUID = -3283942659786236032L; - @SerializedName("correlator") private String correlator; - - @SerializedName("requestId") private String requestId; - - @SerializedName("instanceReferences") private SoInstanceReferences instanceReferences; - - @SerializedName("startTime") private LocalDateTime startTime; - - @SerializedName("finishTime") private LocalDateTime finishTime; - - @SerializedName("requestScope") private String requestScope; - - @SerializedName("requestType") private String requestType; - - @SerializedName("requestStatus") private SoRequestStatus requestStatus; public SoAsyncRequestStatus() { // required by author } - - public String getCorrelator() { - return correlator; - } - - - public LocalDateTime getFinishTime() { - return finishTime; - } - - public SoInstanceReferences getInstanceReferences() { - return instanceReferences; - } - - public String getRequestId() { - return requestId; - } - - public String getRequestScope() { - return requestScope; - } - - public SoRequestStatus getRequestStatus() { - return requestStatus; - } - - public String getRequestType() { - return requestType; - } - - public LocalDateTime getStartTime() { - return startTime; - } - - public void setCorrelator(String correlator) { - this.correlator = correlator; - } - - public void setFinishTime(LocalDateTime finishTime) { - this.finishTime = finishTime; - } - - public void setInstanceReferences(SoInstanceReferences instanceReferences) { - this.instanceReferences = instanceReferences; - } - - public void setRequestId(String requestId) { - this.requestId = requestId; - } - - public void setRequestScope(String requestScope) { - this.requestScope = requestScope; - } - - public void setRequestStatus(SoRequestStatus requestStatus) { - this.requestStatus = requestStatus; - } - - public void setRequestType(String requestType) { - this.requestType = requestType; - } - - public void setStartTime(LocalDateTime startTime) { - this.startTime = startTime; - } - } diff --git a/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoCloudConfiguration.java b/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoCloudConfiguration.java index 8e51bc7f4..a991e702b 100644 --- a/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoCloudConfiguration.java +++ b/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoCloudConfiguration.java @@ -21,38 +21,20 @@ package org.onap.policy.so; -import com.google.gson.annotations.SerializedName; - import java.io.Serializable; +import lombok.Getter; +import lombok.Setter; +@Getter +@Setter public class SoCloudConfiguration implements Serializable { private static final long serialVersionUID = -3283942659786236032L; - @SerializedName("lcpCloudRegionId") private String lcpCloudRegionId; - - @SerializedName("tenantId") private String tenantId; public SoCloudConfiguration() { //required by author } - - public String getLcpCloudRegionId() { - return lcpCloudRegionId; - } - - public String getTenantId() { - return tenantId; - } - - public void setLcpCloudRegionId(String lcpCloudRegionId) { - this.lcpCloudRegionId = lcpCloudRegionId; - } - - public void setTenantId(String tenantId) { - this.tenantId = tenantId; - } - } diff --git a/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoInstanceReferences.java b/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoInstanceReferences.java index 06415d56e..5d1b37365 100644 --- a/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoInstanceReferences.java +++ b/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoInstanceReferences.java @@ -21,38 +21,20 @@ package org.onap.policy.so; -import com.google.gson.annotations.SerializedName; - import java.io.Serializable; +import lombok.Getter; +import lombok.Setter; +@Getter +@Setter public class SoInstanceReferences implements Serializable { private static final long serialVersionUID = -3283942659786236032L; - @SerializedName("requestId") private String requestId; - - @SerializedName("instanceId") private String instanceId; public SoInstanceReferences() { - //requried by author - } - - public String getInstanceId() { - return instanceId; - } - - public String getRequestId() { - return requestId; + //required by author } - - public void setInstanceId(String instanceId) { - this.instanceId = instanceId; - } - - public void setRequestId(String requestId) { - this.requestId = requestId; - } - } diff --git a/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoModelInfo.java b/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoModelInfo.java index 06080faad..785f341c3 100644 --- a/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoModelInfo.java +++ b/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoModelInfo.java @@ -21,93 +21,25 @@ package org.onap.policy.so; -import com.google.gson.annotations.SerializedName; - import java.io.Serializable; +import lombok.Getter; +import lombok.Setter; +@Getter +@Setter public class SoModelInfo implements Serializable { private static final long serialVersionUID = -3283942659786236032L; - @SerializedName("modelType") private String modelType; - - @SerializedName("modelInvariantId") private String modelInvariantId; - - @SerializedName("modelVersionId") private String modelVersionId; - - @SerializedName("modelName") private String modelName; - - @SerializedName("modelVersion") private String modelVersion; - - @SerializedName("modelCustomizationName") private String modelCustomizationName; - - @SerializedName("modelCustomizationId") private String modelCustomizationId; public SoModelInfo() { //required by author } - - public String getModelCustomizationId() { - return modelCustomizationId; - } - - public String getModelCustomizationName() { - return modelCustomizationName; - } - - public String getModelInvariantId() { - return modelInvariantId; - } - - public String getModelName() { - return modelName; - } - - public String getModelType() { - return modelType; - } - - public String getModelVersion() { - return modelVersion; - } - - public String getModelVersionId() { - return modelVersionId; - } - - public void setModelCustomizationId(String modelCustomizationId) { - this.modelCustomizationId = modelCustomizationId; - } - - public void setModelCustomizationName(String modelCustomizationName) { - this.modelCustomizationName = modelCustomizationName; - } - - public void setModelInvariantId(String modelInvariantId) { - this.modelInvariantId = modelInvariantId; - } - - public void setModelName(String modelName) { - this.modelName = modelName; - } - - public void setModelType(String modelType) { - this.modelType = modelType; - } - - public void setModelVersion(String modelVersion) { - this.modelVersion = modelVersion; - } - - public void setModelVersionId(String modelVersionId) { - this.modelVersionId = modelVersionId; - } - } diff --git a/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoPolicyExceptionHolder.java b/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoPolicyExceptionHolder.java index 69861fb28..173a6e03b 100644 --- a/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoPolicyExceptionHolder.java +++ b/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoPolicyExceptionHolder.java @@ -21,38 +21,20 @@ package org.onap.policy.so; -import com.google.gson.annotations.SerializedName; - import java.io.Serializable; +import lombok.Getter; +import lombok.Setter; +@Getter +@Setter public class SoPolicyExceptionHolder implements Serializable { private static final long serialVersionUID = -3283942659786236032L; - @SerializedName("messageId") private String messageId; - - @SerializedName("text") private String text; public SoPolicyExceptionHolder() { //required by author } - - public String getMessageId() { - return messageId; - } - - public String getText() { - return text; - } - - public void setMessageId(String messageId) { - this.messageId = messageId; - } - - public void setText(String text) { - this.text = text; - } - } diff --git a/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoRelatedInstance.java b/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoRelatedInstance.java index 083e73805..044853f1f 100644 --- a/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoRelatedInstance.java +++ b/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoRelatedInstance.java @@ -21,51 +21,21 @@ package org.onap.policy.so; -import com.google.gson.annotations.SerializedName; - import java.io.Serializable; +import lombok.Getter; +import lombok.Setter; +@Getter +@Setter public class SoRelatedInstance implements Serializable { private static final long serialVersionUID = -3283942659786236032L; - @SerializedName("instanceId") private String instanceId; - - @SerializedName("instanceName") private String instanceName; - - @SerializedName("modelInfo") private SoModelInfo modelInfo; public SoRelatedInstance() { //required by author } - - public String getInstanceId() { - return instanceId; - } - - - public String getInstanceName() { - return instanceName; - } - - public SoModelInfo getModelInfo() { - return modelInfo; - } - - public void setInstanceId(String instanceId) { - this.instanceId = instanceId; - } - - public void setInstanceName(String instanceName) { - this.instanceName = instanceName; - } - - - public void setModelInfo(SoModelInfo modelInfo) { - this.modelInfo = modelInfo; - } - } diff --git a/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoRelatedInstanceListElement.java b/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoRelatedInstanceListElement.java index bb8efa89f..8cfaf86b6 100644 --- a/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoRelatedInstanceListElement.java +++ b/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoRelatedInstanceListElement.java @@ -21,27 +21,18 @@ package org.onap.policy.so; -import com.google.gson.annotations.SerializedName; - import java.io.Serializable; +import lombok.Getter; +import lombok.Setter; +@Getter +@Setter public class SoRelatedInstanceListElement implements Serializable { private static final long serialVersionUID = -3283942659786236032L; - - @SerializedName("relatedInstance") private SoRelatedInstance relatedInstance; public SoRelatedInstanceListElement() { //required by author } - - public SoRelatedInstance getRelatedInstance() { - return relatedInstance; - } - - public void setRelatedInstance(SoRelatedInstance relatedInstance) { - this.relatedInstance = relatedInstance; - } - } diff --git a/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoRequest.java b/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoRequest.java index b33db457e..8e28cc33c 100644 --- a/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoRequest.java +++ b/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoRequest.java @@ -21,35 +21,24 @@ package org.onap.policy.so; -import com.google.gson.annotations.SerializedName; - import java.io.Serializable; import java.time.LocalDateTime; import java.util.UUID; +import lombok.Getter; +import lombok.Setter; +@Getter +@Setter public class SoRequest implements Serializable { private static final long serialVersionUID = -3283942659786236032L; - @SerializedName("requestId") private UUID requestId; - - @SerializedName("startTime") private String startTime; - - @SerializedName("finishTime") private LocalDateTime finishTime; - - @SerializedName("requestScope") private String requestScope; - - @SerializedName("requestType") private String requestType; - - @SerializedName("requestDetails") private SoRequestDetails requestDetails; - - @SerializedName("requestStatus") private SoRequestStatus requestStatus; private transient SoOperationType operationType; @@ -57,68 +46,4 @@ public class SoRequest implements Serializable { public SoRequest() { // required by author } - - public LocalDateTime getFinishTime() { - return finishTime; - } - - public SoRequestDetails getRequestDetails() { - return requestDetails; - } - - public UUID getRequestId() { - return requestId; - } - - public String getRequestScope() { - return requestScope; - } - - public SoRequestStatus getRequestStatus() { - return requestStatus; - } - - public String getRequestType() { - return requestType; - } - - public String getStartTime() { - return startTime; - } - - public void setFinishTime(LocalDateTime finishTime) { - this.finishTime = finishTime; - } - - public void setRequestDetails(SoRequestDetails requestDetails) { - this.requestDetails = requestDetails; - } - - public void setRequestId(UUID requestId) { - this.requestId = requestId; - } - - public void setRequestScope(String requestScope) { - this.requestScope = requestScope; - } - - public void setRequestStatus(SoRequestStatus requestStatus) { - this.requestStatus = requestStatus; - } - - public void setRequestType(String requestType) { - this.requestType = requestType; - } - - public void setStartTime(String startTime) { - this.startTime = startTime; - } - - public SoOperationType getOperationType() { - return operationType; - } - - public void setOperationType(SoOperationType operationType) { - this.operationType = operationType; - } } diff --git a/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoRequestDetails.java b/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoRequestDetails.java index 2e94a66c4..3fa3332b3 100644 --- a/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoRequestDetails.java +++ b/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoRequestDetails.java @@ -21,40 +21,28 @@ package org.onap.policy.so; -import com.google.gson.annotations.SerializedName; - import java.io.Serializable; import java.util.LinkedList; import java.util.List; import java.util.Map; +import lombok.Getter; +import lombok.Setter; +@Getter +@Setter public class SoRequestDetails implements Serializable { private static final long serialVersionUID = -3283942659786236032L; - @SerializedName("modelInfo") private SoModelInfo modelInfo; - - @SerializedName("cloudConfiguration") private SoCloudConfiguration cloudConfiguration; - - @SerializedName("requestInfo") private SoRequestInfo requestInfo; - - @SerializedName("subscriberInfo") private SoSubscriberInfo subscriberInfo; - - @SerializedName("relatedInstanceList") private List<SoRelatedInstanceListElement> relatedInstanceList = new LinkedList<>(); - - @SerializedName("requestParameters") private SoRequestParameters requestParameters; - - @SerializedName("configurationParameters") private List<Map<String, String>> configurationParameters = new LinkedList<>(); public SoRequestDetails() { - } /** @@ -126,41 +114,10 @@ public class SoRequestDetails implements Serializable { return false; } if (subscriberInfo == null) { - if (other.subscriberInfo != null) { - return false; - } - } else if (!subscriberInfo.equals(other.subscriberInfo)) { - return false; + return other.subscriberInfo == null; + } else { + return subscriberInfo.equals(other.subscriberInfo); } - return true; - } - - public SoCloudConfiguration getCloudConfiguration() { - return cloudConfiguration; - } - - public SoModelInfo getModelInfo() { - return modelInfo; - } - - public List<SoRelatedInstanceListElement> getRelatedInstanceList() { - return relatedInstanceList; - } - - public SoRequestInfo getRequestInfo() { - return requestInfo; - } - - public SoRequestParameters getRequestParameters() { - return requestParameters; - } - - public List<Map<String, String>> getConfigurationParameters() { - return configurationParameters; - } - - public SoSubscriberInfo getSubscriberInfo() { - return subscriberInfo; } @Override @@ -177,34 +134,6 @@ public class SoRequestDetails implements Serializable { return result; } - public void setCloudConfiguration(SoCloudConfiguration cloudConfiguration) { - this.cloudConfiguration = cloudConfiguration; - } - - public void setModelInfo(SoModelInfo modelInfo) { - this.modelInfo = modelInfo; - } - - public void setRequestInfo(SoRequestInfo requestInfo) { - this.requestInfo = requestInfo; - } - - public void setRequestParameters(SoRequestParameters requestParameters) { - this.requestParameters = requestParameters; - } - - public void setConfigurationParameters(List<Map<String, String>> configurationParameters) { - this.configurationParameters = configurationParameters; - } - - public void setSubscriberInfo(SoSubscriberInfo subscriberInfo) { - this.subscriberInfo = subscriberInfo; - } - - public void setRelatedInstanceList(List<SoRelatedInstanceListElement> relatedInstanceList) { - this.relatedInstanceList = relatedInstanceList; - } - @Override public String toString() { return "SORequestDetails [modelInfo=" + modelInfo + ", cloudConfiguration=" + cloudConfiguration diff --git a/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoRequestError.java b/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoRequestError.java index 8b6e2169d..2f9f13589 100644 --- a/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoRequestError.java +++ b/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoRequestError.java @@ -21,38 +21,20 @@ package org.onap.policy.so; -import com.google.gson.annotations.SerializedName; - import java.io.Serializable; +import lombok.Getter; +import lombok.Setter; +@Getter +@Setter public class SoRequestError implements Serializable { private static final long serialVersionUID = -3283942659786236032L; - @SerializedName("policyException") private SoPolicyExceptionHolder policyException; - - @SerializedName("serviceException") private SoServiceExceptionHolder serviceException; public SoRequestError() { // required by author } - - public SoPolicyExceptionHolder getPolicyException() { - return policyException; - } - - public SoServiceExceptionHolder getServiceException() { - return serviceException; - } - - public void setPolicyException(SoPolicyExceptionHolder policyException) { - this.policyException = policyException; - } - - public void setServiceException(SoServiceExceptionHolder serviceException) { - this.serviceException = serviceException; - } - } diff --git a/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoRequestInfo.java b/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoRequestInfo.java index 148e68097..b6a840c45 100644 --- a/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoRequestInfo.java +++ b/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoRequestInfo.java @@ -21,126 +21,28 @@ package org.onap.policy.so; -import com.google.gson.annotations.SerializedName; - import java.io.Serializable; +import lombok.Getter; +import lombok.Setter; +@Getter +@Setter public class SoRequestInfo implements Serializable { private static final long serialVersionUID = -3283942659786236032L; - @SerializedName("instanceName") private String instanceName; - - @SerializedName("source") private String source; - - @SerializedName("productFamilyId") private String productFamilyId; - - @SerializedName("suppressRollback") private boolean suppressRollback; - - @SerializedName("billingAccountNumber") private String billingAccountNumber; - - @SerializedName("callbackUrl") private String callbackUrl; - - @SerializedName("correlator") private String correlator; - - @SerializedName("orderNumber") private String orderNumber; - - @SerializedName("orderVersion") private Integer orderVersion; - - @SerializedName("requestorId") private String requestorId; public SoRequestInfo() { // required by author } - - public String getBillingAccountNumber() { - return billingAccountNumber; - } - - public String getCallbackUrl() { - return callbackUrl; - } - - public String getCorrelator() { - return correlator; - } - - public String getInstanceName() { - return instanceName; - } - - public String getOrderNumber() { - return orderNumber; - } - - public Integer getOrderVersion() { - return orderVersion; - } - - public String getProductFamilyId() { - return productFamilyId; - } - - public String getRequestorId() { - return requestorId; - } - - public String getSource() { - return source; - } - - public boolean isSuppressRollback() { - return suppressRollback; - } - - public void setBillingAccountNumber(String billingAccountNumber) { - this.billingAccountNumber = billingAccountNumber; - } - - public void setCallbackUrl(String callbackUrl) { - this.callbackUrl = callbackUrl; - } - - public void setCorrelator(String correlator) { - this.correlator = correlator; - } - - public void setInstanceName(String instanceName) { - this.instanceName = instanceName; - } - - public void setOrderNumber(String orderNumber) { - this.orderNumber = orderNumber; - } - - public void setOrderVersion(Integer orderVersion) { - this.orderVersion = orderVersion; - } - - public void setProductFamilyId(String productFamilyId) { - this.productFamilyId = productFamilyId; - } - - public void setRequestorId(String requestorId) { - this.requestorId = requestorId; - } - - public void setSource(String source) { - this.source = source; - } - - public void setSuppressRollback(boolean suppressRollback) { - this.suppressRollback = suppressRollback; - } - } diff --git a/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoRequestParameters.java b/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoRequestParameters.java index 2db4e1a03..e9451e2ae 100644 --- a/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoRequestParameters.java +++ b/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoRequestParameters.java @@ -21,52 +21,24 @@ package org.onap.policy.so; -import com.google.gson.annotations.SerializedName; - import java.io.Serializable; import java.util.LinkedList; import java.util.List; import java.util.Map; +import lombok.Getter; +import lombok.Setter; +@Getter +@Setter public class SoRequestParameters implements Serializable { private static final long serialVersionUID = -3283942659786236033L; - @SerializedName("subscriptionServiceType") private String subscriptionServiceType; - - @SerializedName("usePreload") private boolean usePreload; - - @SerializedName("userParams") private List<Map<String, String>> userParams = new LinkedList<>(); public SoRequestParameters() { // required by author } - - public String getSubscriptionServiceType() { - return subscriptionServiceType; - } - - public boolean isUsePreload() { - return usePreload; - } - - public List<Map<String, String>> getUserParams() { - return userParams; - } - - public void setSubscriptionServiceType(String subscriptionServiceType) { - this.subscriptionServiceType = subscriptionServiceType; - } - - public void setUsePreload(boolean usePreload) { - this.usePreload = usePreload; - } - - public void setUserParams(List<Map<String, String>> userParams) { - this.userParams = userParams; - } - } diff --git a/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoRequestReferences.java b/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoRequestReferences.java index 82372e57a..a1bdbdf62 100644 --- a/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoRequestReferences.java +++ b/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoRequestReferences.java @@ -21,34 +21,16 @@ package org.onap.policy.so; -import com.google.gson.annotations.SerializedName; - import java.io.Serializable; +import lombok.Getter; +import lombok.Setter; +@Getter +@Setter public class SoRequestReferences implements Serializable { private static final long serialVersionUID = -3283942659786236032L; - @SerializedName("instanceId") private String instanceId; - - @SerializedName("requestId") private String requestId; - - public String getInstanceId() { - return instanceId; - } - - public String getRequestId() { - return requestId; - } - - public void setInstanceId(String instanceId) { - this.instanceId = instanceId; - } - - public void setRequestId(String requestId) { - this.requestId = requestId; - } - } diff --git a/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoRequestStatus.java b/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoRequestStatus.java index 4636a7502..8accc5d3d 100644 --- a/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoRequestStatus.java +++ b/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoRequestStatus.java @@ -21,60 +21,22 @@ package org.onap.policy.so; -import com.google.gson.annotations.SerializedName; - import java.io.Serializable; +import lombok.Getter; +import lombok.Setter; +@Getter +@Setter public class SoRequestStatus implements Serializable { private static final long serialVersionUID = -3283942659786236032L; - @SerializedName("percentProgress") private int percentProgress; - - @SerializedName("requestState") private String requestState; - - @SerializedName("timestamp") private String timestamp; - - @SerializedName("wasRolledBack") private boolean wasRolledBack; public SoRequestStatus() { //required by author } - - public int getPercentProgress() { - return percentProgress; - } - - public String getRequestState() { - return requestState; - } - - public String getTimestamp() { - return timestamp; - } - - public boolean isWasRolledBack() { - return wasRolledBack; - } - - public void setPercentProgress(int percentProgress) { - this.percentProgress = percentProgress; - } - - public void setRequestState(String requestState) { - this.requestState = requestState; - } - - public void setTimestamp(String timestamp) { - this.timestamp = timestamp; - } - - public void setWasRolledBack(boolean wasRolledBack) { - this.wasRolledBack = wasRolledBack; - } - } diff --git a/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoResponse.java b/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoResponse.java index 7d9a0a969..22079b515 100644 --- a/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoResponse.java +++ b/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoResponse.java @@ -21,59 +21,22 @@ package org.onap.policy.so; -import com.google.gson.annotations.SerializedName; - import java.io.Serializable; +import lombok.Getter; +import lombok.Setter; +@Getter +@Setter public class SoResponse implements Serializable { private static final long serialVersionUID = -3283942659786236032L; - @SerializedName("requestReferences") private SoRequestReferences requestReferences; - - @SerializedName("requestError") private SoRequestError requestError; - - @SerializedName("request") private SoRequest request; - private int httpResponseCode; public SoResponse() { // required by author } - - public int getHttpResponseCode() { - return httpResponseCode; - } - - public SoRequest getRequest() { - return request; - } - - public SoRequestError getRequestError() { - return requestError; - } - - public SoRequestReferences getRequestReferences() { - return requestReferences; - } - - public void setHttpResponseCode(int httpResponseCode) { - this.httpResponseCode = httpResponseCode; - } - - public void setRequest(SoRequest request) { - this.request = request; - } - - public void setRequestError(SoRequestError requestError) { - this.requestError = requestError; - } - - public void setRequestReferences(SoRequestReferences requestReferences) { - this.requestReferences = requestReferences; - } - } diff --git a/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoResponseWrapper.java b/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoResponseWrapper.java index 1ecba5f83..e4085feb0 100644 --- a/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoResponseWrapper.java +++ b/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoResponseWrapper.java @@ -24,7 +24,11 @@ package org.onap.policy.so; import com.google.gson.annotations.SerializedName; import java.io.Serializable; +import lombok.Getter; +import lombok.Setter; +@Getter +@Setter public class SoResponseWrapper implements Serializable { private static final long serialVersionUID = 7673023687132889069L; @@ -55,27 +59,14 @@ public class SoResponseWrapper implements Serializable { if (other.soResponse != null) { return false; } - } - else if (!soResponse.equals(other.soResponse)) { + } else if (!soResponse.equals(other.soResponse)) { return false; } if (requestId == null) { - if (other.requestId != null) { - return false; - } + return other.requestId == null; + } else { + return requestId.equals(other.requestId); } - else if (!requestId.equals(other.requestId)) { - return false; - } - return true; - } - - public String getRequestId() { - return requestId; - } - - public SoResponse getSoResponse() { - return soResponse; } @Override @@ -87,14 +78,6 @@ public class SoResponseWrapper implements Serializable { return result; } - public void setRequestId(String requestId) { - this.requestId = requestId; - } - - public void setSoResponse(SoResponse response) { - soResponse = response; - } - @Override public String toString() { return "SOResponseWrapper [SOResponse=" + soResponse + ", RequestId=" + requestId + "]"; diff --git a/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoServiceExceptionHolder.java b/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoServiceExceptionHolder.java index 12747d373..78390d7cb 100644 --- a/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoServiceExceptionHolder.java +++ b/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoServiceExceptionHolder.java @@ -21,47 +21,23 @@ package org.onap.policy.so; -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 SoServiceExceptionHolder implements Serializable { private static final long serialVersionUID = -3283942659786236032L; - @SerializedName("messageId") private String messageId; - - @SerializedName("text") private String text; - - @SerializedName("variables") private List<String> variables = new LinkedList<>(); public SoServiceExceptionHolder() { // required by author } - - public String getMessageId() { - return messageId; - } - - public String getText() { - return text; - } - - public List<String> getVariables() { - return variables; - } - - public void setMessageId(String messageId) { - this.messageId = messageId; - } - - public void setText(String text) { - this.text = text; - } - } diff --git a/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoSubscriberInfo.java b/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoSubscriberInfo.java index 61bb900fa..2e85410c3 100644 --- a/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoSubscriberInfo.java +++ b/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoSubscriberInfo.java @@ -21,49 +21,21 @@ package org.onap.policy.so; -import com.google.gson.annotations.SerializedName; - import java.io.Serializable; +import lombok.Getter; +import lombok.Setter; +@Getter +@Setter public class SoSubscriberInfo implements Serializable { private static final long serialVersionUID = -3283942659786236032L; - @SerializedName("globalSubscriberId") private String globalSubscriberId; - - @SerializedName("subscriberCommonSiteId") private String subscriberCommonSiteId; - - @SerializedName("subscriberName") private String subscriberName; public SoSubscriberInfo() { //required by author } - - public String getGlobalSubscriberId() { - return globalSubscriberId; - } - - public String getSubscriberCommonSiteId() { - return subscriberCommonSiteId; - } - - public String getSubscriberName() { - return subscriberName; - } - - public void setGlobalSubscriberId(String globalSubscriberId) { - this.globalSubscriberId = globalSubscriberId; - } - - public void setSubscriberCommonSiteId(String subscriberCommonSiteId) { - this.subscriberCommonSiteId = subscriberCommonSiteId; - } - - public void setSubscriberName(String subscriberName) { - this.subscriberName = subscriberName; - } - } 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; - } } |