Fix sonar violation

Fix sonar violation

Issue-ID: DCAEGEN2-1016
Signed-off-by: Zlatko Murgoski <zlatko.murgoski@nokia.com>
Change-Id: I0db722972aeeb57ebb4b61b11f1e302f613890d5

3 files changed, 7 insertions, 6 deletions

diff --git a/src/main/java/org/onap/dcae/controller/ConfigFilesFacade.java b/src/main/java/org/onap/dcae/controller/ConfigFilesFacade.java
index c83db2df..0b2c197d 100644
--- a/src/main/java/org/onap/dcae/controller/ConfigFilesFacade.java
+++ b/src/main/java/org/onap/dcae/controller/ConfigFilesFacade.java
@@ -53,7 +53,7 @@ class ConfigFilesFacade {
 
     Try<Map<String, String>> readCollectorProperties() {
         log.info(f("Reading collector properties from path: '%s'", propertiesPath));
-        return Try(() -> readProperties())
+        return Try(this::readProperties)
             .map(prop -> toList(prop.getKeys()).toMap(k -> k, k -> (String) prop.getProperty(k)))
             .mapFailure(enhanceError("Unable to read properties configuration from path '%s'", propertiesPath))
             .onFailure(logError(log))
diff --git a/src/main/java/org/onap/dcae/controller/ConfigLoader.java b/src/main/java/org/onap/dcae/controller/ConfigLoader.java
index c1ac65d2..e11c2b8a 100644
--- a/src/main/java/org/onap/dcae/controller/ConfigLoader.java
+++ b/src/main/java/org/onap/dcae/controller/ConfigLoader.java
@@ -68,7 +68,7 @@ public class ConfigLoader {
         log.info("Trying to dynamically update config from Config Binding Service");
         readEnvProps(envVariablesSupplier.get())
             .onEmpty(() -> log.warn(SKIP_MSG))
-            .forEach(props -> updateConfig(props));
+            .forEach(this::updateConfig);
     }
 
     private void updateConfig(EnvProps props) {
diff --git a/src/main/java/org/onap/dcae/controller/ConfigSource.java b/src/main/java/org/onap/dcae/controller/ConfigSource.java
index 68dc2501..a9e439e4 100644
--- a/src/main/java/org/onap/dcae/controller/ConfigSource.java
+++ b/src/main/java/org/onap/dcae/controller/ConfigSource.java
@@ -26,6 +26,7 @@ import static org.onap.dcae.common.publishing.VavrUtils.f;
 import static org.onap.dcae.controller.Conversions.toJson;
 import static org.onap.dcae.controller.Conversions.toJsonArray;
 
+import com.mashape.unirest.http.HttpResponse;
 import com.mashape.unirest.http.Unirest;
 import io.vavr.control.Try;
 import org.json.JSONArray;
@@ -41,11 +42,11 @@ final class ConfigSource {
         log.info("Fetching app configuration from CBS");
         return callConsulForCBSConfiguration(envProps)
             .peek(strBody -> log.info(f("Received following CBS configuration from Consul '%s'", strBody)))
-            .flatMap(strBody -> toJsonArray(strBody))
-            .flatMap(json -> withdrawCatalog(json))
+            .flatMap(Conversions::toJsonArray)
+            .flatMap(ConfigSource::withdrawCatalog)
             .flatMap(json -> constructFullCBSUrl(envProps, json))
             .flatMap(cbsUrl -> callCBSForAppConfig(envProps, cbsUrl))
-            .flatMap(strBody -> toJson(strBody))
+            .flatMap(Conversions::toJson)
             .peek(jsonNode -> log.info(f("Received app configuration: '%s'", jsonNode)))
             .onFailure(exc -> log.error("Could not fetch application config", exc));
     }
@@ -83,7 +84,7 @@ final class ConfigSource {
                 res -> res.getStatus() == 200,
                 res -> new RuntimeException(f("HTTP call (GET '%s') failed with status %s and body '%s'",
                     url, res.getStatus(), res.getBody())))
-            .map(res -> res.getBody())
+            .map(HttpResponse::getBody)
             .peek(body -> log.info(f("HTTP GET on '%s' returned body '%s'", url, body)));
     }