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

Merge branch '6.0.x'

Browse Source
This commit is contained in:
Sébastien Deleuze
2023-05-30 12:44:47 +02:00
parent f69db61147 2cbc7eed73
commit 4e678479b9
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-web/src/main/java/org/springframework/web/bind/MethodArgumentNotValidException.java
View File

@@ -75,7 +75,9 @@ public class MethodArgumentNotValidException extends BindException implements Er
* @param executable the executable that failed validation
* @param bindingResult the results of the validation
* @since 6.0.5
* @deprecated in favor of {@link #MethodArgumentNotValidException(MethodParameter, BindingResult)}
*/
@Deprecated(since = "6.0.10", forRemoval = true)
public MethodArgumentNotValidException(Executable executable, BindingResult bindingResult) {
super(bindingResult);
this.parameter = null;

3
spring-web/src/main/java/org/springframework/web/method/annotation/ModelAttributeMethodProcessor.java
View File

@@ -233,6 +233,7 @@ public class ModelAttributeMethodProcessor implements HandlerMethodArgumentResol
* after constructor resolution.
* @param ctor the constructor to use
* @param attributeName the name of the attribute (never {@code null})
* @param parameter the method parameter declaration
* @param binderFactory for creating WebDataBinder instance
* @param webRequest the current request
* @return the created model attribute (never {@code null})
@@ -340,7 +341,7 @@ public class ModelAttributeMethodProcessor implements HandlerMethodArgumentResol
BindingResult result = binder.getBindingResult();
ObjectError error = new ObjectError(ctor.getName(), cause.getMessage());
result.addError(error);
throw new MethodArgumentNotValidException(ctor, result);
throw new MethodArgumentNotValidException(parameter, result);
}
else {
throw ex;