Attributes from class level annotations (MVC) are missing in Jooby 2.x fix jooby-project#1525

jknack · jknack · commit 448429abb594 · 2020-02-04T20:32:01.000-03:00
diff --git a/modules/jooby-apt/src/main/java/io/jooby/internal/apt/asm/RouteAttributesWriter.java b/modules/jooby-apt/src/main/java/io/jooby/internal/apt/asm/RouteAttributesWriter.java
@@ -108,7 +108,12 @@ public void process(ExecutableElement method) throws NoSuchMethodException {
   }
 
   private Map<String, Object> annotationMap(ExecutableElement method) {
-    return annotationMap(method.getAnnotationMirrors(), null);
+    // class
+    Map<String, Object> attributes = annotationMap(
+        method.getEnclosingElement().getAnnotationMirrors(), null);
+    // method
+    attributes.putAll(annotationMap(method.getAnnotationMirrors(), null));
+    return attributes;
   }
 
   private Map<String, Object> annotationMap(List<? extends AnnotationMirror> annotations,
diff --git a/modules/jooby-apt/src/test/java/source/RouteClassAttributes.java b/modules/jooby-apt/src/test/java/source/RouteClassAttributes.java
@@ -0,0 +1,17 @@
+package source;
+
+import io.jooby.annotations.GET;
+
+@RoleAnnotation("User")
+public class RouteClassAttributes {
+  @RoleAnnotation("Admin")
+  @GET("/admin")
+  public String admin() {
+    return "...";
+  }
+
+  @GET("/user")
+  public String user() {
+    return "...";
+  }
+}
diff --git a/modules/jooby-apt/src/test/java/tests/Issue1525.java b/modules/jooby-apt/src/test/java/tests/Issue1525.java
@@ -0,0 +1,25 @@
+package tests;
+
+import io.jooby.Route;
+import io.jooby.apt.MvcModuleCompilerRunner;
+import org.junit.jupiter.api.Test;
+import source.RouteClassAttributes;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class Issue1525 {
+  @Test
+  public void routeClassAttributes() throws Exception {
+    new MvcModuleCompilerRunner(new RouteClassAttributes())
+        .module(app -> {
+          Route route0 = app.getRoutes().get(0);
+          assertEquals(2, 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("User", route1.attribute("roleAnnotation"));
+        })
+    ;
+  }
+}

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,12 @@ public void process(ExecutableElement method) throws NoSuchMethodException {`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`private Map<String, Object> annotationMap(ExecutableElement method) {`
`111`		`- return annotationMap(method.getAnnotationMirrors(), null);`
	`111`	`+ // class`
	`112`	`+ Map<String, Object> attributes = annotationMap(`
	`113`	`+ method.getEnclosingElement().getAnnotationMirrors(), null);`
	`114`	`+ // method`
	`115`	`+ attributes.putAll(annotationMap(method.getAnnotationMirrors(), null));`
	`116`	`+ return attributes;`
`112`	`117`	`}`
`113`	`118`
`114`	`119`	`private Map<String, Object> annotationMap(List<? extends AnnotationMirror> annotations,`