1 files changed, 8 insertions, 14 deletions
diff --git a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/DmaapConsumerTaskImpl.java b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/DmaapConsumerTaskImpl.java
index dc868b3e..a78d33b2 100644
--- a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/DmaapConsumerTaskImpl.java
+++ b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/DmaapConsumerTaskImpl.java
@@ -19,6 +19,7 @@
  */
 package org.onap.dcaegen2.services.prh.tasks;
 
+import java.util.Optional;
 import org.onap.dcaegen2.services.prh.model.ConsumerDmaapModel;
 import org.onap.dcaegen2.services.prh.config.DmaapConsumerConfiguration;
 import org.onap.dcaegen2.services.prh.configuration.AppConfig;
@@ -38,11 +39,9 @@ import org.springframework.stereotype.Component;
  */
 @Component
 public class DmaapConsumerTaskImpl extends
-    DmaapConsumerTask<ExtendedDmaapConsumerHttpClientImpl, String, ConsumerDmaapModel, DmaapConsumerConfiguration> {
-
+    DmaapConsumerTask<String, ConsumerDmaapModel, DmaapConsumerConfiguration> {
 
     private static final Logger logger = LoggerFactory.getLogger(DmaapConsumerTaskImpl.class);
-
     private final Config prhAppConfig;
     private ExtendedDmaapConsumerHttpClientImpl extendedDmaapConsumerHttpClient;
 
@@ -52,14 +51,14 @@ public class DmaapConsumerTaskImpl extends
     }
 
     @Override
-    protected ConsumerDmaapModel consume(String message) throws DmaapNotFoundException {
+    ConsumerDmaapModel consume(String message) throws DmaapNotFoundException {
         logger.trace("Method called with arg {}", message);
         return DmaapConsumerJsonParser.getJsonObject(message);
     }
 
     @Override
-    public Object execute(Object object) throws PrhTaskException {
-        setDmaapClientConfig();
+    public ConsumerDmaapModel execute(String object) throws PrhTaskException {
+        extendedDmaapConsumerHttpClient = resolveClient();
         logger.trace("Method called with arg {}", object);
         return consume((extendedDmaapConsumerHttpClient.getHttpConsumerResponse().orElseThrow(() ->
             new PrhTaskException("DmaapConsumerTask has returned null"))));
@@ -75,14 +74,9 @@ public class DmaapConsumerTaskImpl extends
         return prhAppConfig.getDmaapConsumerConfiguration();
     }
 
-    protected void setDmaapClientConfig() {
-        extendedDmaapConsumerHttpClient = resolveClient();
-    }
-
     @Override
-    protected ExtendedDmaapConsumerHttpClientImpl resolveClient() {
-        return new ExtendedDmaapConsumerHttpClientImpl(resolveConfiguration());
+    ExtendedDmaapConsumerHttpClientImpl resolveClient() {
+        return Optional.ofNullable(extendedDmaapConsumerHttpClient)
+            .orElseGet(() -> new ExtendedDmaapConsumerHttpClientImpl(resolveConfiguration()));
     }
-
-
 }
 \ No newline at end of file