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

Support cross-parameter validation

Browse Source 
Closes gh-33271
This commit is contained in:
rstoyanchev
2024-08-09 18:53:30 +03:00
parent 0d64c90a79
commit b61eee7fb0
11 changed files with 187 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-web/src/main/java/org/springframework/web/method/annotation/HandlerMethodValidationException.java
View File

@@ -22,6 +22,7 @@ import java.util.Locale;
import java.util.function.Predicate;
import org.springframework.context.MessageSource;
import org.springframework.context.MessageSourceResolvable;
import org.springframework.core.MethodParameter;
import org.springframework.http.HttpStatus;
import org.springframework.lang.Nullable;
@@ -107,8 +108,13 @@ public class HandlerMethodValidationException extends ResponseStatusException im
}
@Override
public List<ParameterValidationResult> getAllValidationResults() {
return this.validationResult.getAllValidationResults();
public List<ParameterValidationResult> getParameterValidationResults() {
return this.validationResult.getParameterValidationResults();
}
@Override
public List<MessageSourceResolvable> getCrossParameterValidationResults() {
return this.validationResult.getCrossParameterValidationResults();
}
/**
@@ -116,7 +122,7 @@ public class HandlerMethodValidationException extends ResponseStatusException im
* through callback methods organized by controller method parameter type.
*/
public void visitResults(Visitor visitor) {
for (ParameterValidationResult result : getAllValidationResults()) {
for (ParameterValidationResult result : getParameterValidationResults()) {
MethodParameter param = result.getMethodParameter();
CookieValue cookieValue = param.getParameterAnnotation(CookieValue.class);
if (cookieValue != null) {

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

@@ -98,7 +98,7 @@ public final class HandlerMethodValidator implements MethodValidator {
}
}
}
if (result.getAllValidationResults().size() == bindingResultCount) {
if (result.getParameterValidationResults().size() == bindingResultCount) {
return;
}
}