From e6849326d5232250e55be83206573a19ad0c68ea Mon Sep 17 00:00:00 2001 From: Fiete Ostkamp Date: Mon, 23 Mar 2026 15:51:05 +0100 Subject: [PATCH] Reduce line count by using lombok for large java classes - use lombok's @Getter and @Setter in the largest java classes to reduce boilerplate code Issue-ID: SDC-4814 Change-Id: I606f422bf2d0af5d438ecfde432b50b93983beb4 Signed-off-by: Fiete Ostkamp --- .../distribution/engine/DmaapClientFactory.java | 2 +- .../engine/JsonContainerResourceInstance.java | 85 +----- .../sdc/be/config/DmaapConsumerConfiguration.java | 267 +---------------- integration-tests/pom.xml | 2 +- .../ci/tests/datatypes/ArtifactReqDetails.java | 133 +-------- .../ci/tests/datatypes/ComponentReqDetails.java | 181 +----------- .../ci/tests/datatypes/PropertyReqDetails.java | 77 +---- .../ci/tests/datatypes/ResourceRespJavaObject.java | 268 +---------------- .../ci/tests/datatypes/ServiceRespJavaObject.java | 183 +----------- .../VendorSoftwareProductObjectReqDetails.java | 128 +-------- .../datatypes/expected/ExpectedArtifactAudit.java | 140 +-------- .../datatypes/expected/ExpectedCategoryAudit.java | 113 +------- .../expected/ExpectedResourceAuditJavaObject.java | 316 +++++---------------- .../tosca/datatypes/ToscaMetadataDefinition.java | 156 +--------- .../org/openecomp/sdc/action/types/Action.java | 118 +------- .../dao/types/EntitlementPoolEntity.java | 137 +-------- .../dao/types/LicenseKeyGroupEntity.java | 142 +-------- .../sdc/vendorlicense/dao/types/LimitEntity.java | 115 +------- 18 files changed, 202 insertions(+), 2361 deletions(-) diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/DmaapClientFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/DmaapClientFactory.java index 593bf5194d..b860f9243b 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/DmaapClientFactory.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/DmaapClientFactory.java @@ -91,7 +91,7 @@ public class DmaapClientFactory { props.setProperty("id", parameters.getConsumerId()); props.setProperty("timeout", Integer.toString(parameters.getTimeoutMs())); props.setProperty("limit", Integer.toString(parameters.getLimit())); - props.setProperty("AFT_DME2_REQ_TRACE_ON", Boolean.toString(parameters.isDme2TraceOn())); + props.setProperty("AFT_DME2_REQ_TRACE_ON", Boolean.toString(parameters.getDme2TraceOn())); props.setProperty("AFT_ENVIRONMENT", parameters.getAftEnvironment()); props.setProperty("AFT_DME2_EP_CONN_TIMEOUT", Integer.toString(parameters.getAftDme2ConnectionTimeoutMs())); props.setProperty("AFT_DME2_ROUNDTRIP_TIMEOUT_MS", Integer.toString(parameters.getAftDme2RoundtripTimeoutMs())); diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/JsonContainerResourceInstance.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/JsonContainerResourceInstance.java index c4b51ffaac..c41dda7511 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/JsonContainerResourceInstance.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/JsonContainerResourceInstance.java @@ -22,6 +22,11 @@ package org.openecomp.sdc.be.components.distribution.engine; import java.util.List; import org.openecomp.sdc.be.model.ComponentInstance; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter public class JsonContainerResourceInstance { private String resourceInstanceName; @@ -59,86 +64,6 @@ public class JsonContainerResourceInstance { this.resourceCustomizationUUID = resourceInstance.getCustomizationUUID(); } - public String getResourceInstanceName() { - return resourceInstanceName; - } - - public void setResourceInstanceName(String resourceInstanceName) { - this.resourceInstanceName = resourceInstanceName; - } - - public String getResourceName() { - return resourceName; - } - - public void setResourceName(String resourceName) { - this.resourceName = resourceName; - } - - public String getResourceVersion() { - return resourceVersion; - } - - public void setResourceVersion(String resourceVersion) { - this.resourceVersion = resourceVersion; - } - - public String getResoucreType() { - return resoucreType; - } - - public void setResoucreType(String resoucreType) { - this.resoucreType = resoucreType; - } - - public String getResourceUUID() { - return resourceUUID; - } - - public void setResourceUUID(String resourceUUID) { - this.resourceUUID = resourceUUID; - } - - public List getArtifacts() { - return artifacts; - } - - public void setArtifacts(List artifacts) { - this.artifacts = artifacts; - } - - public String getResourceInvariantUUID() { - return resourceInvariantUUID; - } - - public void setResourceInvariantUUID(String resourceInvariantUUID) { - this.resourceInvariantUUID = resourceInvariantUUID; - } - - public String getResourceCustomizationUUID() { - return resourceCustomizationUUID; - } - - public void setResourceCustomizationUUID(String customizationUUID) { - this.resourceCustomizationUUID = customizationUUID; - } - - public String getCategory() { - return category; - } - - public void setCategory(String category) { - this.category = category; - } - - public String getSubcategory() { - return subcategory; - } - - public void setSubcategory(String subcategory) { - this.subcategory = subcategory; - } - @Override public String toString() { return "JsonContainerResourceInstance [resourceInstanceName=" + resourceInstanceName + ", resourceName=" + resourceName + ", resourceVersion=" diff --git a/common-app-api/src/main/java/org/openecomp/sdc/be/config/DmaapConsumerConfiguration.java b/common-app-api/src/main/java/org/openecomp/sdc/be/config/DmaapConsumerConfiguration.java index 742cd1815e..380f622c64 100644 --- a/common-app-api/src/main/java/org/openecomp/sdc/be/config/DmaapConsumerConfiguration.java +++ b/common-app-api/src/main/java/org/openecomp/sdc/be/config/DmaapConsumerConfiguration.java @@ -19,9 +19,14 @@ */ package org.openecomp.sdc.be.config; +import lombok.Getter; +import lombok.Setter; + /** * Contains DMAAP Client configuration parameters */ +@Getter +@Setter public class DmaapConsumerConfiguration { private boolean active; @@ -55,250 +60,6 @@ public class DmaapConsumerConfiguration { private String aftDme2ClientKeystorePassword; private String aftDme2ClientSslCertAlias; - public String getHosts() { - return hosts; - } - - public void setHosts(String hosts) { - this.hosts = hosts; - } - - public String getConsumerGroup() { - return consumerGroup; - } - - public void setConsumerGroup(String consumerGroup) { - this.consumerGroup = consumerGroup; - } - - public String getConsumerId() { - return consumerId; - } - - public void setConsumerId(String consumerId) { - this.consumerId = consumerId; - } - - public Integer getTimeoutMs() { - return timeoutMs; - } - - public void setTimeoutMs(Integer timeoutMs) { - this.timeoutMs = timeoutMs; - } - - public Integer getLimit() { - return limit; - } - - public void setLimit(Integer limit) { - this.limit = limit; - } - - public Integer getPollingInterval() { - return pollingInterval; - } - - public void setPollingInterval(Integer pollingInterval) { - this.pollingInterval = pollingInterval; - } - - public String getTopic() { - return topic; - } - - public void setTopic(String topic) { - this.topic = topic; - } - - public Double getLatitude() { - return latitude; - } - - public void setLatitude(Double latitude) { - this.latitude = latitude; - } - - public Double getLongitude() { - return longitude; - } - - public void setLongitude(Double longitude) { - this.longitude = longitude; - } - - public String getVersion() { - return version; - } - - public void setVersion(String version) { - this.version = version; - } - - public String getServiceName() { - return serviceName; - } - - public void setServiceName(String serviceName) { - this.serviceName = serviceName; - } - - public String getEnvironment() { - return environment; - } - - public void setEnvironment(String environment) { - this.environment = environment; - } - - public String getPartner() { - return partner; - } - - public void setPartner(String partner) { - this.partner = partner; - } - - public String getRouteOffer() { - return routeOffer; - } - - public void setRouteOffer(String routeOffer) { - this.routeOffer = routeOffer; - } - - public String getProtocol() { - return protocol; - } - - public void setProtocol(String protocol) { - this.protocol = protocol; - } - - public String getContenttype() { - return contenttype; - } - - public void setContenttype(String contenttype) { - this.contenttype = contenttype; - } - - public Boolean isDme2TraceOn() { - return dme2TraceOn; - } - - public Boolean getDme2TraceOn() { - return dme2TraceOn; - } - - public void setDme2TraceOn(Boolean dme2TraceOn) { - this.dme2TraceOn = dme2TraceOn; - } - - public String getAftEnvironment() { - return aftEnvironment; - } - - public void setAftEnvironment(String aftEnvironment) { - this.aftEnvironment = aftEnvironment; - } - - public Integer getAftDme2ConnectionTimeoutMs() { - return aftDme2ConnectionTimeoutMs; - } - - public void setAftDme2ConnectionTimeoutMs(Integer aftDme2ConnectionTimeoutMs) { - this.aftDme2ConnectionTimeoutMs = aftDme2ConnectionTimeoutMs; - } - - public Integer getAftDme2RoundtripTimeoutMs() { - return aftDme2RoundtripTimeoutMs; - } - - public void setAftDme2RoundtripTimeoutMs(Integer aftDme2RoundtripTimeoutMs) { - this.aftDme2RoundtripTimeoutMs = aftDme2RoundtripTimeoutMs; - } - - public Integer getAftDme2ReadTimeoutMs() { - return aftDme2ReadTimeoutMs; - } - - public void setAftDme2ReadTimeoutMs(Integer aftDme2ReadTimeoutMs) { - this.aftDme2ReadTimeoutMs = aftDme2ReadTimeoutMs; - } - - public String getDme2preferredRouterFilePath() { - return dme2preferredRouterFilePath; - } - - public void setDme2preferredRouterFilePath(String dme2preferredRouterFilePath) { - this.dme2preferredRouterFilePath = dme2preferredRouterFilePath; - } - - public Credential getCredential() { - return credential; - } - - public void setCredential(Credential credential) { - this.credential = credential; - } - - public boolean isActive() { - return active; - } - - public void setActive(boolean isActive) { - this.active = isActive; - } - - public Integer getTimeLimitForNotificationHandleMs() { - return timeLimitForNotificationHandleMs; - } - - public void setTimeLimitForNotificationHandleMs(Integer timeLimitForNotificationHandleMs) { - this.timeLimitForNotificationHandleMs = timeLimitForNotificationHandleMs; - } - - public boolean isAftDme2SslEnable() { - return aftDme2SslEnable; - } - - public void setAftDme2SslEnable(boolean aftDme2SslEnable) { - this.aftDme2SslEnable = aftDme2SslEnable; - } - - public boolean isAftDme2ClientIgnoreSslConfig() { - return aftDme2ClientIgnoreSslConfig; - } - - public void setAftDme2ClientIgnoreSslConfig(boolean aftDme2ClientIgnoreSslConfig) { - this.aftDme2ClientIgnoreSslConfig = aftDme2ClientIgnoreSslConfig; - } - - public String getAftDme2ClientKeystore() { - return aftDme2ClientKeystore; - } - - public void setAftDme2ClientKeystore(String aftDme2ClientKeystore) { - this.aftDme2ClientKeystore = aftDme2ClientKeystore; - } - - public String getAftDme2ClientKeystorePassword() { - return aftDme2ClientKeystorePassword; - } - - public void setAftDme2ClientKeystorePassword(String aftDme2ClientKeystorePassword) { - this.aftDme2ClientKeystorePassword = aftDme2ClientKeystorePassword; - } - - public String getAftDme2ClientSslCertAlias() { - return aftDme2ClientSslCertAlias; - } - - public void setAftDme2ClientSslCertAlias(String aftDme2ClientSslCertAlias) { - this.aftDme2ClientSslCertAlias = aftDme2ClientSslCertAlias; - } - @Override public String toString() { return "DmaapConsumerConfiguration [active=" + active + ", hosts=" + hosts + ", consumerGroup=" + consumerGroup + ", consumerId=" + consumerId @@ -316,27 +77,13 @@ public class DmaapConsumerConfiguration { /** * Contains Dmaap Client credential parameters: username and password */ + @Getter + @Setter public static class Credential { private String username; private String password; - public String getUsername() { - return username; - } - - public void setUsername(String username) { - this.username = username; - } - - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - @Override public String toString() { return "Credential [username=" + username + ", password=" + password + "]"; diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index cf4e848acf..3c3ab10551 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -942,7 +942,7 @@ limitations under the License. - + Onboarding init was successful diff --git a/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/ArtifactReqDetails.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/ArtifactReqDetails.java index 2fdb3965dd..605fc8017b 100644 --- a/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/ArtifactReqDetails.java +++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/ArtifactReqDetails.java @@ -7,9 +7,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -20,10 +20,15 @@ package org.onap.sdc.backend.ci.tests.datatypes; +import lombok.AccessLevel; +import lombok.Getter; +import lombok.Setter; import org.openecomp.sdc.be.model.HeatParameterDefinition; import java.util.List; +@Getter +@Setter public class ArtifactReqDetails { public ArtifactReqDetails() { @@ -53,9 +58,9 @@ public class ArtifactReqDetails { private String artifactName; private String artifactType; private String description; - private String payloadData; + @Getter(AccessLevel.NONE) @Setter(AccessLevel.NONE) private String payloadData; private String artifactLabel; - private String apiUrl; + @Getter(AccessLevel.NONE) @Setter(AccessLevel.NONE) private String apiUrl; private String artifactGroupType; private Integer timeout; private String userIdLastUpdater; @@ -68,46 +73,6 @@ public class ArtifactReqDetails { private boolean mandatory; private boolean serviceApi; - public boolean isServiceApi() { - return serviceApi; - } - - public void setServiceApi(boolean serviceApi) { - this.serviceApi = serviceApi; - } - - public String getArtifactLabel() { - return artifactLabel; - } - - public void setArtifactLabel(String artifactLabel) { - this.artifactLabel = artifactLabel; - } - - public String getArtifactName() { - return artifactName; - } - - public void setArtifactName(String artifactName) { - this.artifactName = artifactName; - } - - public String getArtifactType() { - return artifactType; - } - - public void setArtifactType(String artifactType) { - this.artifactType = artifactType; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - public String getPayload() { return payloadData; } @@ -120,30 +85,6 @@ public class ArtifactReqDetails { this.payloadData = payloadData; } - public String getArtifactGroupType() { - return artifactGroupType; - } - - public void setArtifactGroupType(String artifactGroupType) { - this.artifactGroupType = artifactGroupType; - } - - public Integer getTimeout() { - return timeout; - } - - public void setTimeout(Integer timeout) { - this.timeout = timeout; - } - - public boolean isMandatory() { - return mandatory; - } - - public void setMandatory(boolean mandatory) { - this.mandatory = mandatory; - } - public String getUrl() { return apiUrl; } @@ -182,61 +123,5 @@ public class ArtifactReqDetails { // this.userIdCreator = userIdCreator; // } // - public String getArtifactDisplayName() { - - return artifactDisplayName; - } - - public void setArtifactDisplayName(String artifactDisplayName) { - this.artifactDisplayName = artifactDisplayName; - } - - public String getUserIdLastUpdater() { - return userIdLastUpdater; - } - - public void setUserIdLastUpdater(String userIdLastUpdater) { - this.userIdLastUpdater = userIdLastUpdater; - } - - public String getCreatorFullName() { - return creatorFullName; - } - - public void setCreatorFullName(String creatorFullName) { - this.creatorFullName = creatorFullName; - } - - public String getUpdaterFullName() { - return updaterFullName; - } - - public void setUpdaterFullName(String updaterFullName) { - this.updaterFullName = updaterFullName; - } - - public String getArtifactChecksum() { - return artifactChecksum; - } - - public void setArtifactChecksum(String artifactChecksum) { - this.artifactChecksum = artifactChecksum; - } - - public String getUniqueId() { - return uniqueId; - } - - public void setUniqueId(String artifactUniqueId) { - this.uniqueId = artifactUniqueId; - } - - public List getHeatParameters() { - return heatParameters; - } - - public void setHeatParameters(List heatParameters) { - this.heatParameters = heatParameters; - } } diff --git a/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/ComponentReqDetails.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/ComponentReqDetails.java index 7d1da5da97..4ed6a9bccb 100644 --- a/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/ComponentReqDetails.java +++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/ComponentReqDetails.java @@ -7,9 +7,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -20,6 +20,9 @@ package org.onap.sdc.backend.ci.tests.datatypes; +import lombok.AccessLevel; +import lombok.Getter; +import lombok.Setter; import org.openecomp.sdc.be.model.LifecycleStateEnum; import org.openecomp.sdc.be.model.category.CategoryDefinition; import org.openecomp.sdc.be.model.category.SubCategoryDefinition; @@ -27,8 +30,11 @@ import org.openecomp.sdc.be.model.category.SubCategoryDefinition; import java.util.ArrayList; import java.util.List; +@Getter +@Setter public abstract class ComponentReqDetails { + @Setter(AccessLevel.NONE) protected String name; protected String description; protected List tags = new ArrayList<>(); @@ -52,146 +58,15 @@ public abstract class ComponentReqDetails { protected String importedToscaChecksum; protected String invariantUUID; - public String getCsarVersion() { - return csarVersion; - } - - public void setCsarVersion(String csarVersion) { - this.csarVersion = csarVersion; - } - - public String getName() { - return name; - } - public void setName(String name) { this.name = name; tags.add(name); } - public List getTags() { - return tags; - } - - public void setTags(List tags) { - this.tags = tags; - } - // public String getCategory() { // return category; // } // - public String getContactId() { - return contactId; - } - - public void setContactId(String contactId) { - this.contactId = contactId; - } - - public String getIcon() { - return icon; - } - - public void setIcon(String icon) { - this.icon = icon; - } - - public String getUniqueId() { - return uniqueId; - } - - public void setUniqueId(String uniqueId) { - this.uniqueId = uniqueId; - } - - public void setCreatorUserId(String creatorUserId) { - this.creatorUserId = creatorUserId; - } - - public void setCreatorFullName(String creatorFullName) { - this.creatorFullName = creatorFullName; - } - - public void setLastUpdaterUserId(String lastUpdaterUserId) { - this.lastUpdaterUserId = lastUpdaterUserId; - } - - public void setLastUpdaterFullName(String lastUpdaterFullName) { - this.lastUpdaterFullName = lastUpdaterFullName; - } - - public void setCreationDate(Long creationDate) { - this.creationDate = creationDate; - } - - public void setLastUpdateDate(Long lastUpdateDate) { - this.lastUpdateDate = lastUpdateDate; - } - - public void setLifecycleState(LifecycleStateEnum lifecycleState) { - this.lifecycleState = lifecycleState; - } - - public void setUUID(String uUID) { - this.UUID = uUID; - } - - public String getCreatorUserId() { - return creatorUserId; - } - - public String getCreatorFullName() { - return creatorFullName; - } - - public String getLastUpdaterUserId() { - return lastUpdaterUserId; - } - - public String getLastUpdaterFullName() { - return lastUpdaterFullName; - } - - public Long getCreationDate() { - return creationDate; - } - - public Long getLastUpdateDate() { - return lastUpdateDate; - } - - public LifecycleStateEnum getLifecycleState() { - return lifecycleState; - } - - public String getUUID() { - return UUID; - } - - public String getVersion() { - return version; - } - - public void setVersion(String version) { - this.version = version; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public List getCategories() { - return categories; - } - - public void setCategories(List categories) { - this.categories = categories; - } public void removeAllCategories() { this.categories = new ArrayList<>(); @@ -238,44 +113,4 @@ public abstract class ComponentReqDetails { addCategoryChain(category, null); } - public String getProjectCode() { - return projectCode; - } - - public void setProjectCode(String projectCode) { - this.projectCode = projectCode; - } - - public String getCsarUUID() { - return csarUUID; - } - - public void setCsarUUID(String csarUUID) { - this.csarUUID = csarUUID; - } - - public String getImportedToscaChecksum() { - return importedToscaChecksum; - } - - public void setImportedToscaChecksum(String importedToscaChecksum) { - this.importedToscaChecksum = importedToscaChecksum; - } - - public String getInvariantUUID() { - return invariantUUID; - } - - public void setInvariantUUID(String invariantUUID) { - this.invariantUUID = invariantUUID; - } - - public List getModels() { - return models; - } - - public void setModels(List models) { - this.models = models; - } - } diff --git a/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/PropertyReqDetails.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/PropertyReqDetails.java index 1fbdbb2213..b00281ed19 100644 --- a/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/PropertyReqDetails.java +++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/PropertyReqDetails.java @@ -20,27 +20,30 @@ package org.onap.sdc.backend.ci.tests.datatypes; +import lombok.AccessLevel; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; import org.openecomp.sdc.be.datatypes.elements.SchemaDefinition; +@Getter +@Setter +@NoArgsConstructor public class PropertyReqDetails { String name; - String type; - Boolean required = false; - String defaultValue; - String description; + @Getter(AccessLevel.NONE) @Setter(AccessLevel.NONE) String type; + @Getter(AccessLevel.NONE) @Setter(AccessLevel.NONE) Boolean required = false; + @Getter(AccessLevel.NONE) @Setter(AccessLevel.NONE) String defaultValue; + @Getter(AccessLevel.NONE) @Setter(AccessLevel.NONE) String description; String propertyRangeMin; String propertyRangeMax; - Boolean isPassword = false; + @Getter(AccessLevel.NONE) @Setter(AccessLevel.NONE) Boolean isPassword = false; SchemaDefinition schema; String uniqueId; String parentUniqueId; String value; - public PropertyReqDetails() { - super(); - } - public PropertyReqDetails(String propertyName, String propertyType, Boolean propertyRequired, String propertyDefaultValue, String propertyDescription, String propertyRangeMin, String propertyRangeMax, @@ -66,22 +69,6 @@ public class PropertyReqDetails { this.schema = schema; } - public SchemaDefinition getSchema() { - return schema; - } - - public void setSchema(SchemaDefinition schema) { - this.schema = schema; - } - - public String getName() { - return name; - } - - public void setName(String propertyName) { - this.name = propertyName; - } - public String getPropertyType() { return type; } @@ -114,22 +101,6 @@ public class PropertyReqDetails { this.description = propertyDescription; } - public String getPropertyRangeMin() { - return propertyRangeMin; - } - - public void setPropertyRangeMin(String propertyRangeMin) { - this.propertyRangeMin = propertyRangeMin; - } - - public String getPropertyRangeMax() { - return propertyRangeMax; - } - - public void setPropertyRangeMax(String propertyRangeMax) { - this.propertyRangeMax = propertyRangeMax; - } - public Boolean getPropertyPassword() { return isPassword; } @@ -138,30 +109,6 @@ public class PropertyReqDetails { this.isPassword = propertyPassword; } - public String getUniqueId() { - return uniqueId; - } - - public void setUniqueId(String uniqueId) { - this.uniqueId = uniqueId; - } - - public String getParentUniqueId() { - return parentUniqueId; - } - - public void setParentUniqueId(String parentUniqueId) { - this.parentUniqueId = parentUniqueId; - } - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } - public String propertyToJsonString() { String jsonString; jsonString = diff --git a/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/ResourceRespJavaObject.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/ResourceRespJavaObject.java index 706da45f0f..23c9bfd629 100644 --- a/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/ResourceRespJavaObject.java +++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/ResourceRespJavaObject.java @@ -7,9 +7,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -20,10 +20,16 @@ package org.onap.sdc.backend.ci.tests.datatypes; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; import org.openecomp.sdc.be.model.category.CategoryDefinition; import java.util.List; +@Getter +@Setter +@NoArgsConstructor public class ResourceRespJavaObject { String uniqueId; String name; @@ -54,14 +60,6 @@ public class ResourceRespJavaObject { String resourceType; List categories; - public String getResourceType() { - return resourceType; - } - - public void setResourceType(String resourceType) { - this.resourceType = resourceType; - } - public ResourceRespJavaObject(String uniqueId, String resourceName, String resourceVersion, String creatorUserId, String creatorFullName, String lastUpdaterUserId, String lastUpdaterFullName, String description, String icon, List tags, String isHighestVersion, String creationDate, String lastUpdateDate, @@ -98,259 +96,11 @@ public class ResourceRespJavaObject { this.resourceType = resourceType; } - public void setUuid(String uuid) { - this.uuid = uuid; - } - - public String getCost() { - return cost; - } - - public void setCost(String cost) { - this.cost = cost; - } - - public String getLicenseType() { - return licenseType; - } - - public void setLicenseType(String licenseType) { - this.licenseType = licenseType; - } - - public String getUuid() { - return uuid; - } - + // Legacy alias kept for backward compatibility public String setUuid() { return uuid; } - public List getInterfaces() { - return interfaces; - } - - public void setInterfaces(List interfaces) { - this.interfaces = interfaces; - } - - public List getArtifacts() { - return artifacts; - } - - public void setArtifacts(List artifacts) { - this.artifacts = artifacts; - } - - public ResourceRespJavaObject() { - super(); - } - - // public ResourceRespJavaObject(String uniqueId, String resourceName, - // String resourceVersion, String creatorUserId, - // String creatorFullName, String lastUpdaterUserId, - // String lastUpdaterFullName, String description, String icon, - // List tags, String isHighestVersion, String creationDate, - // String lastUpdateDate, String category, String lifecycleState, - // List derivedFrom, String vendorName, String vendorRelease, - // String contactId, String abstractt, String highestVersion) { - // super(); - // this.uniqueId = uniqueId; - // this.resourceName = resourceName; - // this.resourceVersion = resourceVersion; - // this.creatorUserId = creatorUserId; - // this.creatorFullName = creatorFullName; - // this.lastUpdaterUserId = lastUpdaterUserId; - // this.lastUpdaterFullName = lastUpdaterFullName; - // this.description = description; - // this.icon = icon; - // this.tags = tags; - // this.isHighestVersion = isHighestVersion; - // this.creationDate = creationDate; - // this.lastUpdateDate = lastUpdateDate; - // this.category = category; - // this.lifecycleState = lifecycleState; - // this.derivedFrom = derivedFrom; - // this.vendorName = vendorName; - // this.vendorRelease = vendorRelease; - // this.contactId = contactId; - // this.abstractt = abstractt; - // this.highestVersion = highestVersion; - // } - public String getUniqueId() { - return uniqueId; - } - - public void setUniqueId(String uniqueId) { - this.uniqueId = uniqueId; - } - - public String getName() { - return name; - } - - public void setName(String resourceName) { - this.name = resourceName; - } - - public String getVersion() { - return version; - } - - public void setVersion(String resourceVersion) { - this.version = resourceVersion; - } - - public String getCreatorUserId() { - return creatorUserId; - } - - public void setCreatorUserId(String creatorUserId) { - this.creatorUserId = creatorUserId; - } - - public String getCreatorFullName() { - return creatorFullName; - } - - public void setCreatorFullName(String creatorFullName) { - this.creatorFullName = creatorFullName; - } - - public String getLastUpdaterUserId() { - return lastUpdaterUserId; - } - - public void setLastUpdaterUserId(String lastUpdaterUserId) { - this.lastUpdaterUserId = lastUpdaterUserId; - } - - public String getLastUpdaterFullName() { - return lastUpdaterFullName; - } - - public void setLastUpdaterFullName(String lastUpdaterFullName) { - this.lastUpdaterFullName = lastUpdaterFullName; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public String getIcon() { - return icon; - } - - public void setIcon(String icon) { - this.icon = icon; - } - - public List getTags() { - return tags; - } - - public void setTags(List tags) { - this.tags = tags; - } - - public String getIsHighestVersion() { - return isHighestVersion; - } - - public void setIsHighestVersion(String isHighestVersion) { - this.isHighestVersion = isHighestVersion; - } - - public String getCreationDate() { - return creationDate; - } - - public void setCreationDate(String creationDate) { - this.creationDate = creationDate; - } - - public String getLastUpdateDate() { - return lastUpdateDate; - } - - public void setLastUpdateDate(String lastUpdateDate) { - this.lastUpdateDate = lastUpdateDate; - } - - // public String getCategory() { - // return category; - // } - // public void setCategory(String category) { - // this.category = category; - // } - public String getLifecycleState() { - return lifecycleState; - } - - public void setLifecycleState(String lifecycleState) { - this.lifecycleState = lifecycleState; - } - - public List getDerivedFrom() { - return derivedFrom; - } - - public void setDerivedFrom(List derivedFrom) { - this.derivedFrom = derivedFrom; - } - - public String getVendorName() { - return vendorName; - } - - public void setVendorName(String vendorName) { - this.vendorName = vendorName; - } - - public String getVendorRelease() { - return vendorRelease; - } - - public void setVendorRelease(String vendorRelease) { - this.vendorRelease = vendorRelease; - } - - public String getContactId() { - return contactId; - } - - public void setContactId(String contactId) { - this.contactId = contactId; - } - - public String getAbstractt() { - return abstractt; - } - - public void setAbstractt(String abstractt) { - this.abstractt = abstractt; - } - - public String getHighestVersion() { - return highestVersion; - } - - public void setHighestVersion(String highestVersion) { - this.highestVersion = highestVersion; - } - - public List getCategories() { - return categories; - } - - public void setCategories(List categories) { - this.categories = categories; - } - @Override public String toString() { return "ResourceRespJavaObject [uniqueId=" + uniqueId + ", resourceName=" + name + ", resourceVersion=" diff --git a/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/ServiceRespJavaObject.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/ServiceRespJavaObject.java index c7d9caa07e..87b02bf360 100644 --- a/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/ServiceRespJavaObject.java +++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/ServiceRespJavaObject.java @@ -7,9 +7,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -20,8 +20,15 @@ package org.onap.sdc.backend.ci.tests.datatypes; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + import java.util.ArrayList; +@Getter +@Setter +@NoArgsConstructor public class ServiceRespJavaObject { String category; @@ -47,10 +54,6 @@ public class ServiceRespJavaObject { ArrayList ResourceInstances; ArrayList ResourceInstancesRelations; - public ServiceRespJavaObject() { - super(); - } - public ServiceRespJavaObject(String category, String creatorUserId, String creatorFullName, String lastUpdaterUserId, String lastUpdaterFullName, String serviceName, String version, String creationDate, String icon, String name, String description, ArrayList tags, String uniqueId, @@ -82,174 +85,6 @@ public class ServiceRespJavaObject { ResourceInstancesRelations = resourceInstancesRelations; } - public String getCategory() { - return category; - } - - public void setCategory(String category) { - this.category = category; - } - - public String getCreatorUserId() { - return creatorUserId; - } - - public void setCreatorUserId(String creatorUserId) { - this.creatorUserId = creatorUserId; - } - - public String getCreatorFullName() { - return creatorFullName; - } - - public void setCreatorFullName(String creatorFullName) { - this.creatorFullName = creatorFullName; - } - - public String getLastUpdaterUserId() { - return lastUpdaterUserId; - } - - public void setLastUpdaterUserId(String lastUpdaterUserId) { - this.lastUpdaterUserId = lastUpdaterUserId; - } - - public String getLastUpdaterFullName() { - return lastUpdaterFullName; - } - - public void setLastUpdaterFullName(String lastUpdaterFullName) { - this.lastUpdaterFullName = lastUpdaterFullName; - } - - public String getVersion() { - return version; - } - - public void setVersion(String version) { - this.version = version; - } - - public String getCreationDate() { - return creationDate; - } - - public void setCreationDate(String creationDate) { - this.creationDate = creationDate; - } - - public String getIcon() { - return icon; - } - - public void setIcon(String icon) { - this.icon = icon; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public ArrayList getTags() { - return tags; - } - - public void setTags(ArrayList tags) { - this.tags = tags; - } - - public String getUniqueId() { - return uniqueId; - } - - public void setUniqueId(String uniqueId) { - this.uniqueId = uniqueId; - } - - public String getLastUpdateDate() { - return lastUpdateDate; - } - - public void setLastUpdateDate(String lastUpdateDate) { - this.lastUpdateDate = lastUpdateDate; - } - - public String getContactId() { - return contactId; - } - - public void setContactId(String contactId) { - this.contactId = contactId; - } - - public String getVendorName() { - return vendorName; - } - - public void setVendorName(String vendorName) { - this.vendorName = vendorName; - } - - public String getVendorRelease() { - return vendorRelease; - } - - public void setVendorRelease(String vendorRelease) { - this.vendorRelease = vendorRelease; - } - - public String getLifecycleState() { - return lifecycleState; - } - - public void setLifecycleState(String lifecycleState) { - this.lifecycleState = lifecycleState; - } - - public String getHighestVersion() { - return highestVersion; - } - - public void setHighestVersion(String highest) { - this.highestVersion = highest; - } - - public ArrayList getArtifacts() { - return artifacts; - } - - public void setArtifacts(ArrayList artifacts) { - this.artifacts = artifacts; - } - - public ArrayList getResourceInstances() { - return ResourceInstances; - } - - public void setResourceInstances(ArrayList resourceInstances) { - ResourceInstances = resourceInstances; - } - - public ArrayList getResourceInstancesRelations() { - return ResourceInstancesRelations; - } - - public void setResourceInstancesRelations(ArrayList resourceInstancesRelations) { - ResourceInstancesRelations = resourceInstancesRelations; - } - @Override public String toString() { return "ServiceRespJavaObject [category=" + category + ", creatorUserId=" + creatorUserId + ", creatorFullName=" diff --git a/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/VendorSoftwareProductObjectReqDetails.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/VendorSoftwareProductObjectReqDetails.java index 918d126e66..09d0dc896d 100644 --- a/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/VendorSoftwareProductObjectReqDetails.java +++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/VendorSoftwareProductObjectReqDetails.java @@ -7,9 +7,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -20,6 +20,15 @@ package org.onap.sdc.backend.ci.tests.datatypes; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor public class VendorSoftwareProductObjectReqDetails { private String name; @@ -36,89 +45,6 @@ public class VendorSoftwareProductObjectReqDetails { private String onboardingOrigin; private String icon; - - public String getIcon() { - return icon; - } - - public void setIcon(String icon) { - this.icon = icon; - } - - public VendorSoftwareProductObjectReqDetails() { - } - - public VendorSoftwareProductObjectReqDetails(String name, String description, String category, String subCategory, String vendorId, String vendorName, String licensingVersion, LicensingData licensingData, String onboardingMethod, String networkPackageName, String onboardingOrigin, String icon) { - this.name = name; - this.description = description; - this.category = category; - this.subCategory = subCategory; - this.vendorId = vendorId; - this.vendorName = vendorName; - this.licensingVersion = licensingVersion; - this.licensingData = licensingData; - this.onboardingMethod = onboardingMethod; - this.networkPackageName = networkPackageName; - this.onboardingOrigin = onboardingOrigin; - this.icon = icon; - } - - public String getLicensingVersion() { - return licensingVersion; - } - - public void setLicensingVersion(String licensingVersion) { - this.licensingVersion = licensingVersion; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public String getCategory() { - return category; - } - - public void setCategory(String category) { - this.category = category; - } - - public String getSubCategory() { - return subCategory; - } - - public void setSubCategory(String subCategory) { - this.subCategory = subCategory; - } - - public String getVendorId() { - return vendorId; - } - - public void setVendorId(String vendorId) { - this.vendorId = vendorId; - } - - public String getVendorName() { - return vendorName; - } - - public void setVendorName(String vendorName) { - this.vendorName = vendorName; - } - // public LicensingVersion getLicensingVersion() { // return licensingVersion; // } @@ -127,38 +53,6 @@ public class VendorSoftwareProductObjectReqDetails { // this.licensingVersion = licensingVersion; // } - public LicensingData getLicensingData() { - return licensingData; - } - - public void setLicensingData(LicensingData licensingData) { - this.licensingData = licensingData; - } - - public String getOnboardingMethod() { - return onboardingMethod; - } - - public void setOnboardingMethod(String onboardingMethod) { - this.onboardingMethod = onboardingMethod; - } - - public String getNetworkPackageName() { - return networkPackageName; - } - - public void setNetworkPackageName(String networkPackageName) { - this.networkPackageName = networkPackageName; - } - - public String getOnboardingOrigin() { - return onboardingOrigin; - } - - public void setOnboardingOrigin(String onboardingOrigin) { - this.onboardingOrigin = onboardingOrigin; - } - @Override public String toString() { return "VendorSoftwareProductObjectReqDetails{" + diff --git a/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/expected/ExpectedArtifactAudit.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/expected/ExpectedArtifactAudit.java index 583242b645..f2deff142f 100644 --- a/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/expected/ExpectedArtifactAudit.java +++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/expected/ExpectedArtifactAudit.java @@ -7,9 +7,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -20,6 +20,15 @@ package org.onap.sdc.backend.ci.tests.datatypes.expected; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor public class ExpectedArtifactAudit { private String action; @@ -36,131 +45,4 @@ public class ExpectedArtifactAudit { private String status; private String desc; - public ExpectedArtifactAudit(String action, String resourceName, String resourceType, String prevVersion, - String currVersion, String modifier, String prevState, String currState, String prevArtifactUuid, - String currArtifactUuid, String artifactData, String status, String desc) { - super(); - this.action = action; - this.resourceName = resourceName; - this.resourceType = resourceType; - this.prevVersion = prevVersion; - this.currVersion = currVersion; - this.modifier = modifier; - this.prevState = prevState; - this.currState = currState; - this.prevArtifactUuid = prevArtifactUuid; - this.currArtifactUuid = currArtifactUuid; - this.artifactData = artifactData; - this.status = status; - this.desc = desc; - } - - public ExpectedArtifactAudit() { - super(); - } - - public String getAction() { - return action; - } - - public void setAction(String action) { - this.action = action; - } - - public String getResourceName() { - return resourceName; - } - - public void setResourceName(String resourceName) { - this.resourceName = resourceName; - } - - public String getResourceType() { - return resourceType; - } - - public void setResourceType(String resourceType) { - this.resourceType = resourceType; - } - - public String getPrevVersion() { - return prevVersion; - } - - public void setPrevVersion(String prevVersion) { - this.prevVersion = prevVersion; - } - - public String getCurrVersion() { - return currVersion; - } - - public void setCurrVersion(String currVersion) { - this.currVersion = currVersion; - } - - public String getModifier() { - return modifier; - } - - public void setModifier(String modifier) { - this.modifier = modifier; - } - - public String getPrevState() { - return prevState; - } - - public void setPrevState(String prevState) { - this.prevState = prevState; - } - - public String getCurrState() { - return currState; - } - - public void setCurrState(String currState) { - this.currState = currState; - } - - public String getPrevArtifactUuid() { - return prevArtifactUuid; - } - - public void setPrevArtifactUuid(String prevArtifactUuid) { - this.prevArtifactUuid = prevArtifactUuid; - } - - public String getCurrArtifactUuid() { - return currArtifactUuid; - } - - public void setCurrArtifactUuid(String currArtifactUuid) { - this.currArtifactUuid = currArtifactUuid; - } - - public String getArtifactData() { - return artifactData; - } - - public void setArtifactData(String artifactData) { - this.artifactData = artifactData; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getDesc() { - return desc; - } - - public void setDesc(String desc) { - this.desc = desc; - } - } diff --git a/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/expected/ExpectedCategoryAudit.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/expected/ExpectedCategoryAudit.java index 463ae6df00..66cf35104b 100644 --- a/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/expected/ExpectedCategoryAudit.java +++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/expected/ExpectedCategoryAudit.java @@ -7,9 +7,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -20,6 +20,13 @@ package org.onap.sdc.backend.ci.tests.datatypes.expected; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@NoArgsConstructor public class ExpectedCategoryAudit { String action; String modifier; @@ -46,106 +53,4 @@ public class ExpectedCategoryAudit { this.desc = desc; } - public ExpectedCategoryAudit() { - action = null; - modifier = null; - categoryName = null; - subCategoryName = null; - groupingName = null; - resourceType = null; - status = null; - desc = null; - details = null; - modifierName = null; - modifierUid = null; - } - - public String getAction() { - return action; - } - - public void setAction(String action) { - this.action = action; - } - - public String getModifier() { - return modifier; - } - - public void setModifier(String modifier) { - this.modifier = modifier; - } - - public String getCategoryName() { - return categoryName; - } - - public void setCategoryName(String categoryName) { - this.categoryName = categoryName; - } - - public String getSubCategoryName() { - return subCategoryName; - } - - public void setSubCategoryName(String subCategoryName) { - this.subCategoryName = subCategoryName; - } - - public String getGroupingName() { - return groupingName; - } - - public void setGroupingName(String groupingName) { - this.groupingName = groupingName; - } - - public String getResourceType() { - return resourceType; - } - - public void setResourceType(String resourceType) { - this.resourceType = resourceType; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getDesc() { - return desc; - } - - public void setDesc(String desc) { - this.desc = desc; - } - - public String getDetails() { - return details; - } - - public void setDetails(String details) { - this.details = details; - } - - public String getModifierUid() { - return modifierUid; - } - - public void setModifierUid(String modifierUid) { - this.modifierUid = modifierUid; - } - - public String getModifierName() { - return modifierName; - } - - public void setModifierName(String modifierName) { - this.modifierName = modifierName; - } - } diff --git a/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/expected/ExpectedResourceAuditJavaObject.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/expected/ExpectedResourceAuditJavaObject.java index 328e077dd0..429a9072bc 100644 --- a/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/expected/ExpectedResourceAuditJavaObject.java +++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/expected/ExpectedResourceAuditJavaObject.java @@ -7,9 +7,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -20,128 +20,92 @@ package org.onap.sdc.backend.ci.tests.datatypes.expected; +import lombok.AccessLevel; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@NoArgsConstructor public class ExpectedResourceAuditJavaObject { - String ACTION; - String MODIFIER_NAME; - String MODIFIER_UID; - String STATUS; - String DESC; - String RESOURCE_NAME; - String RESOURCE_TYPE; - String PREV_VERSION; - String CURR_VERSION; - String PREV_STATE; - String CURR_STATE; - String TIMESTAMP; - String ARTIFACT_DATA; - String DPREV_STATUS; - String DCURR_STATUS; - String COMMENT; - String DID; - String TOPIC_NAME; - String TOSCA_NODE_TYPE; - String CURR_ARTIFACT_UUID; - String PREV_ARTIFACT_UUID; - String ARTIFACT_TIMEOUT; - String MODIFIER; - String SERVICE_INSTANCE_ID; - String CONSUMER_ID; - String RESOURCE_URL; - + String action; + String modifierName; + String modifierUid; + String status; + String desc; + String resourceName; + String resourceType; + String prevVersion; + String currVersion; + String prevState; + String currState; + String timestamp; + String artifactData; + String dprevStatus; + String dcurrStatus; + String comment; + @Getter(AccessLevel.NONE) @Setter(AccessLevel.NONE) String did; + String topicName; + String toscaNodeType; + String currArtifactUuid; + String prevArtifactUuid; + String artifactTimeout; + @Getter(AccessLevel.NONE) @Setter(AccessLevel.NONE) String modifier; + @Getter(AccessLevel.NONE) @Setter(AccessLevel.NONE) String serviceInstanceId; + @Getter(AccessLevel.NONE) @Setter(AccessLevel.NONE) String consumerId; + @Getter(AccessLevel.NONE) @Setter(AccessLevel.NONE) String resourceUrl; + // TODO: Remove comment -// String INVARIANT_UUID; -// +// String invariantUUID; +// // public String getINVARIANT_UUID() { -// return INVARIANT_UUID; +// return invariantUUID; // } -// +// // public void setINVARIANT_UUID(String invariant_uuid) { -// INVARIANT_UUID = invariant_uuid; +// invariantUUID = invariant_uuid; // } public String getCONSUMER_ID() { - return CONSUMER_ID; + return consumerId; } public void setCONSUMER_ID(String consumer_id) { - CONSUMER_ID = consumer_id; + consumerId = consumer_id; } public String getRESOURCE_URL() { - return RESOURCE_URL; + return resourceUrl; } public void setRESOURCE_URL(String resource_url) { - RESOURCE_URL = resource_url; + resourceUrl = resource_url; } public String getSERVICE_INSTANCE_ID() { - return SERVICE_INSTANCE_ID; + return serviceInstanceId; } public void setSERVICE_INSTANCE_ID(String sERVICE_INSTANCE_ID) { - SERVICE_INSTANCE_ID = sERVICE_INSTANCE_ID; + serviceInstanceId = sERVICE_INSTANCE_ID; } public String getMODIFIER() { - return MODIFIER; + return modifier; } public void setMODIFIER(String mODIFIER) { - MODIFIER = mODIFIER; - } - - public String getArtifactTimeout() { - return ARTIFACT_TIMEOUT; - } - - public void setArtifactTimeout(String artifactTimeout) { - this.ARTIFACT_TIMEOUT = artifactTimeout; - } - - public String getCurrArtifactUuid() { - return CURR_ARTIFACT_UUID; - } - - public void setCurrArtifactUuid(String currArtifactUuid) { - this.CURR_ARTIFACT_UUID = currArtifactUuid; - } - - public String getPrevArtifactUuid() { - return PREV_ARTIFACT_UUID; - } - - public void setPrevArtifactUuid(String prevArtifactUuid) { - this.PREV_ARTIFACT_UUID = prevArtifactUuid; - } - - public String getToscaNodeType() { - return TOSCA_NODE_TYPE; - } - - public void setToscaNodeType(String ToscaNodeType) { - this.TOSCA_NODE_TYPE = ToscaNodeType; - } - - public String getTopicName() { - return TOPIC_NAME; - } - - public void setTopicName(String topicName) { - this.TOPIC_NAME = topicName; + modifier = mODIFIER; } public String getDistributionId() { - return DID; + return did; } public void setDistributionId(String did) { - this.DID = did; - } - - public ExpectedResourceAuditJavaObject() { - super(); + this.did = did; } public ExpectedResourceAuditJavaObject(String action, String modifierName, String modifierUid, String status, @@ -149,162 +113,34 @@ public class ExpectedResourceAuditJavaObject { String prevState, String currState, String timestamp, String toscaNodesType, String timeout, String modifier, String serviceInstanceId) { super(); - this.ACTION = action; - this.MODIFIER_NAME = modifierName; - this.MODIFIER_UID = modifierUid; - this.STATUS = status; - this.DESC = desc; - this.RESOURCE_NAME = resourceName; - this.RESOURCE_TYPE = resourceType; - this.PREV_VERSION = prevVersion; - this.CURR_VERSION = currVersion; - this.PREV_STATE = prevState; - this.CURR_STATE = currState; - this.TIMESTAMP = timestamp; - this.TOSCA_NODE_TYPE = toscaNodesType; - this.ARTIFACT_TIMEOUT = timeout; - this.MODIFIER = modifier; - this.SERVICE_INSTANCE_ID = serviceInstanceId; - } - - public String getAction() { - return ACTION; - } - - public void setAction(String action) { - this.ACTION = action; - } - - public String getModifierName() { - return MODIFIER_NAME; - } - - public void setModifierName(String modifierName) { - this.MODIFIER_NAME = modifierName; - } - - public String getModifierUid() { - return MODIFIER_UID; - } - - public void setModifierUid(String modifierUid) { - this.MODIFIER_UID = modifierUid; - } - - public String getStatus() { - return STATUS; - } - - public void setStatus(String status) { - this.STATUS = status; - } - - public String getDesc() { - return DESC; - } - - public void setDesc(String desc) { - this.DESC = desc; - } - - public String getResourceName() { - return RESOURCE_NAME; - } - - public void setResourceName(String resourceName) { - this.RESOURCE_NAME = resourceName; - } - - public String getResourceType() { - return RESOURCE_TYPE; - } - - public void setResourceType(String resourceType) { - this.RESOURCE_TYPE = resourceType; - } - - public String getPrevVersion() { - return PREV_VERSION; - } - - public void setPrevVersion(String prevVersion) { - this.PREV_VERSION = prevVersion; - } - - public String getCurrVersion() { - return CURR_VERSION; - } - - public void setCurrVersion(String currVersion) { - this.CURR_VERSION = currVersion; - } - - public String getPrevState() { - return PREV_STATE; - } - - public void setPrevState(String prevState) { - this.PREV_STATE = prevState; - } - - public String getCurrState() { - return CURR_STATE; - } - - public void setCurrState(String currState) { - this.CURR_STATE = currState; - } - - public String getTimestamp() { - return TIMESTAMP; - } - - public void setTimestamp(String timestamp) { - this.TIMESTAMP = timestamp; - } - - public String getArtifactData() { - return ARTIFACT_DATA; - } - - public void setArtifactData(String artifactData) { - this.ARTIFACT_DATA = artifactData; - } - - public String getDprevStatus() { - return DPREV_STATUS; - } - - public void setDprevStatus(String dprevStatus) { - this.DPREV_STATUS = dprevStatus; - } - - public String getDcurrStatus() { - return DCURR_STATUS; - } - - public void setDcurrStatus(String dcurrStatus) { - this.DCURR_STATUS = dcurrStatus; - } - - public String getComment() { - return COMMENT; - } - - public void setComment(String comment) { - this.COMMENT = comment; + this.action = action; + this.modifierName = modifierName; + this.modifierUid = modifierUid; + this.status = status; + this.desc = desc; + this.resourceName = resourceName; + this.resourceType = resourceType; + this.prevVersion = prevVersion; + this.currVersion = currVersion; + this.prevState = prevState; + this.currState = currState; + this.timestamp = timestamp; + this.toscaNodeType = toscaNodesType; + this.artifactTimeout = timeout; + this.modifier = modifier; + this.serviceInstanceId = serviceInstanceId; } @Override public String toString() { - return "ExpectedResourceAuditJavaObject [ACTION=" + ACTION + ", STATUS=" + STATUS + ", DESC=" + DESC - + ", RESOURCE_NAME=" + RESOURCE_NAME + ", RESOURCE_TYPE=" + RESOURCE_TYPE + ", PREV_VERSION=" - + PREV_VERSION + ", CURR_VERSION=" + CURR_VERSION + ", PREV_STATE=" + PREV_STATE + ", CURR_STATE=" - + CURR_STATE + ", TIMESTAMP=" + TIMESTAMP + ", ARTIFACT_DATA=" + ARTIFACT_DATA + ", DPREV_STATUS=" - + DPREV_STATUS + ", DCURR_STATUS=" + DCURR_STATUS + ", COMMENT=" + COMMENT + ", DID=" + DID - + ", TOPIC_NAME=" + TOPIC_NAME + ", TOSCA_NODE_TYPE=" + TOSCA_NODE_TYPE + ", CURR_ARTIFACT_UUID=" - + CURR_ARTIFACT_UUID + ", PREV_ARTIFACT_UUID=" + PREV_ARTIFACT_UUID + ", ARTIFACT_TIMEOUT=" - + ARTIFACT_TIMEOUT + ", MODIFIER=" + MODIFIER + ", SERVICE_INSTANCE_ID=" + SERVICE_INSTANCE_ID + "]"; + return "ExpectedResourceAuditJavaObject [action=" + action + ", status=" + status + ", desc=" + desc + + ", resourceName=" + resourceName + ", resourceType=" + resourceType + ", prevVersion=" + + prevVersion + ", currVersion=" + currVersion + ", prevState=" + prevState + ", currState=" + + currState + ", timestamp=" + timestamp + ", artifactData=" + artifactData + ", dprevStatus=" + + dprevStatus + ", dcurrStatus=" + dcurrStatus + ", comment=" + comment + ", did=" + did + + ", topicName=" + topicName + ", toscaNodeType=" + toscaNodeType + ", currArtifactUuid=" + + currArtifactUuid + ", prevArtifactUuid=" + prevArtifactUuid + ", artifactTimeout=" + + artifactTimeout + ", modifier=" + modifier + ", serviceInstanceId=" + serviceInstanceId + "]"; } } diff --git a/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/tosca/datatypes/ToscaMetadataDefinition.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/tosca/datatypes/ToscaMetadataDefinition.java index 1f0d7abc36..dd942086cc 100644 --- a/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/tosca/datatypes/ToscaMetadataDefinition.java +++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/tosca/datatypes/ToscaMetadataDefinition.java @@ -7,9 +7,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -20,8 +20,16 @@ package org.onap.sdc.backend.ci.tests.tosca.datatypes; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; import org.yaml.snakeyaml.TypeDescription; +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor public class ToscaMetadataDefinition { private String invariantUUID; @@ -39,146 +47,6 @@ public class ToscaMetadataDefinition { private String serviceEcompNaming; private String ecompGeneratedNaming; private String namingPolicy; - - public ToscaMetadataDefinition(String invariantUUID, String uUID, String name, String description, String type, String category, String subcategory, String resourceVendor, String resourceVendorRelease, String resourceVendorModelNumber, - String serviceType, String serviceRole, String serviceEcompNaming, String ecompGeneratedNaming, String namingPolicy) { - super(); - this.invariantUUID = invariantUUID; - UUID = uUID; - this.name = name; - this.description = description; - this.type = type; - this.category = category; - this.subcategory = subcategory; - this.resourceVendor = resourceVendor; - this.resourceVendorRelease = resourceVendorRelease; - this.resourceVendorModelNumber = resourceVendorModelNumber; - this.serviceType = serviceType; - this.serviceRole = serviceRole; - this.serviceEcompNaming = serviceEcompNaming; - this.ecompGeneratedNaming = ecompGeneratedNaming; - this.namingPolicy = namingPolicy; - } - - public String getInvariantUUID() { - return invariantUUID; - } - - public void setInvariantUUID(String invariantUUID) { - this.invariantUUID = invariantUUID; - } - - public String getUUID() { - return UUID; - } - - public void setUUID(String uUID) { - UUID = uUID; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public String getCategory() { - return category; - } - - public void setCategory(String category) { - this.category = category; - } - - public String getSubcategory() { - return subcategory; - } - - public void setSubcategory(String subcategory) { - this.subcategory = subcategory; - } - - public String getResourceVendor() { - return resourceVendor; - } - - public void setResourceVendor(String resourceVendor) { - this.resourceVendor = resourceVendor; - } - - public String getResourceVendorRelease() { - return resourceVendorRelease; - } - - public void setResourceVendorRelease(String resourceVendorRelease) { - this.resourceVendorRelease = resourceVendorRelease; - } - - public String getResourceVendorModelNumber() { - return resourceVendorModelNumber; - } - - public void setResourceVendorModelNumber(String resourceVendorModelNumber) { - this.resourceVendorModelNumber = resourceVendorModelNumber; - } - - public String getServiceType() { - return serviceType; - } - - public void setServiceType(String serviceType) { - this.serviceType = serviceType; - } - - public String getServiceRole() { - return serviceRole; - } - - public void setServiceRole(String serviceRole) { - this.serviceRole = serviceRole; - } - - public String getServiceEcompNaming() { - return serviceEcompNaming; - } - - public void setServiceEcompNaming(String serviceEcompNaming) { - this.serviceEcompNaming = serviceEcompNaming; - } - - public String getEcompGeneratedNaming() { - return ecompGeneratedNaming; - } - - public void setEcompGeneratedNaming(String ecompGeneratedNaming) { - this.ecompGeneratedNaming = ecompGeneratedNaming; - } - - public String getNamingPolicy() { - return namingPolicy; - } - - public void setNamingPolicy(String namingPolicy) { - this.namingPolicy = namingPolicy; - } @Override public String toString() { @@ -186,11 +54,11 @@ public class ToscaMetadataDefinition { + ", resourceVendor=" + resourceVendor + ", resourceVendorRelease=" + resourceVendorRelease + ", resourceVendorModelNumber=" + resourceVendorModelNumber + ", serviceType=" + serviceType + ", serviceRole=" + serviceRole + ", serviceEcompNaming=" + serviceEcompNaming + ", ecompGeneratedNaming=" + ecompGeneratedNaming + ", namingPolicy=" + namingPolicy + "]"; } - + //gets Type description for Yaml snake public static TypeDescription getTypeDescription(){ TypeDescription typeDescription = new TypeDescription(ToscaMetadataDefinition.class); return typeDescription; } - + } diff --git a/openecomp-be/lib/openecomp-sdc-action-lib/openecomp-sdc-action-api/src/main/java/org/openecomp/sdc/action/types/Action.java b/openecomp-be/lib/openecomp-sdc-action-lib/openecomp-sdc-action-api/src/main/java/org/openecomp/sdc/action/types/Action.java index 07dd03882d..8909274143 100644 --- a/openecomp-be/lib/openecomp-sdc-action-lib/openecomp-sdc-action-api/src/main/java/org/openecomp/sdc/action/types/Action.java +++ b/openecomp-be/lib/openecomp-sdc-action-lib/openecomp-sdc-action-api/src/main/java/org/openecomp/sdc/action/types/Action.java @@ -25,6 +25,11 @@ import org.openecomp.sdc.action.ActionConstants; import org.openecomp.sdc.action.dao.types.ActionEntity; import org.openecomp.sdc.versioning.dao.types.Version; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter public class Action implements Comparable { private String actionUuId; @@ -67,119 +72,6 @@ public class Action implements Comparable { this.supportedModels = action.getSupportedModels(); this.artifacts = action.getArtifacts(); } - - public String getActionUuId() { - return actionUuId; - } - - public void setActionUuId(String actionUuId) { - this.actionUuId = actionUuId; - } - - public String getActionInvariantUuId() { - return actionInvariantUuId; - } - - public void setActionInvariantUuId(String actionInvariantUuId) { - this.actionInvariantUuId = actionInvariantUuId; - } - - public String getVersion() { - return version; - } - - public void setVersion(String version) { - this.version = version; - } - - public ActionStatus getStatus() { - return status; - } - - public void setStatus(ActionStatus status) { - this.status = status; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getDisplayName() { - return displayName; - } - - public void setDisplayName(String displayName) { - this.displayName = displayName; - } - - public List getVendorList() { - return vendorList; - } - - public void setVendorList(List vendorList) { - this.vendorList = vendorList; - } - - public List getCategoryList() { - return categoryList; - } - - public void setCategoryList(List categoryList) { - this.categoryList = categoryList; - } - - public Date getTimestamp() { - return timestamp; - } - - public void setTimestamp(Date timestamp) { - this.timestamp = timestamp; - } - - public String getUser() { - return user; - } - - public void setUser(String user) { - this.user = user; - } - - public List> getSupportedModels() { - return supportedModels; - } - - public void setSupportedModels(List> supportedModels) { - this.supportedModels = supportedModels; - } - - public List> getSupportedComponents() { - return supportedComponents; - } - - public void setSupportedComponents(List> supportedComponents) { - this.supportedComponents = supportedComponents; - } - - public List getArtifacts() { - return artifacts; - } - - public void setArtifacts(List artifacts) { - this.artifacts = artifacts; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - /** * To entity action entity. * diff --git a/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-api/src/main/java/org/openecomp/sdc/vendorlicense/dao/types/EntitlementPoolEntity.java b/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-api/src/main/java/org/openecomp/sdc/vendorlicense/dao/types/EntitlementPoolEntity.java index 74df63fba7..6b80aa7ccd 100644 --- a/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-api/src/main/java/org/openecomp/sdc/vendorlicense/dao/types/EntitlementPoolEntity.java +++ b/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-api/src/main/java/org/openecomp/sdc/vendorlicense/dao/types/EntitlementPoolEntity.java @@ -24,6 +24,10 @@ import com.datastax.driver.mapping.annotations.Column; import com.datastax.driver.mapping.annotations.Frozen; import com.datastax.driver.mapping.annotations.PartitionKey; import com.datastax.driver.mapping.annotations.Table; + +import lombok.Getter; +import lombok.Setter; + import java.util.Collection; import java.util.HashSet; import java.util.Objects; @@ -37,6 +41,8 @@ import org.openecomp.sdc.vendorlicense.dao.types.xml.ThresholdForXml; import org.openecomp.sdc.versioning.dao.types.Version; import org.openecomp.sdc.versioning.dao.types.VersionableEntity; +@Getter +@Setter @Table(keyspace = "dox", name = "entitlement_pool") public class EntitlementPoolEntity implements VersionableEntity { @@ -103,104 +109,6 @@ public class EntitlementPoolEntity implements VersionableEntity { return getVendorLicenseModelId(); } - @Override - public String getId() { - return id; - } - - @Override - public void setId(String id) { - this.id = id; - } - - @Override - public Version getVersion() { - return version; - } - - @Override - public void setVersion(Version version) { - this.version = version; - } - - @Override - public String getVersionUuId() { - return versionUuId; - } - - @Override - public void setVersionUuId(String uuId) { - versionUuId = uuId; - } - - public String getVendorLicenseModelId() { - return vendorLicenseModelId; - } - - public void setVendorLicenseModelId(String vendorLicenseModelId) { - this.vendorLicenseModelId = vendorLicenseModelId; - } - - public Set getReferencingFeatureGroups() { - return referencingFeatureGroups; - } - - public void setReferencingFeatureGroups(Set referencingFeatureGroups) { - this.referencingFeatureGroups = referencingFeatureGroups; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public EntitlementPoolType getType() { - return type; - } - - public void setType(EntitlementPoolType type) { - this.type = type; - } - - public Integer getThresholdValue() { - return thresholdValue; - } - - public void setThresholdValue(Integer thresholdValue) { - this.thresholdValue = thresholdValue; - } - - public ThresholdUnit getThresholdUnit() { - return thresholdUnit; - } - - public void setThresholdUnit(ThresholdUnit thresholdUnits) { - this.thresholdUnit = thresholdUnits; - } - - public String getIncrements() { - return increments; - } - - public void setIncrements(String increments) { - this.increments = increments; - } - - public MultiChoiceOrOther getOperationalScope() { - return operationalScope; - } - public void setOperationalScope(MultiChoiceOrOther operationalScope) { if (operationalScope != null) { operationalScope.resolveEnum(OperationalScope.class); @@ -229,30 +137,6 @@ public class EntitlementPoolEntity implements VersionableEntity { return version.toString(); } - public String getStartDate() { - return startDate; - } - - public void setStartDate(String startDate) { - this.startDate = startDate; - } - - public String getExpiryDate() { - return expiryDate; - } - - public void setExpiryDate(String expiryDate) { - this.expiryDate = expiryDate; - } - - public Collection getLimits() { - return limits; - } - - public void setLimits(Collection limits) { - this.limits = limits; - } - public LimitForXml getSPLimits() { if (limits != null) { Set hs = new HashSet<>(); @@ -344,15 +228,6 @@ public class EntitlementPoolEntity implements VersionableEntity { return obj; } - public String getManufacturerReferenceNumber() { - return manufacturerReferenceNumber; - } - - //Defined and used only for License Artifcat XMLs - public void setManufacturerReferenceNumber(String manufacturerReferenceNumber) { - this.manufacturerReferenceNumber = manufacturerReferenceNumber; - } - public String getIsoFormatStartDate() { String isoFormatStartDate = null; if (!StringUtils.isEmpty(startDate)) { diff --git a/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-api/src/main/java/org/openecomp/sdc/vendorlicense/dao/types/LicenseKeyGroupEntity.java b/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-api/src/main/java/org/openecomp/sdc/vendorlicense/dao/types/LicenseKeyGroupEntity.java index 57849a890a..c36fd92b12 100644 --- a/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-api/src/main/java/org/openecomp/sdc/vendorlicense/dao/types/LicenseKeyGroupEntity.java +++ b/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-api/src/main/java/org/openecomp/sdc/vendorlicense/dao/types/LicenseKeyGroupEntity.java @@ -24,6 +24,10 @@ import com.datastax.driver.mapping.annotations.Column; import com.datastax.driver.mapping.annotations.Frozen; import com.datastax.driver.mapping.annotations.PartitionKey; import com.datastax.driver.mapping.annotations.Table; + +import lombok.Getter; +import lombok.Setter; + import java.util.Collection; import java.util.HashSet; import java.util.Objects; @@ -38,6 +42,8 @@ import org.openecomp.sdc.vendorlicense.dao.types.xml.ThresholdForXml; import org.openecomp.sdc.versioning.dao.types.Version; import org.openecomp.sdc.versioning.dao.types.VersionableEntity; +@Getter +@Setter @Table(keyspace = "dox", name = "license_key_group") public class LicenseKeyGroupEntity implements VersionableEntity { @@ -102,68 +108,6 @@ public class LicenseKeyGroupEntity implements VersionableEntity { return getVendorLicenseModelId(); } - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public Version getVersion() { - return version; - } - - public void setVersion(Version version) { - this.version = version; - } - - @Override - public String getVersionUuId() { - return versionUuId; - } - - @Override - public void setVersionUuId(String uuId) { - versionUuId = uuId; - } - - public String getVendorLicenseModelId() { - return vendorLicenseModelId; - } - - public void setVendorLicenseModelId(String vendorLicenseModelId) { - this.vendorLicenseModelId = vendorLicenseModelId; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public LicenseKeyType getType() { - return type; - } - - public void setType(LicenseKeyType type) { - this.type = type; - } - - public MultiChoiceOrOther getOperationalScope() { - return operationalScope; - } - public void setOperationalScope(MultiChoiceOrOther operationalScope) { if (operationalScope != null) { operationalScope.resolveEnum(OperationalScope.class); @@ -171,38 +115,6 @@ public class LicenseKeyGroupEntity implements VersionableEntity { this.operationalScope = operationalScope; } - public Set getReferencingFeatureGroups() { - return referencingFeatureGroups; - } - - public void setReferencingFeatureGroups(Set referencingFeatureGroups) { - this.referencingFeatureGroups = referencingFeatureGroups; - } - - public Integer getThresholdValue() { - return thresholdValue; - } - - public void setThresholdValue(Integer thresholdValue) { - this.thresholdValue = thresholdValue; - } - - public ThresholdUnit getThresholdUnits() { - return thresholdUnits; - } - - public void setThresholdUnits(ThresholdUnit thresholdUnit) { - this.thresholdUnits = thresholdUnit; - } - - public String getIncrements() { - return increments; - } - - public void setIncrements(String increments) { - this.increments = increments; - } - public ThresholdForXml getThresholdForArtifact() { ThresholdForXml threshold = new ThresholdForXml(); threshold.setUnit(getThresholdUnits() == null ? null : getThresholdUnits().name()); @@ -210,14 +122,6 @@ public class LicenseKeyGroupEntity implements VersionableEntity { return threshold; } - public Collection getLimits() { - return limits; - } - - public void setLimits(Collection limits) { - this.limits = limits; - } - public LimitForXml getSPLimits() { if (limits != null) { Set hs = new HashSet<>(); @@ -262,22 +166,6 @@ public class LicenseKeyGroupEntity implements VersionableEntity { return null; } - public String getStartDate() { - return startDate; - } - - public void setStartDate(String startDate) { - this.startDate = startDate; - } - - public String getExpiryDate() { - return expiryDate; - } - - public void setExpiryDate(String expiryDate) { - this.expiryDate = expiryDate; - } - @Override public int hashCode() { return Objects @@ -326,15 +214,6 @@ public class LicenseKeyGroupEntity implements VersionableEntity { return obj; } - /** - * Gets version for artifact. - * - * @return version in format suitable for artifact - */ - public String getVersionForArtifact() { - return version.toString(); - } - /** * Gets type for artifact. * @@ -350,15 +229,6 @@ public class LicenseKeyGroupEntity implements VersionableEntity { return typeXml; } - //Defined and used only for License Artifcat XMLs - public String getManufacturerReferenceNumber() { - return manufacturerReferenceNumber; - } - - public void setManufacturerReferenceNumber(String manufacturerReferenceNumber) { - this.manufacturerReferenceNumber = manufacturerReferenceNumber; - } - public String getIsoFormatStartDate() { String isoFormatStartDate = null; if (!StringUtils.isEmpty(startDate)) { diff --git a/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-api/src/main/java/org/openecomp/sdc/vendorlicense/dao/types/LimitEntity.java b/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-api/src/main/java/org/openecomp/sdc/vendorlicense/dao/types/LimitEntity.java index c4b169b3d3..83d4fb2826 100644 --- a/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-api/src/main/java/org/openecomp/sdc/vendorlicense/dao/types/LimitEntity.java +++ b/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-api/src/main/java/org/openecomp/sdc/vendorlicense/dao/types/LimitEntity.java @@ -23,6 +23,11 @@ import java.util.Objects; import org.openecomp.sdc.versioning.dao.types.Version; import org.openecomp.sdc.versioning.dao.types.VersionableEntity; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter public class LimitEntity implements VersionableEntity { private static final String ENTITY_TYPE = "Limit"; @@ -53,30 +58,6 @@ public class LimitEntity implements VersionableEntity { this.id = id; } - public String getUnit() { - return unit; - } - - public void setUnit(String unit) { - this.unit = unit; - } - - public AggregationFunction getAggregationFunction() { - return aggregationFunction; - } - - public void setAggregationFunction(AggregationFunction aggregationFunction) { - this.aggregationFunction = aggregationFunction; - } - - public String getTime() { - return time; - } - - public void setTime(String time) { - this.time = time; - } - @Override public String getEntityType() { return ENTITY_TYPE; @@ -87,92 +68,6 @@ public class LimitEntity implements VersionableEntity { return getVendorLicenseModelId(); } - @Override - public String getId() { - return id; - } - - @Override - public void setId(String id) { - this.id = id; - } - - @Override - public Version getVersion() { - return version; - } - - @Override - public void setVersion(Version version) { - this.version = version; - } - - public String getEpLkgId() { - return epLkgId; - } - - public void setEpLkgId(String epLkgId) { - this.epLkgId = epLkgId; - } - - public String getVendorLicenseModelId() { - return vendorLicenseModelId; - } - - public void setVendorLicenseModelId(String vendorLicenseModelId) { - this.vendorLicenseModelId = vendorLicenseModelId; - } - - public LimitType getType() { - return type; - } - - public void setType(LimitType type) { - this.type = type; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getMetric() { - return metric; - } - - public void setMetric(String metric) { - this.metric = metric; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } - //Defined and used only to find parent(EP/LKG) of Limit. Not to be persisted in DB and License - - // Xmls - public String getParent() { - return parent; - } - - public void setParent(String parent) { - this.parent = parent; - } - @Override public int hashCode() { return Objects.hash(vendorLicenseModelId, version, epLkgId, id, name, description, type, metric, unit, time, aggregationFunction, value); -- 2.16.6