Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Harmonize Stream.collect() usage

Browse Source 
use Stream.toList() or collect(Collectors.toSet()) where possible.

See gh-36509
This commit is contained in:
Yanming Zhou
2023-07-24 16:03:19 +08:00
committed by Stephane Nicoll
parent c6c8a0f8c8
commit b1ac64c7e2
3 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/util/Instantiator.java
View File

@@ -17,7 +17,6 @@
package org.springframework.boot.util;
import java.lang.reflect.Constructor;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
@@ -28,7 +27,6 @@ import java.util.Map;
import java.util.function.Consumer;
import java.util.function.Function;
import java.util.function.Supplier;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.springframework.core.annotation.AnnotationAwareOrderComparator;
@@ -139,9 +137,7 @@ public class Instantiator<T> {
}
private List<T> instantiate(Stream<TypeSupplier> typeSuppliers) {
List<T> instances = typeSuppliers.map(this::instantiate).collect(Collectors.toCollection(ArrayList::new));
AnnotationAwareOrderComparator.sort(instances);
return Collections.unmodifiableList(instances);
return typeSuppliers.map(this::instantiate).sorted(AnnotationAwareOrderComparator.INSTANCE).toList();
}
private T instantiate(TypeSupplier typeSupplier) {