1 files changed, 11 insertions, 7 deletions

diff --git a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/ScheduledTasks.java b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/ScheduledTasks.java
index 713f5d48..a9c53ccc 100644
--- a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/ScheduledTasks.java
+++ b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/ScheduledTasks.java
@@ -36,25 +36,24 @@ public class ScheduledTasks {
     private static final Logger logger = LoggerFactory.getLogger(ScheduledTasks.class);
     private static final DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("HH:mm:ss");
 
-    private final DmaapConsumerTask dmaapConsumerTask;
-    private final DmaapPublisherTask dmaapPublisherTask;
-    private final AAIPublisherTask aaiPublisherTask;
+    private final Task dmaapConsumerTask;
+    private final Task dmaapProducerTask;
+    private final Task aaiPublisherTask;
 
     @Autowired
     public ScheduledTasks(DmaapConsumerTask dmaapConsumerTask, DmaapPublisherTask dmaapPublisherTask,
         AAIPublisherTask aaiPublisherTask) {
         this.dmaapConsumerTask = dmaapConsumerTask;
-        this.dmaapPublisherTask = dmaapPublisherTask;
+        this.dmaapProducerTask = dmaapPublisherTask;
         this.aaiPublisherTask = aaiPublisherTask;
     }
 
     public void scheduleMainPrhEventTask() {
         logger.debug("Task scheduledTaskAskingDMaaPOfConsumeEvent() :: Execution Time - {}", dateTimeFormatter.format(
             LocalDateTime.now()));
+        setTaskExecutionFlow();
         try {
-            dmaapConsumerTask.execute();
-            dmaapPublisherTask.execute();
-            aaiPublisherTask.execute();
+            dmaapConsumerTask.receiveRequest(null);
         } catch (PrhTaskException e) {
             logger
                 .error("Task scheduledTaskAskingDMaaPOfConsumeEvent()::PrhTaskException :: Execution Time - {}:{}",
@@ -63,4 +62,9 @@ public class ScheduledTasks {
         }
     }
 
+    private void setTaskExecutionFlow() {
+        dmaapConsumerTask.setNext(aaiPublisherTask);
+        aaiPublisherTask.setNext(dmaapProducerTask);
+    }
+
 }