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

Merge pull request #15543 from igor-suhorukov 

* pr/15543:
  Simplify code by using Map computeIfAbsent
This commit is contained in:
Stephane Nicoll 2018-12-21 11:13:24 +01:00
parent b8c82ec425 cbf6b330ba
commit 6013146a9a
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/TypeElementMembers.java
View File

@ -104,11 +104,7 @@ class TypeElementMembers {
else if (isSetter(method)) { else if (isSetter(method)) {
String propertyName = getAccessorName(name); String propertyName = getAccessorName(name);
List<ExecutableElement> matchingSetters = this.publicSetters List<ExecutableElement> matchingSetters = this.publicSetters
.get(propertyName); .computeIfAbsent(propertyName, (k) -> new ArrayList<>());
if (matchingSetters == null) {
matchingSetters = new ArrayList<>();
this.publicSetters.put(propertyName, matchingSetters);
}
TypeMirror paramType = method.getParameters().get(0).asType(); TypeMirror paramType = method.getParameters().get(0).asType();
if (getMatchingSetter(matchingSetters, paramType) == null) { if (getMatchingSetter(matchingSetters, paramType) == null) {
matchingSetters.add(method); matchingSetters.add(method);

6
spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/metadata/ConfigurationMetadata.java
View File

@ -136,11 +136,7 @@ public class ConfigurationMetadata {
} }
private <K, V> void add(Map<K, List<V>> map, K key, V value) { private <K, V> void add(Map<K, List<V>> map, K key, V value) {
List<V> values = map.get(key); List<V> values = map.computeIfAbsent(key, (k) -> new ArrayList<>());
if (values == null) {
values = new ArrayList<>();
map.put(key, values);
}
values.add(value); values.add(value);
} }