From 3a98ad373d3f8a8cccce36f78e24bd24278043d6 Mon Sep 17 00:00:00 2001 From: "k.kedron" Date: Tue, 4 Jun 2019 16:21:03 +0200 Subject: Improve unit test in the NonConfigResourceTest and various sonar fixes. Improve the NonConfigResourceTest. Remove the throws the Exception in CliConfigurationImp constructor. ConfigurationImpl class: - Replace the string to chart in indexOf method. - Extract the assigment out from expression Issue-ID: SDC-2327 Signed-off-by: Krystian Kedron Change-Id: If72a75e6a2d81a9ea74e3ae1af94b16a8489a29a --- .../src/main/java/org/onap/config/impl/ConfigurationImpl.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ConfigurationImpl.java') diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ConfigurationImpl.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ConfigurationImpl.java index c51c8621a9..6cad62ef03 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ConfigurationImpl.java +++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ConfigurationImpl.java @@ -207,7 +207,7 @@ public class ConfigurationImpl implements org.onap.config.api.Configuration { String k = keys.next(); if (k.startsWith(key + ".")) { k = k.substring(key.length() + 1); - String subkey = k.substring(0, k.indexOf(".")); + String subkey = k.substring(0, k.indexOf('.')); if (!map.containsKey(subkey)) { map.put(subkey, get(tenantId, namespace, key + "." + subkey, clazz)); } @@ -248,10 +248,12 @@ public class ConfigurationImpl implements org.onap.config.api.Configuration { while (k.contains(".")) { if (k.contains(".")) { - String subkey = k.substring(0, k.indexOf(".")); - k = k.substring(k.indexOf(".") + 1); + String subkey = k.substring(0, k.indexOf('.')); + k = k.substring(k.indexOf('.') + 1); if (!map.containsKey(subkey)) { - map.put(subkey, map = new HashMap<>()); + Map tmp = new HashMap(); + map.put(subkey, tmp); + map = tmp; } else { map = (Map) map.get(subkey); } -- cgit 1.2.3-korg