cleanups around CbsClientConfiguration resolving

Change-Id: Id3c02de034fbf396e81dab39c4442880b346e70d
Issue-ID: DCAEGEN2-1544
Signed-off-by: grabinsk <maciej.grabinski@nokia.com>

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)