chi router: sync with go version

Author: jknack

jooby/src/main/java/io/jooby/internal/Chi.java

@@ -18,8 +18,8 @@
 import java.util.stream.Stream;
 
 /**
- * Sync: 20-01-20
- * Commit: 17fb1065d2b256d20f68bed0b7bca6c2942aff49
+ * Sync: May 22, 2020
+ * Commit: 5704d7ee98edd3fe55169b506531bdd061667c70
  */
 class Chi implements RouteTree {
   private static final String EMPTY_STRING = "";
@@ -320,7 +320,7 @@ Node addChild(Node child, String search) {
 
           if (segTyp == ntRegexp) {
             child.prefix = seg.rexPat;
-            child.rex = Pattern.compile(seg.rexPat.toString());
+            child.rex = Pattern.compile(seg.rexPat);
           }
 
           if (segStartIdx == 0) {
@@ -471,7 +471,7 @@ Route findRoute(RouterMatch rctx, String method, String path) {
                 }
 
                 if (ntyp == ntRegexp && xn.rex != null) {
-                  if (!xn.rex.matcher(xsearch.substring(0, p).toString()).matches()) {
+                  if (!xn.rex.matcher(xsearch.substring(0, p)).matches()) {
                     continue;
                   }
                 } else if (xsearch.substring(0, p).indexOf('/') != -1) {
@@ -480,12 +480,32 @@ Route findRoute(RouterMatch rctx, String method, String path) {
                 }
 
                 // rctx.routeParams.Values = append(rctx.routeParams.Values, xsearch[:p])
+                int prevlen = rctx.vars.size();
                 rctx.value(xsearch.substring(0, p));
                 xsearch = xsearch.substring(p);
-                break;
+
+                if (xsearch.length() == 0) {
+                  if (xn.isLeaf()) {
+                    Route h = xn.endpoints.get(method);
+                    if (h != null) {
+                      rctx.key(h.getPathKeys());
+                      return h;
+                    }
+                    rctx.methodNotAllowed(xn.endpoints.keySet());
+                  }
+                }
+
+                // recursively find the next node on this branch
+                Route fin = xn.findRoute(rctx, method, xsearch);
+                if (fin != null) {
+                  return fin;
+                }
+
+                // not found on this branch, reset vars
+                rctx.truncate(prevlen);
+                xsearch = path;
               }
               break;
-
             default:
               // catch-all nodes
               // rctx.routeParams.Values = append(rctx.routeParams.Values, search)
@@ -649,7 +669,7 @@ Segment patNextSegment(String pattern) {
         int idx = key.indexOf(':');
         if (idx >= 0) {
           nt = ntRegexp;
-          rexpat = key.substring(idx + 1).toString();
+          rexpat = key.substring(idx + 1);
           //          key = key.substring(0, idx);
         }
 

jooby/src/main/java/io/jooby/internal/RouterMatch.java

@@ -23,7 +23,7 @@ public class RouterMatch implements Router.Match {
 
   private Route route;
 
-  private Map vars = Collections.EMPTY_MAP;
+  Map vars = Collections.EMPTY_MAP;
 
   private Route.Handler handler;
 
@@ -36,6 +36,12 @@ public void key(List<String> keys) {
     }
   }
 
+  public void truncate(int size) {
+    while (size < vars.size()) {
+      vars.remove(size++);
+    }
+  }
+
   public void value(String value) {
     if (vars == Collections.EMPTY_MAP) {
       vars = new LinkedHashMap();

tests/src/test/java/io/jooby/FeaturedTest.java

@@ -2945,7 +2945,7 @@ public void rawVsDecodedValues(ServerTestRunner runner) {
       app.post("/form", ctx -> ctx.form("v").value());
 
       app.post("/multipart", ctx -> ctx.multipart("v").value());
-    }).ready(client-> {
+    }).ready(client -> {
       client.get("/path/a+b%2f", rsp -> {
         assertEquals("a+b/", rsp.body().string().trim());
       });
@@ -2973,6 +2973,50 @@ public void rawVsDecodedValues(ServerTestRunner runner) {
     });
   }
 
+  @ServerTest
+  public void recursiveRegexMatch(ServerTestRunner runner) {
+    runner.define(app -> {
+      app.get("/one/{firstId:[a-z0-9-]+}/{secondId:[a-z0-9-]+}/first",
+          ctx -> "/1/" + ctx.path("firstId").value() + "::" + ctx.path("secondId").value());
+
+      app.get("/one/{firstId:[a-z0-9-_]+}/{secondId:[a-z0-9-_]+}/second",
+          ctx -> "/2/" + ctx.path("firstId").value() + "::" + ctx.path("secondId").value());
+    }).ready(client -> {
+      client.get("/one/hello/peter/first", rsp -> {
+        assertEquals("/1/hello::peter", rsp.body().string());
+      });
+      client.get("/one/hithere/123/second", rsp -> {
+        assertEquals("/2/hithere::123", rsp.body().string());
+      });
+    });
+  }
+
+  @ServerTest
+  public void methodNotAllowedWithPathVariables(ServerTestRunner runner) {
+    runner.define(app -> {
+      app.get("/{var}", Context::getRequestPath);
+    }).ready(client -> {
+      client.delete("/foo", rsp -> {
+        assertEquals(405, rsp.code());
+      });
+
+      client.get("/foo", rsp -> {
+        assertEquals(200, rsp.code());
+      });
+    });
+  }
+
+  @ServerTest
+  public void regexpRoutingShouldIncludeDefaultValueWhenParamIsNotMatched(ServerTestRunner runner) {
+    runner.define(app -> {
+      app.get("/foo-{suffix:[a-z]{2,3}}.json", ctx -> ctx.path("suffix").value());
+    }).ready(client -> {
+      client.get("/foo-abc.json", rsp -> {
+        assertEquals("abc", rsp.body().string());
+      });
+    });
+  }
+
   private byte[][] partition(byte[] bytes, int size) {
     List<byte[]> result = new ArrayList<>();
     int offset = 0;