diff options
author | pwielebs <piotr.wielebski@nokia.com> | 2018-09-04 09:50:05 +0200 |
---|---|---|
committer | pwielebs <piotr.wielebski@nokia.com> | 2018-09-04 09:50:05 +0200 |
commit | be3127220aed103d1c1bb495080d62593d61b835 (patch) | |
tree | d18321c21dd28859e5f6e7eed3553ea0fff38a3c /prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/CloudConfiguration.java | |
parent | a4c979b6de8c1c76f0f12ae2b8dd0e60c3084830 (diff) |
Maven resources refactoring
Added resurces to java spring classpath directly
Change-Id: I194748706f63cff1966111bbdb52538bd5a83855
Issue-ID: DCAEGEN2-606
Signed-off-by: pwielebs <piotr.wielebski@nokia.com>
Diffstat (limited to 'prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/CloudConfiguration.java')
-rw-r--r-- | prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/CloudConfiguration.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/CloudConfiguration.java b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/CloudConfiguration.java index 10626a32..e598b4b3 100644 --- a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/CloudConfiguration.java +++ b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/CloudConfiguration.java @@ -89,7 +89,8 @@ public class CloudConfiguration extends AppConfig { LOGGER.info("Received application configuration: {}", jsonObject); CloudConfigParser cloudConfigParser = new CloudConfigParser(jsonObject); dmaapPublisherCloudConfiguration = cloudConfigParser.getDmaapPublisherConfig(); - aaiClientCloudConfiguration = cloudConfigParser.getAaiClientConfig(); + aaiClientCloudConfiguration = ImmutableAaiClientConfiguration.copyOf(cloudConfigParser.getAaiClientConfig()) + .withAaiHeaders(aaiClientConfiguration.aaiHeaders()); dmaapConsumerCloudConfiguration = cloudConfigParser.getDmaapConsumerConfig(); } @@ -100,11 +101,10 @@ public class CloudConfiguration extends AppConfig { @Override public AaiClientConfiguration getAaiClientConfiguration() { - return Optional.ofNullable(ImmutableAaiClientConfiguration.copyOf(aaiClientCloudConfiguration) - .withAaiHeaders(aaiClientConfiguration.aaiHeaders())) - .orElse(ImmutableAaiClientConfiguration.copyOf(super.getAaiClientConfiguration())); + return Optional.ofNullable(aaiClientCloudConfiguration).orElse(super.getAaiClientConfiguration()); } + @Override public DmaapConsumerConfiguration getDmaapConsumerConfiguration() { return Optional.ofNullable(dmaapConsumerCloudConfiguration).orElse(super.getDmaapConsumerConfiguration()); |