Merge branch '6.1.x'

Author: bclozel

spring-web/src/main/java/org/springframework/web/method/HandlerMethod.java

@@ -417,7 +417,7 @@ public static boolean checkArguments(Class<?> beanType, MethodParameter[] parame
 						return true;
 					}
 					merged = MergedAnnotations.from(getContainerElementAnnotations(param));
-					if (merged.stream().anyMatch(CONSTRAINT_PREDICATE)) {
+					if (merged.stream().anyMatch(CONSTRAINT_PREDICATE.or(VALID_PREDICATE))) {
 						return true;
 					}
 				}

spring-web/src/test/java/org/springframework/web/method/HandlerMethodTests.java

@@ -40,14 +40,14 @@ class HandlerMethodTests {
 	@Test
 	void shouldValidateArgsWithConstraintsDirectlyOnClass() {
 		Object target = new MyClass();
-		testValidateArgs(target, List.of("addIntValue", "addPersonAndIntValue", "addPersons", "addNames"), true);
+		testValidateArgs(target, List.of("addIntValue", "addPersonAndIntValue", "addPersons", "addPeople", "addNames"), true);
 		testValidateArgs(target, List.of("addPerson", "getPerson", "getIntValue", "addPersonNotValidated"), false);
 	}
 
 	@Test
 	void shouldValidateArgsWithConstraintsOnInterface() {
 		Object target = new MyInterfaceImpl();
-		testValidateArgs(target, List.of("addIntValue", "addPersonAndIntValue", "addPersons"), true);
+		testValidateArgs(target, List.of("addIntValue", "addPersonAndIntValue", "addPersons", "addPeople"), true);
 		testValidateArgs(target, List.of("addPerson", "addPersonNotValidated", "getPerson", "getIntValue"), false);
 	}
 
@@ -115,6 +115,9 @@ public void addPersonAndIntValue(@Valid Person person, @Max(10) int value) {
 		public void addPersons(@Valid List<Person> persons) {
 		}
 
+		public void addPeople(List<@Valid Person> persons) {
+		}
+
 		public void addNames(List<@NotEmpty String> names) {
 		}
 
@@ -144,6 +147,8 @@ private interface MyInterface {
 
 		void addPersons(@Valid List<Person> persons);
 
+		void addPeople(List<@Valid Person> persons);
+
 		void addPersonNotValidated(Person person);
 
 		@Valid
@@ -173,6 +178,10 @@ public void addPersonAndIntValue(Person person, int value) {
 		public void addPersons(List<Person> persons) {
 		}
 
+		@Override
+		public void addPeople(List<@Valid Person> persons) {
+		}
+
 		@Override
 		public void addPersonNotValidated(Person person) {
 		}