Updated Spring version to 5.0.3.RELEASE. Made the spring-webmvc depedency optional to allow implementer to include their version. The code is tested with Spring 4.x and 5.x. This closes #95.

Author: sapessi

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

@@ -78,6 +78,7 @@ public class AwsHttpServletResponse
     public AwsHttpServletResponse(AwsHttpServletRequest req, CountDownLatch latch) {
         writersCountDownLatch = latch;
         request = req;
+        statusCode = 0;
     }
 
 
@@ -233,7 +234,7 @@ public void setStatus(int i, String s) {
 
     @Override
     public int getStatus() {
-        return statusCode;
+        return (statusCode <= 0?SC_OK:statusCode);
     }
 
 

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

@@ -25,6 +25,7 @@
 import org.apache.commons.fileupload.FileUploadException;
 import org.apache.commons.fileupload.disk.DiskFileItemFactory;
 import org.apache.commons.fileupload.servlet.ServletFileUpload;
+import org.apache.commons.io.input.NullInputStream;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -403,7 +404,7 @@ public String getContentType() {
     public ServletInputStream getInputStream()
             throws IOException {
         if (request.getBody() == null) {
-            return null;
+            return new AwsServletInputStream(new NullInputStream(0, false, false));
         }
         byte[] bodyBytes = null;
         if (request.isBase64Encoded()) {

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

@@ -50,11 +50,8 @@ public AwsProxyResponse writeResponse(AwsHttpServletResponse containerResponse,
         }
         awsProxyResponse.setHeaders(containerResponse.getAwsResponseHeaders());
 
-        if (containerResponse.getStatus() <= 0) {
-            awsProxyResponse.setStatusCode(200);
-        } else {
-            awsProxyResponse.setStatusCode(containerResponse.getStatus());
-        }
+        awsProxyResponse.setStatusCode(containerResponse.getStatus());
+
         Timer.stop("SERVLET_RESPONSE_WRITE");
         return awsProxyResponse;
     }

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

@@ -72,6 +72,7 @@ public AwsProxyRequestBuilder(String path, String httpMethod) {
         this.request.getRequestContext().setRequestId("test-invoke-request");
         this.request.getRequestContext().setStage("test");
         this.request.getRequestContext().setProtocol("HTTP/1.1");
+        this.request.getRequestContext().setRequestTimeEpoch(System.currentTimeMillis());
         ApiGatewayRequestIdentity identity = new ApiGatewayRequestIdentity();
         identity.setSourceIp("127.0.0.1");
         this.request.getRequestContext().setIdentity(identity);

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

@@ -15,8 +15,8 @@
     </parent>
 
     <properties>
-        <spring.version>4.3.13.RELEASE</spring.version>
-        <spring-security.version>4.2.4.RELEASE</spring-security.version>
+        <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>
     </properties>
 
@@ -33,6 +33,7 @@
             <groupId>org.springframework</groupId>
             <artifactId>spring-webmvc</artifactId>
             <version>${spring.version}</version>
+            <optional>true</optional>
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/org.springframework/spring-test -->
@@ -83,6 +84,16 @@
             <artifactId>spring-boot-autoconfigure</artifactId>
             <version>1.5.9.RELEASE</version>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-context</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-core</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.springframework.security</groupId>

aws-serverless-java-container-spring/src/test/java/com/amazonaws/serverless/proxy/spring/SpringAwsProxyTest.java

@@ -214,6 +214,7 @@ public void injectBody_populatedResponse_noException() {
 
         AwsProxyResponse response = handler.proxy(request, lambdaContext);
         assertNotNull(response.getBody());
+        assertEquals(200, response.getStatusCode());
         try {
             SingleValueModel output = objectMapper.readValue(response.getBody(), SingleValueModel.class);
             assertEquals("true", output.getValue());

aws-serverless-java-container-spring/src/test/java/com/amazonaws/serverless/proxy/spring/echoapp/EchoResource.java

@@ -16,6 +16,7 @@
 import java.net.URI;
 import java.util.Enumeration;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Random;
 
 import static org.springframework.web.servlet.mvc.method.annotation.MvcUriComponentsBuilder.fromMethodCall;
@@ -119,10 +120,10 @@ public SingleValueModel echoRequestURL(HttpServletRequest request) {
     }
 
     @RequestMapping(path = "/request-body", method = RequestMethod.POST)
-    public SingleValueModel helloForPopulatedBody(@RequestBody(required = false) String input) {
+    public SingleValueModel helloForPopulatedBody(@RequestBody(required = false) Optional<String> input) {
         SingleValueModel valueModel = new SingleValueModel();
-        System.out.println("Input: \"" + input + "\"");
-        if (input != null && !"null".equals(input)) {
+        if (input.isPresent() && !"null".equals(input.get())) {
+            System.out.println("Input: \"" + input.get() + "\"");
             valueModel.setValue("true");
         }
 

samples/spring/pet-store/pom.xml

@@ -26,7 +26,7 @@
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
-        <spring.version>5.0.2.RELEASE</spring.version>
+        <spring.version>5.0.3.RELEASE</spring.version>
         <jackson.version>2.8.4</jackson.version>
     </properties>