Merge pull request #137 from awslabs/core

Bump in jackson dependency version

Author: sapessi

archetypes/jersey/src/main/resources/archetype-resources/pom.xml

@@ -20,7 +20,7 @@
         <dependency>
             <groupId>com.amazonaws.serverless</groupId>
             <artifactId>aws-serverless-java-container-jersey</artifactId>
-            <version>1.0</version>
+            <version>1.0.1</version>
         </dependency>
 
         <dependency>

archetypes/spark/src/main/resources/archetype-resources/pom.xml

@@ -23,7 +23,7 @@
         <dependency>
             <groupId>com.amazonaws.serverless</groupId>
             <artifactId>aws-serverless-java-container-spark</artifactId>
-            <version>1.0</version>
+            <version>1.0.1</version>
         </dependency>
 
         <dependency>

archetypes/spring/src/main/resources/archetype-resources/pom.xml

@@ -22,7 +22,7 @@
         <dependency>
             <groupId>com.amazonaws.serverless</groupId>
             <artifactId>aws-serverless-java-container-spring</artifactId>
-            <version>1.0</version>
+            <version>1.0.1</version>
         </dependency>
 
         <dependency>

archetypes/springboot/src/main/resources/archetype-resources/pom.xml

@@ -27,7 +27,7 @@
         <dependency>
             <groupId>com.amazonaws.serverless</groupId>
             <artifactId>aws-serverless-java-container-spring</artifactId>
-            <version>1.0</version>
+            <version>1.0.1</version>
         </dependency>
 
         <dependency>

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

@@ -15,7 +15,7 @@
     </parent>
 
     <properties>
-        <jackson.version>2.9.3</jackson.version>
+        <jackson.version>2.9.4</jackson.version>
         <jaxrs.version>2.1</jaxrs.version>
         <servlet.version>3.1.0</servlet.version>
     </properties>

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

@@ -704,7 +704,7 @@ private Map<String, Part> getMultipartFormParametersMap() {
 
 
     private String cleanUri(String uri) {
-        String finalUri = uri;
+        String finalUri = (uri == null ? "" : uri);
 
         if (!finalUri.startsWith("/")) {
             finalUri = "/" + finalUri;

aws-serverless-java-container-spark/src/test/java/com/amazonaws/serverless/proxy/spark/HelloWorldSparkStreamTest.java

@@ -78,6 +78,21 @@ public void helloRequest_basicStream_populatesOutputSuccessfully() {
         }
     }
 
+    @Test
+    public void nullPathRequest_doesntFail_expectA404() {
+        InputStream req = new AwsProxyRequestBuilder().method("GET").path(null).buildStream();
+        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+        try {
+            handler.proxyStream(req, outputStream, new MockLambdaContext());
+            AwsProxyResponse response = LambdaContainerHandler.getObjectMapper().readValue(outputStream.toByteArray(), AwsProxyResponse.class);
+
+            assertEquals(404, response.getStatusCode());
+        } catch (IOException e) {
+            e.printStackTrace();
+            fail();
+        }
+    }
+
     private static void configureRoutes() {
         get("/hello", (req, res) -> {
             res.status(200);

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

@@ -17,7 +17,7 @@
     <properties>
         <spring.version>5.0.3.RELEASE</spring.version>
         <spring-security.version>5.0.1.RELEASE</spring-security.version>
-        <jackson.version>2.9.3</jackson.version>
+        <jackson.version>2.9.4</jackson.version>
     </properties>
 
     <dependencies>