root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Fix usage of putIfAbsent

This commit is contained in:
Stephane Nicoll 2014-11-21 16:13:26 +01:00
parent 0f64a04780
commit 5f673c9e84
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/configurationmetadata/SimpleConfigurationMetadataRepository.java
View File

@ -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<String, ConfigurationMetadataProperty> entry : group.getProperties().entrySet()) {
existingGroup.getProperties().putIfAbsent(entry.getKey(), entry.getValue());
putIfAbsent(existingGroup.getProperties(), entry.getKey(), entry.getValue());
}
// Merge sources
for (Map.Entry<String, ConfigurationMetadataSource> 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 <V> void putIfAbsent(Map<String, V> map, String key, V value) {
if (!map.containsKey(key)) {
map.put(key, value);
}
}
}