From 011ac9cfcfd1d5aba077feffb0edbb25818e4ea0 Mon Sep 17 00:00:00 2001
From: Phillip Leigh <phillip.leigh@amdocs.com>
Date: Fri, 23 Nov 2018 15:38:00 -0500
Subject: Pre-create POMBA Topics before calling in CtxAggr

Removing POMBA-TEST-ONLY topic and apply review
comments.

Issue-ID: LOG-824
Change-Id: I8cf293ca0edebad216decf5ace4f7911e7fcca86
Signed-off-by: Leigh, Phillip (pl876u) <phillip.leigh@amdocs.com>
---
 config/application.properties                                  |  2 +-
 .../onap/pomba/contextaggregator/config/TransportConfig.java   |  4 ----
 .../contextaggregator/service/ContextAggregatorProcessor.java  | 10 +++++++++-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/config/application.properties b/config/application.properties
index 9dd9da8..8d42920 100644
--- a/config/application.properties
+++ b/config/application.properties
@@ -16,7 +16,7 @@ transport.consume.batchsize=8
 transport.consume.type=HTTPAUTH
 transport.message-router.apiKey=apiKeyTemp123
 transport.message-router.apiSecret=apiSecretTemp123
-transport.message-router.requiredPombaTopics=POA-AUDIT-INIT,POA-AUDIT-RESULT,POA-RULE-VALIDATION,POA-AUDIT-TEST-ONLY
+transport.message-router.requiredPombaTopics=POA-AUDIT-INIT,POA-AUDIT-RESULT,POA-RULE-VALIDATION
 
 transport.publish.host=<replace_with_host_or_ip>
 transport.publish.port=<replace>
diff --git a/src/main/java/org/onap/pomba/contextaggregator/config/TransportConfig.java b/src/main/java/org/onap/pomba/contextaggregator/config/TransportConfig.java
index 1532f43..c030306 100644
--- a/src/main/java/org/onap/pomba/contextaggregator/config/TransportConfig.java
+++ b/src/main/java/org/onap/pomba/contextaggregator/config/TransportConfig.java
@@ -68,10 +68,6 @@ public class TransportConfig {
         return mgr;
     }
 
-    @Bean
-    public String messageRouterRequiredPombaTopicList(@Value("${transport.message-router.requiredPombaTopics}") String requiredPombaTopics) {
-        return requiredPombaTopics;
-    }
 
     @Bean
     public EventPublisherFactory publisherFactory(@Value("${transport.publish.host}") String host,
diff --git a/src/main/java/org/onap/pomba/contextaggregator/service/ContextAggregatorProcessor.java b/src/main/java/org/onap/pomba/contextaggregator/service/ContextAggregatorProcessor.java
index f79bf96..9e9f129 100644
--- a/src/main/java/org/onap/pomba/contextaggregator/service/ContextAggregatorProcessor.java
+++ b/src/main/java/org/onap/pomba/contextaggregator/service/ContextAggregatorProcessor.java
@@ -70,7 +70,7 @@ public class ContextAggregatorProcessor implements Callable<Void> {
     @Autowired
     private MRTopicManager messageRouterTopicMgr;
 
-    @Autowired
+    @Value("${transport.message-router.requiredPombaTopics}")
     private String messageRouterRequiredPombaTopicList;
 
     @Autowired
@@ -122,6 +122,14 @@ public class ContextAggregatorProcessor implements Callable<Void> {
         }
     }
 
+    /**
+     * The configurable POMBA Topics (POA-AUDIT-INIT,POA-AUDIT-RESULT,POA-RULE-VALIDATION, etc.)
+     * will be created if any of topics doesn't exist prior to be invoked.
+     *
+     * @param eventPayload
+     * @return
+     * @throws ContextAggregatorException
+     */
     @Override
     public Void call() throws Exception {
         createPombaTopics();
-- 
cgit 1.2.3-korg