Bugfix, creating only one DmaapProducer

[nonrtric.git] / policy-agent / src / main / java / org / oransc / policyagent / dmaap / DmaapMessageConsumer.java

diff --git a/policy-agent/src/main/java/org/oransc/policyagent/dmaap/DmaapMessageConsumer.java b/policy-agent/src/main/java/org/oransc/policyagent/dmaap/DmaapMessageConsumer.java
index 6312e37..9165af5 100644 (file)
--- a/policy-agent/src/main/java/org/oransc/policyagent/dmaap/DmaapMessageConsumer.java
+++ b/policy-agent/src/main/java/org/oransc/policyagent/dmaap/DmaapMessageConsumer.java
@@ -41,13 +41,14 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 /**
- * The class fetches incoming requests from DMAAP. It uses the timeout parameter that lets the MessageRouter keep the
- * connection with the Kafka open until requests are sent in.
+ * The class fetches incoming requests from DMAAP. It uses the timeout parameter
+ * that lets the MessageRouter keep the connection with the Kafka open until
+ * requests are sent in.
  *
  * <p>
- * If there is no DMaaP configuration in the application configuration, then this service will regularly check the
- * configuration and start polling DMaaP if the configuration is added. If the DMaaP configuration is removed, then the
- * service will stop polling and resume checking for configuration.
+ * this service will regularly check the configuration and start polling DMaaP
+ * if the configuration is added. If the DMaaP configuration is removed, then
+ * the service will stop polling and resume checking for configuration.
  *
  * <p>
  * Each received request is processed by {@link DmaapMessageHandler}.
@@ -61,6 +62,9 @@ public class DmaapMessageConsumer {
 
     private final ApplicationConfig applicationConfig;
 
+    private DmaapMessageHandler dmaapMessageHandler = null;
+    private MRConsumer messageRouterConsumer = null;
+
     @Value("${server.port}")
     private int localServerPort;
 
@@ -140,13 +144,15 @@ public class DmaapMessageConsumer {
         getDmaapMessageHandler().handleDmaapMsg(msg);
     }
 
-    private DmaapMessageHandler getDmaapMessageHandler() throws IOException {
-        String agentBaseUrl = "https://localhost:" + this.localServerPort;
-        AsyncRestClient agentClient = createRestClient(agentBaseUrl);
-        Properties dmaapPublisherProperties = applicationConfig.getDmaapPublisherConfig();
-        MRBatchingPublisher producer = getMessageRouterPublisher(dmaapPublisherProperties);
-
-        return createDmaapMessageHandler(agentClient, producer);
+    protected DmaapMessageHandler getDmaapMessageHandler() throws IOException {
+        if (this.dmaapMessageHandler == null) {
+            String agentBaseUrl = "https://localhost:" + this.localServerPort;
+            AsyncRestClient agentClient = new AsyncRestClient(agentBaseUrl);
+            Properties dmaapPublisherProperties = applicationConfig.getDmaapPublisherConfig();
+            MRBatchingPublisher producer = MRClientFactory.createBatchingPublisher(dmaapPublisherProperties);
+            this.dmaapMessageHandler = new DmaapMessageHandler(producer, agentClient);
+        }
+        return this.dmaapMessageHandler;
     }
 
     protected void sleep(Duration duration) {
@@ -158,18 +164,10 @@ public class DmaapMessageConsumer {
     }
 
     protected MRConsumer getMessageRouterConsumer(Properties dmaapConsumerProperties) throws IOException {
-        return MRClientFactory.createConsumer(dmaapConsumerProperties);
-    }
-
-    protected DmaapMessageHandler createDmaapMessageHandler(AsyncRestClient agentClient, MRBatchingPublisher producer) {
-        return new DmaapMessageHandler(producer, agentClient);
-    }
-
-    protected AsyncRestClient createRestClient(String agentBaseUrl) {
-        return new AsyncRestClient(agentBaseUrl);
+        if (this.messageRouterConsumer == null) {
+            this.messageRouterConsumer = MRClientFactory.createConsumer(dmaapConsumerProperties);
+        }
+        return this.messageRouterConsumer;
     }
 
-    protected MRBatchingPublisher getMessageRouterPublisher(Properties dmaapPublisherProperties) throws IOException {
-        return MRClientFactory.createBatchingPublisher(dmaapPublisherProperties);
-    }
 }