Merge "Use lombok annotations for aai, appc, appclcm, cds"

17 files changed, 61 insertions, 145 deletions

diff --git a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiConstants.java b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiConstants.java
index 084e4a504..e6c46e5e2 100644
--- a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiConstants.java
+++ b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiConstants.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP
  * ================================================================================
- * Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2020-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.
@@ -20,15 +20,15 @@
 
 package org.onap.policy.aai;
 
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+
 /**
  * Constants used with A&AI classes.
  */
-public class AaiConstants {
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public final class AaiConstants {
 
     public static final String ACTOR_NAME = "AAI";
     public static final String CONTEXT_PREFIX = ACTOR_NAME + ".";
-
-    private AaiConstants() {
-        // do nothing
-    }
 }
diff --git a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiManager.java b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiManager.java
index b2a410733..a6a671815 100644
--- a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiManager.java
+++ b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiManager.java
@@ -29,6 +29,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
 import java.util.stream.Collectors;
+import lombok.AllArgsConstructor;
 import org.apache.commons.lang3.tuple.Pair;
 import org.json.JSONArray;
 import org.json.JSONObject;
@@ -44,6 +45,7 @@ import org.slf4j.LoggerFactory;
 /**
  * This class handles communication towards and responses from A&AI for this module.
  */
+@AllArgsConstructor
 public final class AaiManager {
 
     // TODO remove this class
@@ -55,9 +57,6 @@ public final class AaiManager {
 
     private static final StandardCoder CODER = new StandardCoder();
 
-    // The REST manager used for processing REST calls for this AAI manager
-    private final RestManager restManager;
-
     /** custom query and other AAI resource URLs. */
     private static final String CQ_URL = "/aai/v21/query?format=resource";
     private static final String TENANT_URL = "/aai/v21/search/nodes-query?"
@@ -66,14 +65,8 @@ public final class AaiManager {
     private static final String PNF_URL = PREFIX + "/network/pnfs/pnf/";
     private static final String AAI_DEPTH_SUFFIX = "?depth=0";
 
-    /**
-     * Constructor, create the AAI manager with the specified REST manager.
-     *
-     * @param restManager the rest manager to use for REST calls
-     */
-    public AaiManager(final RestManager restManager) {
-        this.restManager = restManager;
-    }
+    // The REST manager used for processing REST calls for this AAI manager
+    private final RestManager restManager;
 
     /**
      * Creates the custom query payload from a tenant query response.
diff --git a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/util/Serialization.java b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/util/Serialization.java
index 7a14a854f..4b2be050a 100644
--- a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/util/Serialization.java
+++ b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/util/Serialization.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * aai
  * ================================================================================
- * 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");
@@ -23,12 +23,11 @@ package org.onap.policy.aai.util;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
 
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
 public final class Serialization {
 
     public static final Gson gsonPretty = new GsonBuilder().disableHtmlEscaping().setPrettyPrinting().create();
-
-    private Serialization() {
-        // Private constructor to prevent subclassing
-    }
 }
diff --git a/models-interactions/model-impl/appc/src/main/java/org/onap/policy/appc/CommonHeader.java b/models-interactions/model-impl/appc/src/main/java/org/onap/policy/appc/CommonHeader.java
index d48d7250c..e2b6be268 100644
--- a/models-interactions/model-impl/appc/src/main/java/org/onap/policy/appc/CommonHeader.java
+++ b/models-interactions/model-impl/appc/src/main/java/org/onap/policy/appc/CommonHeader.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * appc
  * ================================================================================
- * 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");
@@ -30,11 +30,15 @@ import java.util.Map;
 import java.util.UUID;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.Setter;
+import lombok.ToString;
 
 @Getter
 @Setter
 @EqualsAndHashCode
+@NoArgsConstructor
+@ToString
 public class CommonHeader implements Serializable {
     private static final long serialVersionUID = -3581658269910980336L;
 
@@ -59,10 +63,6 @@ public class CommonHeader implements Serializable {
     @SerializedName("Flags")
     private Collection<Map<String, String>> flags = new ArrayList<>();
 
-    public CommonHeader() {
-        // Default constructor
-    }
-
     /**
      * Construct an instance from an existing instance.
      *
@@ -81,11 +81,4 @@ public class CommonHeader implements Serializable {
             this.flags.addAll(commonHeader.flags);
         }
     }
-
-    @Override
-    public String toString() {
-        return "CommonHeader [TimeStamp=" + timeStamp + ", APIver=" + apiVer + ", OriginatorId=" + originatorId
-                + ", RequestId=" + requestId + ", SubrequestId=" + subRequestId + ", RequestTrack=" + requestTrack
-                + ", Flags=" + flags + "]";
-    }
 }
diff --git a/models-interactions/model-impl/appc/src/main/java/org/onap/policy/appc/Request.java b/models-interactions/model-impl/appc/src/main/java/org/onap/policy/appc/Request.java
index c26566fe1..20b75d23a 100644
--- a/models-interactions/model-impl/appc/src/main/java/org/onap/policy/appc/Request.java
+++ b/models-interactions/model-impl/appc/src/main/java/org/onap/policy/appc/Request.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * appc
  * ================================================================================
- * 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");
@@ -27,11 +27,15 @@ import java.util.HashMap;
 import java.util.Map;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.Setter;
+import lombok.ToString;
 
 @Getter
 @Setter
 @EqualsAndHashCode
+@NoArgsConstructor
+@ToString
 public class Request implements Serializable {
     private static final long serialVersionUID = -3912323643990646431L;
 
@@ -49,15 +53,4 @@ public class Request implements Serializable {
 
     @SerializedName("Payload")
     private Map<String, Object> payload = new HashMap<>();
-
-    public Request() {
-        // Initiate an empty Request instance
-    }
-
-    @Override
-    public String toString() {
-        return "Request [CommonHeader=" + commonHeader + ", Action=" + action + ", TargetId=" + targetId + ", ObjectId="
-                + objectId + ", Payload=" + payload + "]";
-    }
-
 }
diff --git a/models-interactions/model-impl/appc/src/main/java/org/onap/policy/appc/Response.java b/models-interactions/model-impl/appc/src/main/java/org/onap/policy/appc/Response.java
index 3afbd53c7..2576e3806 100644
--- a/models-interactions/model-impl/appc/src/main/java/org/onap/policy/appc/Response.java
+++ b/models-interactions/model-impl/appc/src/main/java/org/onap/policy/appc/Response.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * appc
  * ================================================================================
- * 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");
@@ -27,11 +27,15 @@ import java.util.HashMap;
 import java.util.Map;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.Setter;
+import lombok.ToString;
 
 @Getter
 @Setter
 @EqualsAndHashCode
+@NoArgsConstructor
+@ToString
 public class Response implements Serializable {
 
     private static final long serialVersionUID = 434953706339865151L;
@@ -50,10 +54,6 @@ public class Response implements Serializable {
     @SerializedName("Payload")
     private Map<String, Object> payload = new HashMap<>();
 
-    public Response() {
-
-    }
-
     /**
      * Construct an instance from an existing instance.
      *
@@ -67,9 +67,4 @@ public class Response implements Serializable {
             this.payload.putAll(request.getPayload());
         }
     }
-
-    @Override
-    public String toString() {
-        return "Response [CommonHeader=" + commonHeader + ", Status=" + status + ", Payload=" + payload + "]";
-    }
 }
diff --git a/models-interactions/model-impl/appc/src/main/java/org/onap/policy/appc/ResponseStatus.java b/models-interactions/model-impl/appc/src/main/java/org/onap/policy/appc/ResponseStatus.java
index 6a0e19a42..6e8a72de7 100644
--- a/models-interactions/model-impl/appc/src/main/java/org/onap/policy/appc/ResponseStatus.java
+++ b/models-interactions/model-impl/appc/src/main/java/org/onap/policy/appc/ResponseStatus.java
@@ -23,11 +23,15 @@ package org.onap.policy.appc;
 
 import com.google.gson.annotations.SerializedName;
 import java.io.Serializable;
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
+import lombok.ToString;
 
 @Getter
 @Setter
+@EqualsAndHashCode
+@ToString
 public class ResponseStatus implements Serializable {
     private static final long serialVersionUID = 2421770469587860452L;
 
@@ -39,52 +43,4 @@ public class ResponseStatus implements Serializable {
 
     @SerializedName("Description")
     private String description;
-
-    @Override
-    public String toString() {
-        return "ResponseStatus [Code=" + code + ", Value=" + value + ", Description=" + description + "]";
-    }
-
-    @Override
-    public int hashCode() {
-        final var prime = 31;
-        var result = 1;
-        result = prime * result + code;
-        result = prime * result + ((description == null) ? 0 : description.hashCode());
-        result = prime * result + ((value == null) ? 0 : value.hashCode());
-        return result;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        ResponseStatus other = (ResponseStatus) obj;
-        if (code != other.code) {
-            return false;
-        }
-        if (description == null) {
-            if (other.description != null) {
-                return false;
-            }
-        } else if (!description.equals(other.description)) {
-            return false;
-        }
-        if (value == null) {
-            if (other.value != null) {
-                return false;
-            }
-        } else if (!value.equals(other.value)) {
-            return false;
-        }
-        return true;
-    }
-
 }
diff --git a/models-interactions/model-impl/appc/src/main/java/org/onap/policy/appc/util/Serialization.java b/models-interactions/model-impl/appc/src/main/java/org/onap/policy/appc/util/Serialization.java
index 9fa503131..faf3fc49c 100644
--- a/models-interactions/model-impl/appc/src/main/java/org/onap/policy/appc/util/Serialization.java
+++ b/models-interactions/model-impl/appc/src/main/java/org/onap/policy/appc/util/Serialization.java
@@ -26,9 +26,12 @@ import com.google.gson.GsonBuilder;
 import java.time.Instant;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
 import org.onap.policy.common.gson.InstantAsMillisTypeAdapter;
 import org.onap.policy.common.gson.ZonedDateTimeTypeAdapter;
 
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
 public final class Serialization {
     public static final DateTimeFormatter format = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSSSSSxxx");
 
@@ -38,8 +41,4 @@ public final class Serialization {
             // .registerTypeAdapter(CommonHeader1607.class, new gsonCommonHeaderInstance())
             // .registerTypeAdapter(ResponseStatus1607.class, new gsonResponseStatus())
             .create();
-
-    private Serialization() {
-        // Private constructor to prevent subclassing
-    }
 }
diff --git a/models-interactions/model-impl/appc/src/test/java/org/onap/policy/appc/CommonHeaderTest.java b/models-interactions/model-impl/appc/src/test/java/org/onap/policy/appc/CommonHeaderTest.java
index 686e6a416..8c00fd5de 100644
--- a/models-interactions/model-impl/appc/src/test/java/org/onap/policy/appc/CommonHeaderTest.java
+++ b/models-interactions/model-impl/appc/src/test/java/org/onap/policy/appc/CommonHeaderTest.java
@@ -21,6 +21,7 @@
 
 package org.onap.policy.appc;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
@@ -73,7 +74,7 @@ public class CommonHeaderTest {
 
         assertNotEquals(0, commonHeader.hashCode());
 
-        assertEquals("CommonHeader [TimeStamp=", commonHeader.toString().substring(0, 24));
+        assertThat(commonHeader.toString()).startsWith("CommonHeader(timeStamp=");
 
         CommonHeader copiedCommonHeader = new CommonHeader();
         copiedCommonHeader.setApiVer(commonHeader.getApiVer());
diff --git a/models-interactions/model-impl/appc/src/test/java/org/onap/policy/appc/RequestTest.java b/models-interactions/model-impl/appc/src/test/java/org/onap/policy/appc/RequestTest.java
index 5bff56b78..52b974c54 100644
--- a/models-interactions/model-impl/appc/src/test/java/org/onap/policy/appc/RequestTest.java
+++ b/models-interactions/model-impl/appc/src/test/java/org/onap/policy/appc/RequestTest.java
@@ -21,6 +21,7 @@
 
 package org.onap.policy.appc;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
@@ -64,7 +65,7 @@ public class RequestTest {
 
         assertNotEquals(0, request.hashCode());
 
-        assertEquals("Request [CommonHeader=CommonHeader [TimeStamp=", request.toString().substring(0, 46));
+        assertThat(request.toString()).startsWith("Request(commonHeader=CommonHeader(timeStamp=");
 
         Request copiedRequest = new Request();
         copiedRequest.setCommonHeader(request.getCommonHeader());
diff --git a/models-interactions/model-impl/appc/src/test/java/org/onap/policy/appc/ResponseStatusTest.java b/models-interactions/model-impl/appc/src/test/java/org/onap/policy/appc/ResponseStatusTest.java
index c79062594..cd4e2a697 100644
--- a/models-interactions/model-impl/appc/src/test/java/org/onap/policy/appc/ResponseStatusTest.java
+++ b/models-interactions/model-impl/appc/src/test/java/org/onap/policy/appc/ResponseStatusTest.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * appc
  * ================================================================================
- * 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");
@@ -21,6 +21,7 @@
 
 package org.onap.policy.appc;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
@@ -48,7 +49,7 @@ public class ResponseStatusTest {
         assertEquals(THERE_S_NO_PLACE_LIKE_HOME, status.getValue());
         assertNotEquals(0, status.hashCode());
 
-        assertEquals("ResponseStatus [Code=1234, Value=There's no pla", status.toString().substring(0, 47));
+        assertThat(status.toString()).startsWith("ResponseStatus(code=1234, value=There's no pla");
 
         ResponseStatus copiedStatus = new ResponseStatus();
         copiedStatus.setCode(status.getCode());
diff --git a/models-interactions/model-impl/appc/src/test/java/org/onap/policy/appc/ResponseTest.java b/models-interactions/model-impl/appc/src/test/java/org/onap/policy/appc/ResponseTest.java
index 9e20331f9..42e5a6d85 100644
--- a/models-interactions/model-impl/appc/src/test/java/org/onap/policy/appc/ResponseTest.java
+++ b/models-interactions/model-impl/appc/src/test/java/org/onap/policy/appc/ResponseTest.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * appc
  * ================================================================================
- * 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");
@@ -21,6 +21,7 @@
 
 package org.onap.policy.appc;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
@@ -60,7 +61,7 @@ public class ResponseTest {
 
         assertNotEquals(0, response.hashCode());
 
-        assertEquals("Response [CommonHeader=CommonHeader [TimeStamp=", response.toString().substring(0, 47));
+        assertThat(response.toString()).startsWith("Response(commonHeader=CommonHeader(timeStamp=");
 
         Response copiedResponse = new Response();
         copiedResponse.setCommonHeader(response.getCommonHeader());
diff --git a/models-interactions/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/AppcLcmResponseCode.java b/models-interactions/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/AppcLcmResponseCode.java
index 43697e9e8..30b15950f 100644
--- a/models-interactions/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/AppcLcmResponseCode.java
+++ b/models-interactions/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/AppcLcmResponseCode.java
@@ -23,8 +23,12 @@
 package org.onap.policy.appclcm;
 
 import java.io.Serializable;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
 import org.onap.policy.appclcm.util.StatusCodeEnum;
 
+@AllArgsConstructor(access = AccessLevel.PROTECTED)
 public class AppcLcmResponseCode implements Serializable {
 
     /* These fields define the key to the response code value. */
@@ -37,15 +41,8 @@ public class AppcLcmResponseCode implements Serializable {
     public static final String PARTIAL_FAILURE = "PARTIAL FAILURE";
     private static final long serialVersionUID = 8189456447227022582L;
 
-    private final Integer code;
-
-    protected AppcLcmResponseCode(final int code) {
-        this.code = code;
-    }
-
-    public int getCode() {
-        return this.code;
-    }
+    @Getter
+    private final int code;
 
     @Override
     public String toString() {
diff --git a/models-interactions/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/util/Serialization.java b/models-interactions/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/util/Serialization.java
index 7dd6e46de..ce7a868d6 100644
--- a/models-interactions/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/util/Serialization.java
+++ b/models-interactions/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/util/Serialization.java
@@ -24,9 +24,12 @@ package org.onap.policy.appclcm.util;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import java.time.Instant;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
 import org.onap.policy.common.gson.InstantAsMillisTypeAdapter;
 import org.onap.policy.common.gson.InstantTypeAdapter;
 
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
 public final class Serialization {
     public static final Gson gsonPretty = new GsonBuilder().disableHtmlEscaping().setPrettyPrinting()
             .registerTypeAdapter(Instant.class, new InstantTypeAdapter()).create();
@@ -36,8 +39,4 @@ public final class Serialization {
 
     public static final Gson gsonJunit = new GsonBuilder().disableHtmlEscaping().setPrettyPrinting()
             .registerTypeAdapter(Instant.class, new InstantAsMillisTypeAdapter()).create();
-
-    private Serialization() {
-        // Private constructor to prevent subclassing
-    }
 }
diff --git a/models-interactions/model-impl/cds/src/main/java/org/onap/policy/cds/CdsResponse.java b/models-interactions/model-impl/cds/src/main/java/org/onap/policy/cds/CdsResponse.java
index fd12fbf44..411dff94e 100644
--- a/models-interactions/model-impl/cds/src/main/java/org/onap/policy/cds/CdsResponse.java
+++ b/models-interactions/model-impl/cds/src/main/java/org/onap/policy/cds/CdsResponse.java
@@ -1,6 +1,7 @@
 /*-
  * ============LICENSE_START=======================================================
  * Copyright (C) 2019 Bell Canada.
+ * 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.
@@ -34,12 +35,4 @@ public class CdsResponse implements Serializable {
 
     private String requestId;
     private String status;
-
-    /**
-     * Default empty constructor.
-     */
-    public CdsResponse() {
-        super();
-    }
-
 }
diff --git a/models-interactions/model-impl/cds/src/main/java/org/onap/policy/cds/client/BasicAuthClientHeaderInterceptor.java b/models-interactions/model-impl/cds/src/main/java/org/onap/policy/cds/client/BasicAuthClientHeaderInterceptor.java
index 17eefd227..bd6af797c 100644
--- a/models-interactions/model-impl/cds/src/main/java/org/onap/policy/cds/client/BasicAuthClientHeaderInterceptor.java
+++ b/models-interactions/model-impl/cds/src/main/java/org/onap/policy/cds/client/BasicAuthClientHeaderInterceptor.java
@@ -1,7 +1,7 @@
 /*-
  * ============LICENSE_START=======================================================
  * Copyright (C) 2019 Bell Canada.
- * Modifications Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019, 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.
@@ -27,6 +27,7 @@ import io.grpc.ForwardingClientCall;
 import io.grpc.Metadata;
 import io.grpc.Metadata.Key;
 import io.grpc.MethodDescriptor;
+import lombok.AllArgsConstructor;
 import org.onap.policy.cds.properties.CdsServerProperties;
 
 /**
@@ -40,15 +41,12 @@ import org.onap.policy.cds.properties.CdsServerProperties;
  * On the server side, CDS BasicAuthServerInterceptor (1) gets the client metadata from the server context, (2) extract
  * the "Authorization" header key and finally (3) decodes the username and password from the authHeader.</p>
  */
+@AllArgsConstructor
 public class BasicAuthClientHeaderInterceptor implements ClientInterceptor {
 
     static final String BASIC_AUTH_HEADER_KEY = "Authorization";
     private CdsServerProperties props;
 
-    BasicAuthClientHeaderInterceptor(CdsServerProperties props) {
-        this.props = props;
-    }
-
     @Override
     public <Q, P> ClientCall<Q, P> interceptCall(MethodDescriptor<Q, P> method,
         CallOptions callOptions, Channel channel) {
diff --git a/models-interactions/model-impl/cds/src/main/java/org/onap/policy/cds/client/CdsProcessorHandler.java b/models-interactions/model-impl/cds/src/main/java/org/onap/policy/cds/client/CdsProcessorHandler.java
index bb7a038db..6c4d6caab 100644
--- a/models-interactions/model-impl/cds/src/main/java/org/onap/policy/cds/client/CdsProcessorHandler.java
+++ b/models-interactions/model-impl/cds/src/main/java/org/onap/policy/cds/client/CdsProcessorHandler.java
@@ -22,6 +22,7 @@ package org.onap.policy.cds.client;
 import io.grpc.ManagedChannel;
 import io.grpc.stub.StreamObserver;
 import java.util.concurrent.CountDownLatch;
+import lombok.AllArgsConstructor;
 import org.onap.ccsdk.cds.controllerblueprints.processing.api.BluePrintProcessingServiceGrpc;
 import org.onap.ccsdk.cds.controllerblueprints.processing.api.BluePrintProcessingServiceGrpc.BluePrintProcessingServiceStub;
 import org.onap.ccsdk.cds.controllerblueprints.processing.api.ExecutionServiceInput;
@@ -33,6 +34,7 @@ import org.onap.policy.common.endpoints.utils.NetLoggerUtil.EventType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@AllArgsConstructor
 public class CdsProcessorHandler {
     private static final Logger LOGGER = LoggerFactory.getLogger(CdsProcessorHandler.class);
     private static final String LOG_MSG = "[{}|{}|{}|]{}{}";
@@ -40,11 +42,6 @@ public class CdsProcessorHandler {
     private CdsProcessorListener listener;
     private String url;
 
-    CdsProcessorHandler(final CdsProcessorListener listener, String url) {
-        this.listener = listener;
-        this.url = url;
-    }
-
     CountDownLatch process(ExecutionServiceInput request, ManagedChannel channel) {
         final var header = request.getActionIdentifiers();
         LOGGER.info("Processing blueprint({}:{}) for action({})", header.getBlueprintVersion(),