Avoid infinite recursion in BeanValidationBeanRegistrationAotProcessor
Prior to this commit, AOT processing for bean validation failed with a StackOverflowError for constraints with fields having recursive generic types. With this commit, the algorithm tracks visited classes and aborts preemptively when a cycle is detected. Closes gh-33950 Co-authored-by: Sam Brannen <sam.brannen@broadcom.com>
This commit is contained in:
committed by
Sam Brannen
parent
1910d32405
commit
5e7b3a3bed
@@ -22,6 +22,9 @@ import java.lang.annotation.Retention;
|
||||
import java.lang.annotation.Target;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Optional;
|
||||
import java.util.Set;
|
||||
|
||||
import jakarta.validation.Constraint;
|
||||
import jakarta.validation.ConstraintValidator;
|
||||
@@ -31,6 +34,8 @@ import jakarta.validation.Valid;
|
||||
import jakarta.validation.constraints.Pattern;
|
||||
import org.hibernate.validator.internal.constraintvalidators.bv.PatternValidator;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.junit.jupiter.params.ParameterizedTest;
|
||||
import org.junit.jupiter.params.provider.ValueSource;
|
||||
|
||||
import org.springframework.aot.generate.GenerationContext;
|
||||
import org.springframework.aot.hint.MemberCategory;
|
||||
@@ -121,6 +126,15 @@ class BeanValidationBeanRegistrationAotProcessorTests {
|
||||
.withMemberCategory(MemberCategory.INVOKE_DECLARED_CONSTRUCTORS)).accepts(this.generationContext.getRuntimeHints());
|
||||
}
|
||||
|
||||
@ParameterizedTest // gh-33936
|
||||
@ValueSource(classes = {BeanWithIterable.class, BeanWithMap.class, BeanWithOptional.class})
|
||||
void shouldProcessRecursiveGenericsWithoutInfiniteRecursion(Class<?> beanClass) {
|
||||
process(beanClass);
|
||||
assertThat(this.generationContext.getRuntimeHints().reflection().typeHints()).hasSize(1);
|
||||
assertThat(RuntimeHintsPredicates.reflection().onType(beanClass)
|
||||
.withMemberCategory(MemberCategory.DECLARED_FIELDS)).accepts(this.generationContext.getRuntimeHints());
|
||||
}
|
||||
|
||||
private void process(Class<?> beanClass) {
|
||||
BeanRegistrationAotContribution contribution = createContribution(beanClass);
|
||||
if (contribution != null) {
|
||||
@@ -244,4 +258,16 @@ class BeanValidationBeanRegistrationAotProcessorTests {
|
||||
}
|
||||
}
|
||||
|
||||
static class BeanWithIterable {
|
||||
private final Iterable<BeanWithIterable> beans = Set.of();
|
||||
}
|
||||
|
||||
static class BeanWithMap {
|
||||
private final Map<String, BeanWithMap> beans = Map.of();
|
||||
}
|
||||
|
||||
static class BeanWithOptional {
|
||||
private final Optional<BeanWithOptional> beans = Optional.empty();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user