diff options
author | vempo <vitaliy.emporopulo@amdocs.com> | 2018-10-31 10:27:59 +0200 |
---|---|---|
committer | Avi Gaffa <avi.gaffa@amdocs.com> | 2018-10-31 12:06:24 +0000 |
commit | 461e964344d01e245464980b6ace12e4b28569e6 (patch) | |
tree | ae9ddafa9e3437aec8a7cf56b37f79fae924f7d8 /common/onap-common-configuration-management/onap-configuration-management-api/src/main/java/org/onap/config/api/ConfigurationManager.java | |
parent | eba6fee58790a1ffece980de44100b21764051ca (diff) |
Removed JMX, other unused code from configuration
Removed code duplicates, stabilized test execution via
Maven, re-aranged code, fixed spelling.
Change-Id: I41fc303ea0a8c7d78d89a12bb20850de51cb8c52
Issue-ID: SDC-1867
Signed-off-by: vempo <vitaliy.emporopulo@amdocs.com>
Diffstat (limited to 'common/onap-common-configuration-management/onap-configuration-management-api/src/main/java/org/onap/config/api/ConfigurationManager.java')
-rw-r--r-- | common/onap-common-configuration-management/onap-configuration-management-api/src/main/java/org/onap/config/api/ConfigurationManager.java | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/common/onap-common-configuration-management/onap-configuration-management-api/src/main/java/org/onap/config/api/ConfigurationManager.java b/common/onap-common-configuration-management/onap-configuration-management-api/src/main/java/org/onap/config/api/ConfigurationManager.java index 0bb33595e5..9f0f8b7113 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-api/src/main/java/org/onap/config/api/ConfigurationManager.java +++ b/common/onap-common-configuration-management/onap-configuration-management-api/src/main/java/org/onap/config/api/ConfigurationManager.java @@ -17,22 +17,13 @@ package org.onap.config.api; import java.util.Collection; -import java.util.Iterator; import java.util.Map; -import java.util.ServiceLoader; public interface ConfigurationManager extends Configuration { - Configuration CONFIG = lookup(); + Configuration CONFIG = ConfigurationLoader.load(); static Configuration lookup() { - - if (CONFIG == null) { - ServiceLoader<ConfigurationManager> loader = ServiceLoader.load(ConfigurationManager.class); - Iterator<ConfigurationManager> configManagers = loader.iterator(); - return configManagers.hasNext() ? configManagers.next() : null; - } - return CONFIG; } |