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

Refine decision to create object for constructor injection 

Closes gh-31488
This commit is contained in:
rstoyanchev 2023-10-25 11:38:55 +01:00
parent d7e6b79336
commit aa4f09d080
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
spring-context/src/main/java/org/springframework/validation/DataBinder.java
View File

@ -22,6 +22,7 @@ import java.lang.reflect.Constructor;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
@ -947,7 +948,7 @@ public class DataBinder implements PropertyEditorRegistry, TypeConverter {
Class<?> paramType = paramTypes[i]; Class<?> paramType = paramTypes[i];
Object value = valueResolver.resolveValue(paramPath, paramType); Object value = valueResolver.resolveValue(paramPath, paramType);
if (value == null && !BeanUtils.isSimpleValueType(param.nestedIfOptional().getNestedParameterType())) { if (value == null && shouldCreateObject(param)) {
ResolvableType type = ResolvableType.forMethodParameter(param); ResolvableType type = ResolvableType.forMethodParameter(param);
args[i] = createObject(type, paramPath + ".", valueResolver); args[i] = createObject(type, paramPath + ".", valueResolver);
} }
@ -1007,6 +1008,12 @@ public class DataBinder implements PropertyEditorRegistry, TypeConverter {
return (isOptional && !nestedPath.isEmpty() ? Optional.ofNullable(result) : result); return (isOptional && !nestedPath.isEmpty() ? Optional.ofNullable(result) : result);
} }
private static boolean shouldCreateObject(MethodParameter param) {
Class<?> type = param.nestedIfOptional().getNestedParameterType();
return !(BeanUtils.isSimpleValueType(type) ||
Collection.class.isAssignableFrom(type) || Map.class.isAssignableFrom(type) || type.isArray());
}
private void validateConstructorArgument( private void validateConstructorArgument(
Class<?> constructorClass, String nestedPath, String name, @Nullable Object value) { Class<?> constructorClass, String nestedPath, String name, @Nullable Object value) {