Merge pull request #279 from SentryMan/master

Prisms 1.3/Turn Aspect Reader into a method

Author: rbygrave

inject-generator/pom.xml

@@ -25,7 +25,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-prisms</artifactId>
-      <version>1.1</version>
+      <version>1.3</version>
       <optional>true</optional>
       <scope>provided</scope>
     </dependency>
@@ -55,7 +55,7 @@
             <path>
               <groupId>io.avaje</groupId>
               <artifactId>avaje-prisms</artifactId>
-              <version>1.1</version>
+              <version>1.3</version>
             </path>
           </annotationProcessorPaths>
         </configuration>

inject-generator/src/main/java/io/avaje/inject/generator/AspectAnnotationReader.java

@@ -1,5 +1,6 @@
 package io.avaje.inject.generator;
 
+import javax.lang.model.element.AnnotationMirror;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.Modifier;
@@ -34,9 +35,7 @@ final class TypeExtendsInjection {
     this.baseType = baseType;
     this.context = context;
     this.factory = factory;
-
-    AspectAnnotationReader reader = new AspectAnnotationReader(context, baseType, baseType);
-    this.typeAspects = reader.read();
+    this.typeAspects = readAspects(baseType);
   }
 
   void read(TypeElement type) {
@@ -55,6 +54,19 @@ void read(TypeElement type) {
     }
   }
 
+  /** Read the annotations on the type. */
+  List<AspectPair> readAspects(Element element) {
+    final List<AspectPair> aspects = new ArrayList<>();
+    for (final AnnotationMirror annotationMirror : element.getAnnotationMirrors()) {
+      final var anElement = annotationMirror.getAnnotationType().asElement();
+      final var aspect = AspectPrism.getInstanceOn(anElement);
+      if (aspect != null) {
+        aspects.add(new AspectPair(anElement, aspect.ordering()));
+      }
+    }
+    return aspects;
+  }
+
   private void readField(Element element) {
     InjectPrism inject = InjectPrism.getInstanceOn(element);
     if (inject != null) {
@@ -133,7 +145,7 @@ private void checkForAspect(ExecutableElement methodElement) {
       return;
     }
     int nameIndex = methodNameIndex(methodElement.getSimpleName().toString());
-    List<AspectPair> aspectPairs = new AspectAnnotationReader(context, baseType, methodElement).read();
+    List<AspectPair> aspectPairs = readAspects(methodElement);
     aspectPairs.addAll(typeAspects);
 
     if (!aspectPairs.isEmpty()) {