Merge branch '6.1.x'

2024-06-05 20:05:50 +02:00
parent 3305485d1e 404c4d9d92
commit 316e531c69
2 changed files with 12 additions and 3 deletions
--- a/spring-web/src/main/java/org/springframework/web/method/HandlerMethod.java
+++ b/spring-web/src/main/java/org/springframework/web/method/HandlerMethod.java
@@ -417,7 +417,7 @@ public class HandlerMethod extends AnnotatedMethod {
 						return true;
 					}
 					merged = MergedAnnotations.from(getContainerElementAnnotations(param));
-					if (merged.stream().anyMatch(CONSTRAINT_PREDICATE)) {
+					if (merged.stream().anyMatch(CONSTRAINT_PREDICATE.or(VALID_PREDICATE))) {
 						return true;
 					}
 				}