openapi: MVC routes don't have custom annotations in attributes

- fix #3582

Author: jknack

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

@@ -167,28 +167,31 @@ 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));
+      result.putAll(toMap(annotation.getElementValues(), prefix, false));
 
       // Defaults value only pick "value"
-      toMap(elements.getElementValuesWithDefaults(annotation), prefix, "value"::equals)
+      toMap(elements.getElementValuesWithDefaults(annotation), prefix, true, "value"::equals)
           .forEach(result::putIfAbsent);
     }
     return result;
   }
 
   private Map<String, Object> toMap(
-      Map<? extends ExecutableElement, ? extends AnnotationValue> values, String prefix) {
-    return toMap(values, prefix, name -> true);
+      Map<? extends ExecutableElement, ? extends AnnotationValue> values,
+      String prefix,
+      boolean defaults) {
+    return toMap(values, prefix, defaults, name -> true);
   }
 
   private Map<String, Object> toMap(
       Map<? extends ExecutableElement, ? extends AnnotationValue> values,
       String prefix,
+      boolean defaults,
       Predicate<String> filter) {
     Map<String, Object> result = new LinkedHashMap<>();
     for (var attribute : values.entrySet()) {
       var value = annotationValue(attribute.getValue());
-      if (value != null && !value.toString().isEmpty()) {
+      if (defaults || (value != null && !value.toString().isEmpty())) {
         var method = attribute.getKey().getSimpleName().toString();
         if (filter.test(method)) {
           var name = method.equals("value") ? prefix : prefix + "." + method;

modules/jooby-apt/src/test/java/tests/i3582/Annotation3582.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.i3582;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ElementType.METHOD, ElementType.TYPE, ElementType.ANNOTATION_TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Annotation3582 {
+  String value() default "";
+}

modules/jooby-apt/src/test/java/tests/i3582/C3582.java

@@ -0,0 +1,22 @@
+/*
+ * Jooby https://jooby.io
+ * Apache License Version 2.0 https://jooby.io/LICENSE.txt
+ * Copyright 2014 Edgar Espina
+ */
+package tests.i3582;
+
+import com.google.inject.Inject;
+import io.jooby.annotation.GET;
+import io.jooby.annotation.QueryParam;
+
+@Annotation3582
+public class C3582 {
+
+  @Inject
+  public C3582() {}
+
+  @GET("/hello")
+  public String helloWorld(@QueryParam String property) {
+    return "hello world" + property;
+  }
+}

modules/jooby-apt/src/test/java/tests/i3582/Issue3585.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.i3582;
+
+import static org.junit.Assert.assertTrue;
+
+import org.junit.jupiter.api.Test;
+
+import io.jooby.apt.ProcessorRunner;
+
+public class Issue3585 {
+
+  @Test
+  public void shouldGenerateDefaultAnnotation() throws Exception {
+    new ProcessorRunner(new C3582())
+        .withSourceCode(
+            source -> {
+              assertTrue(source.contains(".setAttributes(java.util.Map.of("));
+              assertTrue(source.contains("\"Annotation3582\", \"\"))"));
+            });
+  }
+}