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

Allow validation of Set method parameters 

See gh-33150
This commit is contained in:
Sébastien NUSSBAUMER 2024-07-04 22:15:42 +02:00 committed by rstoyanchev
parent bc2deef951
commit f0c758498b
2 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-context/src/main/java/org/springframework/validation/beanvalidation/MethodValidationAdapter.java
View File

@ -346,6 +346,10 @@ public class MethodValidationAdapter implements MethodValidator {
value = map.get(key); value = map.get(key);
container = map; container = map;
} }
else if (arg instanceof Set<?>) {
value = arg;
container = null;
}
else if (arg instanceof Optional<?> optional) { else if (arg instanceof Optional<?> optional) {
value = optional.orElse(null); value = optional.orElse(null);
container = optional; container = optional;

22
spring-context/src/test/java/org/springframework/validation/beanvalidation/MethodValidationAdapterTests.java
View File

@ -19,6 +19,7 @@ package org.springframework.validation.beanvalidation;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.Set;
import java.util.function.Consumer; import java.util.function.Consumer;
import jakarta.validation.Valid; import jakarta.validation.Valid;
@ -39,6 +40,7 @@ import org.springframework.validation.method.ParameterErrors;
import org.springframework.validation.method.ParameterValidationResult; import org.springframework.validation.method.ParameterValidationResult;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.InstanceOfAssertFactories.SET;
/** /**
* Tests for {@link MethodValidationAdapter}. * Tests for {@link MethodValidationAdapter}.
@ -213,6 +215,24 @@ class MethodValidationAdapterTests {
}); });
} }
@Test
void validateValueSetArgument() {
MyService target = new MyService();
Method method = getMethod(target, "addUniqueHobbies");
testArgs(target, method, new Object[] {Set.of("test", " ")}, ex -> {
assertThat(ex.getAllValidationResults()).hasSize(1);
assertValueResult(ex.getValueResults().get(0), 0, Set.of("test", " "), List.of("""
org.springframework.context.support.DefaultMessageSourceResolvable: \
codes [NotBlank.myService#addUniqueHobbies.hobbies,NotBlank.hobbies,NotBlank.java.util.Set,NotBlank]; \
arguments [org.springframework.context.support.DefaultMessageSourceResolvable: \
codes [myService#addUniqueHobbies.hobbies,hobbies]; \
arguments []; default message [hobbies]]; default message [must not be blank]"""));
});
}
private void testArgs(Object target, Method method, Object[] args, Consumer<MethodValidationResult> consumer) { private void testArgs(Object target, Method method, Object[] args, Consumer<MethodValidationResult> consumer) {
consumer.accept(this.validationAdapter.validateArguments(target, method, null, args, new Class<?>[0])); consumer.accept(this.validationAdapter.validateArguments(target, method, null, args, new Class<?>[0]));
} }
@ -271,6 +291,8 @@ class MethodValidationAdapterTests {
public void addHobbies(List<@NotBlank String> hobbies) { public void addHobbies(List<@NotBlank String> hobbies) {
} }
public void addUniqueHobbies(Set<@NotBlank String> hobbies) {
}
} }