MVC Routes: prefix route attributes with annotation name fix jooby-project#1099

jknack · jknack · commit b2d18dc337d1 · 2018-05-28T09:27:39.000-03:00
diff --git a/jooby/src/main/java/org/jooby/internal/mvc/MvcRoutes.java b/jooby/src/main/java/org/jooby/internal/mvc/MvcRoutes.java
@@ -381,7 +381,7 @@ private static String attrName(final Annotation annotation, final Method attr) {
       return CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_CAMEL,
           annotation.annotationType().getSimpleName());
     }
-    return name;
+    return annotation.annotationType().getSimpleName() + "." + name;
   }
 
   private static List<MediaType> produces(final Method method) {
diff --git a/modules/coverage-report/src/test/java/org/jooby/issues/Issue346.java b/modules/coverage-report/src/test/java/org/jooby/issues/Issue346.java
@@ -1,6 +1,12 @@
 package org.jooby.issues;
 
+import com.google.common.collect.ImmutableMap;
+import org.jooby.Request;
+import org.jooby.mvc.GET;
+import org.jooby.mvc.Path;
+import org.jooby.test.ServerFeature;
 import static org.junit.Assert.assertEquals;
+import org.junit.Test;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -9,14 +15,6 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.jooby.Request;
-import org.jooby.mvc.GET;
-import org.jooby.mvc.Path;
-import org.jooby.test.ServerFeature;
-import org.junit.Test;
-
-import com.google.common.collect.ImmutableMap;
-
 public class Issue346 extends ServerFeature {
 
   @Target({ElementType.METHOD, ElementType.TYPE, ElementType.ANNOTATION_TYPE })
@@ -60,17 +58,17 @@ public Object admin(final Request req) {
 
   {
     use("/1", (req, rsp) -> {
-      assertEquals(ImmutableMap.of("priority", 1.0, "changefreq", "always"),
+      assertEquals(ImmutableMap.of("SitemapUrl.priority", 1.0, "SitemapUrl.changefreq", "always"),
           req.route().attributes());
     });
 
     use("/2", (req, rsp) -> {
-      assertEquals(ImmutableMap.of("priority", 0.5, "changefreq", "always"),
+      assertEquals(ImmutableMap.of("SitemapUrl.priority", 0.5, "SitemapUrl.changefreq", "always"),
           req.route().attributes());
     });
 
     use("/3", (req, rsp) -> {
-      assertEquals(ImmutableMap.of("priority", 0.5, "changefreq", "always", "role", "admin"),
+      assertEquals(ImmutableMap.of("SitemapUrl.priority", 0.5, "SitemapUrl.changefreq", "always", "role", "admin"),
           req.route().attributes());
     });
     use(Resource.class);
@@ -81,19 +79,19 @@ public void mvcAttrs() throws Exception {
     request().get("/1")
         .expect(value -> {
           Map<String, Object> hash = toMap(value.substring(1, value.length() - 1));
-          assertEquals(ImmutableMap.of("priority", "1.0", "changefreq", "always"), hash);
+          assertEquals(ImmutableMap.of("SitemapUrl.priority", "1.0", "SitemapUrl.changefreq", "always"), hash);
         });
 
     request().get("/2")
         .expect(value -> {
           Map<String, Object> hash = toMap(value.substring(1, value.length() - 1));
-          assertEquals(ImmutableMap.of("priority", "0.5", "changefreq", "always"), hash);
+          assertEquals(ImmutableMap.of("SitemapUrl.priority", "0.5", "SitemapUrl.changefreq", "always"), hash);
         });
 
     request().get("/3")
         .expect(value -> {
           Map<String, Object> hash = toMap(value.substring(1, value.length() - 1));
-          assertEquals(ImmutableMap.of("priority", "0.5", "changefreq", "always", "role", "admin"),
+          assertEquals(ImmutableMap.of("SitemapUrl.priority", "0.5", "SitemapUrl.changefreq", "always", "role", "admin"),
               hash);
         });
   }

Original file line number	Diff line number	Diff line change
`@@ -381,7 +381,7 @@ private static String attrName(final Annotation annotation, final Method attr) {`
`381`	`381`	`return CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_CAMEL,`
`382`	`382`	`annotation.annotationType().getSimpleName());`
`383`	`383`	`}`
`384`		`- return name;`
	`384`	`+ return annotation.annotationType().getSimpleName() + "." + name;`
`385`	`385`	`}`
`386`	`386`
`387`	`387`	`private static List<MediaType> produces(final Method method) {`