Use lombok annotations for actors

This is the last one for policy-models!

Issue-ID: POLICY-3396
Change-Id: I05b114a57a720a6ae8ae073b80c8bded36d0d06d
Signed-off-by: Jim Hahn <jrh3@att.com>

4 files changed, 15 insertions, 33 deletions

diff --git a/models-interactions/model-actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorserviceprovider/OperationProperties.java b/models-interactions/model-actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorserviceprovider/OperationProperties.java
index d4dea7c48..0c8615dc0 100644
--- a/models-interactions/model-actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorserviceprovider/OperationProperties.java
+++ b/models-interactions/model-actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorserviceprovider/OperationProperties.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,6 +20,9 @@
 
 package org.onap.policy.controlloop.actorserviceprovider;
 
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+
 /**
  * Names of properties needed by the Actors defined within this repo. Note: this is not
  * exhaustive, as additional property names may be returned by company-defined Actors.
@@ -27,7 +30,8 @@ package org.onap.policy.controlloop.actorserviceprovider;
  * Note: any time a property is added, applications using the actors must be updated to
  * provide the property's value when requested.
  */
-public class OperationProperties {
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public final class OperationProperties {
 
     /**
      * A&AI Default Cloud Region. Obtained as follows:
@@ -153,9 +157,4 @@ public class OperationProperties {
      * An Integer containing the count.
      */
     public static final String DATA_VF_COUNT = "data/vfCount";
-
-
-    private OperationProperties() {
-        super();
-    }
 }
diff --git a/models-interactions/model-actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorserviceprovider/Util.java b/models-interactions/model-actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorserviceprovider/Util.java
index ba4785922..d185c2ee4 100644
--- a/models-interactions/model-actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorserviceprovider/Util.java
+++ b/models-interactions/model-actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorserviceprovider/Util.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.
@@ -23,6 +23,8 @@ package org.onap.policy.controlloop.actorserviceprovider;
 import java.util.Arrays;
 import java.util.LinkedHashMap;
 import java.util.Map;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
 import org.onap.policy.common.utils.coder.Coder;
 import org.onap.policy.common.utils.coder.CoderException;
 import org.onap.policy.common.utils.coder.StandardCoder;
@@ -32,14 +34,11 @@ import org.slf4j.LoggerFactory;
 /**
  * Actor utilities.
  */
-public class Util {
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public final class Util {
     private static final Logger logger = LoggerFactory.getLogger(Util.class);
     private static final Coder coder = new StandardCoder();
 
-    private Util() {
-        // do nothing
-    }
-
     /**
      * Extracts an object's identity by invoking {@link Object#toString()} and returning
      * the portion starting with "@". Extraction is done on-demand, when toString() is
diff --git a/models-interactions/model-actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorserviceprovider/parameters/ControlLoopOperationParams.java b/models-interactions/model-actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorserviceprovider/parameters/ControlLoopOperationParams.java
index 22dfc28bc..dec351321 100644
--- a/models-interactions/model-actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorserviceprovider/parameters/ControlLoopOperationParams.java
+++ b/models-interactions/model-actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorserviceprovider/parameters/ControlLoopOperationParams.java
@@ -79,6 +79,7 @@ public class ControlLoopOperationParams {
      * across various components/servers.
      */
     @NotNull
+    @Getter
     private UUID requestId;
 
     /**
@@ -174,15 +175,6 @@ public class ControlLoopOperationParams {
     }
 
     /**
-     * Gets the requested ID of the associated event.
-     *
-     * @return the event's request ID, or {@code null} if no request ID is available
-     */
-    public UUID getRequestId() {
-        return requestId;
-    }
-
-    /**
      * Makes an operation outcome, populating it from the parameters.
      *
      * @return a new operation outcome
diff --git a/models-interactions/model-actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorserviceprovider/topic/Forwarder.java b/models-interactions/model-actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorserviceprovider/topic/Forwarder.java
index 957185e47..a4071ad20 100644
--- a/models-interactions/model-actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorserviceprovider/topic/Forwarder.java
+++ b/models-interactions/model-actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorserviceprovider/topic/Forwarder.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.
@@ -25,6 +25,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.BiConsumer;
+import lombok.AllArgsConstructor;
 import org.onap.policy.common.utils.coder.StandardCoderObject;
 import org.onap.policy.controlloop.actorserviceprovider.Util;
 import org.slf4j.Logger;
@@ -35,6 +36,7 @@ import org.slf4j.LoggerFactory;
  * message. Each forwarder is associated with a single set of selector keys. Listeners are
  * then registered with that forwarder for a particular set of values for the given keys.
  */
+@AllArgsConstructor
 public class Forwarder {
     private static final Logger logger = LoggerFactory.getLogger(Forwarder.class);
 
@@ -52,16 +54,6 @@ public class Forwarder {
     private final List<SelectorKey> keys;
 
     /**
-     * Constructs the object.
-     *
-     * @param keys keys used to extract the field's value from the
-     *        {@link StandardCoderObject}
-     */
-    public Forwarder(List<SelectorKey> keys) {
-        this.keys = keys;
-    }
-
-    /**
      * Registers a listener for messages containing the given field values.
      *
      * @param values field values of interest, in one-to-one correspondence with the keys