Merge branch '2.4.x' into 2.5.x

See gh-27072
This commit is contained in:
Andy Wilkinson
2021-06-24 09:53:04 +01:00

View File

@@ -114,7 +114,7 @@ public class Instantiator<T> {
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());
AnnotationAwareOrderComparator.sort(instances);
return Collections.unmodifiableList(instances);