Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Exclude Part and MultipartFile from nested constructor binding

Browse Source 
Closes gh-31669
This commit is contained in:
rstoyanchev
2023-11-28 16:06:07 +00:00
parent feef98b73c
commit 9ade52dbe2
4 changed files with 33 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -948,7 +948,7 @@ public class DataBinder implements PropertyEditorRegistry, TypeConverter {
Class<?> paramType = paramTypes[i];
Object value = valueResolver.resolveValue(paramPath, paramType);
if (value == null && shouldCreateObject(param)) {
if (value == null && shouldConstructArgument(param)) {
ResolvableType type = ResolvableType.forMethodParameter(param);
args[i] = createObject(type, paramPath + ".", valueResolver);
}
@@ -1008,7 +1008,14 @@ public class DataBinder implements PropertyEditorRegistry, TypeConverter {
return (isOptional && !nestedPath.isEmpty() ? Optional.ofNullable(result) : result);
}
private static boolean shouldCreateObject(MethodParameter param) {
/**
* Whether to instantiate the constructor argument of the given type,
* matching its own constructor arguments to bind values.
* <p>By default, simple value types, maps, collections, and arrays are
* excluded from nested constructor binding initialization.
* @since 6.1.2
*/
protected boolean shouldConstructArgument(MethodParameter param) {
Class<?> type = param.nestedIfOptional().getNestedParameterType();
return !(BeanUtils.isSimpleValueType(type) ||
Collection.class.isAssignableFrom(type) || Map.class.isAssignableFrom(type) || type.isArray());