support for detection of 'inherited' '@NotNull' elements per #395

stoicflame · May 26, 2016 · defdba0 · defdba0
1 parent 0bbc783
commit defdba0
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/core/src/main/java/com/webcohesion/enunciate/util/BeanValidationUtils.java b/core/src/main/java/com/webcohesion/enunciate/util/BeanValidationUtils.java
@@ -14,6 +14,10 @@ public class BeanValidationUtils {
   private BeanValidationUtils() {}
 
   public static boolean isNotNull(Element el) {
+    return isNotNull(el, true);
+  }
+
+  private static boolean isNotNull(Element el, boolean recurse) {
     List<? extends AnnotationMirror> annotations = el.getAnnotationMirrors();
     for (AnnotationMirror annotation : annotations) {
       DeclaredType annotationType = annotation.getAnnotationType();
@@ -22,6 +26,10 @@ public static boolean isNotNull(Element el) {
         if (annotationElement instanceof TypeElement && "javax.validation.constraints.NotNull".equals(((TypeElement) annotationElement).getQualifiedName().toString())) {
           return true;
         }
+
+        if (recurse) {
+          return isNotNull(annotationElement, false);
+        }
       }
     }