Parsing arguments from cloudify.

*Added functionality for replacing default value
from command line tosca template.

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

1 files changed, 20 insertions, 19 deletions

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 2fa35608..8720cf47 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
@@ -51,7 +51,7 @@ import org.springframework.context.annotation.Configuration;
 @Configuration
 @EnableConfigurationProperties
 @ConfigurationProperties("app")
-public class PrhAppConfig implements AppConfig {
+public abstract class PrhAppConfig implements Config {
 
     private static final String CONFIG = "configs";
     private static final String AAI = "aai";
@@ -63,15 +63,31 @@ public class PrhAppConfig implements AppConfig {
     private static final Logger logger = LoggerFactory.getLogger(PrhAppConfig.class);
     private static final DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("HH:mm:ss");
 
-    private AAIHttpClientConfiguration aaiHttpClientConfiguration;
+    AAIHttpClientConfiguration aaiHttpClientConfiguration;
 
-    private DmaapConsumerConfiguration dmaapConsumerConfiguration;
+    DmaapConsumerConfiguration dmaapConsumerConfiguration;
 
-    private DmaapPublisherConfiguration dmaapPublisherConfiguration;
+    DmaapPublisherConfiguration dmaapPublisherConfiguration;
 
     @NotEmpty
     private String filepath;
 
+
+    @Override
+    public DmaapConsumerConfiguration getDmaapConsumerConfiguration() {
+        return dmaapConsumerConfiguration;
+    }
+
+    @Override
+    public AAIHttpClientConfiguration getAAIHttpClientConfiguration() {
+        return aaiHttpClientConfiguration;
+    }
+
+    @Override
+    public DmaapPublisherConfiguration getDmaapPublisherConfiguration() {
+        return dmaapPublisherConfiguration;
+    }
+
     @Override
     public void initFileStreamReader() {
 
@@ -95,7 +111,6 @@ public class PrhAppConfig implements AppConfig {
                     jsonObject.getAsJsonObject(CONFIG).getAsJsonObject(DMAAP).getAsJsonObject(DMAAP_PRODUCER),
                     DmaapPublisherConfiguration.class);
             }
-
         } catch (FileNotFoundException e) {
             logger
                 .error(
@@ -134,18 +149,4 @@ public class PrhAppConfig implements AppConfig {
         this.filepath = filepath;
     }
 
-    @Override
-    public DmaapConsumerConfiguration getDmaapConsumerConfiguration() {
-        return dmaapConsumerConfiguration;
-    }
-
-    @Override
-    public AAIHttpClientConfiguration getAAIHttpClientConfiguration() {
-        return aaiHttpClientConfiguration;
-    }
-
-    @Override
-    public DmaapPublisherConfiguration getDmaapPublisherConfiguration() {
-        return dmaapPublisherConfiguration;
-    }
 }
\ No newline at end of file