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
097ab91e
Commit
097ab91e
authored
Jun 15, 2018
by
Stephane Nicoll
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #13473 from izeye:empty-list
* pr/13473: Reduce object creation in findMatchingItemMetadata()
parents
27bb4614
f34fb5f1
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
7 deletions
+3
-7
ConfigurationMetadata.java
...onfigurationprocessor/metadata/ConfigurationMetadata.java
+3
-7
No files found.
spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/metadata/ConfigurationMetadata.java
View file @
097ab91e
...
...
@@ -145,10 +145,11 @@ public class ConfigurationMetadata {
}
private
ItemMetadata
findMatchingItemMetadata
(
ItemMetadata
metadata
)
{
List
<
ItemMetadata
>
candidates
=
getCandidates
(
metadata
.
getName
());
if
(
candidates
.
isEmpty
())
{
List
<
ItemMetadata
>
candidates
=
this
.
items
.
get
(
metadata
.
getName
());
if
(
candidates
==
null
||
candidates
.
isEmpty
())
{
return
null
;
}
candidates
=
new
ArrayList
<>(
candidates
);
candidates
.
removeIf
((
itemMetadata
)
->
!
itemMetadata
.
hasSameType
(
metadata
));
if
(
candidates
.
size
()
>
1
&&
metadata
.
getType
()
!=
null
)
{
candidates
.
removeIf
(
...
...
@@ -165,11 +166,6 @@ public class ConfigurationMetadata {
return
null
;
}
private
List
<
ItemMetadata
>
getCandidates
(
String
name
)
{
List
<
ItemMetadata
>
candidates
=
this
.
items
.
get
(
name
);
return
(
candidates
!=
null
?
new
ArrayList
<>(
candidates
)
:
new
ArrayList
<>());
}
private
boolean
nullSafeEquals
(
Object
o1
,
Object
o2
)
{
if
(
o1
==
o2
)
{
return
true
;
...
...
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