APT: fix random bug on JDK 11 related to annotation and defalts value

Author: jknack

modules/jooby-apt/src/main/java/io/jooby/apt/JoobyProcessor.java

@@ -96,10 +96,10 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
             .forEach(e -> routeMap.computeIfAbsent(e, k -> new LinkedHashMap<>()));
 
         if (Annotations.HTTP_METHODS.contains(annotation.asType().toString())) {
-          List<ExecutableElement> methods = elements.stream()
+          Set<ExecutableElement> methods = elements.stream()
               .filter(ExecutableElement.class::isInstance)
               .map(ExecutableElement.class::cast)
-              .collect(Collectors.toList());
+              .collect(Collectors.toCollection(LinkedHashSet::new));
           for (ExecutableElement method : methods) {
             Map<TypeElement, List<ExecutableElement>> mapping = routeMap
                 .computeIfAbsent(method.getEnclosingElement(), k -> new LinkedHashMap<>());

modules/jooby-apt/src/main/java/io/jooby/internal/apt/ModuleCompiler.java

@@ -59,16 +59,18 @@ public class ModuleCompiler {
   private final String moduleClass;
   private final String moduleInternalName;
   private final String moduleJava;
-  private final ProcessingEnvironment env;
+  private final ProcessingEnvironment processingEnv;
   private final String moduleDescriptorName;
+  private final boolean debug;
 
-  public ModuleCompiler(ProcessingEnvironment env, String controllerClass) {
+  public ModuleCompiler(ProcessingEnvironment processingEnv, String controllerClass) {
     this.controllerClass = controllerClass;
     this.moduleClass = this.controllerClass + "$Module";
     this.moduleJava = this.moduleClass + ".java";
     this.moduleInternalName = moduleClass.replace(".", "/");
     this.moduleDescriptorName = "L" + moduleInternalName + ";";
-    this.env = env;
+    this.processingEnv = processingEnv;
+    this.debug = Boolean.parseBoolean(processingEnv.getOptions().getOrDefault("debug", "false"));
   }
 
   public String getModuleClass() {
@@ -156,8 +158,8 @@ private void install(ClassWriter writer, List<HandlerCompiler> handlers) throws
     visitor.visitParameter("provider", 0);
     visitor.visitCode();
 
-    RouteAttributesWriter routeAttributes = new RouteAttributesWriter(env.getElementUtils(),
-        env.getTypeUtils(), writer, moduleInternalName, visitor);
+    RouteAttributesWriter routeAttributes = new RouteAttributesWriter(processingEnv.getElementUtils(),
+        processingEnv.getTypeUtils(), writer, moduleInternalName, visitor);
 
     Map<String, Integer> nameRegistry = new HashMap<>();
     for (HandlerCompiler handler : handlers) {
@@ -200,7 +202,9 @@ private void install(ClassWriter writer, List<HandlerCompiler> handlers) throws
        * Annotations as route attributes
        * ******************************************************************************************
        */
-      routeAttributes.process(handler.getExecutable());
+      debug("route attributes %s.%s", handler.getExecutable().getEnclosingElement(),
+          handler.getExecutable());
+      routeAttributes.process(handler.getExecutable(), this::debug);
 
       /**
        * ******************************************************************************************
@@ -237,7 +241,7 @@ private void setDispatch(MethodVisitor visitor, ExecutableElement executable)
   }
 
   private Object annotationAttribute(AnnotationMirror annotationMirror, String method) {
-    Map<? extends ExecutableElement, ? extends AnnotationValue> map = env
+    Map<? extends ExecutableElement, ? extends AnnotationValue> map = processingEnv
         .getElementUtils().getElementValuesWithDefaults(annotationMirror);
     for (Map.Entry<? extends ExecutableElement, ? extends AnnotationValue> entry : map.entrySet()) {
       if (entry.getKey().getSimpleName().toString().equals(method)) {
@@ -329,4 +333,10 @@ private void supports(ClassWriter writer) {
     visitor.visitMaxs(0, 0);
     visitor.visitEnd();
   }
+
+  private void debug(String format, Object... args) {
+    if (debug) {
+      System.out.printf(format + "\n", args);
+    }
+  }
 }

modules/jooby-apt/src/main/java/io/jooby/internal/apt/asm/RouteAttributesWriter.java

@@ -29,9 +29,12 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
+import java.util.function.BiConsumer;
+import java.util.function.Consumer;
 import java.util.function.Predicate;
 
 import static io.jooby.SneakyThrows.throwingConsumer;
@@ -107,12 +110,14 @@ public RouteAttributesWriter(Elements elements, Types types, ClassWriter writer,
     this.visitor = visitor;
   }
 
-  public void process(ExecutableElement method) throws NoSuchMethodException {
+  public void process(ExecutableElement method, BiConsumer<String, Object[]> log)
+      throws NoSuchMethodException {
     Method target = Route.class.getDeclaredMethod("attribute", String.class, Object.class);
     Map<String, Object> attributes = annotationMap(method);
     for (Map.Entry<String, Object> attribute : attributes.entrySet()) {
       String name = attribute.getKey();
       Object value = attribute.getValue();
+      log.accept("  %s: %s", new Object[]{name, value});
 
       visitor.visitVarInsn(ALOAD, 2);
       visitor.visitLdcInsn(name);
@@ -145,16 +150,26 @@ private Map<String, Object> annotationMap(List<? extends AnnotationMirror> annot
       String prefix = root == null
           ? annotation.getAnnotationType().asElement().getSimpleName().toString()
           : root;
-      Map<? extends ExecutableElement, ? extends AnnotationValue> values = elements
-          .getElementValuesWithDefaults(annotation);
-      for (Map.Entry<? extends ExecutableElement, ? extends AnnotationValue> attribute : values
-          .entrySet()) {
-        Object value = annotationValue(attribute.getValue());
-        if (value != null) {
-          String method = attribute.getKey().getSimpleName().toString();
-          String name = method.equals("value") ? prefix : prefix + "." + method;
-          result.put(name, value);
-        }
+      // Set all values and then override with present values (fix for JDK 11+)
+      result.putAll(toMap(elements
+          .getElementValuesWithDefaults(annotation), prefix));
+      result.putAll(toMap(annotation.getElementValues(), prefix));
+    }
+    return result;
+  }
+
+  private Map<String, Object> toMap(
+      Map<? extends ExecutableElement, ? extends AnnotationValue> values,
+      String prefix) {
+    Map<String, Object> result = new LinkedHashMap<>();
+    for (Map.Entry<? extends ExecutableElement, ? extends AnnotationValue> attribute : values
+        .entrySet()) {
+      Object value = annotationValue(attribute.getValue());
+      if (value != null) {
+        String method = attribute.getKey().getSimpleName().toString();
+        String name = method.equals("value") ? prefix : prefix + "." + method;
+        // Found value is override on JDK 11 with default annotation value, we trust that spe
+        result.putIfAbsent(name, value);
       }
     }
     return result;
@@ -194,7 +209,9 @@ private void annotationValue(ClassWriter writer, MethodVisitor visitor, Object v
           .visitMethodInsn(INVOKESTATIC, moduleInternalName, newMap, "()Ljava/util/Map;", false);
     } else if (value instanceof List) {
       List values = (List) value;
-      String componentType = values.get(0) instanceof EnumValue? ((EnumValue) values.get(0)).type : values.get(0).getClass().getName();
+      String componentType = values.get(0) instanceof EnumValue ?
+          ((EnumValue) values.get(0)).type :
+          values.get(0).getClass().getName();
       if (values.size() > 0) {
         ArrayWriter.write(visitor, componentType, values, throwingConsumer(v ->
             annotationValue(writer, visitor, v)
@@ -274,7 +291,8 @@ private void annotationSingleValue(MethodVisitor visitor, Object value)
     } else if (value instanceof EnumValue) {
       EnumValue enumValue = (EnumValue) value;
       Type type = Type.getObjectType(enumValue.type.replace(".", "/"));
-      visitor.visitFieldInsn(GETSTATIC, type.getInternalName(), enumValue.value, type.getDescriptor());
+      visitor
+          .visitFieldInsn(GETSTATIC, type.getInternalName(), enumValue.value, type.getDescriptor());
     }
 
     Method wrapper = Primitives.wrapper(value.getClass());

modules/jooby-apt/src/test/java/tests/ModuleCompilerTest.java

@@ -86,7 +86,7 @@ public void voidRoutes() throws Exception {
 
   @Test
   public void getPostRoutes() throws Exception {
-    new MvcModuleCompilerRunner(new GetPostRoute(), true)
+    new MvcModuleCompilerRunner(new GetPostRoute())
         .module(app -> {
           MockRouter router = new MockRouter(app);
           router.get("/", rsp -> {