Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
e2d68aa8
Commit
e2d68aa8
authored
Jun 24, 2021
by
Andy Wilkinson
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '2.4.x' into 2.5.x
See gh-27072
parents
b093db10
a7872f47
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
Instantiator.java
...main/java/org/springframework/boot/util/Instantiator.java
+1
-1
No files found.
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/util/Instantiator.java
View file @
e2d68aa8
...
...
@@ -114,7 +114,7 @@ public class Instantiator<T> {
return
instantiate
(
types
.
stream
().
map
((
type
)
->
TypeSupplier
.
forType
(
type
)));
}
p
ublic
List
<
T
>
instantiate
(
Stream
<
TypeSupplier
>
typeSuppliers
)
{
p
rivate
List
<
T
>
instantiate
(
Stream
<
TypeSupplier
>
typeSuppliers
)
{
List
<
T
>
instances
=
typeSuppliers
.
map
(
this
::
instantiate
).
collect
(
Collectors
.
toList
());
AnnotationAwareOrderComparator
.
sort
(
instances
);
return
Collections
.
unmodifiableList
(
instances
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment