root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Merge branch '6.1.x'

This commit is contained in:
Brian Clozel 2024-06-05 20:05:50 +02:00
parent 3305485d1e 404c4d9d92
commit 316e531c69
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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;
}
}

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

@ -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 @@ class HandlerMethodTests {
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 @@ class HandlerMethodTests {
void addPersons(@Valid List<Person> persons);
void addPeople(List<@Valid Person> persons);
void addPersonNotValidated(Person person);
@Valid
@ -173,6 +178,10 @@ class HandlerMethodTests {
public void addPersons(List<Person> persons) {
}
@Override
public void addPeople(List<@Valid Person> persons) {
}
@Override
public void addPersonNotValidated(Person person) {
}