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

Consistent data class constructor resolution with clear error message

Browse Source 
MVC data class processor constructs target instance even in case of binding failure, as long as the corresponding method parameter is not marked as optional.

Closes gh-24372
This commit is contained in:
Juergen Hoeller
2020-09-01 19:10:32 +02:00
parent 278c6d5cdb
commit e20bff9c64
5 changed files with 93 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
spring-jdbc/src/main/java/org/springframework/jdbc/core/DataClassRowMapper.java
View File

@@ -79,23 +79,7 @@ public class DataClassRowMapper<T> extends BeanPropertyRowMapper<T> {
protected void initialize(Class<T> mappedClass) {
super.initialize(mappedClass);
this.mappedConstructor = BeanUtils.findPrimaryConstructor(mappedClass);
if (this.mappedConstructor == null) {
Constructor<?>[] ctors = mappedClass.getConstructors();
if (ctors.length == 1) {
this.mappedConstructor = (Constructor<T>) ctors[0];
}
else {
try {
this.mappedConstructor = mappedClass.getDeclaredConstructor();
}
catch (NoSuchMethodException ex) {
throw new IllegalStateException("No primary or default constructor found for " + mappedClass, ex);
}
}
}
this.mappedConstructor = BeanUtils.getResolvableConstructor(mappedClass);
if (this.mappedConstructor.getParameterCount() > 0) {
this.constructorParameterNames = BeanUtils.getParameterNames(this.mappedConstructor);
this.constructorParameterTypes = this.mappedConstructor.getParameterTypes();