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

Refactoring in MethodValidationResult

Browse Source 
Remove throwIfViolationsPresent and replace with static factory
methods on MethodValidationException taking MethodValidationResult,
which makes handling more explicit and allows choice of what
exception to raise.

Update MethodValidationResult to expose the target, the method, and
forReturnValue flag, so the code handling an exception will have
access to all details.

See gh-30644
This commit is contained in:
rstoyanchev
2023-06-28 19:08:39 +01:00
parent 1393fac402
commit a8ea472121
6 changed files with 125 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
spring-web/src/main/java/org/springframework/web/method/annotation/HandlerMethodValidator.java
View File

@@ -16,8 +16,6 @@
package org.springframework.web.method.annotation;
import java.lang.reflect.Method;
import jakarta.validation.Validator;
import org.springframework.core.Conventions;
@@ -28,6 +26,7 @@ import org.springframework.validation.BindingResult;
import org.springframework.validation.MessageCodesResolver;
import org.springframework.validation.beanvalidation.DefaultMethodValidator;
import org.springframework.validation.beanvalidation.MethodValidationAdapter;
import org.springframework.validation.beanvalidation.MethodValidationException;
import org.springframework.validation.beanvalidation.MethodValidationResult;
import org.springframework.validation.beanvalidation.MethodValidator;
import org.springframework.validation.beanvalidation.ParameterErrors;
@@ -53,8 +52,8 @@ public final class HandlerMethodValidator extends DefaultMethodValidator {
@Override
protected void handleArgumentsValidationResult(
Object bean, Method method, Object[] arguments, Class<?>[] groups, MethodValidationResult result) {
protected void handleArgumentsResult(
Object[] arguments, Class<?>[] groups, MethodValidationResult result) {
if (result.getConstraintViolations().isEmpty()) {
return;
@@ -76,7 +75,9 @@ public final class HandlerMethodValidator extends DefaultMethodValidator {
return;
}
}
result.throwIfViolationsPresent();
if (result.hasViolations()) {
throw MethodValidationException.forResult(result);
}
}
private String determineObjectName(MethodParameter param, @Nullable Object argument) {