reverse route fix #344

Author: jknack

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

@@ -29,6 +29,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 import org.jooby.internal.AssetProxy;
@@ -41,6 +42,8 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
+import com.google.inject.Key;
+import com.google.inject.TypeLiteral;
 
 /**
  * Routes are a key concept in Jooby. Routes are executed in the same order they are defined
@@ -927,6 +930,26 @@ public List<String> vars() {
       return cpattern.vars();
     }
 
+    /**
+     * Recreate a route path and apply the given variables.
+     *
+     * @param vars Path variables.
+     * @return A route pattern.
+     */
+    public String reverse(final Map<String, Object> vars) {
+      return cpattern.reverse(vars);
+    }
+
+    /**
+     * Recreate a route path and apply the given variables.
+     *
+     * @param values Path variable values.
+     * @return A route pattern.
+     */
+    public String reverse(final Object... values) {
+      return cpattern.reverse(values);
+    }
+
     /**
      * Set route attribute.
      *
@@ -1032,7 +1055,7 @@ public String name() {
      */
     public Definition name(final String name) {
       checkArgument(!Strings.isNullOrEmpty(name), "A route's name is required.");
-      this.name = RoutePattern.normalize(name);
+      this.name = normalize(name);
       return this;
     }
 
@@ -1705,7 +1728,8 @@ public void send(final Result result) throws Exception {
    * The goal of the <code>complete</code> handler is to probably cleanup request object and log
    * responses.
    *
-   * Please note that the <code>complete</code> handler is just syntax sugar for {@link Route.Filter}.
+   * Please note that the <code>complete</code> handler is just syntax sugar for
+   * {@link Route.Filter}.
    * For example, the <code>complete</code> handler was implemented as:
    *
    * <pre>{@code
@@ -1845,6 +1869,10 @@ default void next(final Request req, final Response rsp) throws Throwable {
 
   }
 
+  /** Renderer key. */
+  Key<Set<Route.Definition>> KEY = Key.get(new TypeLiteral<Set<Route.Definition>>() {
+  });
+
   String GET = "GET";
 
   String POST = "POST";
@@ -1957,4 +1985,13 @@ default String attr(final String name) {
     return attributes().get(name);
   }
 
+  /**
+   * Normalize a path by removing double or trailing slashes.
+   *
+   * @param path A path to normalize.
+   * @return A normalized path.
+   */
+  static String normalize(final String path) {
+    return RoutePattern.normalize(path);
+  }
 }

jooby/src/test/java/org/jooby/RouteDefinitionTest.java

@@ -6,12 +6,15 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
+import java.util.function.Function;
 
 import org.jooby.Route.Definition;
 import org.jooby.internal.RouteImpl;
 import org.jooby.test.MockUnit;
 import org.junit.Test;
 
+import com.google.common.collect.ImmutableMap;
+
 public class RouteDefinitionTest {
 
   @Test
@@ -281,4 +284,20 @@ public void properties() throws Exception {
     assertEquals(MediaType.json, def.consumes().get(0));
     assertEquals(MediaType.json, def.produces().get(0));
   }
+
+  @Test
+  public void reverse() throws Exception {
+    Function<String, Route.Definition> route = path -> new Route.Definition("*", path, () -> null);
+    assertEquals("/1", route.apply("/:id").reverse(1));
+
+    assertEquals("/cat/1", route.apply("/:type/:id").reverse("cat", 1));
+
+    assertEquals("/cat/5", route.apply("/{type}/{id}").reverse("cat", 5));
+
+    assertEquals("/ccat/1",
+        route.apply("/c{type}/{id}").reverse(ImmutableMap.of("type", "cat", "id", 1)));
+
+    assertEquals("/cat/tom", route.apply("/cat/tom").reverse("cat", 1));
+  }
+
 }