aboutsummaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorEddy Hautot <eh552t@intl.att.com>2018-03-14 09:27:19 +0000
committerGerrit Code Review <gerrit@onap.org>2018-03-14 09:27:19 +0000
commit32b15cbf9626866efb8fb9159b1d4ac208be6a36 (patch)
treea605fe243192a790d66f41567d9ac50313965e6e /src/main
parent8dd2e0cc280b77bb134e2b8854d18fcd17072d08 (diff)
parentb4fac9a908a16662ae63cbda0c5e5e4c5977fd96 (diff)
Merge "Rework the SDC config"
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/org/onap/clamp/clds/config/sdc/SdcControllersConfiguration.java3
-rw-r--r--src/main/java/org/onap/clamp/clds/util/ResourceFileUtil.java2
2 files changed, 2 insertions, 3 deletions
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);