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

Harmonize use of Stream in ConfigDataLocationBindHandler.onSuccess 

See gh-36463
This commit is contained in:
elevne 2023-07-20 10:37:36 +09:00 committed by Stephane Nicoll
parent abf2f8af8a
commit d59cec9e01
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigDataLocationBindHandler.java
View File

@ -16,6 +16,7 @@
package org.springframework.boot.context.config; package org.springframework.boot.context.config;
import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
@ -44,23 +45,16 @@ class ConfigDataLocationBindHandler extends AbstractBindHandler {
return withOrigin(context, (ConfigDataLocation) result); return withOrigin(context, (ConfigDataLocation) result);
} }
if (result instanceof List) { if (result instanceof List) {
List<Object> list = ((List<Object>) result).stream().filter(Objects::nonNull).collect(Collectors.toList()); return ((List<Object>) result).stream()
for (int i = 0; i < list.size(); i++) { .filter(Objects::nonNull)
Object element = list.get(i); .map(e -> (e instanceof ConfigDataLocation) ? withOrigin(context, (ConfigDataLocation) e) : e)
if (element instanceof ConfigDataLocation) { .collect(Collectors.toCollection(ArrayList::new));
list.set(i, withOrigin(context, (ConfigDataLocation) element));
}
}
return list;
} }
if (result instanceof ConfigDataLocation[]) { if (result instanceof ConfigDataLocation[]) {
ConfigDataLocation[] locations = Arrays.stream((ConfigDataLocation[]) result) return Arrays.stream((ConfigDataLocation[]) result)
.filter(Objects::nonNull) .filter(Objects::nonNull)
.map(e -> withOrigin(context, e))
.toArray(ConfigDataLocation[]::new); .toArray(ConfigDataLocation[]::new);
for (int i = 0; i < locations.length; i++) {
locations[i] = withOrigin(context, locations[i]);
}
return locations;
} }
return result; return result;
} }