From 461e964344d01e245464980b6ace12e4b28569e6 Mon Sep 17 00:00:00 2001
From: vempo <vitaliy.emporopulo@amdocs.com>
Date: Wed, 31 Oct 2018 10:27:59 +0200
Subject: 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>
---
 .../onap/config/impl/ConfigurationRepository.java  | 46 ++--------------------
 1 file changed, 4 insertions(+), 42 deletions(-)

(limited to 'common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ConfigurationRepository.java')

diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ConfigurationRepository.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ConfigurationRepository.java
index 5b950d1af6..5863caef68 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ConfigurationRepository.java
+++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ConfigurationRepository.java
@@ -18,7 +18,6 @@ package org.onap.config.impl;
 
 import java.io.File;
 import java.sql.Timestamp;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
@@ -31,7 +30,6 @@ import org.apache.commons.configuration2.Configuration;
 import org.apache.commons.configuration2.FileBasedConfiguration;
 import org.apache.commons.configuration2.builder.BasicConfigurationBuilder;
 import org.apache.commons.configuration2.builder.FileBasedConfigurationBuilder;
-import org.apache.commons.configuration2.ex.ConfigurationException;
 import org.onap.config.ConfigurationUtils;
 import org.onap.config.Constants;
 
@@ -105,29 +103,16 @@ public final class ConfigurationRepository {
     }
 
     public void populateOverrideConfiguration(String key, File file) {
+
         ConfigurationHolder holder = store.get(key);
+
         if (holder == null) {
             holder = new ConfigurationHolder(new CombinedConfiguration());
             store.put(key, holder);
         }
-        holder.addOverrideConfiguration(file.getAbsolutePath(), ConfigurationUtils.getConfigurationBuilder(file, true));
-        populateTenantsNamespace(key);
-    }
 
-    public void refreshOverrideConfigurationFor(String key, int index) {
-        ConfigurationHolder holder = store.get(key);
-        if (holder != null) {
-            holder.refreshOverrideConfiguration(index);
-        }
-    }
-
-    public void removeOverrideConfiguration(File file) {
-        for (String s : (Iterable<String>) new ArrayList(store.keySet())) {
-            ConfigurationHolder holder = store.get(s);
-            if (holder.containsOverrideConfiguration(file.getAbsolutePath())) {
-                holder.removeOverrideConfiguration(file.getAbsolutePath());
-            }
-        }
+        holder.addOverrideConfiguration(file.getAbsolutePath(), ConfigurationUtils.getConfigurationBuilder(file));
+        populateTenantsNamespace(key);
     }
 
     private class ConfigurationHolder {
@@ -147,20 +132,6 @@ public final class ConfigurationRepository {
             this.config = builder;
         }
 
-        public void refreshOverrideConfiguration(int index) {
-            int count = -1;
-            for (FileBasedConfigurationBuilder overrides : overrideConfiguration.values()) {
-                try {
-                    if (++count == index) {
-                        overrides.save();
-                        overrides.resetResult();
-                    }
-                } catch (ConfigurationException exception) {
-                    //do nothing
-                }
-            }
-        }
-
         public void addOverrideConfiguration(String path, BasicConfigurationBuilder<FileBasedConfiguration> builder) {
             overrideConfiguration.put(path.toUpperCase(), (FileBasedConfigurationBuilder) builder);
             getEffectiveConfiguration(config, overrideConfiguration.values());
@@ -181,15 +152,6 @@ public final class ConfigurationRepository {
             }
         }
 
-        public void removeOverrideConfiguration(String path) {
-            overrideConfiguration.remove(path.toUpperCase());
-            getEffectiveConfiguration(config, overrideConfiguration.values());
-        }
-
-        public boolean containsOverrideConfiguration(String path) {
-            return overrideConfiguration.containsKey(path.toUpperCase());
-        }
-
         public Configuration getConfiguration(String namespace) throws Exception {
 
             if (config == null) {
-- 
cgit 1.2.3-korg