diff options
author | grabinsk <maciej.grabinski@nokia.com> | 2019-05-09 11:41:11 +0200 |
---|---|---|
committer | grabinsk <maciej.grabinski@nokia.com> | 2019-06-03 14:35:51 +0200 |
commit | 7c8f795a243d1b68c5f1595933aa564b513a23fd (patch) | |
tree | 28f57ef8d23c82332943429ce859c580ecf7080e /prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/CbsConfiguration.java | |
parent | aa0e23d09507e7f675a747dd75120ed94e8c111d (diff) |
cleanups around CbsClientConfiguration resolving
Change-Id: Id3c02de034fbf396e81dab39c4442880b346e70d
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, 4 insertions, 14 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 e262da55..1f752733 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 @@ -35,7 +35,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.annotation.Configuration; import reactor.core.publisher.Flux; -import reactor.core.publisher.Mono; import reactor.core.scheduler.Schedulers; import java.util.Optional; @@ -51,27 +50,18 @@ public class CbsConfiguration implements Config { private MessageRouterSubscribeRequest messageRouterCBSSubscribeRequest; private MessageRouterPublishRequest messageRouterCBSUpdatePublishRequest; - private final ConsulConfigFileReader consulConfigFileReader; + private final CbsClientConfigurationResolver cbsClientConfigurationResolver; - public CbsConfiguration(ConsulConfigFileReader consulConfigFileReader) { - this.consulConfigFileReader = consulConfigFileReader; + public CbsConfiguration(CbsClientConfigurationResolver cbsClientConfigurationResolver) { + this.cbsClientConfigurationResolver = cbsClientConfigurationResolver; } public void runTask() { - Flux.defer(this::resolveCbsClientConfiguration) + Flux.defer(cbsClientConfigurationResolver::resolveCbsClientConfiguration) .subscribeOn(Schedulers.parallel()) .subscribe(this::parsingConfigSuccess, this::parsingConfigError); } - private Mono<CbsClientConfiguration> resolveCbsClientConfiguration() { - try { - return Mono.just(CbsClientConfiguration.fromEnvironment()); - } catch(Exception e){ - parsingConfigError(e); - return consulConfigFileReader.evaluate(); - } - } - private void parsingConfigSuccess(CbsClientConfiguration cbsClientConfiguration) { LOGGER.debug("Fetching PRH configuration from Consul"); CbsClientFactory.createCbsClient(cbsClientConfiguration) |