Request.queryString

jknack · jknack · commit e8c77c5a014a · 2016-10-23T21:38:37.000-03:00
* fix jooby-project#518 * fix jooby-project#514
diff --git a/coverage-report/src/test/java/org/jooby/issues/Issue514.java b/coverage-report/src/test/java/org/jooby/issues/Issue514.java
@@ -0,0 +1,29 @@
+package org.jooby.issues;
+
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import org.jooby.Mutant;
+import org.jooby.test.ServerFeature;
+import org.junit.Test;
+
+public class Issue514 extends ServerFeature {
+
+  {
+    get("/514", req -> {
+      Map<String, Mutant> params = req.params().toMap();
+      return req.path() + "?" + params.entrySet().stream()
+          .map(e -> e.getKey() + "=" + e.getValue().value()).collect(Collectors.joining("&"));
+    });
+  }
+
+  @Test
+  public void shouldReCreateQueryString() throws Exception {
+    request()
+        .get("/514?foo=1&bar=2&baz=3")
+        .expect(v -> {
+          System.out.println(v);
+        });
+  }
+
+}
diff --git a/coverage-report/src/test/java/org/jooby/issues/Issue518.java b/coverage-report/src/test/java/org/jooby/issues/Issue518.java
@@ -0,0 +1,29 @@
+package org.jooby.issues;
+
+import org.jooby.test.ServerFeature;
+import org.junit.Test;
+
+public class Issue518 extends ServerFeature {
+
+  {
+    get("/518", req -> {
+      return req.path() + req.queryString().map(it -> "?" + it).orElse("");
+    });
+  }
+
+  @Test
+  public void shouldGetQueryString() throws Exception {
+    request()
+        .get("/518?foo=1&bar=2&baz=3")
+        .expect("/518?foo=1&bar=2&baz=3");
+
+    request()
+        .get("/518")
+        .expect("/518");
+
+    request()
+        .get("/518?")
+        .expect("/518");
+  }
+
+}
diff --git a/jooby-netty/src/main/java/org/jooby/internal/netty/NettyRequest.java b/jooby-netty/src/main/java/org/jooby/internal/netty/NettyRequest.java
@@ -109,6 +109,13 @@ public NettyRequest(final ChannelHandlerContext ctx,
     channel.attr(ASYNC).set(false);
   }
 
+  @Override
+  public Optional<String> queryString() {
+    String uri = req.uri();
+    int at = uri.indexOf('?') + 1;
+    return at > 0 && at < uri.length() ? Optional.of(uri.substring(at)) : Optional.empty();
+  }
+
   @Override
   public String method() {
     return req.method().name();
diff --git a/jooby-servlet/src/main/java/org/jooby/servlet/ServletServletRequest.java b/jooby-servlet/src/main/java/org/jooby/servlet/ServletServletRequest.java
@@ -39,6 +39,7 @@
 import org.jooby.spi.NativeRequest;
 import org.jooby.spi.NativeUpload;
 
+import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableList.Builder;
 
@@ -81,6 +82,11 @@ public String method() {
     return req.getMethod();
   }
 
+  @Override
+  public Optional<String> queryString() {
+    return Optional.ofNullable(Strings.emptyToNull(req.getQueryString()));
+  }
+
   @Override
   public String path() {
     return path;
diff --git a/jooby-undertow/src/main/java/org/jooby/internal/undertow/UndertowRequest.java b/jooby-undertow/src/main/java/org/jooby/internal/undertow/UndertowRequest.java
@@ -81,6 +81,12 @@ public UndertowRequest(final HttpServerExchange exchange, final Config conf)
     this.path = URLDecoder.decode(exchange.getRequestPath(), "UTF-8");
   }
 
+  @Override
+  public Optional<String> queryString() {
+    String q = exchange.getQueryString();
+    return q.length() == 0 ? Optional.empty() : Optional.of(q);
+  }
+
   @Override
   public String method() {
     return exchange.getRequestMethod().toString();
diff --git a/jooby/src/main/java/org/jooby/Request.java b/jooby/src/main/java/org/jooby/Request.java
@@ -126,6 +126,11 @@ public String path() {
       return req.path();
     }
 
+    @Override
+    public Optional<String> queryString() {
+      return req.queryString();
+    }
+
     @Override
     public String path(final boolean escape) {
       return req.path(escape);
@@ -479,6 +484,13 @@ default String path() {
     return path(false);
   }
 
+  /**
+   * The query string, without the leading <code>?</code>.
+   *
+   * @return The query string, without the leading <code>?</code>.
+   */
+  Optional<String> queryString();
+
   /**
    * Escape the path using {@link UrlEscapers#urlFragmentEscaper()}.
    *
diff --git a/jooby/src/main/java/org/jooby/internal/RequestImpl.java b/jooby/src/main/java/org/jooby/internal/RequestImpl.java
@@ -127,6 +127,11 @@ public String contextPath() {
     return contextPath;
   }
 
+  @Override
+  public Optional<String> queryString() {
+    return req.queryString();
+  }
+
   @SuppressWarnings("unchecked")
   @Override
   public <T> Optional<T> ifGet(final String name) {
diff --git a/jooby/src/main/java/org/jooby/spi/NativeRequest.java b/jooby/src/main/java/org/jooby/spi/NativeRequest.java
@@ -47,6 +47,13 @@ public interface NativeRequest {
    */
   String path();
 
+  /**
+   * Returns the query string that is contained in the request URL after the path.
+   *
+   * @return Query string or <code>empty</code>
+   */
+  Optional<String> queryString();
+
   /**
    * @return List with all the parameter names from query string plus any other form/multipart param
    *         names (excluding file uploads). This method should NOT returns null, absence of params
diff --git a/jooby/src/test/java/org/jooby/RequestForwardingTest.java b/jooby/src/test/java/org/jooby/RequestForwardingTest.java
@@ -111,6 +111,19 @@ public void verb() throws Exception {
         });
   }
 
+  @Test
+  public void queryString() throws Exception {
+    new MockUnit(Request.class)
+        .expect(unit -> {
+          Request req = unit.get(Request.class);
+          expect(req.queryString()).andReturn(Optional.empty());
+        })
+        .run(unit -> {
+          assertEquals(Optional.empty(),
+              new Request.Forwarding(unit.get(Request.class)).queryString());
+        });
+  }
+
   @Test
   public void type() throws Exception {
     new MockUnit(Request.class)
diff --git a/jooby/src/test/java/org/jooby/RequestTest.java b/jooby/src/test/java/org/jooby/RequestTest.java
@@ -28,6 +28,11 @@ public MediaType type() {
       throw new UnsupportedOperationException();
     }
 
+    @Override
+    public Optional<String> queryString() {
+      throw new UnsupportedOperationException();
+    }
+
     @Override
     public boolean matches(final String pattern) {
       throw new UnsupportedOperationException();
