remove encoder from 404 route

jknack · jknack · commit be73d0d871fa · 2020-04-12T12:55:28.000-03:00
diff --git a/jooby/src/main/java/io/jooby/internal/Chi.java b/jooby/src/main/java/io/jooby/internal/Chi.java
@@ -804,20 +804,20 @@ public void destroy() {
     root.destroy();
   }
 
-  public boolean find(String method, String path) {
+  public boolean exists(String method, String path) {
     if (!staticPaths.getOrDefault(path, NO_MATCH).methods.containsKey(method)) {
       return root.findRoute(new RouterMatch(), method, new ZeroCopyString(path)) != null;
     }
     return true;
   }
 
-  public Router.Match find(String method, String path, MessageEncoder encoder) {
+  public Router.Match find(String method, String path) {
     StaticRouterMatch match = staticPaths.getOrDefault(path, NO_MATCH).methods.get(method);
     if (match == null) {
       // use radix tree
       RouterMatch result = new RouterMatch();
       Route route = root.findRoute(result, method, new ZeroCopyString(path));
-      return route == null ? result.missing(method, path, encoder) : result.found(route);
+      return route == null ? result.missing(method, path) : result.found(route);
     }
     return match;
   }
diff --git a/jooby/src/main/java/io/jooby/internal/RouteTree.java b/jooby/src/main/java/io/jooby/internal/RouteTree.java
@@ -5,16 +5,15 @@
  */
 package io.jooby.internal;
 
-import io.jooby.MessageEncoder;
 import io.jooby.Route;
 import io.jooby.Router;
 
 interface RouteTree {
   void insert(String method, String pattern, Route route);
 
-  boolean find(String method, String path);
+  boolean exists(String method, String path);
 
-  Router.Match find(String method, String path, MessageEncoder encoder);
+  Router.Match find(String method, String path);
 
   void destroy();
 }
diff --git a/jooby/src/main/java/io/jooby/internal/RouteTreeForwarding.java b/jooby/src/main/java/io/jooby/internal/RouteTreeForwarding.java
@@ -20,12 +20,12 @@ public RouteTreeForwarding(RouteTree tree) {
     tree.insert(method, pattern, route);
   }
 
-  @Override public boolean find(String method, String path) {
-    return tree.find(method, path);
+  @Override public boolean exists(String method, String path) {
+    return tree.exists(method, path);
   }
 
-  @Override public Router.Match find(String method, String path, MessageEncoder encoder) {
-    return tree.find(method, path, encoder);
+  @Override public Router.Match find(String method, String path) {
+    return tree.find(method, path);
   }
 
   @Override public void destroy() {
diff --git a/jooby/src/main/java/io/jooby/internal/RouteTreeIgnoreTrailingSlash.java b/jooby/src/main/java/io/jooby/internal/RouteTreeIgnoreTrailingSlash.java
@@ -13,11 +13,11 @@ public RouteTreeIgnoreTrailingSlash(RouteTree tree) {
     super(tree);
   }
 
-  @Override public boolean find(String method, String path) {
-    return super.find(method, Router.noTrailingSlash(path));
+  @Override public boolean exists(String method, String path) {
+    return super.exists(method, Router.noTrailingSlash(path));
   }
 
-  @Override public Router.Match find(String method, String path, MessageEncoder encoder) {
-    return super.find(method, Router.noTrailingSlash(path), encoder);
+  @Override public Router.Match find(String method, String path) {
+    return super.find(method, Router.noTrailingSlash(path));
   }
 }
diff --git a/jooby/src/main/java/io/jooby/internal/RouteTreeLowerCasePath.java b/jooby/src/main/java/io/jooby/internal/RouteTreeLowerCasePath.java
@@ -5,19 +5,18 @@
  */
 package io.jooby.internal;
 
-import io.jooby.MessageEncoder;
 import io.jooby.Router;
 
 public class RouteTreeLowerCasePath extends RouteTreeForwarding {
   public RouteTreeLowerCasePath(RouteTree tree) {
     super(tree);
   }
 
-  @Override public boolean find(String method, String path) {
-    return super.find(method, path.toLowerCase());
+  @Override public boolean exists(String method, String path) {
+    return super.exists(method, path.toLowerCase());
   }
 
-  @Override public Router.Match find(String method, String path, MessageEncoder encoder) {
-    return super.find(method, path.toLowerCase(), encoder);
+  @Override public Router.Match find(String method, String path) {
+    return super.find(method, path.toLowerCase());
   }
 }
diff --git a/jooby/src/main/java/io/jooby/internal/RouteTreeNormPath.java b/jooby/src/main/java/io/jooby/internal/RouteTreeNormPath.java
@@ -5,19 +5,18 @@
  */
 package io.jooby.internal;
 
-import io.jooby.MessageEncoder;
 import io.jooby.Router;
 
 public class RouteTreeNormPath extends RouteTreeForwarding {
   public RouteTreeNormPath(RouteTree tree) {
     super(tree);
   }
 
-  @Override public boolean find(String method, String path) {
-    return super.find(method, Router.normalizePath(path));
+  @Override public boolean exists(String method, String path) {
+    return super.exists(method, Router.normalizePath(path));
   }
 
-  @Override public Router.Match find(String method, String path, MessageEncoder encoder) {
-    return super.find(method, Router.normalizePath(path), encoder);
+  @Override public Router.Match find(String method, String path) {
+    return super.find(method, Router.normalizePath(path));
   }
 }
diff --git a/jooby/src/main/java/io/jooby/internal/RouterImpl.java b/jooby/src/main/java/io/jooby/internal/RouterImpl.java
@@ -607,20 +607,20 @@ public void destroy() {
     if (predicateMap != null) {
       for (Map.Entry<Predicate<Context>, RouteTree> e : predicateMap.entrySet()) {
         if (e.getKey().test(ctx)) {
-          Router.Match match = e.getValue().find(ctx.getMethod(), ctx.getRequestPath(), encoder);
+          Router.Match match = e.getValue().find(ctx.getMethod(), ctx.getRequestPath());
           if (match.matches()) {
             return match;
           }
         }
       }
     }
-    return chi.find(ctx.getMethod(), ctx.getRequestPath(), encoder);
+    return chi.find(ctx.getMethod(), ctx.getRequestPath());
   }
 
   @Override public boolean match(@Nonnull String pattern, @Nonnull String path) {
     Chi chi = new Chi();
     chi.insert(Router.GET, pattern, ROUTE_MARK);
-    return chi.find(Router.GET, path);
+    return chi.exists(Router.GET, path);
   }
 
   @Nonnull @Override public Router errorCode(@Nonnull Class<? extends Throwable> type,
diff --git a/jooby/src/main/java/io/jooby/internal/RouterMatch.java b/jooby/src/main/java/io/jooby/internal/RouterMatch.java
@@ -97,15 +97,14 @@ public void execute(Context context) {
     }
   }
 
-  public RouterMatch missing(String method, String path, MessageEncoder encoder) {
+  public RouterMatch missing(String method, String path) {
     Route.Handler h;
     if (this.handler == null) {
       h = path.endsWith("/favicon.ico") ? Route.FAVICON : Route.NOT_FOUND;
     } else {
       h = this.handler;
     }
     this.route = new Route(method, path, h);
-    this.route.setEncoder(encoder);
     this.route.setReturnType(Context.class);
     return this;
   }
diff --git a/jooby/src/test/java/io/jooby/internal/ChiBenchmark.java b/jooby/src/test/java/io/jooby/internal/ChiBenchmark.java
@@ -39,17 +39,17 @@ private Route route(String method, String pattern) {
 
   @Benchmark
   public void _plaintext() {
-    router.find("GET", "/plaintext", null);
+    router.find("GET", "/plaintext");
   }
 
   @Benchmark
   public void articles() {
-    router.find("GET", "/articles/123", null);
+    router.find("GET", "/articles/123");
   }
 
   @Benchmark
   public void articlesEdit() {
-    router.find("GET", "/articles/123/edit", null);
+    router.find("GET", "/articles/123/edit");
   }
 
 }
diff --git a/jooby/src/test/java/io/jooby/internal/ChiTest.java b/jooby/src/test/java/io/jooby/internal/ChiTest.java
@@ -24,7 +24,7 @@ public void routeOverride() {
     router.insert(bar);
 
     Router.Match result = router
-        .find("GET", "/abcd", MessageEncoder.TO_STRING);
+        .find("GET", "/abcd");
     assertTrue(result.matches());
     assertEquals(bar, result.route());
   }
@@ -38,7 +38,7 @@ public void routeCase() {
     router.insert(foos);
 
     Router.Match result = router
-        .find("GET", "/abcd/", MessageEncoder.TO_STRING);
+        .find("GET", "/abcd/");
     assertTrue(result.matches());
     assertEquals(foos, result.route());
   }
@@ -174,7 +174,7 @@ public void regexWithQuantity() {
   private void find(Chi router, String pattern,
       SneakyThrows.Consumer2<Context, Router.Match> consumer) {
     Router.Match result = router
-        .find("GET", pattern, MessageEncoder.TO_STRING);
+        .find("GET", pattern);
     consumer.accept(ctx(pattern), result);
   }
 
diff --git a/tests/src/test/java/io/jooby/FeaturedTest.java b/tests/src/test/java/io/jooby/FeaturedTest.java
@@ -2966,11 +2966,4 @@ private Map<String, Object> mapOf(String... values) {
     }
     return hash;
   }
-
-  private String sid(Response rsp, String prefix) {
-    String setCookie = rsp.header("Set-Cookie");
-    assertNotNull(setCookie);
-    assertTrue(setCookie.startsWith(prefix));
-    return setCookie.substring(prefix.length(), setCookie.indexOf(";"));
-  }
 }

Original file line number	Diff line number	Diff line change
`@@ -804,20 +804,20 @@ public void destroy() {`
`804`	`804`	`root.destroy();`
`805`	`805`	`}`
`806`	`806`
`807`		`- public boolean find(String method, String path) {`
	`807`	`+ public boolean exists(String method, String path) {`
`808`	`808`	`if (!staticPaths.getOrDefault(path, NO_MATCH).methods.containsKey(method)) {`
`809`	`809`	`return root.findRoute(new RouterMatch(), method, new ZeroCopyString(path)) != null;`
`810`	`810`	`}`
`811`	`811`	`return true;`
`812`	`812`	`}`
`813`	`813`
`814`		`- public Router.Match find(String method, String path, MessageEncoder encoder) {`
	`814`	`+ public Router.Match find(String method, String path) {`
`815`	`815`	`StaticRouterMatch match = staticPaths.getOrDefault(path, NO_MATCH).methods.get(method);`
`816`	`816`	`if (match == null) {`
`817`	`817`	`// use radix tree`
`818`	`818`	`RouterMatch result = new RouterMatch();`
`819`	`819`	`Route route = root.findRoute(result, method, new ZeroCopyString(path));`
`820`		`- return route == null ? result.missing(method, path, encoder) : result.found(route);`
	`820`	`+ return route == null ? result.missing(method, path) : result.found(route);`
`821`	`821`	`}`
`822`	`822`	`return match;`
`823`	`823`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,12 +20,12 @@ public RouteTreeForwarding(RouteTree tree) {`
`20`	`20`	`tree.insert(method, pattern, route);`
`21`	`21`	`}`
`22`	`22`
`23`		`- @Override public boolean find(String method, String path) {`
`24`		`- return tree.find(method, path);`
	`23`	`+ @Override public boolean exists(String method, String path) {`
	`24`	`+ return tree.exists(method, path);`
`25`	`25`	`}`
`26`	`26`
`27`		`- @Override public Router.Match find(String method, String path, MessageEncoder encoder) {`
`28`		`- return tree.find(method, path, encoder);`
	`27`	`+ @Override public Router.Match find(String method, String path) {`
	`28`	`+ return tree.find(method, path);`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`@Override public void destroy() {`
Original file line number	Diff line number	Diff line change
`@@ -13,11 +13,11 @@ public RouteTreeIgnoreTrailingSlash(RouteTree tree) {`
`13`	`13`	`super(tree);`
`14`	`14`	`}`
`15`	`15`
`16`		`- @Override public boolean find(String method, String path) {`
`17`		`- return super.find(method, Router.noTrailingSlash(path));`
	`16`	`+ @Override public boolean exists(String method, String path) {`
	`17`	`+ return super.exists(method, Router.noTrailingSlash(path));`
`18`	`18`	`}`
`19`	`19`
`20`		`- @Override public Router.Match find(String method, String path, MessageEncoder encoder) {`
`21`		`- return super.find(method, Router.noTrailingSlash(path), encoder);`
	`20`	`+ @Override public Router.Match find(String method, String path) {`
	`21`	`+ return super.find(method, Router.noTrailingSlash(path));`
`22`	`22`	`}`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,19 +5,18 @@`
`5`	`5`	`*/`
`6`	`6`	`package io.jooby.internal;`
`7`	`7`
`8`		`-import io.jooby.MessageEncoder;`
`9`	`8`	`import io.jooby.Router;`
`10`	`9`
`11`	`10`	`public class RouteTreeLowerCasePath extends RouteTreeForwarding {`
`12`	`11`	`public RouteTreeLowerCasePath(RouteTree tree) {`
`13`	`12`	`super(tree);`
`14`	`13`	`}`
`15`	`14`
`16`		`- @Override public boolean find(String method, String path) {`
`17`		`- return super.find(method, path.toLowerCase());`
	`15`	`+ @Override public boolean exists(String method, String path) {`
	`16`	`+ return super.exists(method, path.toLowerCase());`
`18`	`17`	`}`
`19`	`18`
`20`		`- @Override public Router.Match find(String method, String path, MessageEncoder encoder) {`
`21`		`- return super.find(method, path.toLowerCase(), encoder);`
	`19`	`+ @Override public Router.Match find(String method, String path) {`
	`20`	`+ return super.find(method, path.toLowerCase());`
`22`	`21`	`}`
`23`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -607,20 +607,20 @@ public void destroy() {`
`607`	`607`	`if (predicateMap != null) {`
`608`	`608`	`for (Map.Entry<Predicate<Context>, RouteTree> e : predicateMap.entrySet()) {`
`609`	`609`	`if (e.getKey().test(ctx)) {`
`610`		`- Router.Match match = e.getValue().find(ctx.getMethod(), ctx.getRequestPath(), encoder);`
	`610`	`+ Router.Match match = e.getValue().find(ctx.getMethod(), ctx.getRequestPath());`
`611`	`611`	`if (match.matches()) {`
`612`	`612`	`return match;`
`613`	`613`	`}`
`614`	`614`	`}`
`615`	`615`	`}`
`616`	`616`	`}`
`617`		`- return chi.find(ctx.getMethod(), ctx.getRequestPath(), encoder);`
	`617`	`+ return chi.find(ctx.getMethod(), ctx.getRequestPath());`
`618`	`618`	`}`
`619`	`619`
`620`	`620`	`@Override public boolean match(@Nonnull String pattern, @Nonnull String path) {`
`621`	`621`	`Chi chi = new Chi();`
`622`	`622`	`chi.insert(Router.GET, pattern, ROUTE_MARK);`
`623`		`- return chi.find(Router.GET, path);`
	`623`	`+ return chi.exists(Router.GET, path);`
`624`	`624`	`}`
`625`	`625`
`626`	`626`	`@Nonnull @Override public Router errorCode(@Nonnull Class<? extends Throwable> type,`
Original file line number	Diff line number	Diff line change
`@@ -97,15 +97,14 @@ public void execute(Context context) {`
`97`	`97`	`}`
`98`	`98`	`}`
`99`	`99`
`100`		`- public RouterMatch missing(String method, String path, MessageEncoder encoder) {`
	`100`	`+ public RouterMatch missing(String method, String path) {`
`101`	`101`	`Route.Handler h;`
`102`	`102`	`if (this.handler == null) {`
`103`	`103`	`h = path.endsWith("/favicon.ico") ? Route.FAVICON : Route.NOT_FOUND;`
`104`	`104`	`} else {`
`105`	`105`	`h = this.handler;`
`106`	`106`	`}`
`107`	`107`	`this.route = new Route(method, path, h);`
`108`		`- this.route.setEncoder(encoder);`
`109`	`108`	`this.route.setReturnType(Context.class);`
`110`	`109`	`return this;`
`111`	`110`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,17 +39,17 @@ private Route route(String method, String pattern) {`
`39`	`39`
`40`	`40`	`@Benchmark`
`41`	`41`	`public void _plaintext() {`
`42`		`- router.find("GET", "/plaintext", null);`
	`42`	`+ router.find("GET", "/plaintext");`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`@Benchmark`
`46`	`46`	`public void articles() {`
`47`		`- router.find("GET", "/articles/123", null);`
	`47`	`+ router.find("GET", "/articles/123");`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`@Benchmark`
`51`	`51`	`public void articlesEdit() {`
`52`		`- router.find("GET", "/articles/123/edit", null);`
	`52`	`+ router.find("GET", "/articles/123/edit");`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`}`