From 8a894e564dc7577d78273c890396ffb5dbe86bbb Mon Sep 17 00:00:00 2001 From: "michal.banka" Date: Tue, 16 Jul 2019 13:51:00 +0200 Subject: Fix checkstyle violations in sdc-main/common Change-Id: I3e132cf4bffd77f9910bf6eff2026c3267873b11 Issue-ID: SDC-2454 Signed-off-by: michal.banka --- .../java/org/onap/config/impl/ConfigurationImpl.java | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 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 6cad62ef03..9a3fbd26fb 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 @@ -44,7 +44,7 @@ public class ConfigurationImpl implements org.onap.config.api.Configuration { private static final String KEY_CANNOT_BE_NULL = "Key can't be null."; - private static final NonConfigResource nonConfigResource = new NonConfigResource(); + private static final NonConfigResource NON_CONFIG_RESOURCE = new NonConfigResource(); static { @@ -70,7 +70,7 @@ public class ConfigurationImpl implements org.onap.config.api.Configuration { } moduleConfig.addConfig(url); } else { - nonConfigResource.add(url); + NON_CONFIG_RESOURCE.add(url); } } String configLocation = System.getProperty("config.location"); @@ -88,7 +88,7 @@ public class ConfigurationImpl implements org.onap.config.api.Configuration { } moduleConfig.addConfig(file); } else { - nonConfigResource.add(file); + NON_CONFIG_RESOURCE.add(file); } } } @@ -397,13 +397,17 @@ public class ConfigurationImpl implements org.onap.config.api.Configuration { clazzToInstantiate = field.getType(); } Constructor construct = getConstructorWithArguments(clazzToInstantiate, Collection.class); + if (construct != null) { construct.setAccessible(true); field.set(objToReturn, construct.newInstance(list)); - } else if ((construct = getConstructorWithArguments(clazzToInstantiate, Integer.class, - Boolean.class, Collection.class)) != null) { - construct.setAccessible(true); - field.set(objToReturn, construct.newInstance(list.size(), true, list)); + } else { + construct = getConstructorWithArguments(clazzToInstantiate, Integer.class, + Boolean.class, Collection.class); + if (construct != null) { + construct.setAccessible(true); + field.set(objToReturn, construct.newInstance(list.size(), true, list)); + } } } } else if (Map.class.isAssignableFrom(field.getType())) { @@ -454,7 +458,7 @@ public class ConfigurationImpl implements org.onap.config.api.Configuration { if (String.class.equals(clazz)) { if (obj.toString().startsWith("@") && ConfigurationUtils.isExternalLookup(processingHint)) { String contents = ConfigurationUtils.getFileContents( - nonConfigResource.locate(obj.toString().substring(1).trim())); + NON_CONFIG_RESOURCE.locate(obj.toString().substring(1).trim())); if (contents == null) { contents = ConfigurationUtils.getFileContents(obj.toString().substring(1).trim()); } -- cgit 1.2.3-korg