From 5f673c9e84d71f39e65434c31a10d73848f573c7 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 21 Nov 2014 16:13:26 +0100 Subject: [PATCH] Fix usage of putIfAbsent --- .../SimpleConfigurationMetadataRepository.java | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/configurationmetadata/SimpleConfigurationMetadataRepository.java b/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/configurationmetadata/SimpleConfigurationMetadataRepository.java index 87d311fecc2..2cd9e2b8998 100644 --- a/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/configurationmetadata/SimpleConfigurationMetadataRepository.java +++ b/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/configurationmetadata/SimpleConfigurationMetadataRepository.java @@ -58,7 +58,7 @@ public class SimpleConfigurationMetadataRepository implements ConfigurationMetad } String sourceType = source.getType(); if (sourceType != null) { - group.getSources().putIfAbsent(sourceType, source); + putIfAbsent(group.getSources(), sourceType, source); } } } @@ -69,9 +69,9 @@ public class SimpleConfigurationMetadataRepository implements ConfigurationMetad */ public void add(ConfigurationMetadataProperty property, ConfigurationMetadataSource source) { if (source != null) { - source.getProperties().putIfAbsent(property.getId(), property); + putIfAbsent(source.getProperties(),property.getId(), property); } - getGroup(source).getProperties().putIfAbsent(property.getId(), property); + putIfAbsent(getGroup(source).getProperties(), property.getId(), property); } @@ -87,11 +87,11 @@ public class SimpleConfigurationMetadataRepository implements ConfigurationMetad else { // Merge properties for (Map.Entry entry : group.getProperties().entrySet()) { - existingGroup.getProperties().putIfAbsent(entry.getKey(), entry.getValue()); + putIfAbsent(existingGroup.getProperties(), entry.getKey(), entry.getValue()); } // Merge sources for (Map.Entry entry : group.getSources().entrySet()) { - existingGroup.getSources().putIfAbsent(entry.getKey(), entry.getValue()); + putIfAbsent(existingGroup.getSources(), entry.getKey(), entry.getValue()); } } } @@ -112,4 +112,10 @@ public class SimpleConfigurationMetadataRepository implements ConfigurationMetad } } + private void putIfAbsent(Map map, String key, V value) { + if (!map.containsKey(key)) { + map.put(key, value); + } + } + }