include nested structures in search of annotations

solita · Dec 29, 2023 · a46f466 · a46f466
1 parent d1d7e85
commit a46f466
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>fi.solita.utils</groupId>
     <artifactId>meta-utils</artifactId>
-    <version>0.12.25</version>
+    <version>0.12.26</version>
     <build>
         <resources>
             <resource>
@@ -36,7 +36,7 @@
         <dependency>
             <groupId>fi.solita.utils</groupId>
             <artifactId>functional-utils</artifactId>
-            <version>0.12.39</version>
+            <version>0.12.42</version>
         </dependency>
 
         <dependency>

diff --git a/src/main/java/fi/solita/utils/meta/CommonMetadataProcessor.java b/src/main/java/fi/solita/utils/meta/CommonMetadataProcessor.java
@@ -128,11 +128,11 @@ public boolean accept(Element candidate) {
                     //msg.printMessage(Kind.OTHER, "Skipping due to being generated element: " + candidate.getSimpleName());
                     return false;
                 }
-                if (!includeAllByAnnotation.accept(candidate) && !withAnnotations(includesAnnotation()).accept(candidate)) {
+                if (!includeAllByAnnotation.accept(candidate) && !withAnnotations(includesAnnotation(), true).accept(candidate)) {
                     //msg.printMessage(Kind.OTHER, "Skipping due to not included by annotation: " + candidate.getSimpleName());
                     return false;
                 }
-                if (withAnnotations(excludesAnnotation()).accept(candidate)) {
+                if (withAnnotations(excludesAnnotation(), true).accept(candidate)) {
                     //msg.printMessage(Kind.OTHER, "Skipping due to being excluded by annotation: " + candidate.getSimpleName());
                     return false;
                 }

diff --git a/src/main/java/fi/solita/utils/meta/Helpers.java b/src/main/java/fi/solita/utils/meta/Helpers.java
@@ -9,6 +9,7 @@
 import static fi.solita.utils.functional.Functional.filter;
 import static fi.solita.utils.functional.Functional.head;
 import static fi.solita.utils.functional.Functional.map;
+import static fi.solita.utils.functional.Functional.flatMap;
 import static fi.solita.utils.functional.Functional.reduce;
 import static fi.solita.utils.functional.Functional.zip;
 import static fi.solita.utils.functional.FunctionalC.reverse;
@@ -740,7 +741,7 @@ public String transform(VariableElement source) {
         return map(join, zip(argCasts, map(simpleName, parameters)));
     }
 
-    public static final Predicate<Element> withAnnotations(final String classNames) {
+    public static final Predicate<Element> withAnnotations(final String classNames, final boolean includeNested) {
         final Set<String> className = newSet(classNames.split(","));
         return new Predicate<Element>() {
             @Override
@@ -753,13 +754,44 @@ private boolean acc(final Element e, final Set<Element> visited) {
                     return false;
                 }
                 visited.add(e);
+
+                Iterable<AnnotationMirror> constructorAnnotations;
+                Iterable<AnnotationMirror> methodAnnotations;
+                Iterable<AnnotationMirror> fieldAnnotations;
+                if (includeNested) {
+                    for (TypeElement n: element2NestedClasses.apply(e)) {
+                        if (acc(n, visited)) {
+                            // annotation exists on a nested class
+                            return true;
+                        }
+                    }
+                    constructorAnnotations = flatMap(new Transformer<ExecutableElement,List<? extends AnnotationMirror>>() {
+                        @Override
+                        public List<? extends AnnotationMirror> transform(ExecutableElement source) {
+                            return source.getAnnotationMirrors();
+                        }}, element2Constructors.apply(e));
+                    methodAnnotations = flatMap(new Transformer<ExecutableElement,List<? extends AnnotationMirror>>() {
+                        @Override
+                        public List<? extends AnnotationMirror> transform(ExecutableElement source) {
+                            return source.getAnnotationMirrors();
+                        }}, element2Methods.apply(e));
+                    fieldAnnotations = flatMap(new Transformer<VariableElement,List<? extends AnnotationMirror>>() {
+                        @Override
+                        public List<? extends AnnotationMirror> transform(VariableElement source) {
+                            return source.getAnnotationMirrors();
+                        }}, element2Fields.apply(e));
+                } else {
+                    constructorAnnotations = Collections.emptyList();
+                    methodAnnotations = Collections.emptyList();
+                    fieldAnnotations = Collections.emptyList();
+                }
                 return exists(new Predicate<AnnotationMirror>() {
                     @Override
                     public boolean accept(AnnotationMirror m) {
                         Element elem = m.getAnnotationType().asElement();
                         return className.contains(qualifiedName.apply(elem)) || !elem.equals(e) && acc(elem, visited);
                     }
-                }, e.getAnnotationMirrors());
+                }, concat(e.getAnnotationMirrors(), constructorAnnotations, methodAnnotations, fieldAnnotations));
             }
         };
     }