From: wasala <przemyslaw.wasala@nokia.com>
Date: Tue, 24 Apr 2018 13:00:26 +0000 (+0200)
Subject: Load configuration by executing tasks
X-Git-Tag: 2.0.0-ONAP~36
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=d7640cf52a678a63698e1a2293e116b350eaa7f7;p=dcaegen2%2Fservices%2Fprh.git

Load configuration by executing tasks

Change-Id: Ie8f18a836e42dabd96a8bdb41e6ba8189c59e023
Issue-ID: DCAEGEN2-469
Signed-off-by: wasala <przemyslaw.wasala@nokia.com>
---

diff --git a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/AppConfig.java b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/AppConfig.java
index d6ca423b..85ca5226 100644
--- a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/AppConfig.java
+++ b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/AppConfig.java
@@ -34,4 +34,6 @@ public interface AppConfig {
 
     DmaapPublisherConfiguration getDmaapPublisherConfiguration();
 
+    void initFileStreamReader();
+
 }
diff --git a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/PrhAppConfig.java b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/PrhAppConfig.java
index 1bd90eef..2fa35608 100644
--- a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/PrhAppConfig.java
+++ b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/PrhAppConfig.java
@@ -72,6 +72,7 @@ public class PrhAppConfig implements AppConfig {
     @NotEmpty
     private String filepath;
 
+    @Override
     public void initFileStreamReader() {
 
         GsonBuilder gsonBuilder = new GsonBuilder();
diff --git a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/AAIPublisherTaskImpl.java b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/AAIPublisherTaskImpl.java
index 47733946..9a256986 100644
--- a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/AAIPublisherTaskImpl.java
+++ b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/AAIPublisherTaskImpl.java
@@ -67,6 +67,10 @@ public class AAIPublisherTaskImpl extends AAIPublisherTask<AAIHttpClientConfigur
         return null;
     }
 
+    @Override
+    void initConfigs() {
+    }
+
     @Override
     protected AAIHttpClientConfiguration resolveConfiguration() {
         return prhAppConfig.getAAIHttpClientConfiguration();
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 1ee85d03..f7cc7e1d 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
@@ -70,4 +70,9 @@ public class DmaapConsumerTaskImpl extends DmaapConsumerTask<DmaapConsumerConfig
     protected DmaapConsumerConfiguration resolveConfiguration() {
         return prhAppConfig.getDmaapConsumerConfiguration();
     }
+
+    @Override
+    protected void initConfigs() {
+        prhAppConfig.initFileStreamReader();
+    }
 }
\ No newline at end of file
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 b14d8d37..74d08539 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
@@ -64,6 +64,11 @@ public class DmaapPublisherTaskImpl extends DmaapPublisherTask<DmaapPublisherCon
         return null;
     }
 
+    @Override
+    void initConfigs() {
+        
+    }
+
     @Override
     protected DmaapPublisherConfiguration resolveConfiguration() {
         return prhAppConfig.getDmaapPublisherConfiguration();
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 a9c53ccc..c051afbc 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
@@ -21,6 +21,7 @@ package org.onap.dcaegen2.services.prh.tasks;
 
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
+import org.onap.dcaegen2.services.config.DmaapConsumerConfiguration;
 import org.onap.dcaegen2.services.prh.exceptions.PrhTaskException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -53,6 +54,7 @@ public class ScheduledTasks {
             LocalDateTime.now()));
         setTaskExecutionFlow();
         try {
+            dmaapConsumerTask.initConfigs();
             dmaapConsumerTask.receiveRequest(null);
         } catch (PrhTaskException e) {
             logger
diff --git a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/Task.java b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/Task.java
index f5e8b39e..3f521f2c 100644
--- a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/Task.java
+++ b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/Task.java
@@ -36,7 +36,8 @@ public abstract class Task {
     }
 
     public void receiveRequest(Object body) throws PrhTaskException {
-        Object responseEntity = execute(body);
+
+        ResponseEntity responseEntity = execute(body);
         if (taskProcess != null) {
             taskProcess.receiveRequest(responseEntity);
         }
@@ -44,5 +45,5 @@ public abstract class Task {
 
     abstract ResponseEntity execute(Object object) throws PrhTaskException;
 
-
+    abstract void initConfigs();
 }