diff options
| author |   pwielebs <piotr.wielebski@nokia.com> | 2018-09-04 09:44:33 +0200 |
|---|---|---|
| committer | pwielebs <piotr.wielebski@nokia.com> | 2018-09-04 09:44:33 +0200 |
| commit | a4c979b6de8c1c76f0f12ae2b8dd0e60c3084830 (patch) | |
| tree | 5fd8eca8889fb37000b834128fdd742dc05664df /prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/CloudConfiguration.java | |
| parent | 3737046ff3c8e032257b257912778403fc058ee0 (diff) | |
Fixing code issues
1. SonarIssues
2. CheckStyle corrections
3. Empty code deletions
4. Adding AAIHeaders config to cloud configurations
Change-Id: Id624c52bc7f57338fad5276fffd9f29b21af2f69
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 | 5 |
1 files changed, 4 insertions, 1 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 11c75e80..10626a32 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 @@ -26,6 +26,7 @@ import java.util.Properties; import org.onap.dcaegen2.services.prh.config.AaiClientConfiguration; import org.onap.dcaegen2.services.prh.config.DmaapConsumerConfiguration; import org.onap.dcaegen2.services.prh.config.DmaapPublisherConfiguration; +import org.onap.dcaegen2.services.prh.config.ImmutableAaiClientConfiguration; import org.onap.dcaegen2.services.prh.model.EnvProperties; import org.onap.dcaegen2.services.prh.service.PrhConfigurationProvider; import org.slf4j.Logger; @@ -99,7 +100,9 @@ public class CloudConfiguration extends AppConfig { @Override public AaiClientConfiguration getAaiClientConfiguration() { - return Optional.ofNullable(aaiClientCloudConfiguration).orElse(super.getAaiClientConfiguration()); + return Optional.ofNullable(ImmutableAaiClientConfiguration.copyOf(aaiClientCloudConfiguration) + .withAaiHeaders(aaiClientConfiguration.aaiHeaders())) + .orElse(ImmutableAaiClientConfiguration.copyOf(super.getAaiClientConfiguration())); } @Override |