Context: remove pathString() fix #1646

Author: jknack

docs/asciidoc/context.adoc

@@ -134,7 +134,7 @@ Path parameter are part of the `URI`. To define a path variable you need to use
 ----
 {
   get("/{name}", ctx -> {
-    String pathString = ctx.getRequestPath();         // <1>
+    String pathString = ctx.getRequestPath();     // <1>
     
     Value path = ctx.path();                      // <2>
     
@@ -152,7 +152,7 @@ Path parameter are part of the `URI`. To define a path variable you need to use
 ----
 {
   get("/{name}") {
-    val pathString = ctx.getRequestPath()     // <1>
+    val pathString = ctx.getRequestPath()  // <1>
     
     val path = ctx.path()                 // <2>
     

docs/asciidoc/routing.adoc

@@ -1184,13 +1184,13 @@ Composition is available through the javadoc:Router[use, io.jooby.Router] operat
 ----
 public class Foo extends Jooby {
   {
-    get("/foo", Context::pathString);
+    get("/foo", Context::getRequestPath);
   }
 }
 
 public class Bar extends Jooby {
   {
-    get("/bar", Context::pathString);
+    get("/bar", Context::getRequestPath);
   }
 }
 
@@ -1200,7 +1200,7 @@ public class App extends Jooby {
 
     use(new Bar());                     // <2>
 
-    get("/app", Context::pathString);   // <3>
+    get("/app", Context::getRequestPath);   // <3>
   }
 }
 ----
@@ -1241,7 +1241,7 @@ class App: Kooby({
 ----
 public class Foo extends Jooby {
   {
-    get("/foo", Context::pathString);
+    get("/foo", Context::getRequestPath);
   }
 }
 

jooby/src/main/java/io/jooby/Context.java

@@ -213,15 +213,6 @@ public interface Context extends Registry {
     return getRouter().getContextPath();
   }
 
-  /**
-   * Request path without decoding (a.k.a raw Path) without query string.
-   *
-   * @return Request path without decoding (a.k.a raw Path) without query string.
-   * @deprecated Use {{@link #getRequestPath()}}.
-   */
-  @Deprecated
-  @Nonnull String pathString();
-
   /**
    * Request path without decoding (a.k.a raw Path) without query string.
    *

jooby/src/main/java/io/jooby/DefaultContext.java

@@ -64,7 +64,7 @@ public interface DefaultContext extends Context {
   }
 
   @Override default boolean matches(String pattern) {
-    return getRouter().match(pattern, pathString());
+    return getRouter().match(pattern, getRequestPath());
   }
 
   /**

jooby/src/main/java/io/jooby/ForwardingContext.java

@@ -121,10 +121,6 @@ public ForwardingContext(@Nonnull Context context) {
     return ctx.setRoute(route);
   }
 
-  @Override @Nonnull public String pathString() {
-    return ctx.getRequestPath();
-  }
-
   @Nonnull @Override public String getRequestPath() {
     return ctx.getRequestPath();
   }

jooby/src/main/java/io/jooby/WebVariables.java

@@ -22,7 +22,7 @@
  * Template engine will be able to access to the following attributes:
  *
  * - contextPath. Empty when context path is set to <code>/</code> or actual context path.
- * - path. Current request path, as defined by {@link Context#pathString()}.
+ * - path. Current request path, as defined by {@link Context#getRequestPath()}.
  * - user. Current user (if any) as defined by {@link Context#getUser()}.
  *
  * @author edgar

jooby/src/test/java/io/jooby/internal/ReturnTypeTest.java

@@ -83,7 +83,7 @@ public void literals() {
   public void methodInvocation() {
     assertType(String.class, ctx -> ctx.getRequestPath());
 
-    assertType(String.class, Context::pathString);
+    assertType(String.class, Context::getRequestPath);
   }
 
   @Test

modules/jooby-jetty/src/main/java/io/jooby/internal/jetty/JettyContext.java

@@ -159,10 +159,6 @@ public JettyContext(Request request, Router router, int bufferSize, long maxRequ
     return this;
   }
 
-  @Nonnull @Override public String pathString() {
-    return getRequestPath();
-  }
-
   @Nonnull @Override public String getRequestPath() {
     return requestPath;
   }
@@ -570,9 +566,9 @@ void complete(Throwable x) {
       Logger log = router.getLog();
       if (x != null) {
         if (Server.connectionLost(x)) {
-          log.debug("exception found while sending response {} {}", getMethod(), pathString(), x);
+          log.debug("exception found while sending response {} {}", getMethod(), getRequestPath(), x);
         } else {
-          log.error("exception found while sending response {} {}", getMethod(), pathString(), x);
+          log.error("exception found while sending response {} {}", getMethod(), getRequestPath(), x);
         }
       }
     } finally {

modules/jooby-netty/src/main/java/io/jooby/internal/netty/NettyContext.java

@@ -171,10 +171,6 @@ public NettyContext(ChannelHandlerContext ctx, HttpRequest req, Router router, S
     return this;
   }
 
-  @Nonnull @Override public final String pathString() {
-    return path;
-  }
-
   @Nonnull @Override public String getRequestPath() {
     return path;
   }
@@ -698,11 +694,11 @@ void destroy(Throwable cause) {
     if (cause != null) {
       if (Server.connectionLost(cause)) {
         router.getLog()
-            .debug("exception found while sending response {} {}", getMethod(), pathString(),
+            .debug("exception found while sending response {} {}", getMethod(), getRequestPath(),
                 cause);
       } else {
         router.getLog()
-            .error("exception found while sending response {} {}", getMethod(), pathString(),
+            .error("exception found while sending response {} {}", getMethod(), getRequestPath(),
                 cause);
       }
     }
@@ -798,6 +794,6 @@ private void prepareChunked() {
   }
 
   @Override public String toString() {
-    return getMethod() + " " + pathString();
+    return getMethod() + " " + getRequestPath();
   }
 }

modules/jooby-test/src/main/java/io/jooby/MockContext.java

@@ -199,10 +199,6 @@ public MockContext setFlashMap(@Nonnull FlashMap flashMap) {
     return this;
   }
 
-  @Nonnull @Override public String pathString() {
-    return requestPath;
-  }
-
   @Nonnull @Override public String getRequestPath() {
     return requestPath;
   }
@@ -213,7 +209,7 @@ public MockContext setFlashMap(@Nonnull FlashMap flashMap) {
    * @param pathString Path string.
    * @return This context.
    */
-  public @Nonnull MockContext setRequestPath(@Nonnull String pathString) {
+  @Override public @Nonnull MockContext setRequestPath(@Nonnull String pathString) {
     int q = pathString.indexOf("?");
     if (q > 0) {
       this.requestPath = pathString.substring(0, q);