Fix another case of a method validation with a class constraint (#201)

micronaut-projects · Aug 31, 2023 · 39dadf7 · 39dadf7
1 parent 9fe9148
commit 39dadf7
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 7 deletions.
diff --git a/validation/src/main/java/io/micronaut/validation/validator/DefaultValidator.java b/validation/src/main/java/io/micronaut/validation/validator/DefaultValidator.java
@@ -450,11 +450,15 @@ public <T> Set<ConstraintViolation<T>> validateReturnValue(@NonNull T object,
                         try (DefaultConstraintValidatorContext.GroupsValidation validation = context.withGroupSequence(groupSequence)) {
                             // Strip class annotations
                             AnnotationMetadata returnAm = returnType.asArgument().getAnnotationMetadata();
-                            if (returnAm instanceof AnnotationMetadataHierarchy annotationMetadataHierarchy && returnAm.getDeclaredMetadata() instanceof AnnotationMetadataHierarchy) {
-                                returnAm = new AnnotationMetadataHierarchy(
-                                    annotationMetadataHierarchy.getRootMetadata(),
-                                    annotationMetadataHierarchy.getDeclaredMetadata().getDeclaredMetadata()
-                                );
+                            if (returnAm instanceof AnnotationMetadataHierarchy annotationMetadataHierarchy) {
+                                if (returnAm.getDeclaredMetadata() instanceof AnnotationMetadataHierarchy) {
+                                    returnAm = new AnnotationMetadataHierarchy(
+                                        annotationMetadataHierarchy.getRootMetadata(),
+                                        annotationMetadataHierarchy.getDeclaredMetadata().getDeclaredMetadata()
+                                    );
+                                } else {
+                                    returnAm = annotationMetadataHierarchy.getDeclaredMetadata();
+                                }
                             }
                             visitElement(context, bean, returnType.asArgument(), returnAm, returnValue, canCascade);
 

diff --git a/...icronaut/validation/validator/constraints/custom/BeanWithConstraintAndPrivateMethods.java b/...icronaut/validation/validator/constraints/custom/BeanWithConstraintAndPrivateMethods.java
@@ -11,14 +11,23 @@
 class BeanWithConstraintAndPrivateMethods {
 
     @NotBlank
-    public String publicCombine(@NotNull String a, String b) {
+    public String publicCombine1(@NotNull String a, String b) {
         return privateCombine(a, b);
     }
 
     public String publicCombine2(String a, String b) {
         return privateCombine(a, b);
     }
 
+    public String publicCombine3(@NotNull String a, String b) {
+        return privateCombine(a, b);
+    }
+
+    @NotBlank
+    public String publicCombine4(String a, String b) {
+        return privateCombine(a, b);
+    }
+
     private String privateCombine(String a, String b) {
         return a + b;
     }

diff --git a/.../groovy/io/micronaut/validation/validator/constraints/custom/CustomConstraintsSpec.groovy b/.../groovy/io/micronaut/validation/validator/constraints/custom/CustomConstraintsSpec.groovy
@@ -159,7 +159,25 @@ class CustomConstraintsSpec extends Specification {
         BeanWithConstraintAndPrivateMethods abean = applicationContext.getBean(BeanWithConstraintAndPrivateMethods)
 
         when:
-        def result = abean.publicCombine("A", "B")
+        def result = abean.publicCombine1("A", "B")
+
+        then:
+        result == "AB"
+
+        when:
+        result = abean.publicCombine2("A", "B")
+
+        then:
+        result == "AB"
+
+        when:
+        result = abean.publicCombine3("A", "B")
+
+        then:
+        result == "AB"
+
+        when:
+        result = abean.publicCombine4("A", "B")
 
         then:
         result == "AB"