Merge pull request #35087 from gsmet/config-validator-container-elements

Take into account container element constraints in config mapping validation
quarkusio · Jul 28, 2023 · 01fd090 · 01fd090
2 parents c764f17 + 2e75e4c
commit 01fd090
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/.../src/main/java/io/quarkus/hibernate/validator/deployment/HibernateValidatorProcessor.java b/.../src/main/java/io/quarkus/hibernate/validator/deployment/HibernateValidatorProcessor.java
@@ -247,6 +247,15 @@ void configValidator(
                     if (configMappings.contains(declaringClass.name())) {
                         configMappingsConstraints.add(builtinConstraintCandidate);
                     }
+                } else if (annotation.target().kind() == AnnotationTarget.Kind.TYPE) {
+                    AnnotationTarget target = annotation.target().asType().enclosingTarget();
+                    if (target.kind() == AnnotationTarget.Kind.METHOD) {
+                        MethodInfo methodInfo = target.asMethod();
+                        ClassInfo declaringClass = methodInfo.declaringClass();
+                        if (configMappings.contains(declaringClass.name())) {
+                            configMappingsConstraints.add(builtinConstraintCandidate);
+                        }
+                    }
                 } else if (annotation.target().kind() == AnnotationTarget.Kind.CLASS) {
                     ClassInfo classInfo = annotation.target().asClass();
                     if (configMappings.contains(classInfo.name())) {

diff --git a/...nt/src/test/java/io/quarkus/hibernate/validator/test/config/ConfigMappingInvalidTest.java b/...nt/src/test/java/io/quarkus/hibernate/validator/test/config/ConfigMappingInvalidTest.java
@@ -2,9 +2,12 @@
 
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
+import java.util.List;
+
 import jakarta.inject.Inject;
 import jakarta.validation.constraints.Max;
 import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.Size;
 
 import org.jboss.shrinkwrap.api.ShrinkWrap;
@@ -25,6 +28,7 @@ public class ConfigMappingInvalidTest {
     static final QuarkusUnitTest UNIT_TEST = new QuarkusUnitTest().setArchiveProducer(
             () -> ShrinkWrap.create(JavaArchive.class)
                     .addAsResource(new StringAsset("validator.server.host=localhost\n" +
+                            "validator.server.services=redis,postgresql\n" +
                             "validator.hierarchy.number=1\n" +
                             "validator.repeatable.name=a"), "application.properties"));
 
@@ -54,6 +58,8 @@ void repeatable() {
     public interface Server {
         @Max(3)
         String host();
+
+        List<@NotEmpty String> services();
     }
 
     public interface Parent {