Fix topic configurations.

- adjust kafka configurations
- remove UEB references

Issue-ID: POLICY-4955
Change-Id: Ie3ff62a0ba5531ae4c0d123f214a50bb7f721807
Signed-off-by: adheli.tavares <adheli.tavares@est.tech>

4 files changed, 21 insertions, 21 deletions

diff --git a/feature-pooling-messages/src/main/feature/config/feature-pooling-messages.properties b/feature-pooling-messages/src/main/feature/config/feature-pooling-messages.properties
index 925d1698..8497538e 100644
--- a/feature-pooling-messages/src/main/feature/config/feature-pooling-messages.properties
+++ b/feature-pooling-messages/src/main/feature/config/feature-pooling-messages.properties
@@ -72,18 +72,18 @@
 # be enabled at the same time.
 
 pooling.usecases.enabled=true
-pooling.usecases.topic=${env:POOLING_TOPIC}
+pooling.usecases.topic=${envd:POOLING_TOPIC}
 
 # the list of sources and sinks should be identical
-kafka.source.topics=POOLING_TOPIC
-kafka.sink.topics=POOLING_TOPIC
-
-kafka.source.topics.POOLING_TOPIC.servers=${env:KAFKA_SERVERS}
-kafka.source.topics.POOLING_TOPIC.effectiveTopic=${env:POOLING_TOPIC}
-kafka.source.topics.POOLING_TOPIC.apiKey=
-kafka.source.topics.POOLING_TOPIC.apiSecret=
-
-kafka.sink.topics.POOLING_TOPIC.servers=${env:kafka_SERVERS}
-kafka.sink.topics.POOLING_TOPIC.effectiveTopic=${env:POOLING_TOPIC}
-kafka.sink.topics.POOLING_TOPIC.apiKey=
-kafka.sink.topics.POOLING_TOPIC.apiSecret=
+kafka.source.topics=${envd:POOLING_TOPIC}
+kafka.sink.topics=${envd:POOLING_TOPIC}
+
+kafka.source.topics.policy-pdp-pooling.servers=${envd:KAFKA_SERVERS}
+kafka.source.topics.policy-pdp-pooling.effectiveTopic=${envd:POOLING_TOPIC}
+kafka.source.topics.policy-pdp-pooling.apiKey=
+kafka.source.topics.policy-pdp-pooling.apiSecret=
+
+kafka.sink.topics.policy-pdp-pooling.servers=${envd:KAFKA_SERVERS}
+kafka.sink.topics.policy-pdp-pooling.effectiveTopic=${envd:POOLING_TOPIC}
+kafka.sink.topics.policy-pdp-pooling.apiKey=
+kafka.sink.topics.policy-pdp-pooling.apiSecret=
diff --git a/feature-pooling-messages/src/main/java/org/onap/policy/drools/pooling/PoolingFeature.java b/feature-pooling-messages/src/main/java/org/onap/policy/drools/pooling/PoolingFeature.java
index 6411dd81..a1368d8c 100644
--- a/feature-pooling-messages/src/main/java/org/onap/policy/drools/pooling/PoolingFeature.java
+++ b/feature-pooling-messages/src/main/java/org/onap/policy/drools/pooling/PoolingFeature.java
@@ -52,7 +52,7 @@ import org.slf4j.LoggerFactory;
  * hosts, instead of all running on a single, active host.
  *
  * <p>With each controller, there is an
- * associated DMaaP topic that is used for internal communication between the different hosts
+ * associated topic that is used for internal communication between the different hosts
  * serving the controller.
  */
 public class PoolingFeature implements PolicyEngineFeatureApi, PolicyControllerFeatureApi, DroolsControllerFeatureApi {
diff --git a/feature-pooling-messages/src/main/java/org/onap/policy/drools/pooling/PoolingManager.java b/feature-pooling-messages/src/main/java/org/onap/policy/drools/pooling/PoolingManager.java
index 5e358e61..20f51023 100644
--- a/feature-pooling-messages/src/main/java/org/onap/policy/drools/pooling/PoolingManager.java
+++ b/feature-pooling-messages/src/main/java/org/onap/policy/drools/pooling/PoolingManager.java
@@ -46,10 +46,10 @@ public interface PoolingManager {
     String getHost();
 
     /**
-     * Gets the name of the internal DMaaP topic used by this manager to communicate with
+     * Gets the name of the internal topic used by this manager to communicate with
      * its other hosts.
      *
-     * @return the name of the internal DMaaP topic
+     * @return the name of the internal topic
      */
     String getTopic();
 
diff --git a/feature-pooling-messages/src/main/java/org/onap/policy/drools/pooling/PoolingManagerImpl.java b/feature-pooling-messages/src/main/java/org/onap/policy/drools/pooling/PoolingManagerImpl.java
index 7c0436eb..fec6ba81 100644
--- a/feature-pooling-messages/src/main/java/org/onap/policy/drools/pooling/PoolingManagerImpl.java
+++ b/feature-pooling-messages/src/main/java/org/onap/policy/drools/pooling/PoolingManagerImpl.java
@@ -91,13 +91,13 @@ public class PoolingManagerImpl implements PoolingManager, TopicListener {
     private final Serializer serializer;
 
     /**
-     * Internal DMaaP topic used by this controller.
+     * Internal topic used by this controller.
      */
     @Getter
     private final String topic;
 
     /**
-     * Manager for the internal DMaaP topic.
+     * Manager for the internal topic.
      */
     private final TopicMessageManager topicMessageManager;
 
@@ -157,7 +157,7 @@ public class PoolingManagerImpl implements PoolingManager, TopicListener {
             throw new PoolingFeatureRtException(e);
 
         } catch (PoolingFeatureException e) {
-            logger.error("failed to attach internal DMaaP topic to controller {}", controller.getName());
+            logger.error("failed to attach internal topic to controller {}", controller.getName());
             throw new PoolingFeatureRtException(e);
         }
     }
@@ -598,9 +598,9 @@ public class PoolingManagerImpl implements PoolingManager, TopicListener {
     }
 
     /**
-     * Creates a DMaaP manager.
+     * Creates a topic manager.
      *
-     * @param topic name of the internal DMaaP topic
+     * @param topic name of the internal topic
      * @return a new topic messages manager
      * @throws PoolingFeatureException if an error occurs
      */