root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge branch '2.6.x' into 2.7.x

This commit is contained in:
Phillip Webb 2022-09-30 21:18:09 -07:00
parent 1eb0dd5e39 75f4d9e3fd
commit 0e98a577fe
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/ValueObjectBinder.java
View File

@ -131,10 +131,6 @@ class ValueObjectBinder implements DataObjectBinder {
Class<T> resolved = (Class<T>) type.resolve(); Class<T> resolved = (Class<T>) type.resolve();
Assert.state(resolved == null || isEmptyDefaultValueAllowed(resolved), Assert.state(resolved == null || isEmptyDefaultValueAllowed(resolved),
() -> "Parameter of type " + type + " must have a non-empty default value."); () -> "Parameter of type " + type + " must have a non-empty default value.");
T instance = create(Bindable.of(type), context);
if (instance != null) {
return instance;
}
if (resolved != null) { if (resolved != null) {
if (Optional.class == resolved) { if (Optional.class == resolved) {
return (T) Optional.empty(); return (T) Optional.empty();
@ -148,9 +144,12 @@ class ValueObjectBinder implements DataObjectBinder {
if (resolved.isArray()) { if (resolved.isArray()) {
return (T) Array.newInstance(resolved.getComponentType(), 0); return (T) Array.newInstance(resolved.getComponentType(), 0);
} }
return BeanUtils.instantiateClass(resolved);
} }
return null; T instance = create(Bindable.of(type), context);
if (instance != null) {
return instance;
}
return (resolved != null) ? BeanUtils.instantiateClass(resolved) : null;
} }
private boolean isEmptyDefaultValueAllowed(Class<?> type) { private boolean isEmptyDefaultValueAllowed(Class<?> type) {