summaryrefslogtreecommitdiffstats
path: root/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ConfigurationRepository.java
diff options
context:
space:
mode:
authorvasraz <vasyl.razinkov@est.tech>2021-03-27 22:58:29 +0000
committerChristophe Closset <christophe.closset@intl.att.com>2021-03-29 07:15:14 +0000
commit04c236567737c965545f64c9542a7d75ed6f9046 (patch)
tree8d2a3ea1bcb80b8d66603bb31a8b6877a98d84f8 /common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ConfigurationRepository.java
parentbe66acfea37b8d96cbb1b1e14592de57ec3bc4ae (diff)
Reformat common
Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-3449 Change-Id: Ifa1412b8a614f7cdb4c52f05d811ab5e9cf20d83
Diffstat (limited to 'common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ConfigurationRepository.java')
-rw-r--r--common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ConfigurationRepository.java43
1 files changed, 14 insertions, 29 deletions
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 7b2e267a14..9be4c262b8 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
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.onap.config.impl;
import java.io.File;
@@ -40,26 +39,20 @@ public final class ConfigurationRepository {
private static final Logger logger = LoggerFactory.getLogger(ConfigurationRepository.class);
private static final ConfigurationRepository REPO = new ConfigurationRepository();
-
private final Set<String> tenants = Collections.synchronizedSet(new HashSet<>());
-
private final Set<String> namespaces = Collections.synchronizedSet(new HashSet<>());
-
- private final Map<String, ConfigurationHolder> store = Collections.synchronizedMap(
-
- new LinkedHashMap<String, ConfigurationHolder>(16, 0.75f, true) {
-
- @Override
- protected boolean removeEldestEntry(Map.Entry eldest) {
- try {
- return size() > getConfigurationFor(Constants.DEFAULT_TENANT, Constants.DB_NAMESPACE)
- .getInt("config.size.max");
- } catch (Exception exception) {
- logger.info("ConfigurationException", exception);
- return false;
- }
+ private final Map<String, ConfigurationHolder> store = Collections
+ .synchronizedMap(new LinkedHashMap<String, ConfigurationHolder>(16, 0.75f, true) {
+ @Override
+ protected boolean removeEldestEntry(Map.Entry eldest) {
+ try {
+ return size() > getConfigurationFor(Constants.DEFAULT_TENANT, Constants.DB_NAMESPACE).getInt("config.size.max");
+ } catch (Exception exception) {
+ logger.info("ConfigurationException", exception);
+ return false;
}
- });
+ }
+ });
private ConfigurationRepository() {
tenants.add(Constants.DEFAULT_TENANT);
@@ -106,22 +99,18 @@ 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));
populateTenantsNamespace(key);
}
private class ConfigurationHolder {
- private final Map<String, FileBasedConfigurationBuilder<FileBasedConfiguration>> overrideConfiguration =
- new LinkedHashMap<>();
+ private final Map<String, FileBasedConfigurationBuilder<FileBasedConfiguration>> overrideConfiguration = new LinkedHashMap<>();
private BasicConfigurationBuilder<Configuration> builder;
private Timestamp lastConfigurationBuildTime;
private Configuration config;
@@ -160,17 +149,13 @@ public final class ConfigurationRepository {
if (config == null) {
config = builder.getConfiguration();
lastConfigurationBuildTime = new Timestamp(System.currentTimeMillis());
- } else if (lastConfigurationBuildTime != null
- && System.currentTimeMillis() - lastConfigurationBuildTime.getTime()
- > getConfigurationFor(Constants.DEFAULT_TENANT, Constants.DB_NAMESPACE)
- .getInt("config.refresh.interval")) {
+ } else if (lastConfigurationBuildTime != null && System.currentTimeMillis() - lastConfigurationBuildTime.getTime() > getConfigurationFor(
+ Constants.DEFAULT_TENANT, Constants.DB_NAMESPACE).getInt("config.refresh.interval")) {
lastConfigurationBuildTime = new Timestamp(System.currentTimeMillis());
}
-
if (composite == null && overrideConfiguration.size() != 0) {
composite = getEffectiveConfiguration(config, overrideConfiguration.values());
}
-
return overrideConfiguration.size() == 0 ? config : composite;
}
}