jooby-apt: should NOT generate metadata for defaults annotation attributes

jknack · jknack · commit b4f50672bcee · 2024-09-14T11:51:20.000-03:00
- ref #3525 - fix #3526
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
@@ -108,13 +108,13 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
         verifyBeanValidationDependency(routeMap.values());
         for (var router : routeMap.values()) {
           try {
+            context.add(router);
             var sourceCode = router.toSourceCode(null);
             var sourceLocation = router.getGeneratedFilename();
             onGeneratedSource(toJavaFileObject(sourceLocation, sourceCode));
             context.debug("router %s: %s", router.getTargetType(), router.getGeneratedType());
             router.getRoutes().forEach(it -> context.debug("   %s", it));
             writeSource(router, sourceLocation, sourceCode);
-            context.add(router);
           } catch (IOException cause) {
             throw new RuntimeException("Unable to generate: " + router.getTargetType(), cause);
           }
diff --git a/modules/jooby-apt/src/main/java/io/jooby/internal/apt/RouteAttributesGenerator.java b/modules/jooby-apt/src/main/java/io/jooby/internal/apt/RouteAttributesGenerator.java
@@ -60,11 +60,13 @@ public Optional<String> toSourceCode(boolean kt, MvcRoute route, int indent) {
     if (attributes.isEmpty()) {
       return Optional.empty();
     } else {
-      return Optional.of(toSourceCode(kt, annotationMap(route.getMethod()), indent + 6));
+      return Optional.of(
+          toSourceCode(kt, annotationMap(route.getMethod()), indent + 6, new HashMap<>()));
     }
   }
 
-  private String toSourceCode(boolean kt, Map<String, Object> attributes, int indent) {
+  private String toSourceCode(
+      boolean kt, Map<String, Object> attributes, int indent, Map<String, Object> defaults) {
     var buffer = new StringBuilder();
     var separator = ",\n";
     var pairPrefix = "";
@@ -82,23 +84,24 @@ private String toSourceCode(boolean kt, Map<String, Object> attributes, int inde
       buffer.append(indent(indent + 4));
       buffer.append(pairPrefix);
       buffer.append(CodeBlock.string(e.getKey())).append(", ");
-      buffer.append(valueToSourceCode(kt, e.getValue(), indent + 4));
+      buffer.append(valueToSourceCode(kt, e.getValue(), indent + 4, defaults));
       buffer.append(pairSuffix).append(separator);
     }
     buffer.setLength(buffer.length() - separator.length());
     buffer.append(")");
     return buffer.toString();
   }
 
-  private Object valueToSourceCode(boolean kt, Object value, int indent) {
+  private Object valueToSourceCode(
+      boolean kt, Object value, int indent, Map<String, Object> defaults) {
     if (value instanceof String) {
       return CodeBlock.string((String) value);
     } else if (value instanceof Character) {
       return "'" + value + "'";
     } else if (value instanceof Map attributeMap) {
-      return "\n  " + indent(indent) + toSourceCode(kt, attributeMap, indent + 1);
+      return "\n  " + indent(indent) + toSourceCode(kt, attributeMap, indent + 1, defaults);
     } else if (value instanceof List list) {
-      return valueToSourceCode(kt, list, indent);
+      return valueToSourceCode(kt, list, indent, defaults);
     } else if (value instanceof EnumValue enumValue) {
       return enumValue.type + "." + enumValue.value;
     } else if (value instanceof TypeMirror) {
@@ -118,12 +121,13 @@ private Object valueToSourceCode(boolean kt, Object value, int indent) {
     }
   }
 
-  private String valueToSourceCode(boolean kt, List values, int indent) {
+  private String valueToSourceCode(
+      boolean kt, List values, int indent, Map<String, Object> defaults) {
     var buffer = new StringBuilder();
     buffer.append("java.util.List.of(");
     var separator = ", ";
     for (Object value : values) {
-      buffer.append(valueToSourceCode(kt, value, indent)).append(separator);
+      buffer.append(valueToSourceCode(kt, value, indent, defaults)).append(separator);
     }
     buffer.setLength(buffer.length() - separator.length());
     buffer.append(")");
@@ -158,7 +162,8 @@ private Map<String, Object> annotationMap(List<? extends AnnotationMirror> annot
       String prefix = elem.getSimpleName().toString();
       // Set all values and then override with present values (fix for JDK 11+)
       result.putAll(toMap(annotation.getElementValues(), prefix));
-      toMap(elements.getElementValuesWithDefaults(annotation), prefix).forEach(result::putIfAbsent);
+      // toMap(elements.getElementValuesWithDefaults(annotation),
+      // prefix).forEach(result::putIfAbsent);
     }
     return result;
   }
diff --git a/modules/jooby-apt/src/test/java/io/jooby/apt/ProcessorRunner.java b/modules/jooby-apt/src/test/java/io/jooby/apt/ProcessorRunner.java
@@ -58,6 +58,7 @@ protected Class<?> findClass(String name) throws ClassNotFoundException {
 
   private static class HookJoobyProcessor extends JoobyProcessor {
     private JavaFileObject source;
+    private String kotlinSource;
 
     public HookJoobyProcessor(Consumer<String> console) {
       super((kind, message) -> console.accept(message));
@@ -72,13 +73,23 @@ public JavaFileObject getSource() {
       return source;
     }
 
+    public String getKotlinSource() {
+      return kotlinSource;
+    }
+
     public MvcContext getContext() {
       return context;
     }
 
     @Override
     protected void onGeneratedSource(JavaFileObject source) {
       this.source = source;
+      try {
+        // Generate kotlin source code inside the compiler scope... avoid false positive errors
+        this.kotlinSource = context.getRouters().get(0).toSourceCode(true);
+      } catch (IOException e) {
+        SneakyThrows.propagate(e);
+      }
     }
   }
 
@@ -117,14 +128,17 @@ public ProcessorRunner withRouter(SneakyThrows.Consumer2<Jooby, JavaFileObject>
     return this;
   }
 
-  public ProcessorRunner withSource(SneakyThrows.Consumer<JavaFileObject> consumer) {
+  public ProcessorRunner withJavaObject(SneakyThrows.Consumer<JavaFileObject> consumer) {
     consumer.accept(processor.getSource());
     return this;
   }
 
-  public ProcessorRunner withSource(boolean kt, SneakyThrows.Consumer<String> consumer)
-      throws IOException {
-    consumer.accept(processor.getContext().getRouters().get(0).toSourceCode(kt));
+  public ProcessorRunner withSourceCode(SneakyThrows.Consumer<String> consumer) {
+    return withSourceCode(false, consumer);
+  }
+
+  public ProcessorRunner withSourceCode(boolean kt, SneakyThrows.Consumer<String> consumer) {
+    consumer.accept(kt ? processor.kotlinSource : processor.getSource().toString());
     return this;
   }
 
diff --git a/modules/jooby-apt/src/test/java/tests/Issue1525.java b/modules/jooby-apt/src/test/java/tests/Issue1525.java
@@ -20,11 +20,11 @@ public void routeClassAttributes() throws Exception {
         .withRouter(
             app -> {
               Route route0 = app.getRoutes().get(0);
-              assertEquals(2, route0.getAttributes().size(), route0.getAttributes().toString());
+              assertEquals(1, route0.getAttributes().size(), route0.getAttributes().toString());
               assertEquals("Admin", route0.attribute("roleAnnotation"));
 
               Route route1 = app.getRoutes().get(1);
-              assertEquals(2, route1.getAttributes().size(), route1.getAttributes().toString());
+              assertEquals(1, route1.getAttributes().size(), route1.getAttributes().toString());
               assertEquals("User", route1.attribute("roleAnnotation"));
             });
   }
diff --git a/modules/jooby-apt/src/test/java/tests/ModuleCompilerTest.java b/modules/jooby-apt/src/test/java/tests/ModuleCompilerTest.java
@@ -277,7 +277,7 @@ public void routeAttributes() throws Exception {
         .withRouter(
             app -> {
               Route route = app.getRoutes().get(0);
-              assertEquals(13, route.getAttributes().size(), route.getAttributes().toString());
+              assertEquals(12, route.getAttributes().size(), route.getAttributes().toString());
               assertEquals("string", route.attribute("someAnnotation"));
               assertEquals(Integer.valueOf(5), route.attribute("someAnnotation.i"));
               assertEquals(Long.valueOf(200), route.attribute("someAnnotation.l"));
@@ -289,7 +289,6 @@ public void routeAttributes() throws Exception {
               assertEquals(Short.MIN_VALUE, (short) route.attribute("someAnnotation.s"));
               assertEquals(Arrays.asList("a", "b"), route.attribute("someAnnotation.values"));
               assertEquals("User", route.attribute("roleAnnotation"));
-              assertEquals("one", route.attribute("roleAnnotation.level"));
               Map<String, Object> link = route.attribute("someAnnotation.annotation");
               assertNotNull(link);
               assertEquals("link", link.get("LinkAnnotation"));
diff --git a/modules/jooby-apt/src/test/java/tests/i3469/Issue3469.java b/modules/jooby-apt/src/test/java/tests/i3469/Issue3469.java
@@ -19,7 +19,7 @@ public class Issue3469 {
   @Test
   public void shouldGenerateConstructors() throws Exception {
     new ProcessorRunner(new C3469(new Foo3469(), List.of(new Bar3469())))
-        .withSource(
+        .withJavaObject(
             source -> {
               assertTrue(
                   source
@@ -35,7 +35,7 @@ public void shouldGenerateConstructors() throws Exception {
   @Test
   public void shouldGenerateFieldInjectWithDefaultConstructor() throws Exception {
     new ProcessorRunner(new C3469FieldInject())
-        .withSource(
+        .withJavaObject(
             source -> {
               assertTrue(source.toString().contains("this(C3469FieldInject.class);"));
             });
diff --git a/modules/jooby-apt/src/test/java/tests/i3476/Issue3476.java b/modules/jooby-apt/src/test/java/tests/i3476/Issue3476.java
@@ -16,7 +16,7 @@ public class Issue3476 {
   @Test
   public void shouldGenerateGenerics() throws Exception {
     new ProcessorRunner(new C3476())
-        .withSource(
+        .withJavaObject(
             source -> {
               assertTrue(source.toString().contains("public <T> java.util.List<T> get("));
               assertTrue(source.toString().contains("return (java.util.List<T>) c.get("));
diff --git a/modules/jooby-apt/src/test/java/tests/i3490/Issue3490.java b/modules/jooby-apt/src/test/java/tests/i3490/Issue3490.java
@@ -18,7 +18,7 @@ public class Issue3490 {
   @Test
   public void shouldNotGeneratePrimitiveOnKotlinGenerics() throws IOException {
     new ProcessorRunner(new C3490())
-        .withSource(
+        .withSourceCode(
             true,
             source -> {
               assertTrue(
diff --git a/modules/jooby-apt/src/test/java/tests/i3507/Issue3507.java b/modules/jooby-apt/src/test/java/tests/i3507/Issue3507.java
@@ -18,7 +18,7 @@ public class Issue3507 {
   @Test
   public void shouldGenerateNullSafeKtReturnType() throws IOException {
     new ProcessorRunner(new C3507())
-        .withSource(
+        .withSourceCode(
             true,
             source -> {
               assertTrue(source.contains("return c.get(ctx.query(\"query\").value())!!"));
diff --git a/modules/jooby-apt/src/test/java/tests/i3525/C3525.java b/modules/jooby-apt/src/test/java/tests/i3525/C3525.java
@@ -0,0 +1,17 @@
+/*
+ * Jooby https://jooby.io
+ * Apache License Version 2.0 https://jooby.io/LICENSE.txt
+ * Copyright 2014 Edgar Espina
+ */
+package tests.i3525;
+
+import io.jooby.annotation.GET;
+import io.jooby.annotation.QueryParam;
+import io.swagger.v3.oas.annotations.Parameter;
+
+public class C3525 {
+  @GET("/3525")
+  @Parameter(name = "paramA", description = "paramA")
+  @Parameter(name = "paramB", description = "paramB")
+  public void repeatable(@QueryParam String paramA, @QueryParam String paramB) {}
+}
diff --git a/modules/jooby-apt/src/test/java/tests/i3525/Issue3525.java b/modules/jooby-apt/src/test/java/tests/i3525/Issue3525.java
@@ -0,0 +1,25 @@
+/*
+ * Jooby https://jooby.io
+ * Apache License Version 2.0 https://jooby.io/LICENSE.txt
+ * Copyright 2014 Edgar Espina
+ */
+package tests.i3525;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
+
+import io.jooby.apt.ProcessorRunner;
+
+public class Issue3525 {
+
+  @Test
+  public void shouldNotRunOnInfiniteLoop() throws Exception {
+    new ProcessorRunner(new C3525())
+        .withSourceCode(
+            source -> {
+              assertTrue(source.contains("\"Parameter.description\", \"paramA\","));
+              assertTrue(source.contains("\"Parameter.description\", \"paramB\","));
+            });
+  }
+}
diff --git a/modules/jooby-apt/src/test/java/tests/validation/BeanValidationGeneratorTest.java b/modules/jooby-apt/src/test/java/tests/validation/BeanValidationGeneratorTest.java
@@ -16,7 +16,7 @@ public class BeanValidationGeneratorTest {
   @Test
   public void generate_validation_forBean() throws Exception {
     new ProcessorRunner(new BeanValidationsController())
-        .withSource(
+        .withSourceCode(
             false,
             source -> {
               assertTrue(
diff --git a/tests/src/test/java/io/jooby/test/RouteAttributeTest.java b/tests/src/test/java/io/jooby/test/RouteAttributeTest.java
@@ -22,7 +22,9 @@ public void canRetrieveRouteAttributesForMvcAPI(ServerTestRunner runner) {
                   next ->
                       ctx -> {
                         String role = (String) ctx.getRoute().attribute("Role");
-                        String level = (String) ctx.getRoute().attribute("Role.level");
+                        String level =
+                            (String)
+                                ctx.getRoute().getAttributes().getOrDefault("Role.level", "one");
 
                         if (ctx.getRoute().getPattern().equals("/attr/secured/otherpath")) {
                           assertEquals("User", role);
