route prefix doesn't work after route is created and in MVC routes fix #426

Author: jknack

coverage-report/src/test/java/org/jooby/issues/Issue187.java

@@ -0,0 +1,63 @@
+package org.jooby.issues;
+
+import org.jooby.Jooby;
+import org.jooby.Route;
+import org.jooby.mvc.GET;
+import org.jooby.mvc.Path;
+import org.jooby.test.ServerFeature;
+import org.junit.Test;
+
+public class Issue187 extends ServerFeature {
+
+  public static class RouteBean1 {
+
+    @GET
+    @Path("/1/foo")
+    public String name(final Route route) {
+      return route.name();
+    }
+  }
+
+  public static class RouteBean2 {
+
+    @GET
+    @Path("/2/foo")
+    public String name(final Route route) {
+      return route.name();
+    }
+  }
+
+  public static class App extends Jooby {
+
+    public App(final String prefix) {
+      super(prefix);
+
+      get("/foo", req -> req.route().name())
+          .name("foo");
+
+      use(RouteBean2.class);
+    }
+
+  }
+
+  public Issue187() {
+    super("187");
+
+    use(new App("bar"));
+
+    use(RouteBean1.class);
+  }
+
+  @Test
+  public void renameRoutesViaPrefix() throws Exception {
+    request().get("/foo")
+        .expect("/bar/foo");
+
+    request().get("/1/foo")
+        .expect("/187/RouteBean1.name");
+
+    request().get("/2/foo")
+        .expect("/bar/RouteBean2.name");
+  }
+
+}

jooby/src/main/java/org/jooby/Jooby.java

@@ -524,9 +524,12 @@ private static class MvcClass implements Route.Props<MvcClass> {
 
     private Mapper<?> mapper;
 
-    public MvcClass(final Class<?> routeClass, final String path) {
+    private String prefix;
+
+    public MvcClass(final Class<?> routeClass, final String path, final String prefix) {
       this.routeClass = routeClass;
       this.path = path;
+      this.prefix = prefix;
     }
 
     @Override
@@ -570,6 +573,9 @@ public Route.Definition apply(final Route.Definition route) {
       if (name != null) {
         route.name(name);
       }
+      if (prefix != null) {
+        route.name(prefix + "/" + route.name());
+      }
       if (consumes != null) {
         route.consumes(consumes);
       }
@@ -710,7 +716,7 @@ private Jooby use(final Optional<String> path, final Jooby app) {
       } else if (it instanceof Route.Group) {
         ((Route.Group) it).routes().forEach(r -> this.bag.add(rewrite.apply(r)));
       } else if (it instanceof MvcClass) {
-        Object routes = path.<Object> map(p -> new MvcClass(((MvcClass) it).routeClass, p))
+        Object routes = path.<Object> map(p -> new MvcClass(((MvcClass) it).routeClass, p, prefix))
             .orElse(it);
         this.bag.add(routes);
       } else {
@@ -3235,7 +3241,7 @@ public Route.Definition assets(final String path, final AssetHandler handler) {
   @Override
   public Route.Collection use(final Class<?> routeClass) {
     requireNonNull(routeClass, "Route class is required.");
-    MvcClass mvc = new MvcClass(routeClass, "");
+    MvcClass mvc = new MvcClass(routeClass, "", prefix);
     bag.add(mvc);
     return new Route.Collection(mvc);
   }
@@ -3247,9 +3253,9 @@ public Route.Collection use(final Class<?> routeClass) {
    * @return The same route definition.
    */
   private Route.Definition appendDefinition(final Route.Definition route) {
-    if (prefix != null) {
-      route.name(prefix + "/" + route.name());
-    }
+    route.prefix = prefix;
+    // reset name will update the name if prefix != null
+    route.name(route.name());
     bag.add(route);
     return route;
   }
@@ -3745,13 +3751,8 @@ private static List<Object> normalize(final List<Object> services, final Env env
         MvcClass mvcRoute = ((MvcClass) candidate);
         Class<?> mvcClass = mvcRoute.routeClass;
         String path = ((MvcClass) candidate).path;
-        MvcRoutes.routes(env, classInfo, path, mvcClass).forEach(route -> {
-          mvcRoute.apply(route);
-          if (prefix != null) {
-            route.name(prefix + "/" + route.name());
-          }
-          result.add(route);
-        });
+        MvcRoutes.routes(env, classInfo, path, mvcClass)
+            .forEach(route -> result.add(mvcRoute.apply(route)));
       } else {
         result.add(candidate);
       }

jooby/src/main/java/org/jooby/Route.java

@@ -1056,6 +1056,8 @@ class Definition implements Props<Definition> {
 
     private String declaringClass;
 
+    String prefix;
+
     /**
      * Creates a new route definition.
      *
@@ -1293,7 +1295,7 @@ public String name() {
     @Override
     public Definition name(final String name) {
       checkArgument(!Strings.isNullOrEmpty(name), "A route's name is required.");
-      this.name = normalize(name);
+      this.name = normalize(prefix != null ? prefix + "/" + name : name);
       return this;
     }
 

jooby/src/test/java/org/jooby/test/JoobyRunner.java

@@ -80,7 +80,7 @@ private void prepare(final Class<?> klass, final Class<?> server) throws Initial
       if (!Jooby.class.isAssignableFrom(appClass)) {
         throw new InitializationError("Invalid jooby app: " + appClass);
       }
-      int processors = Math.max(1,Runtime.getRuntime().availableProcessors());
+      int processors = Math.max(1, Runtime.getRuntime().availableProcessors());
       // required by Jetty (processors * 2, 1(http), 1(https), 1(request)
       int maxThreads = processors * 2 + 3;
       Config config = ConfigFactory.empty("test-config")

jooby/src/test/java/org/jooby/test/ServerFeature.java

@@ -30,6 +30,13 @@ public abstract class ServerFeature extends Jooby {
 
   private Client server = null;
 
+  public ServerFeature(final String prefix) {
+    super(prefix);
+  }
+
+  public ServerFeature() {
+  }
+
   @Before
   public void debug() {
     if (DEBUG) {