Use lombok in policy-endpoints

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

9 files changed, 44 insertions, 128 deletions

diff --git a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/TopicEndpointManager.java b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/TopicEndpointManager.java
index c390afc6..fb18a307 100644
--- a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/TopicEndpointManager.java
+++ b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/TopicEndpointManager.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP
  * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * 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.
@@ -20,8 +20,11 @@
 
 package org.onap.policy.common.endpoints.event.comm;
 
+import lombok.AccessLevel;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
 public class TopicEndpointManager {
 
     /**
@@ -29,9 +32,4 @@ public class TopicEndpointManager {
      */
     @Getter
     private static TopicEndpoint manager = new TopicEndpointProxy();
-
-
-    private TopicEndpointManager() {
-        // do nothing
-    }
 }
diff --git a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/TopicEndpointProxy.java b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/TopicEndpointProxy.java
index cf89762a..293bf608 100644
--- a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/TopicEndpointProxy.java
+++ b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/TopicEndpointProxy.java
@@ -24,6 +24,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Properties;
+import lombok.Getter;
 import org.onap.policy.common.capabilities.Startable;
 import org.onap.policy.common.endpoints.event.comm.bus.DmaapTopicFactories;
 import org.onap.policy.common.endpoints.event.comm.bus.DmaapTopicSink;
@@ -53,11 +54,13 @@ class TopicEndpointProxy implements TopicEndpoint {
     /**
      * Is this element locked boolean.
      */
+    @Getter
     private volatile boolean locked = false;
 
     /**
      * Is this element alive boolean.
      */
+    @Getter
     private volatile boolean alive = false;
 
     @Override
@@ -435,11 +438,6 @@ class TopicEndpointProxy implements TopicEndpoint {
     }
 
     @Override
-    public boolean isAlive() {
-        return this.alive;
-    }
-
-    @Override
     public boolean lock() {
         boolean shouldLock;
 
@@ -484,11 +482,6 @@ class TopicEndpointProxy implements TopicEndpoint {
     }
 
     @Override
-    public boolean isLocked() {
-        return this.locked;
-    }
-
-    @Override
     public TopicSource getTopicSource(Topic.CommInfrastructure commType, String topicName) {
 
         if (commType == null) {
diff --git a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/NoopTopicFactories.java b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/NoopTopicFactories.java
index aa85e714..c3e7e0a4 100644
--- a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/NoopTopicFactories.java
+++ b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/NoopTopicFactories.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP
  * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * 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.
@@ -20,8 +20,11 @@
 
 package org.onap.policy.common.endpoints.event.comm.bus;
 
+import lombok.AccessLevel;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
 public class NoopTopicFactories {
 
     /**
@@ -35,9 +38,4 @@ public class NoopTopicFactories {
      */
     @Getter
     private static final NoopTopicSourceFactory sourceFactory = new NoopTopicSourceFactory();
-
-
-    private NoopTopicFactories() {
-        // do nothing
-    }
 }
diff --git a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/UebTopicFactories.java b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/UebTopicFactories.java
index d02758be..721f2135 100644
--- a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/UebTopicFactories.java
+++ b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/UebTopicFactories.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP
  * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * 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.
@@ -20,8 +20,11 @@
 
 package org.onap.policy.common.endpoints.event.comm.bus;
 
+import lombok.AccessLevel;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
 public class UebTopicFactories {
 
     /**
@@ -35,9 +38,4 @@ public class UebTopicFactories {
      */
     @Getter
     private static final UebTopicSourceFactory sourceFactory = new IndexedUebTopicSourceFactory();
-
-
-    private UebTopicFactories() {
-        // do nothing
-    }
 }
diff --git a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/internal/BusTopicBase.java b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/internal/BusTopicBase.java
index 6dd6a3eb..67ee84e5 100644
--- a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/internal/BusTopicBase.java
+++ b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/internal/BusTopicBase.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP
  * ================================================================================
- * 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) 2020 Bell Canada. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,11 +21,13 @@
 
 package org.onap.policy.common.endpoints.event.comm.bus.internal;
 
+import lombok.Getter;
 import org.onap.policy.common.endpoints.event.comm.bus.ApiKeyEnabled;
 
 /**
  * Bus Topic Base.
  */
+@Getter
 public abstract class BusTopicBase extends TopicBase implements ApiKeyEnabled {
 
     /**
@@ -68,34 +70,6 @@ public abstract class BusTopicBase extends TopicBase implements ApiKeyEnabled {
         this.allowSelfSignedCerts = busTopicParams.isAllowSelfSignedCerts();
     }
 
-    @Override
-    public String getApiKey() {
-        return apiKey;
-    }
-
-    @Override
-    public String getApiSecret() {
-        return apiSecret;
-    }
-
-    /**
-     * Is using HTTPS.
-     *
-     * @return if using https
-     */
-    public boolean isUseHttps() {
-        return useHttps;
-    }
-
-    /**
-     * Is self signed certificates allowed.
-     *
-     * @return if self signed certificates are allowed
-     */
-    public boolean isAllowSelfSignedCerts() {
-        return allowSelfSignedCerts;
-    }
-
     protected boolean anyNullOrEmpty(String... args) {
         for (String arg : args) {
             if (arg == null || arg.isEmpty()) {
diff --git a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/internal/BusTopicParams.java b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/internal/BusTopicParams.java
index 9df7221f..f9537f52 100644
--- a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/internal/BusTopicParams.java
+++ b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/internal/BusTopicParams.java
@@ -3,7 +3,7 @@
  * ONAP
  * ================================================================================
  * Copyright (C) 2018 Samsung Electronics Co., Ltd. All rights reserved.
- * Modifications Copyright (C) 2018-2019 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2018-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");
@@ -24,7 +24,9 @@ package org.onap.policy.common.endpoints.event.comm.bus.internal;
 
 import java.util.List;
 import java.util.Map;
+import lombok.AccessLevel;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.Setter;
 import org.apache.commons.lang3.StringUtils;
 
@@ -78,6 +80,7 @@ public class BusTopicParams {
     private String clientName;
     private String hostname;
     private String basePath;
+    @Getter
     private String serializationProvider;
 
     public static TopicParamsBuilder builder() {
@@ -165,17 +168,11 @@ public class BusTopicParams {
         return additionalProps != null;
     }
 
-    public String getSerializationProvider() {
-        return serializationProvider;
-    }
-
+    @NoArgsConstructor(access = AccessLevel.PRIVATE)
     public static class TopicParamsBuilder {
 
         final BusTopicParams params = new BusTopicParams();
 
-        private TopicParamsBuilder() {
-        }
-
         public TopicParamsBuilder servers(List<String> servers) {
             this.params.servers = servers;
             return this;
diff --git a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/internal/InlineBusTopicSink.java b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/internal/InlineBusTopicSink.java
index d586f887..27ed5e7a 100644
--- a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/internal/InlineBusTopicSink.java
+++ b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/internal/InlineBusTopicSink.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * policy-endpoints
  * ================================================================================
- * 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) 2018-2019 Samsung Electronics Co., Ltd.
  * Modifications Copyright (C) 2020 Bell Canada. All rights reserved.
 * ================================================================================
@@ -23,6 +23,8 @@
 package org.onap.policy.common.endpoints.event.comm.bus.internal;
 
 import java.util.UUID;
+import lombok.Getter;
+import lombok.Setter;
 import org.onap.policy.common.endpoints.event.comm.bus.BusTopicSink;
 import org.onap.policy.common.endpoints.utils.NetLoggerUtil;
 import org.onap.policy.common.endpoints.utils.NetLoggerUtil.EventType;
@@ -44,7 +46,9 @@ public abstract class InlineBusTopicSink extends BusTopicBase implements BusTopi
     /**
      * The partition key to publish to.
      */
-    protected String partitionId;
+    @Getter
+    @Setter
+    protected String partitionKey;
 
     /**
      * Message bus publisher.
@@ -68,9 +72,9 @@ public abstract class InlineBusTopicSink extends BusTopicBase implements BusTopi
         super(busTopicParams);
 
         if (busTopicParams.isPartitionIdInvalid()) {
-            this.partitionId = UUID.randomUUID().toString();
+            this.partitionKey = UUID.randomUUID().toString();
         } else {
-            this.partitionId = busTopicParams.getPartitionId();
+            this.partitionKey = busTopicParams.getPartitionId();
         }
     }
 
@@ -139,7 +143,7 @@ public abstract class InlineBusTopicSink extends BusTopicBase implements BusTopi
 
             NetLoggerUtil.log(EventType.OUT, this.getTopicCommInfrastructure(), this.topic, message);
 
-            publisher.send(this.partitionId, message);
+            publisher.send(this.partitionKey, message);
             broadcast(message);
         } catch (Exception e) {
             logger.warn("{}: cannot send because of {}", this, e.getMessage(), e);
@@ -150,16 +154,6 @@ public abstract class InlineBusTopicSink extends BusTopicBase implements BusTopi
     }
 
     @Override
-    public void setPartitionKey(String partitionKey) {
-        this.partitionId = partitionKey;
-    }
-
-    @Override
-    public String getPartitionKey() {
-        return this.partitionId;
-    }
-
-    @Override
     public void shutdown() {
         this.stop();
     }
@@ -188,6 +182,7 @@ public abstract class InlineBusTopicSink extends BusTopicBase implements BusTopi
 
     @Override
     public String toString() {
-        return "InlineBusTopicSink [partitionId=" + partitionId + ", alive=" + alive + ", publisher=" + publisher + "]";
+        return "InlineBusTopicSink [partitionId=" + partitionKey + ", alive=" + alive + ", publisher=" + publisher
+                        + "]";
     }
 }
diff --git a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/internal/SingleThreadedBusTopicSource.java b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/internal/SingleThreadedBusTopicSource.java
index 376a62d1..3b7851d6 100644
--- a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/internal/SingleThreadedBusTopicSource.java
+++ b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/internal/SingleThreadedBusTopicSource.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * policy-endpoints
  * ================================================================================
- * 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) 2018-2019 Samsung Electronics Co., Ltd.
  * Modifications Copyright (C) 2020 Bell Canada. All rights reserved.
  * ================================================================================
@@ -25,6 +25,7 @@ package org.onap.policy.common.endpoints.event.comm.bus.internal;
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.util.UUID;
+import lombok.Getter;
 import org.onap.policy.common.endpoints.event.comm.TopicListener;
 import org.onap.policy.common.endpoints.event.comm.bus.BusTopicSource;
 import org.onap.policy.common.endpoints.properties.PolicyEndPointProperties;
@@ -50,21 +51,25 @@ public abstract class SingleThreadedBusTopicSource extends BusTopicBase
     /**
      * Bus consumer group.
      */
+    @Getter
     protected final String consumerGroup;
 
     /**
      * Bus consumer instance.
      */
+    @Getter
     protected final String consumerInstance;
 
     /**
      * Bus fetch timeout.
      */
+    @Getter
     protected final int fetchTimeout;
 
     /**
      * Bus fetch limit.
      */
+    @Getter
     protected final int fetchLimit;
 
     /**
@@ -270,29 +275,8 @@ public abstract class SingleThreadedBusTopicSource extends BusTopicBase
     }
 
     @Override
-    public String getConsumerGroup() {
-        return consumerGroup;
-    }
-
-    @Override
-    public String getConsumerInstance() {
-        return consumerInstance;
-    }
-
-    @Override
     public void shutdown() {
         this.stop();
         this.topicListeners.clear();
     }
-
-    @Override
-    public int getFetchTimeout() {
-        return fetchTimeout;
-    }
-
-    @Override
-    public int getFetchLimit() {
-        return fetchLimit;
-    }
-
 }
diff --git a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/internal/TopicBase.java b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/internal/TopicBase.java
index dca1437b..daeaea13 100644
--- a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/internal/TopicBase.java
+++ b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/internal/TopicBase.java
@@ -23,12 +23,15 @@ package org.onap.policy.common.endpoints.event.comm.bus.internal;
 
 import java.util.ArrayList;
 import java.util.List;
+import lombok.AccessLevel;
+import lombok.Getter;
 import org.apache.commons.collections4.queue.CircularFifoQueue;
 import org.onap.policy.common.endpoints.event.comm.Topic;
 import org.onap.policy.common.endpoints.event.comm.TopicListener;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@Getter
 public abstract class TopicBase implements Topic {
 
     /**
@@ -72,6 +75,7 @@ public abstract class TopicBase implements Topic {
     /**
      * All my subscribers for new message notifications.
      */
+    @Getter(AccessLevel.NONE)
     protected final ArrayList<TopicListener> topicListeners = new ArrayList<>();
 
     /**
@@ -219,31 +223,6 @@ public abstract class TopicBase implements Topic {
     }
 
     @Override
-    public boolean isLocked() {
-        return this.locked;
-    }
-
-    @Override
-    public String getTopic() {
-        return topic;
-    }
-
-    @Override
-    public String getEffectiveTopic() {
-        return effectiveTopic;
-    }
-
-    @Override
-    public boolean isAlive() {
-        return this.alive;
-    }
-
-    @Override
-    public List<String> getServers() {
-        return servers;
-    }
-
-    @Override
     public synchronized String[] getRecentEvents() {
         var events = new String[recentEvents.size()];
         return recentEvents.toArray(events);