add route.glob():boolean method fix #354

Author: jknack

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

@@ -0,0 +1,34 @@
+package org.jooby.issues;
+
+import org.jooby.test.ServerFeature;
+import org.junit.Test;
+
+import com.google.common.collect.ImmutableMap;
+
+public class Issue354 extends ServerFeature {
+
+  {
+    get("/:glob", req -> req.route().reverse(req.route().glob() ? "yes" : "no"));
+    get("/g/:glob",
+        req -> req.route().reverse(ImmutableMap.of("glob", req.route().glob() ? "yes" : "no")));
+    get("/s/*", req -> req.route().glob() ? "yes" : "no");
+    get("/q/t?st", req -> req.route().glob() ? "yes" : "no");
+    get("/w/**/*", req -> req.route().glob() ? "yes" : "no");
+  }
+
+  @Test
+  public void glob() throws Exception {
+    request().get("/glob")
+        .expect("/no");
+    request().get("/g/glob")
+        .expect("/g/no");
+
+    request().get("/s/glob")
+        .expect("yes");
+    request().get("/q/test")
+        .expect("yes");
+    request().get("/w/test")
+        .expect("yes");
+  }
+
+}

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

@@ -44,7 +44,6 @@
 
 import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
 import com.google.common.primitives.Primitives;
 import com.google.inject.Key;
@@ -1058,6 +1057,17 @@ public List<String> vars() {
       return cpattern.vars();
     }
 
+    /**
+     * Indicates if the {@link #pattern()} contains a glob charecter, like <code>?</code>,
+     * <code>*</code> or <code>**</code>.
+     *
+     * @return Indicates if the {@link #pattern()} contains a glob charecter, like <code>?</code>,
+     *         <code>*</code> or <code>**</code>.
+     */
+    public boolean glob() {
+      return cpattern.glob();
+    }
+
     /**
      * Recreate a route path and apply the given variables.
      *
@@ -1113,22 +1123,22 @@ public <T> T attr(final String name) {
      * @return A read only view of attributes.
      */
     public Map<String, Object> attributes() {
-      return ImmutableMap.copyOf(attributes);
+      return Collections.unmodifiableMap(attributes);
     }
 
     /**
      * Test if the route matches the given verb, path, content type and accept header.
      *
-     * @param verb A HTTP verb.
+     * @param method A HTTP verb.
      * @param path Current HTTP path.
      * @param contentType The <code>Content-Type</code> header.
      * @param accept The <code>Accept</code> header.
      * @return A route or an empty optional.
      */
-    public Optional<Route> matches(final String verb,
+    public Optional<Route> matches(final String method,
         final String path, final MediaType contentType,
         final List<MediaType> accept) {
-      String fpath = verb + path;
+      String fpath = method + path;
       if (excludes.size() > 0 && excludes(fpath)) {
         return Optional.empty();
       }
@@ -1139,7 +1149,7 @@ public Optional<Route> matches(final String verb,
           // keep accept when */*
           List<MediaType> produces = result.size() == 1 && result.get(0).name().equals("*/*")
               ? accept : this.produces;
-          return Optional.of(asRoute(verb, matcher, produces));
+          return Optional.of(asRoute(method, matcher, produces));
         }
       }
       return Optional.empty();
@@ -1286,14 +1296,14 @@ private boolean excludes(final String path) {
      * @return All the types this route can consumes.
      */
     public List<MediaType> consumes() {
-      return ImmutableList.copyOf(this.consumes);
+      return Collections.unmodifiableList(this.consumes);
     }
 
     /**
      * @return All the types this route can produces.
      */
     public List<MediaType> produces() {
-      return ImmutableList.copyOf(this.produces);
+      return Collections.unmodifiableList(this.produces);
     }
 
     @Override
@@ -1327,8 +1337,7 @@ private Route asRoute(final String method, final RouteMatcher matcher,
       if (filter instanceof AssetProxy) {
         filter = ((AssetProxy) filter).delegate();
       }
-      return new RouteImpl(filter, method, matcher.path(), pattern, name, matcher.vars(), consumes,
-          produces, attributes, mapper);
+      return new RouteImpl(filter, this, method, matcher.path(), produces, matcher.vars(), mapper);
     }
 
   }
@@ -1400,6 +1409,21 @@ public <T> T attr(final String name) {
       return route.attr(name);
     }
 
+    @Override
+    public boolean glob() {
+      return route.glob();
+    }
+
+    @Override
+    public String reverse(final Map<String, Object> vars) {
+      return route.reverse(vars);
+    }
+
+    @Override
+    public String reverse(final Object... values) {
+      return route.reverse(values);
+    }
+
     @Override
     public String toString() {
       return route.toString();
@@ -2041,6 +2065,31 @@ default <T> T attr(final String name) {
     return (T) attributes().get(name);
   }
 
+  /**
+   * Indicates if the {@link #pattern()} contains a glob charecter, like <code>?</code>,
+   * <code>*</code> or <code>**</code>.
+   *
+   * @return Indicates if the {@link #pattern()} contains a glob charecter, like <code>?</code>,
+   *         <code>*</code> or <code>**</code>.
+   */
+  boolean glob();
+
+  /**
+   * Recreate a route path and apply the given variables.
+   *
+   * @param vars Path variables.
+   * @return A route pattern.
+   */
+  String reverse(final Map<String, Object> vars);
+
+  /**
+   * Recreate a route path and apply the given variables.
+   *
+   * @param values Path variable values.
+   * @return A route pattern.
+   */
+  String reverse(final Object... values);
+
   /**
    * Normalize a path by removing double or trailing slashes.
    *

jooby/src/main/java/org/jooby/internal/RouteImpl.java

@@ -42,25 +42,17 @@ public class RouteImpl implements Route, Route.Filter {
 
   private static Map<Object, String> NO_VARS = ImmutableMap.of();
 
-  private static ImmutableMap<String, Object> NO_ATTRS = ImmutableMap.of();
-
-  private String method;
+  private Definition route;
 
   private String path;
 
-  private String pattern;
-
-  private String name;
-
   private Map<Object, String> vars;
 
-  private List<MediaType> consumes;
+  private Filter filter;
 
   private List<MediaType> produces;
 
-  private Filter filter;
-
-  private Map<String, Object> attributes;
+  private String method;
 
   public static RouteImpl notFound(final String method, final String path,
       final List<MediaType> produces) {
@@ -73,27 +65,18 @@ public static RouteImpl notFound(final String method, final String path,
 
   public static RouteImpl fromStatus(final Filter filter, final String method,
       final String path, final String name, final List<MediaType> produces) {
-    return new RouteImpl(filter, method, path, path, name, NO_VARS, MediaType.ALL, produces,
-        NO_ATTRS, null) {
+    return new RouteImpl(filter, new Route.Definition(method, path, filter)
+        .name(name), method, path, produces, NO_VARS, null) {
       @Override
       public boolean apply(final String filter) {
         return true;
       }
     };
   }
 
-  public RouteImpl(final Filter filter, final String method, final String path,
-      final String pattern, final String name, final Map<Object, String> vars,
-      final List<MediaType> consumes, final List<MediaType> produces,
-      final Map<String, Object> attributes, final Mapper<?> mapper) {
-    this(filter, method, path, pattern, name, vars, consumes, produces,
-        ImmutableMap.<String, Object> copyOf(attributes), mapper);
-  }
-
-  public RouteImpl(final Filter filter, final String method, final String path,
-      final String pattern, final String name, final Map<Object, String> vars,
-      final List<MediaType> consumes, final List<MediaType> produces,
-      final ImmutableMap<String, Object> attributes, final Mapper<?> mapper) {
+  public RouteImpl(final Filter filter, final Definition route, final String method,
+      final String path, final List<MediaType> produces, final Map<Object, String> vars,
+      final Mapper<?> mapper) {
     this.filter = Option.of(mapper)
         .map(m -> Match(filter).of(
             Case(instanceOf(Route.OneArgHandler.class),
@@ -109,14 +92,11 @@ public RouteImpl(final Filter filter, final String method, final String path,
             }),
             Case($(), filter)))
         .getOrElse(filter);
+    this.route = route;
     this.method = method;
+    this.produces = produces;
     this.path = path;
-    this.pattern = pattern;
-    this.name = name;
     this.vars = vars;
-    this.consumes = consumes;
-    this.produces = produces;
-    this.attributes = attributes;
   }
 
   @Override
@@ -127,7 +107,7 @@ public void handle(final Request request, final Response response, final Chain c
 
   @Override
   public Map<String, Object> attributes() {
-    return attributes;
+    return route.attributes();
   }
 
   @Override
@@ -142,12 +122,12 @@ public String method() {
 
   @Override
   public String pattern() {
-    return pattern.substring(pattern.indexOf('/'));
+    return route.pattern().substring(route.pattern().indexOf('/'));
   }
 
   @Override
   public String name() {
-    return name;
+    return route.name();
   }
 
   @Override
@@ -157,14 +137,29 @@ public Map<Object, String> vars() {
 
   @Override
   public List<MediaType> consumes() {
-    return consumes;
+    return route.consumes();
   }
 
   @Override
   public List<MediaType> produces() {
     return produces;
   }
 
+  @Override
+  public boolean glob() {
+    return route.glob();
+  }
+
+  @Override
+  public String reverse(final Map<String, Object> vars) {
+    return route.reverse(vars);
+  }
+
+  @Override
+  public String reverse(final Object... values) {
+    return route.reverse(values);
+  }
+
   @Override
   public String toString() {
     StringBuilder buffer = new StringBuilder();

jooby/src/main/java/org/jooby/internal/RoutePattern.java

@@ -31,7 +31,7 @@
 import java.util.stream.Collectors;
 
 import javaslang.Tuple;
-import javaslang.Tuple3;
+import javaslang.Tuple4;
 
 public class RoutePattern {
 
@@ -48,15 +48,22 @@ public class RoutePattern {
 
   private List<String> reverse;
 
+  private boolean glob;
+
   public RoutePattern(final String verb, final String pattern) {
     requireNonNull(verb, "A HTTP verb is required.");
     requireNonNull(pattern, "A path pattern is required.");
     this.pattern = normalize(pattern);
-    Tuple3<Function<String, RouteMatcher>, List<String>, List<String>> result = rewrite(this,
+    Tuple4<Function<String, RouteMatcher>, List<String>, List<String>, Boolean> result = rewrite(this,
         verb.toUpperCase(), this.pattern.replace("/**/", "/**"));
     matcher = result._1;
     vars = result._2;
     reverse = result._3;
+    glob = result._4;
+  }
+
+  public boolean glob() {
+    return glob;
   }
 
   public List<String> vars() {
@@ -87,7 +94,7 @@ public RouteMatcher matcher(final String path) {
     return matcher.apply(path);
   }
 
-  private static Tuple3<Function<String, RouteMatcher>, List<String>, List<String>> rewrite(
+  private static Tuple4<Function<String, RouteMatcher>, List<String>, List<String>, Boolean> rewrite(
       final RoutePattern owner, final String verb, final String pattern) {
     List<String> vars = new LinkedList<>();
     String rwrverb = verbs(verb);
@@ -96,6 +103,7 @@ private static Tuple3<Function<String, RouteMatcher>, List<String>, List<String>
     int end = 0;
     boolean regex = !rwrverb.equals(verb);
     List<String> reverse = new ArrayList<>();
+    boolean glob = false;
     while (matcher.find()) {
       String head = pattern.substring(end, matcher.start());
       patternBuilder.append(Pattern.quote(head));
@@ -105,14 +113,17 @@ private static Tuple3<Function<String, RouteMatcher>, List<String>, List<String>
         patternBuilder.append("([^/])");
         reverse.add(match);
         regex = true;
+        glob = true;
       } else if ("*".equals(match)) {
         patternBuilder.append("([^/]*)");
         reverse.add(match);
         regex = true;
+        glob = true;
       } else if (match.equals("/**")) {
         reverse.add(match);
         patternBuilder.append("($|/.*)");
         regex = true;
+        glob = true;
       } else if (match.startsWith(":")) {
         regex = true;
         String varName = match.substring(1);
@@ -143,7 +154,7 @@ private static Tuple3<Function<String, RouteMatcher>, List<String>, List<String>
     reverse.add(tail);
     patternBuilder.append(Pattern.quote(tail));
     return Tuple.of(fn(owner, regex, regex ? patternBuilder.toString() : verb + pattern, vars),
-        vars, reverse);
+        vars, reverse, glob);
   }
 
   private static String verbs(final String verb) {
@@ -195,4 +206,5 @@ public static String normalize(final String pattern) {
   public String toString() {
     return pattern;
   }
+
 }