Switched jersey request reader to use a instead of instantiating a new URI directly. This addresses issue #59

Author: sapessi

aws-serverless-java-container-core/pom.xml

@@ -73,14 +73,6 @@
             <version>4.5.3</version>
             <scope>test</scope>
         </dependency>
-
-        <!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-simple -->
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-simple</artifactId>
-            <version>1.7.25</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
 </project>

aws-serverless-java-container-core/src/main/java/com/amazonaws/serverless/proxy/internal/AwsProxyExceptionHandler.java

@@ -73,6 +73,7 @@ public class AwsProxyExceptionHandler
 
     @Override
     public AwsProxyResponse handle(Throwable ex) {
+        log.error("Called exception handler for:", ex);
         if (ex instanceof InvalidRequestEventException) {
             return new AwsProxyResponse(500, headers, getErrorJson(INTERNAL_SERVER_ERROR));
         } else {

aws-serverless-java-container-jersey/src/main/java/com/amazonaws/serverless/proxy/jersey/JerseyAwsProxyRequestReader.java

@@ -21,8 +21,12 @@
 import org.glassfish.jersey.internal.MapPropertiesDelegate;
 import org.glassfish.jersey.internal.PropertiesDelegate;
 import org.glassfish.jersey.server.ContainerRequest;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.ws.rs.core.SecurityContext;
+import javax.ws.rs.core.UriBuilder;
+
 import java.io.ByteArrayInputStream;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -47,6 +51,8 @@ public class JerseyAwsProxyRequestReader extends RequestReader<AwsProxyRequest,
     private static AwsProxyRequest currentRequest;
     private static Context currentLambdaContext;
 
+    private Logger log = LoggerFactory.getLogger(JerseyAwsProxyRequestReader.class);
+
 
     //-------------------------------------------------------------
     // Methods - Implementation
@@ -78,15 +84,21 @@ public ContainerRequest readRequest(AwsProxyRequest request, SecurityContext sec
         try {
             basePathUri = new URI(basePath);
         } catch (URISyntaxException e) {
+            log.error("Could not read base path URI", e);
             throw new InvalidRequestEventException("Error while generating base path URI: " + basePath, e);
         }
 
-        try {
-            requestPathUri = new URI(request.getQueryString() == null ? request.getPath() : request.getPath() + request.getQueryString());
-        } catch (URISyntaxException e) {
-            throw new InvalidRequestEventException("Error while generating request path URI: " + request.getPath(), e);
+
+        UriBuilder uriBuilder = UriBuilder.fromPath(request.getPath());
+
+        if (request.getQueryStringParameters() != null) {
+            for (String paramKey : request.getQueryStringParameters().keySet()) {
+                uriBuilder = uriBuilder.queryParam(paramKey, request.getQueryStringParameters().get(paramKey));
+            }
         }
 
+        requestPathUri = uriBuilder.build();
+
         PropertiesDelegate apiGatewayProperties = new MapPropertiesDelegate();
         apiGatewayProperties.setProperty(API_GATEWAY_CONTEXT_PROPERTY, request.getRequestContext());
         apiGatewayProperties.setProperty(API_GATEWAY_STAGE_VARS_PROPERTY, request.getStageVariables());

aws-serverless-java-container-jersey/src/test/java/com/amazonaws/serverless/proxy/jersey/JerseyAwsProxyTest.java

@@ -47,6 +47,9 @@ public class JerseyAwsProxyTest {
     private static final String CUSTOM_HEADER_KEY = "x-custom-header";
     private static final String CUSTOM_HEADER_VALUE = "my-custom-value";
     private static final String AUTHORIZER_PRINCIPAL_ID = "test-principal-" + UUID.randomUUID().toString();
+    private static final String QUERY_STRING_KEY = "identifier";
+    private static final String QUERY_STRING_NON_ENCODED_VALUE = "Space Test";
+    private static final String QUERY_STRING_ENCODED_VALUE = "Space%20Test";
 
 
     private static ObjectMapper objectMapper = new ObjectMapper();
@@ -118,6 +121,34 @@ public void queryString_uriInfo_echo() {
         validateMapResponseModel(output);
     }
 
+    @Test
+    public void queryString_notEncoded_echo() {
+        AwsProxyRequest request = new AwsProxyRequestBuilder("/echo/query-string", "GET")
+                                          .json()
+                                          .queryString(QUERY_STRING_KEY, QUERY_STRING_NON_ENCODED_VALUE)
+                                          .build();
+
+        AwsProxyResponse output = handler.proxy(request, lambdaContext);
+        assertEquals(200, output.getStatusCode());
+        assertEquals("application/json", output.getHeaders().get("Content-Type"));
+
+        validateMapResponseModel(output, QUERY_STRING_KEY, QUERY_STRING_NON_ENCODED_VALUE);
+    }
+
+    @Test
+    public void queryString_encoded_echo() {
+        AwsProxyRequest request = new AwsProxyRequestBuilder("/echo/query-string", "GET")
+                                          .json()
+                                          .queryString(QUERY_STRING_KEY, QUERY_STRING_ENCODED_VALUE)
+                                          .build();
+
+        AwsProxyResponse output = handler.proxy(request, lambdaContext);
+        assertEquals(200, output.getStatusCode());
+        assertEquals("application/json", output.getHeaders().get("Content-Type"));
+
+        validateMapResponseModel(output, QUERY_STRING_KEY, QUERY_STRING_NON_ENCODED_VALUE);
+    }
+
     @Test
     public void authorizer_securityContext_customPrincipalSuccess() {
         AwsProxyRequest request = new AwsProxyRequestBuilder("/echo/authorizer-principal", "GET")
@@ -215,10 +246,14 @@ public void base64_binaryResponse_base64Encoding() {
     }
 
     private void validateMapResponseModel(AwsProxyResponse output) {
+        validateMapResponseModel(output, CUSTOM_HEADER_KEY, CUSTOM_HEADER_VALUE);
+    }
+
+    private void validateMapResponseModel(AwsProxyResponse output, String key, String value) {
         try {
             MapResponseModel response = objectMapper.readValue(output.getBody(), MapResponseModel.class);
-            assertNotNull(response.getValues().get(CUSTOM_HEADER_KEY));
-            assertEquals(CUSTOM_HEADER_VALUE, response.getValues().get(CUSTOM_HEADER_KEY));
+            assertNotNull(response.getValues().get(key));
+            assertEquals(value, response.getValues().get(key));
         } catch (IOException e) {
             fail("Exception while parsing response body: " + e.getMessage());
             e.printStackTrace();

pom.xml

@@ -46,6 +46,14 @@
             <artifactId>slf4j-api</artifactId>
             <version>1.7.25</version>
         </dependency>
+
+        <!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-simple -->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <version>1.7.25</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>