diff options
author | 2019-05-29 15:06:10 +0200 | |
---|---|---|
committer | 2019-05-30 12:38:26 +0200 | |
commit | 6ae123a7e8c095dd87c9b459b86195f9f492b508 (patch) | |
tree | 50d477aec2fc5cb158b313848042d450fef951c3 /prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/CbsConfiguration.java | |
parent | 37444e2753f351cfe22b4651bcf777b833aeba92 (diff) |
Configs cleanup
Adding test for AppInfoController
Change-Id: Ib793cf20a17bcca56f5fe2162048c1b95409da01
Issue-ID: DCAEGEN2-1544
Signed-off-by: grabinsk <maciej.grabinski@nokia.com>
Diffstat (limited to 'prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/CbsConfiguration.java')
-rw-r--r-- | prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/CbsConfiguration.java | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/CbsConfiguration.java b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/CbsConfiguration.java index 0cf07a0f..e412bff5 100644 --- a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/CbsConfiguration.java +++ b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/CbsConfiguration.java @@ -33,12 +33,7 @@ import org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.model.MessageRo import org.onap.dcaegen2.services.sdk.rest.services.model.logging.RequestDiagnosticContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Primary; -import org.springframework.scheduling.annotation.EnableScheduling; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; import reactor.core.scheduler.Schedulers; @@ -46,11 +41,7 @@ import reactor.core.scheduler.Schedulers; import java.util.Optional; @Configuration -@ComponentScan("org.onap.dcaegen2.services.sdk.rest.services.cbs.client.providers") -@EnableConfigurationProperties -@EnableScheduling -@Primary -public class CbsConfiguration extends PrhAppConfig { +public class CbsConfiguration implements Config { private static final Logger LOGGER = LoggerFactory.getLogger(CbsConfiguration.class); private AaiClientConfiguration aaiClientCBSConfiguration; private MessageRouterPublisher messageRouterPublisher; @@ -59,8 +50,11 @@ public class CbsConfiguration extends PrhAppConfig { private MessageRouterSubscribeRequest messageRouterCBSSubscribeRequest; private MessageRouterPublishRequest messageRouterCBSUpdatePublishRequest; - @Autowired - private ConsulConfigFileReader consulConfigFileReader; + private final ConsulConfigFileReader consulConfigFileReader; + + public CbsConfiguration(ConsulConfigFileReader consulConfigFileReader) { + this.consulConfigFileReader = consulConfigFileReader; + } public void runTask() { Flux.defer(this::resolveEnvProperties) |