Merge branch '2.5.x'
See gh-27073
This commit is contained in:
@@ -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);
|
||||||
|
|||||||
Reference in New Issue
Block a user