FP-307: forwarding query parameters to backend

Author: retog

src/main/java/eu/fusepool/p3/proxy/ProxyHandler.java

@@ -89,7 +89,7 @@ public class ProxyHandler extends AbstractHandler {
     public void handle(String target, Request baseRequest,
             final HttpServletRequest inRequest, final HttpServletResponse outResponse)
             throws IOException, ServletException {
-        final String targetUriString = targetBaseUri + inRequest.getRequestURI();
+        final String targetUriString = targetBaseUri + getFullRequestUriPath(inRequest);
         final String requestUri = getFullRequestUrl(inRequest);
         //System.out.println(targetUriString);
         final URI targetUri;
@@ -195,6 +195,14 @@ private static String getFullRequestUrl(HttpServletRequest request) {
         }
         return requestURL.toString();
     }
+    
+    private static String getFullRequestUriPath(HttpServletRequest request) {
+        final StringBuffer requestURL = new StringBuffer(request.getRequestURI());
+        if (request.getQueryString() != null) {
+            requestURL.append("?").append(request.getQueryString());
+        }
+        return requestURL.toString();
+    }
 
     /**
      * If uri is a transforming container returns the URI of the associated

src/test/java/eu/fusepool/p3/proxy/ProxyTest.java

@@ -105,6 +105,26 @@ public void nonTransformingContainer() throws Exception {
 
     }
 
+    @Test
+    public void queryParamsForwarded() throws Exception {
+
+        final String textResponse = "hello";
+        
+        stubFor(get(urlEqualTo("/my/test?a=1&b=2"))
+                .withHeader("Accept", equalTo("text/plain"))
+                .willReturn(aResponse()
+                        .withStatus(200)
+                        .withHeader("Content-Type", "text/plain")
+                        .withBody(textResponse)));
+
+        RestAssured.given().header("Accept", "text/plain")
+                .expect().statusCode(HttpStatus.SC_OK)
+                .header("Content-Type", "text/plain")
+                .body(new IsEqual(textResponse)).when()
+                .get("/my/test?a=1&b=2");
+
+    }
+    
     @Test
     public void transformingContainer() throws Exception {