From: Determe, Sebastien (sd378r) <sd378r@intl.att.com>
Date: Mon, 12 Mar 2018 18:33:49 +0000 (+0100)
Subject: Rework the SDC config
X-Git-Tag: 6.0.0~11^2~847^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=b4fac9a908a16662ae63cbda0c5e5e4c5977fd96;p=policy%2Fclamp.git

Rework the SDC config

Rework the SDC configuration code

Issue-ID: CLAMP-81
Change-Id: Ic924f1c2c35e096bf3cd5b8e4075cbab83cc3f11
Signed-off-by: Determe, Sebastien (sd378r) <sd378r@intl.att.com>
---

diff --git a/src/main/java/org/onap/clamp/clds/config/sdc/SdcControllersConfiguration.java b/src/main/java/org/onap/clamp/clds/config/sdc/SdcControllersConfiguration.java
index 5b5490426..f1a961840 100644
--- a/src/main/java/org/onap/clamp/clds/config/sdc/SdcControllersConfiguration.java
+++ b/src/main/java/org/onap/clamp/clds/config/sdc/SdcControllersConfiguration.java
@@ -71,8 +71,7 @@ public class SdcControllersConfiguration {
     }
 
     public SdcSingleControllerConfiguration getSdcSingleControllerConfiguration(String controllerName) {
-        Map<String, SdcSingleControllerConfiguration> controllerMap = getAllDefinedControllers();
-        return controllerMap.get(controllerName);
+        return getAllDefinedControllers().get(controllerName);
     }
 
     /**
diff --git a/src/main/java/org/onap/clamp/clds/util/ResourceFileUtil.java b/src/main/java/org/onap/clamp/clds/util/ResourceFileUtil.java
index 720576c47..0402754ac 100644
--- a/src/main/java/org/onap/clamp/clds/util/ResourceFileUtil.java
+++ b/src/main/java/org/onap/clamp/clds/util/ResourceFileUtil.java
@@ -52,7 +52,7 @@ public final class ResourceFileUtil {
     }
 
     /**
-     * Return resource as a Stream.
+     * Return resource as a String.
      */
     public static String getResourceAsString(String name) throws IOException {
         InputStream is = getResourceAsStream(name);