1 files changed, 20 insertions, 40 deletions

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 6f07df1b..c63fbcc2 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
@@ -2,14 +2,16 @@
  * ============LICENSE_START=======================================================
  * ONAP
  * ================================================================================
- * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2021 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2020 Bell Canada. All rights reserved.
+ * Modifications Copyright (C) 2023 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -22,19 +24,21 @@ 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 {
 
     /**
      * Logger.
      */
-    private static Logger logger = LoggerFactory.getLogger(TopicBase.class);
+    private static final Logger logger = LoggerFactory.getLogger(TopicBase.class);
 
     /**
      * List of servers.
@@ -72,17 +76,18 @@ public abstract class TopicBase implements Topic {
     /**
      * All my subscribers for new message notifications.
      */
+    @Getter(AccessLevel.NONE)
     protected final ArrayList<TopicListener> topicListeners = new ArrayList<>();
 
     /**
      * Instantiates a new Topic Base.
-     * 
+     *
      * @param servers list of servers
      * @param topic topic name
-     * 
+     *
      * @throws IllegalArgumentException if invalid parameters are present
      */
-    public TopicBase(List<String> servers, String topic) {
+    protected TopicBase(List<String> servers, String topic) {
         this(servers, topic, topic);
     }
 
@@ -94,7 +99,7 @@ public abstract class TopicBase implements Topic {
      *
      * @throws IllegalArgumentException if invalid parameters are present
      */
-    public TopicBase(List<String> servers, String topic, String effectiveTopic) {
+    protected TopicBase(List<String> servers, String topic, String effectiveTopic) {
 
         if (servers == null || servers.isEmpty()) {
             throw new IllegalArgumentException("Server(s) must be provided");
@@ -112,8 +117,8 @@ public abstract class TopicBase implements Topic {
         }
 
         this.servers = servers;
-        this.topic = topic;
-        this.effectiveTopic = effectiveTopicCopy;
+        this.topic = topic.toLowerCase();
+        this.effectiveTopic = effectiveTopicCopy.toLowerCase();
     }
 
     @Override
@@ -152,14 +157,14 @@ public abstract class TopicBase implements Topic {
 
     /**
      * Broadcast event to all listeners.
-     * 
+     *
      * @param message the event
      * @return true if all notifications are performed with no error, false otherwise
      */
     protected boolean broadcast(String message) {
         List<TopicListener> snapshotListeners = this.snapshotTopicListeners();
 
-        boolean success = true;
+        var success = true;
         for (TopicListener topicListener : snapshotListeners) {
             try {
                 topicListener.onTopicEvent(this.getTopicCommInfrastructure(), this.topic, message);
@@ -173,7 +178,7 @@ public abstract class TopicBase implements Topic {
 
     /**
      * Take a snapshot of current topic listeners.
-     * 
+     *
      * @return the topic listeners
      */
     protected synchronized List<TopicListener> snapshotTopicListeners() {
@@ -219,33 +224,8 @@ 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() {
-        String[] events = new String[recentEvents.size()];
+        var events = new String[recentEvents.size()];
         return recentEvents.toArray(events);
     }