Refactoring

franklx · franklx · commit e7ee37b99ef5 · 2020-03-12T17:02:42.000+01:00
diff --git a/modules/jooby-apt/src/main/java/io/jooby/apt/JoobyProcessor.java b/modules/jooby-apt/src/main/java/io/jooby/apt/JoobyProcessor.java
@@ -69,11 +69,15 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
         return false;
       }
       /**
-       * Do MVC handler: per each mvc method we create a Route.Handler.
+       * Classes inheriting MVC classes whouldn't be processed so we force the inspection
+       * of all http methods annotations on classes with Path annotation.
        */
       if (annotations.retainAll(Annotations.PATH)) {
         annotations = this.httpMethodsAnnotations;
       }
+      /**
+       * Do MVC handler: per each mvc method we create a Route.Handler.
+       */
       List<HandlerCompiler> result = new ArrayList<>();
       JoobyProcessorRoundEnvironment joobyRoundEnv = new JoobyProcessorRoundEnvironment(roundEnv, processingEnvironment);
       for (TypeElement httpMethod : annotations) {
diff --git a/modules/jooby-apt/src/main/java/io/jooby/apt/JoobyProcessorRoundEnvironment.java b/modules/jooby-apt/src/main/java/io/jooby/apt/JoobyProcessorRoundEnvironment.java
@@ -7,12 +7,9 @@
 import javax.lang.model.element.*;
 import javax.lang.model.type.DeclaredType;
 import javax.lang.model.type.TypeKind;
-import javax.lang.model.type.TypeMirror;
 import javax.lang.model.util.ElementScanner8;
 import javax.lang.model.util.Elements;
 import javax.lang.model.util.Types;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
 import java.util.*;
 
 public class JoobyProcessorRoundEnvironment {
@@ -30,27 +27,23 @@ public class JoobyProcessorRoundEnvironment {
   public Set<? extends Element> getElementsAnnotatedWith(TypeElement a) {
 
     Set<Element> result = Collections.emptySet();
-    ElementScanner8<Set<Element>, TypeElement> scanner = new AnnotationSetScanner(result);
+    ElementScanner8<Set<Element>, TypeElement> scanner = new JoobyAnnotationSetScanner(result);
 
     for (Element element : rootElements)
       result = scanner.scan(element, a);
 
     return result;
   }
 
-  // Could be written as a local class inside getElementsAnnotatedWith
-  private class AnnotationSetScanner extends
-      ElementScanningIncludingTypeParameters<Set<Element>, TypeElement> {
-    // Insertion-order preserving set
+  private class JoobyAnnotationSetScanner extends ElementScanner8<Set<Element>, TypeElement> {
     private Set<Element> annotatedElements = new LinkedHashSet<>();
 
-    AnnotationSetScanner(Set<Element> defaultSet) {
+    JoobyAnnotationSetScanner(Set<Element> defaultSet) {
       super(defaultSet);
     }
 
     @Override
     public Set<Element> scan(Element e, TypeElement annotation) {
-      //System.out.println("\t\t" + e);
       for (AnnotationMirror annotMirror :  eltUtils.getAllAnnotationMirrors(e)) {
         if (annotation.equals(mirrorAsElement(annotMirror))) {
           annotatedElements.add(e);
@@ -61,33 +54,18 @@ public Set<Element> scan(Element e, TypeElement annotation) {
       return annotatedElements;
     }
 
-  }
-
-  private static abstract class ElementScanningIncludingTypeParameters<R, P>
-      extends ElementScanner8<R, P> {
-
-    protected ElementScanningIncludingTypeParameters(R defaultValue) {
-      super(defaultValue);
-    }
-
     @Override
-    public R visitType(TypeElement e, P p) {
-      // Type parameters are not considered to be enclosed by a type
+    public Set<Element> visitType(TypeElement e, TypeElement p) {
       if (e.getSuperclass().getKind() == TypeKind.DECLARED) {
-        //System.out.println(e + " <<<< " + e.getSuperclass());
-        TypeElement superElement = (TypeElement) ((DeclaredType) e.getSuperclass()).asElement();
+        javax.lang.model.element.TypeElement superElement = (javax.lang.model.element.TypeElement) ((DeclaredType) e.getSuperclass()).asElement();
         List<Element> clonedElements = new ArrayList<>();
         for(Element enclosedElement : superElement.getEnclosedElements()) {
           if (enclosedElement.getKind() == ElementKind.METHOD && enclosedElement.getAnnotationMirrors().size() > 0) {
             Symbol.MethodSymbol methodSymbol = ((Symbol.MethodSymbol)enclosedElement).clone((Symbol.ClassSymbol)e);
             methodSymbol.appendAttributes( ((Symbol.MethodSymbol)enclosedElement).getAnnotationMirrors() );
-            //System.out.println("\t\tEnclosing: " + methodSymbol.getEnclosingElement() + "::" + methodSymbol + " #" + methodSymbol.getAnnotationMirrors().size());
             methodSymbol.params = ((Symbol.MethodSymbol)enclosedElement).params;
             methodSymbol.extraParams = ((Symbol.MethodSymbol)enclosedElement).extraParams;
             methodSymbol.capturedLocals = ((Symbol.MethodSymbol)enclosedElement).capturedLocals;
-            //Symbol.MethodSymbol w = (Symbol.MethodSymbol)enclosedElement;
-            //System.out.println("\t\t\tEnclosed (orig):" + w.params);
-            //System.out.println("\t\t\tEnclosed (copy):" + methodSymbol.params);
             clonedElements.add(methodSymbol);
           }
         }
