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 5b54904..f1a9618 100644 (file)
--- 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 720576c..0402754 100644 (file)
--- 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);