AAI tasks added

- aaiClients spllitted for consuming and producing
- http removed from names of all clients and interfaces
- HttpRequestDetails added as a second parameter for tasks
- parameters required from dmaap consumer
 - pnf-name for URI (get request -> aaiConsumer)
 - pnf-name and ipv4-oam (and or ipv6-oam)
   (patch request -> aaiProducer)

Change-Id: I87a1b46ab419cd00e9573e08c4d89cb384dd75b5
Issue-ID: DCAEGEN2-451
Signed-off-by: pwielebs <piotr.wielebski@nokia.com>

1 files changed, 9 insertions, 5 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 c051afbc..2922da1a 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
@@ -39,14 +39,16 @@ public class ScheduledTasks {
 
     private final Task dmaapConsumerTask;
     private final Task dmaapProducerTask;
-    private final Task aaiPublisherTask;
+    private final Task aaiProducerTask;
+    private final Task aaiConsumerTask;
 
     @Autowired
     public ScheduledTasks(DmaapConsumerTask dmaapConsumerTask, DmaapPublisherTask dmaapPublisherTask,
-        AAIPublisherTask aaiPublisherTask) {
+        AAIProducerTask aaiPublisherTask, AAIConsumerTask aaiConsumerTask) {
         this.dmaapConsumerTask = dmaapConsumerTask;
         this.dmaapProducerTask = dmaapPublisherTask;
-        this.aaiPublisherTask = aaiPublisherTask;
+        this.aaiProducerTask = aaiPublisherTask;
+        this.aaiConsumerTask = aaiConsumerTask;
     }
 
     public void scheduleMainPrhEventTask() {
@@ -65,8 +67,10 @@ public class ScheduledTasks {
     }
 
     private void setTaskExecutionFlow() {
-        dmaapConsumerTask.setNext(aaiPublisherTask);
-        aaiPublisherTask.setNext(dmaapProducerTask);
+        dmaapConsumerTask.setNext(aaiProducerTask);
+        aaiProducerTask.setNext(dmaapProducerTask);
+        aaiConsumerTask.setNext(aaiConsumerTask);
+        dmaapProducerTask.setNext(dmaapConsumerTask);
     }
 
 }