SDK integration: use 'cbs-client' in PRH

Change-Id: Ifd097c7d2305432f450bbcceb521cf2341f4cb6c
Issue-ID: DCAEGEN2-1011
Signed-off-by: Piotr Bocheński <piotr.bochenski@nokia.com>

1 files changed, 10 insertions, 11 deletions

diff --git a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/EnvironmentProcessor.java b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/EnvironmentProcessor.java
index 114e9839..793fcc27 100644
--- a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/EnvironmentProcessor.java
+++ b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/EnvironmentProcessor.java
@@ -20,28 +20,29 @@
 
 package org.onap.dcaegen2.services.prh.configuration;
 
-import java.util.Optional;
-import java.util.Properties;
 import org.onap.dcaegen2.services.prh.exceptions.EnvironmentLoaderException;
-import org.onap.dcaegen2.services.prh.model.EnvProperties;
-import org.onap.dcaegen2.services.prh.model.ImmutableEnvProperties;
+import org.onap.dcaegen2.services.sdk.rest.services.cbs.client.http.configuration.EnvProperties;
+import org.onap.dcaegen2.services.sdk.rest.services.cbs.client.http.configuration.ImmutableEnvProperties;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import reactor.core.publisher.Mono;
 
+import java.util.Optional;
+import java.util.Properties;
+
 /**
  * @author <a href="mailto:przemyslaw.wasala@nokia.com">Przemysław Wąsala</a> on 8/10/18
  */
-class EnvironmentProcessor {
+final class EnvironmentProcessor {
 
-    private static final int DEFAULT_CONSUL_PORT = 8500;
     private static final Logger LOGGER = LoggerFactory.getLogger(EnvironmentProcessor.class);
+    private static final int DEFAULT_CONSUL_PORT = 8500;
 
     private EnvironmentProcessor() {
     }
 
     static Mono<EnvProperties> evaluate(Properties systemEnvironment) {
-        LOGGER.info("Loading configuration from system environment variables");
+        LOGGER.debug("Loading configuration from system environment variables");
         EnvProperties envProperties;
         try {
             envProperties = ImmutableEnvProperties.builder().consulHost(getConsulHost(systemEnvironment))
@@ -50,7 +51,7 @@ class EnvironmentProcessor {
         } catch (EnvironmentLoaderException e) {
             return Mono.error(e);
         }
-        LOGGER.info("Evaluated environment system variables {}", envProperties);
+        LOGGER.info("Evaluated system environment variables: {}", envProperties);
         return Mono.just(envProperties);
     }
 
@@ -78,9 +79,7 @@ class EnvironmentProcessor {
     }
 
     private static Integer getDefaultPortOfConsul() {
-        LOGGER.warn("$CONSUL_PORT environment has not been defined");
-        LOGGER.warn("$CONSUL_PORT variable will be set to default port {}", DEFAULT_CONSUL_PORT);
+        LOGGER.warn("$CONSUL_PORT environment has not been defined, using default port: {}", DEFAULT_CONSUL_PORT);
         return DEFAULT_CONSUL_PORT;
     }
 }
-