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
07ebfc03
Commit
07ebfc03
authored
May 28, 2019
by
Phillip Webb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Polish
parent
b1e90fdc
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
9 deletions
+8
-9
JavaBeanBinder.java
...ramework/boot/context/properties/bind/JavaBeanBinder.java
+8
-9
No files found.
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/JavaBeanBinder.java
View file @
07ebfc03
...
...
@@ -192,14 +192,6 @@ class JavaBeanBinder implements BeanBinder {
});
}
private
boolean
isOfDifferentType
(
ResolvableType
targetType
,
Class
<?>
resolvedType
)
{
if
(
this
.
type
.
hasGenerics
()
||
targetType
.
hasGenerics
())
{
return
!
this
.
type
.
equals
(
targetType
);
}
return
this
.
resolvedType
==
null
||
!
this
.
resolvedType
.
equals
(
resolvedType
);
}
@SuppressWarnings
(
"unchecked"
)
public
static
<
T
>
Bean
<
T
>
get
(
Bindable
<
T
>
bindable
,
boolean
canCallGetValue
)
{
ResolvableType
type
=
bindable
.
getType
();
...
...
@@ -214,7 +206,7 @@ class JavaBeanBinder implements BeanBinder {
return
null
;
}
Bean
<?>
bean
=
Bean
.
cached
;
if
(
bean
==
null
||
bean
.
isOfDifferent
Type
(
type
,
resolvedType
))
{
if
(
bean
==
null
||
!
bean
.
isOf
Type
(
type
,
resolvedType
))
{
bean
=
new
Bean
<>(
type
,
resolvedType
);
cached
=
bean
;
}
...
...
@@ -234,6 +226,13 @@ class JavaBeanBinder implements BeanBinder {
}
}
private
boolean
isOfType
(
ResolvableType
type
,
Class
<?>
resolvedType
)
{
if
(
this
.
type
.
hasGenerics
()
||
type
.
hasGenerics
())
{
return
this
.
type
.
equals
(
type
);
}
return
this
.
resolvedType
!=
null
&&
this
.
resolvedType
.
equals
(
resolvedType
);
}
}
private
static
class
BeanSupplier
<
T
>
implements
Supplier
<
T
>
{
...
...
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