1 files changed, 21 insertions, 9 deletions

diff --git a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/DmaapPublisherTaskImpl.java b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/DmaapPublisherTaskImpl.java
index 92eb875c..b14d8d37 100644
--- a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/DmaapPublisherTaskImpl.java
+++ b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/DmaapPublisherTaskImpl.java
@@ -21,39 +21,51 @@ package org.onap.dcaegen2.services.prh.tasks;
 
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
+import org.onap.dcaegen2.services.config.DmaapPublisherConfiguration;
 import org.onap.dcaegen2.services.prh.configuration.AppConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
 
 /**
  * @author <a href="mailto:przemyslaw.wasala@nokia.com">Przemysław Wąsala</a> on 4/13/18
  */
 @Component
-public class DmaapPublisherTaskImpl extends DmaapPublisherTask {
+public class DmaapPublisherTaskImpl extends DmaapPublisherTask<DmaapPublisherConfiguration> {
 
     private static final Logger logger = LoggerFactory.getLogger(ScheduledTasks.class);
     private static final DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("HH:mm:ss");
 
+    private final AppConfig prhAppConfig;
+
     @Autowired
-    public AppConfig prhAppConfig;
+    public DmaapPublisherTaskImpl(AppConfig prhAppConfig) {
+        this.prhAppConfig = prhAppConfig;
+    }
 
     @Override
-    public void execute() {
-        logger.debug("Start task DmaapPublisherTask::consume() :: Execution Time - {}", dateTimeFormatter.format(
+    protected void publish() {
+        logger.debug("Start task DmaapPublisherTask::publish() :: Execution Time - {}", dateTimeFormatter.format(
             LocalDateTime.now()));
 
-        logger.debug("End task DmaapPublisherTask::consume() :: Execution Time - {}",
+        logger.debug("End task DmaapPublisherTask::publish() :: Execution Time - {}",
             dateTimeFormatter.format(LocalDateTime.now()));
     }
 
     @Override
-    protected void publish() {
-        logger.debug("Start task DmaapPublisherTask::publish() :: Execution Time - {}", dateTimeFormatter.format(
+    public ResponseEntity execute(Object object) {
+        logger.debug("Start task DmaapPublisherTask::consume() :: Execution Time - {}", dateTimeFormatter.format(
             LocalDateTime.now()));
-
-        logger.debug("End task DmaapPublisherTask::publish() :: Execution Time - {}",
+        publish();
+        logger.debug("End task DmaapPublisherTask::consume() :: Execution Time - {}",
             dateTimeFormatter.format(LocalDateTime.now()));
+        return null;
+    }
+
+    @Override
+    protected DmaapPublisherConfiguration resolveConfiguration() {
+        return prhAppConfig.getDmaapPublisherConfiguration();
     }
 }