1 files changed, 141 insertions, 5 deletions
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 85ca5226..76633d26 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
@@ -19,21 +19,157 @@
  */
 package org.onap.dcaegen2.services.prh.configuration;
 
+import java.util.Optional;
 import org.onap.dcaegen2.services.config.AAIHttpClientConfiguration;
 import org.onap.dcaegen2.services.config.DmaapConsumerConfiguration;
 import org.onap.dcaegen2.services.config.DmaapPublisherConfiguration;
+import org.onap.dcaegen2.services.config.ImmutableAAIHttpClientConfiguration;
+import org.onap.dcaegen2.services.config.ImmutableDmaapConsumerConfiguration;
+import org.onap.dcaegen2.services.config.ImmutableDmaapPublisherConfiguration;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.stereotype.Component;
 
 /**
  * @author <a href="mailto:przemyslaw.wasala@nokia.com">Przemysław Wąsala</a> on 4/9/18
  */
-public interface AppConfig {
 
-    DmaapConsumerConfiguration getDmaapConsumerConfiguration();
+@Component
+@Configuration
+public class AppConfig extends PrhAppConfig {
 
-    AAIHttpClientConfiguration getAAIHttpClientConfiguration();
+    @Value("${dmaap.dmaapConsumerConfiguration.dmmapHostName:}")
+    public String consumerDmmapHostName;
 
-    DmaapPublisherConfiguration getDmaapPublisherConfiguration();
+    @Value("${dmaap.dmaapConsumerConfiguration.dmmapPortNumber:}")
+    public Integer consumerDmmapPortNumber;
 
-    void initFileStreamReader();
+    @Value("${dmaap.dmaapConsumerConfiguration.dmmapTopicName:}")
+    public String consumerDmmapTopicName;
+
+    @Value("${dmaap.dmaapConsumerConfiguration.dmmapProtocol:}")
+    public String consumerDmmapProtocol;
+
+    @Value("${dmaap.dmaapConsumerConfiguration.dmmapUserName:}")
+    public String consumerDmmapUserName;
+
+    @Value("${dmaap.dmaapConsumerConfiguration.dmmapUserPassword:}")
+    public String consumerDmmapUserPassword;
+
+    @Value("${dmaap.dmaapConsumerConfiguration.dmmapContentType:}")
+    public String consumerDmmapContentType;
+
+    @Value("${dmaap.dmaapConsumerConfiguration.consumerId:}")
+    public String consumerId;
+
+    @Value("${dmaap.dmaapConsumerConfiguration.consumerGroup:}")
+    public String consumerGroup;
+
+    @Value("${dmaap.dmaapConsumerConfiguration.timeoutMS:}")
+    public Integer consumerTimeoutMS;
+
+    @Value("${dmaap.dmaapConsumerConfiguration.message-limit:}")
+    public Integer consumerMessageLimit;
+
+    @Value("${dmaap.dmaapProducerConfiguration.dmmapHostName:}")
+    public String producerDmmapHostName;
+
+    @Value("${dmaap.dmaapProducerConfiguration.dmmapPortNumber:}")
+    public Integer producerDmmapPortNumber;
+
+    @Value("${dmaap.dmaapProducerConfiguration.dmmapTopicName:}")
+    public String producerDmmapTopicName;
+
+    @Value("${dmaap.dmaapProducerConfiguration.dmmapProtocol:}")
+    public String producerDmmapProtocol;
+
+    @Value("${dmaap.dmaapProducerConfiguration.dmmapUserName:}")
+    public String producerDmmapUserName;
+
+    @Value("${dmaap.dmaapProducerConfiguration.dmmapUserPassword:}")
+    public String producerDmmapUserPassword;
+
+    @Value("${dmaap.dmaapProducerConfiguration.dmmapContentType:}")
+    public String producerDmmapContentType;
+
+    @Value("${aai.aaiHttpClientConfiguration.aaiHost:}")
+    public String aaiHost;
+
+    @Value("${aai.aaiHttpClientConfiguration.aaiHostPortNumber:}")
+    public Integer aaiHostPortNumber;
+
+    @Value("${aai.aaiHttpClientConfiguration.aaiProtocol:}")
+    public String aaiProtocol;
+
+    @Value("${aai.aaiHttpClientConfiguration.aaiUserName:}")
+    public String aaiUserName;
+
+    @Value("${aai.aaiHttpClientConfiguration.aaiUserPassword:}")
+    public String aaiUserPassword;
+
+    @Value("${aai.aaiHttpClientConfiguration.aaiIgnoreSSLCertificateErrors:}")
+    public Boolean aaiIgnoreSSLCertificateErrors;
+
+    @Override
+    public DmaapConsumerConfiguration getDmaapConsumerConfiguration() {
+        return new ImmutableDmaapConsumerConfiguration.Builder()
+            .dmaapUserPassword(
+                Optional.ofNullable(consumerDmmapUserPassword).orElse(dmaapConsumerConfiguration.dmaapUserPassword()))
+            .dmaapUserName(
+                Optional.ofNullable(consumerDmmapUserName).orElse(dmaapConsumerConfiguration.dmaapUserName()))
+            .dmaapHostName(
+                Optional.ofNullable(consumerDmmapHostName).orElse(dmaapConsumerConfiguration.dmaapHostName()))
+            .dmaapPortNumber(
+                Optional.ofNullable(consumerDmmapPortNumber).orElse(dmaapConsumerConfiguration.dmaapPortNumber()))
+            .dmaapProtocol(
+                Optional.ofNullable(consumerDmmapProtocol).orElse(dmaapConsumerConfiguration.dmaapProtocol()))
+            .dmaapContentType(
+                Optional.ofNullable(consumerDmmapContentType).orElse(dmaapConsumerConfiguration.dmaapContentType()))
+            .dmaapTopicName(
+                Optional.ofNullable(consumerDmmapTopicName).orElse(dmaapConsumerConfiguration.dmaapTopicName()))
+            .messageLimit(
+                Optional.ofNullable(consumerMessageLimit).orElse(dmaapConsumerConfiguration.messageLimit()))
+            .timeoutMS(Optional.ofNullable(consumerTimeoutMS).orElse(dmaapConsumerConfiguration.timeoutMS()))
+            .consumerGroup(Optional.ofNullable(consumerGroup).orElse(dmaapConsumerConfiguration.consumerGroup()))
+            .consumerId(Optional.ofNullable(consumerId).orElse(dmaapConsumerConfiguration.consumerId()))
+            .build();
+    }
+
+    @Override
+    public AAIHttpClientConfiguration getAAIHttpClientConfiguration() {
+        return new ImmutableAAIHttpClientConfiguration.Builder()
+            .aaiHost(Optional.ofNullable(aaiHost).orElse(aaiHttpClientConfiguration.aaiHost()))
+            .aaiHostPortNumber(
+                Optional.ofNullable(aaiHostPortNumber).orElse(aaiHttpClientConfiguration.aaiHostPortNumber()))
+            .aaiIgnoreSSLCertificateErrors(
+                Optional.ofNullable(aaiIgnoreSSLCertificateErrors)
+                    .orElse(aaiHttpClientConfiguration.aaiIgnoreSSLCertificateErrors()))
+            .aaiProtocol(Optional.ofNullable(aaiProtocol).orElse(aaiHttpClientConfiguration.aaiProtocol()))
+            .aaiUserName(
+                Optional.ofNullable(aaiUserName).orElse(aaiHttpClientConfiguration.aaiUserName()))
+            .aaiUserPassword(Optional.ofNullable(
+                aaiUserPassword).orElse(aaiHttpClientConfiguration.aaiUserPassword()))
+            .build();
+    }
+
+    @Override
+    public DmaapPublisherConfiguration getDmaapPublisherConfiguration() {
+        return new ImmutableDmaapPublisherConfiguration.Builder()
+            .dmaapContentType(
+                Optional.ofNullable(producerDmmapContentType).orElse(dmaapPublisherConfiguration.dmaapContentType()))
+            .dmaapHostName(
+                Optional.ofNullable(producerDmmapHostName).orElse(dmaapPublisherConfiguration.dmaapHostName()))
+            .dmaapPortNumber(
+                Optional.ofNullable(producerDmmapPortNumber).orElse(dmaapPublisherConfiguration.dmaapPortNumber()))
+            .dmaapProtocol(
+                Optional.ofNullable(producerDmmapProtocol).orElse(dmaapPublisherConfiguration.dmaapProtocol()))
+            .dmaapTopicName(
+                Optional.ofNullable(producerDmmapTopicName).orElse(dmaapPublisherConfiguration.dmaapTopicName()))
+            .dmaapUserName(
+                Optional.ofNullable(producerDmmapUserName).orElse(dmaapPublisherConfiguration.dmaapUserName()))
+            .dmaapUserPassword(
+                Optional.ofNullable(producerDmmapUserPassword).orElse(dmaapPublisherConfiguration.dmaapUserPassword()))
+            .build();
+    }
 
 }