Browse Source

Merge branch '2.5.x'

See gh-27073
pull/27085/head
Andy Wilkinson 5 years ago
parent
commit
9b91c18163
  1. 2
      spring-boot-project/spring-boot/src/main/java/org/springframework/boot/util/Instantiator.java

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/util/Instantiator.java

@ -114,7 +114,7 @@ public class Instantiator<T> {
return instantiate(types.stream().map((type) -> TypeSupplier.forType(type))); return instantiate(types.stream().map((type) -> TypeSupplier.forType(type)));
} }
public List<T> instantiate(Stream<TypeSupplier> typeSuppliers) { private List<T> instantiate(Stream<TypeSupplier> typeSuppliers) {
List<T> instances = typeSuppliers.map(this::instantiate).collect(Collectors.toList()); List<T> instances = typeSuppliers.map(this::instantiate).collect(Collectors.toList());
AnnotationAwareOrderComparator.sort(instances); AnnotationAwareOrderComparator.sort(instances);
return Collections.unmodifiableList(instances); return Collections.unmodifiableList(instances);

Loading…
Cancel
Save