From 815674c947f970e9e57e06c8907758f88032b30a Mon Sep 17 00:00:00 2001 From: Dmitry Puzikov Date: Fri, 20 Mar 2020 09:11:38 +0100 Subject: Fix unit tests Add asserts where required, fix tiny issues. Replaced getters-setters with Lombok annotations. Change-Id: I9d75c871870fffe82876e14dd2eb9d3585ecb916 Issue-ID: SDC-2708 Signed-off-by: Dmitry Puzikov --- .../be/components/validation/ApiResourceEnum.java | 8 ++--- .../api/client/RegistrationRequest.java | 39 +++------------------- .../api/client/ServerListResponse.java | 15 ++++----- .../api/client/TopicRegistrationResponse.java | 23 ++++--------- .../api/client/TopicUnregistrationResponse.java | 19 ++--------- 5 files changed, 23 insertions(+), 81 deletions(-) (limited to 'catalog-be/src/main/java') diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/validation/ApiResourceEnum.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/validation/ApiResourceEnum.java index 1a10ac94b1..7f217b95b1 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/validation/ApiResourceEnum.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/validation/ApiResourceEnum.java @@ -20,9 +20,12 @@ package org.openecomp.sdc.be.components.validation; +import lombok.Getter; + /** * Created by chaya on 11/14/2017. */ +@Getter public enum ApiResourceEnum { ENVIRONMENT_ID("Environment ID"), @@ -34,9 +37,4 @@ public enum ApiResourceEnum { ApiResourceEnum(String value) { this.value = value; } - - public String getValue() { - return this.value; - } - } diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/distribution/api/client/RegistrationRequest.java b/catalog-be/src/main/java/org/openecomp/sdc/be/distribution/api/client/RegistrationRequest.java index 8377749a64..1ce3621d84 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/distribution/api/client/RegistrationRequest.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/distribution/api/client/RegistrationRequest.java @@ -21,7 +21,11 @@ package org.openecomp.sdc.be.distribution.api.client; import java.util.List; +import lombok.Getter; +import lombok.Setter; +@Getter +@Setter public class RegistrationRequest { private String apiPublicKey; private String distrEnvName; @@ -41,39 +45,4 @@ public class RegistrationRequest { this.distEnvEndPoints = distEnvEndPoints; this.isConsumerToSdcDistrStatusTopic = isConsumerToSdcDistrStatusTopic; } - - public String getApiPublicKey() { - return apiPublicKey; - } - - public String getDistrEnvName() { - return distrEnvName; - } - - public Boolean getIsConsumerToSdcDistrStatusTopic() { - return isConsumerToSdcDistrStatusTopic; - } - public List getDistEnvEndPoints() { - return distEnvEndPoints; - } - - public void setDistEnvEndPoints(List distEnvEndPoints) { - this.distEnvEndPoints = distEnvEndPoints; - } - - public String getManagerApiPublicKey() { - return managerApiPublicKey; - } - - public void setManagerApiPublicKey(String managerApiPublicKey) { - this.managerApiPublicKey = managerApiPublicKey; - } - - public String getManagerApiSecretKey() { - return managerApiSecretKey; - } - - public void setManagerApiSecretKey(String managerApiSecretKey) { - this.managerApiSecretKey = managerApiSecretKey; - } } diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/distribution/api/client/ServerListResponse.java b/catalog-be/src/main/java/org/openecomp/sdc/be/distribution/api/client/ServerListResponse.java index 2eebedfd7c..b0db19f541 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/distribution/api/client/ServerListResponse.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/distribution/api/client/ServerListResponse.java @@ -21,16 +21,13 @@ package org.openecomp.sdc.be.distribution.api.client; import java.util.List; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +@Getter +@Setter +@NoArgsConstructor(force = true) public class ServerListResponse { - private List uebServerList; - - public List getUebServerList() { - return uebServerList; - } - - public void setUebServerList(List uebServerList) { - this.uebServerList = uebServerList; - } } diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/distribution/api/client/TopicRegistrationResponse.java b/catalog-be/src/main/java/org/openecomp/sdc/be/distribution/api/client/TopicRegistrationResponse.java index 5d1b0657c6..6b3e9e15e2 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/distribution/api/client/TopicRegistrationResponse.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/distribution/api/client/TopicRegistrationResponse.java @@ -20,23 +20,14 @@ package org.openecomp.sdc.be.distribution.api.client; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@NoArgsConstructor(force = true) public class TopicRegistrationResponse { String distrNotificationTopicName; String distrStatusTopicName; - - public void setDistrNotificationTopicName(String distrNotificationTopicName) { - this.distrNotificationTopicName = distrNotificationTopicName; - } - - public void setDistrStatusTopicName(String distrStatusTopicName) { - this.distrStatusTopicName = distrStatusTopicName; - } - - public String getDistrNotificationTopicName() { - return distrNotificationTopicName; - } - - public String getDistrStatusTopicName() { - return distrStatusTopicName; - } } diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/distribution/api/client/TopicUnregistrationResponse.java b/catalog-be/src/main/java/org/openecomp/sdc/be/distribution/api/client/TopicUnregistrationResponse.java index 621cd37a54..55c3baef24 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/distribution/api/client/TopicUnregistrationResponse.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/distribution/api/client/TopicUnregistrationResponse.java @@ -20,6 +20,9 @@ package org.openecomp.sdc.be.distribution.api.client; +import lombok.Getter; + +@Getter public class TopicUnregistrationResponse { String distrNotificationTopicName; String distrStatusTopicName; @@ -33,20 +36,4 @@ public class TopicUnregistrationResponse { this.notificationUnregisterResult = notificationUnregisterResult; this.statusUnregisterResult = statusUnregisterResult; } - - public String getDistrNotificationTopicName() { - return distrNotificationTopicName; - } - - public String getDistrStatusTopicName() { - return distrStatusTopicName; - } - - public CambriaOperationStatus getNotificationUnregisterResult() { - return notificationUnregisterResult; - } - - public CambriaOperationStatus getStatusUnregisterResult() { - return statusUnregisterResult; - } } -- cgit 1.2.3-korg