diff options
author | Jim Hahn <jrh3@att.com> | 2021-06-17 15:26:35 -0400 |
---|---|---|
committer | Jim Hahn <jrh3@att.com> | 2021-06-17 15:33:45 -0400 |
commit | c569329ba047f88fcd82aef0e916149911430ed9 (patch) | |
tree | c015b5e733e4d9ae5099d8b2e4e7a58d2fb6ac67 /models-interactions/model-impl/so/src/main | |
parent | 27ac6bce15318a074d4fb53606571eb30e46bf07 (diff) |
Use lombok annotations for so, vfc
Issue-ID: POLICY-3396
Change-Id: I33781c72dd1c0b9a7a525c23e81c4259fa32384f
Signed-off-by: Jim Hahn <jrh3@att.com>
Diffstat (limited to 'models-interactions/model-impl/so/src/main')
19 files changed, 32 insertions, 140 deletions
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 7475c8ad4..ff43a011c 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 @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * so * ================================================================================ - * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017-2019, 2021 AT&T Intellectual Property. All rights reserved. * Modifications Copyright (C) 2019 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); @@ -40,8 +40,4 @@ public class SoAsyncRequestStatus implements Serializable { private String requestScope; private String requestType; private SoRequestStatus requestStatus; - - public SoAsyncRequestStatus() { - // required by author - } } 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 a991e702b..d7857f35c 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 @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * so * ================================================================================ - * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017-2019, 2021 AT&T Intellectual Property. All rights reserved. * Modifications Copyright (C) 2019 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); @@ -33,8 +33,4 @@ public class SoCloudConfiguration implements Serializable { private String lcpCloudRegionId; private String tenantId; - - public SoCloudConfiguration() { - //required by author - } } 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 5d1b37365..98f81e473 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 @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * so * ================================================================================ - * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017-2019, 2021 AT&T Intellectual Property. All rights reserved. * Modifications Copyright (C) 2019 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); @@ -33,8 +33,4 @@ public class SoInstanceReferences implements Serializable { private String requestId; private String instanceId; - - public SoInstanceReferences() { - //required by author - } } 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 785f341c3..025d0638a 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 @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * so * ================================================================================ - * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017-2019, 2021 AT&T Intellectual Property. All rights reserved. * Modifications Copyright (C) 2019 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); @@ -38,8 +38,4 @@ public class SoModelInfo implements Serializable { private String modelVersion; private String modelCustomizationName; private String modelCustomizationId; - - public SoModelInfo() { - //required by author - } } 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 173a6e03b..e5c9f6fd3 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 @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * so * ================================================================================ - * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017-2019, 2021 AT&T Intellectual Property. All rights reserved. * Modifications Copyright (C) 2019 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); @@ -33,8 +33,4 @@ public class SoPolicyExceptionHolder implements Serializable { private String messageId; private String text; - - public SoPolicyExceptionHolder() { - //required by author - } } 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 044853f1f..51d488492 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 @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * so * ================================================================================ - * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017-2019, 2021 AT&T Intellectual Property. All rights reserved. * Modifications Copyright (C) 2019 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); @@ -34,8 +34,4 @@ public class SoRelatedInstance implements Serializable { private String instanceId; private String instanceName; private SoModelInfo modelInfo; - - public SoRelatedInstance() { - //required by author - } } 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 8cfaf86b6..615f942ae 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 @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * so * ================================================================================ - * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017-2019, 2021 AT&T Intellectual Property. All rights reserved. * Modifications Copyright (C) 2019 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); @@ -28,11 +28,8 @@ import lombok.Setter; @Getter @Setter public class SoRelatedInstanceListElement implements Serializable { - + private static final long serialVersionUID = -3283942659786236032L; - private SoRelatedInstance relatedInstance; - public SoRelatedInstanceListElement() { - //required by author - } + private SoRelatedInstance 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 8e28cc33c..61683327e 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 @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * so * ================================================================================ - * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017-2019, 2021 AT&T Intellectual Property. All rights reserved. * Modifications Copyright (C) 2019 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); @@ -42,8 +42,4 @@ public class SoRequest implements Serializable { private SoRequestStatus requestStatus; private transient SoOperationType operationType; - - public SoRequest() { - // required by author - } } diff --git a/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoRequest3gpp.java b/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoRequest3gpp.java index 212eabe58..820f6afbb 100644 --- a/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoRequest3gpp.java +++ b/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/SoRequest3gpp.java @@ -3,6 +3,7 @@ * ONAP * ================================================================================ * Copyright (C) 2020 Wipro Limited. + * Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -41,9 +42,4 @@ public class SoRequest3gpp implements Serializable { private String subscriptionServiceType; private String networkType; private Map<String, Object> additionalProperties; - - - public SoRequest3gpp() { - // required by author - } } 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 9c3a4ec33..66b493e11 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 @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * so * ================================================================================ - * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017-2019, 2021 AT&T Intellectual Property. All rights reserved. * Modifications Copyright (C) 2019 Nordix Foundation. * Modifications Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. * ================================================================================ @@ -28,11 +28,15 @@ import java.util.List; import java.util.Map; import lombok.EqualsAndHashCode; import lombok.Getter; +import lombok.NoArgsConstructor; import lombok.Setter; +import lombok.ToString; @Getter @Setter @EqualsAndHashCode +@ToString +@NoArgsConstructor public class SoRequestDetails implements Serializable { private static final long serialVersionUID = -3283942659786236032L; @@ -45,9 +49,6 @@ public class SoRequestDetails implements Serializable { private SoRequestParameters requestParameters; private List<Map<String, String>> configurationParameters = new LinkedList<>(); - public SoRequestDetails() { - } - /** * Constructor. * @@ -61,13 +62,4 @@ public class SoRequestDetails implements Serializable { this.requestParameters = soRequestDetails.requestParameters; this.subscriberInfo = soRequestDetails.subscriberInfo; } - - @Override - public String toString() { - return "SORequestDetails [modelInfo=" + modelInfo + ", cloudConfiguration=" + cloudConfiguration - + ", requestInfo=" + requestInfo + ", subscriberInfo=" + subscriberInfo - + ", relatedInstanceList=" + relatedInstanceList + ", requestParameters=" + requestParameters - + ", configurationParameters=" + configurationParameters + "]"; - } - } 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 2f9f13589..f13438880 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 @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * so * ================================================================================ - * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017-2019, 2021 AT&T Intellectual Property. All rights reserved. * Modifications Copyright (C) 2019 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); @@ -33,8 +33,4 @@ public class SoRequestError implements Serializable { private SoPolicyExceptionHolder policyException; private SoServiceExceptionHolder serviceException; - - public SoRequestError() { - // required by author - } } 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 b6a840c45..c68ab774f 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 @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * so * ================================================================================ - * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017-2019, 2021 AT&T Intellectual Property. All rights reserved. * Modifications Copyright (C) 2019 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); @@ -41,8 +41,4 @@ public class SoRequestInfo implements Serializable { private String orderNumber; private Integer orderVersion; private String requestorId; - - public SoRequestInfo() { - // required by author - } } 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 e9451e2ae..dfe6e0ed8 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 @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * so * ================================================================================ - * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017-2019, 2021 AT&T Intellectual Property. All rights reserved. * Modifications Copyright (C) 2019 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); @@ -37,8 +37,4 @@ public class SoRequestParameters implements Serializable { private String subscriptionServiceType; private boolean usePreload; private List<Map<String, String>> userParams = new LinkedList<>(); - - public SoRequestParameters() { - // required by author - } } 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 8accc5d3d..c3f7b2918 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 @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * so * ================================================================================ - * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017-2019, 2021 AT&T Intellectual Property. All rights reserved. * Modifications Copyright (C) 2019 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,8 +35,4 @@ public class SoRequestStatus implements Serializable { private String requestState; private String timestamp; private boolean wasRolledBack; - - public SoRequestStatus() { - //required by author - } } 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 22079b515..3cbaa31c8 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 @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * so * ================================================================================ - * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017-2019, 2021 AT&T Intellectual Property. All rights reserved. * Modifications Copyright (C) 2019 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,8 +35,4 @@ public class SoResponse implements Serializable { private SoRequestError requestError; private SoRequest request; private int httpResponseCode; - - public SoResponse() { - // required by author - } } 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 b6eef29d2..198d16980 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 @@ -23,11 +23,15 @@ package org.onap.policy.so; import com.google.gson.annotations.SerializedName; import java.io.Serializable; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; @Getter @Setter +@AllArgsConstructor +@EqualsAndHashCode public class SoResponseWrapper implements Serializable { private static final long serialVersionUID = 7673023687132889069L; @@ -35,48 +39,9 @@ public class SoResponseWrapper implements Serializable { @SerializedName("SoResponse") private SoResponse soResponse; + @EqualsAndHashCode.Include private transient String requestId; - public SoResponseWrapper(SoResponse response, String reqId) { - this.soResponse = response; - this.requestId = reqId; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) { - return true; - } - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { - return false; - } - SoResponseWrapper other = (SoResponseWrapper) obj; - if (soResponse == null) { - if (other.soResponse != null) { - return false; - } - } else if (!soResponse.equals(other.soResponse)) { - return false; - } - if (requestId == null) { - return other.requestId == null; - } else { - return requestId.equals(other.requestId); - } - } - - @Override - public int hashCode() { - final var prime = 31; - int result = super.hashCode(); - result = prime * result + ((soResponse == null) ? 0 : soResponse.hashCode()); - result = prime * result + ((requestId == null) ? 0 : requestId.hashCode()); - return result; - } - @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 78390d7cb..7f05b3157 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 @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * so * ================================================================================ - * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017-2019, 2021 AT&T Intellectual Property. All rights reserved. * Modifications Copyright (C) 2019 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); @@ -36,8 +36,4 @@ public class SoServiceExceptionHolder implements Serializable { private String messageId; private String text; private List<String> variables = new LinkedList<>(); - - public SoServiceExceptionHolder() { - // required by author - } } 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 2e85410c3..9fc1fc8f2 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 @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * so * ================================================================================ - * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017-2019, 2021 AT&T Intellectual Property. All rights reserved. * Modifications Copyright (C) 2019 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); @@ -34,8 +34,4 @@ public class SoSubscriberInfo implements Serializable { private String globalSubscriberId; private String subscriberCommonSiteId; private String subscriberName; - - public SoSubscriberInfo() { - //required by author - } } diff --git a/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/util/Serialization.java b/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/util/Serialization.java index 78506380d..4aac0b866 100644 --- a/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/util/Serialization.java +++ b/models-interactions/model-impl/so/src/main/java/org/onap/policy/so/util/Serialization.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * mso * ================================================================================ - * Copyright (C) 2017-2020 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017-2021 AT&T Intellectual Property. All rights reserved. * Modifications Copyright (C) 2019 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); @@ -24,16 +24,14 @@ package org.onap.policy.so.util; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import java.time.LocalDateTime; +import lombok.AccessLevel; +import lombok.NoArgsConstructor; +@NoArgsConstructor(access = AccessLevel.PRIVATE) public final class Serialization { public static final Gson gsonPretty = new GsonBuilder().disableHtmlEscaping().setPrettyPrinting() .registerTypeAdapter(LocalDateTime.class, new SoLocalDateTimeTypeAdapter()) .create(); - - private Serialization() { - // utility class with explicit private constructor - // change if class is more than utility - } } |