diff options
author | 2018-10-28 19:04:06 +0200 | |
---|---|---|
committer | 2018-10-28 19:05:11 +0000 | |
commit | 8b7a0405a97cacf765c0e9a1988af98cd91a9f67 (patch) | |
tree | aa100b988d6e974089609caa27863667353a7860 /common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/AggregateConfiguration.java | |
parent | 2074ab2e8b4416126542c09205d3ca6646ed6718 (diff) |
Handled not thread-safe fields in configuration
Replaced not thread-safe fields with synchornized versions,
removed duplicate code, deleted class that was accessing DB,
made surefire plugin to pick up all available unit tests
(instead of hand-picked).
Change-Id: Idff3ac333dc87ebfd3ecf50438ba0179556eb9c9
Issue-ID: SDC-1867
Signed-off-by: vempo <vitaliy.emporopulo@amdocs.com>
Diffstat (limited to 'common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/AggregateConfiguration.java')
-rw-r--r-- | common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/AggregateConfiguration.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/AggregateConfiguration.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/AggregateConfiguration.java index 32a1902151..e81d82bf7d 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/AggregateConfiguration.java +++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/AggregateConfiguration.java @@ -35,10 +35,10 @@ import org.onap.config.type.ConfigurationMode; public final class AggregateConfiguration { - private final Map<String, Configuration> rootConfig = new HashMap<>(); - private final Map<String, Configuration> unionConfig = new HashMap<>(); - private final Map<String, Configuration> mergeConfig = new HashMap<>(); - private final Map<String, Configuration> overrideConfig = new LinkedHashMap<>(); + private final Map<String, Configuration> rootConfig = Collections.synchronizedMap(new HashMap<>()); + private final Map<String, Configuration> unionConfig = Collections.synchronizedMap(new HashMap<>()); + private final Map<String, Configuration> mergeConfig = Collections.synchronizedMap(new HashMap<>()); + private final Map<String, Configuration> overrideConfig = Collections.synchronizedMap(new LinkedHashMap<>()); public void addConfig(File file) throws Exception { addConfig(file.getAbsolutePath().toUpperCase(), ConfigurationUtils.getMergeStrategy(file), |