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>

2 files changed, 41 insertions, 10 deletions

diff --git a/common/onap-common-configuration-management/onap-configuration-management-api/src/main/java/org/onap/config/api/ConfigurationLoader.java b/common/onap-common-configuration-management/onap-configuration-management-api/src/main/java/org/onap/config/api/ConfigurationLoader.java
new file mode 100644
index 0000000000..d84a470e1c
--- /dev/null
+++ b/common/onap-common-configuration-management/onap-configuration-management-api/src/main/java/org/onap/config/api/ConfigurationLoader.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright © 2016-2018 European Support Limited
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.onap.config.api;
+
+import java.util.Iterator;
+import java.util.ServiceLoader;
+
+/**
+ * Loads a Java SPI binding for the configuration service.
+ *
+ * @author evitaliy
+ * @since 29 Oct 2018
+ */
+class ConfigurationLoader {
+
+    static Configuration load() {
+
+        ServiceLoader<ConfigurationManager> loader = ServiceLoader.load(ConfigurationManager.class);
+        Iterator<ConfigurationManager> configManagers = loader.iterator();
+        if (configManagers.hasNext()) {
+            return configManagers.next();
+        }
+
+        throw new IllegalStateException("No binding found for configuration service");
+    }
+}
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;
     }