Get rid of %E2%80%8B fix jooby-project#503

jknack · jknack · commit 0990de36e1d4 · 2016-10-23T21:38:37.000-03:00
diff --git a/coverage-report/src/test/java/org/jooby/issues/Issue503.java b/coverage-report/src/test/java/org/jooby/issues/Issue503.java
@@ -0,0 +1,34 @@
+package org.jooby.issues;
+
+import org.jooby.test.ServerFeature;
+import org.junit.Test;
+
+import com.typesafe.config.ConfigFactory;
+import com.typesafe.config.ConfigValueFactory;
+
+public class Issue503 extends ServerFeature {
+
+  {
+    use(ConfigFactory.empty().withValue("application.path", ConfigValueFactory.fromAnyRef("/503")));
+
+    get("/", () -> "503");
+
+    err((req, rsp, x) -> {
+      rsp.send(req.path(true));
+    });
+  }
+
+  @Test
+  public void shouldNotSeeOddCharacters() throws Exception {
+    request()
+        .get("/")
+        .expect(404)
+        .expect("/");
+
+    request()
+        .get("/foo")
+        .expect(404)
+        .expect("/foo");
+  }
+
+}
diff --git a/jooby/src/main/java/org/jooby/Request.java b/jooby/src/main/java/org/jooby/Request.java
@@ -437,7 +437,7 @@ default String path() {
    */
   default String path(final boolean escape) {
     String path = route().path();
-    return escape ? UrlEscapers.urlFragmentEscaper().escape(path) : path;
+    return escape? UrlEscapers.urlFragmentEscaper().escape(path) : path;
   }
 
   /**
diff --git a/jooby/src/main/java/org/jooby/Route.java b/jooby/src/main/java/org/jooby/Route.java
@@ -2089,6 +2089,8 @@ default void next(final Request req, final Response rsp) throws Throwable {
   Key<Set<Route.Definition>> KEY = Key.get(new TypeLiteral<Set<Route.Definition>>() {
   });
 
+  char OUT_OF_PATH = '\u200B';
+
   String GET = "GET";
 
   String POST = "POST";
diff --git a/jooby/src/main/java/org/jooby/internal/HttpHandlerImpl.java b/jooby/src/main/java/org/jooby/internal/HttpHandlerImpl.java
@@ -524,7 +524,7 @@ private static Function<String, String> rootpath(final String applicationPath) {
         return p.substring(applicationPath.length());
       } else {
         // mark as failure
-        return p + '\u200B';
+        return p + Route.OUT_OF_PATH;
       }
     };
   }
diff --git a/jooby/src/main/java/org/jooby/internal/RouteImpl.java b/jooby/src/main/java/org/jooby/internal/RouteImpl.java
@@ -97,9 +97,14 @@ public RouteImpl(final Filter filter, final Definition route, final String metho
     this.route = route;
     this.method = method;
     this.produces = produces;
-    this.path = path;
     this.vars = vars;
     this.source = source;
+    /** Clean up out of path char. */
+    if (path.charAt(path.length() - 1) == OUT_OF_PATH) {
+      this.path = path.substring(0, path.length() - 1);
+    } else {
+      this.path = path;
+    }
   }
 
   @Override

Original file line number	Diff line number	Diff line change
`@@ -437,7 +437,7 @@ default String path() {`
`437`	`437`	`*/`
`438`	`438`	`default String path(final boolean escape) {`
`439`	`439`	`String path = route().path();`
`440`		`- return escape ? UrlEscapers.urlFragmentEscaper().escape(path) : path;`
	`440`	`+ return escape? UrlEscapers.urlFragmentEscaper().escape(path) : path;`
`441`	`441`	`}`
`442`	`442`
`443`	`443`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -524,7 +524,7 @@ private static Function<String, String> rootpath(final String applicationPath) {`
`524`	`524`	`return p.substring(applicationPath.length());`
`525`	`525`	`} else {`
`526`	`526`	`// mark as failure`
`527`		`- return p + '\u200B';`
	`527`	`+ return p + Route.OUT_OF_PATH;`
`528`	`528`	`}`
`529`	`529`	`};`
`530`	`530`	`}`