Updated proxyStream method to handle stream flushing and closing. Changed all samples and archetypes to remove the close() call for issue #183.

Author: sapessi

README.md

@@ -29,9 +29,6 @@ public class StreamLambdaHandler implements RequestStreamHandler {
     public void handleRequest(InputStream inputStream, OutputStream outputStream, Context context)
             throws IOException {
         handler.proxyStream(inputStream, outputStream, context);
-
-        // just in case it wasn't closed by the mapper
-        outputStream.close();
     }
 }
 ``` 

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

@@ -28,6 +28,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectReader;
 import com.fasterxml.jackson.databind.ObjectWriter;
+import com.fasterxml.jackson.module.afterburner.AfterburnerModule;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -81,6 +82,9 @@ public abstract class LambdaContainerHandler<RequestType, ResponseType, Containe
 
     private static ContainerConfig config = ContainerConfig.defaultConfig();
     private static ObjectMapper objectMapper = new ObjectMapper();
+    static {
+        objectMapper.registerModule(new AfterburnerModule());
+    }
 
 
 
@@ -211,6 +215,9 @@ public void proxyStream(InputStream input, OutputStream output, Context context)
         } catch (JsonMappingException e) {
             log.error("Error while mapping object to RequestType class", e);
             getObjectMapper().writeValue(output, exceptionHandler.handle(e));
+        } finally {
+            output.flush();
+            output.close();
         }
     }
 

aws-serverless-jersey-archetype/src/main/resources/archetype-resources/src/main/java/StreamLambdaHandler.java

@@ -13,10 +13,12 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 
+import ${groupId}.resource.PingResource;
+
 
 public class StreamLambdaHandler implements RequestStreamHandler {
     private static final ResourceConfig jerseyApplication = new ResourceConfig()
-                                                                    .packages("${groupId}.resource")
+                                                                    .register(PingResource.class)
                                                                     .register(JacksonFeature.class);
     private static final JerseyLambdaContainerHandler<AwsProxyRequest, AwsProxyResponse> handler
             = JerseyLambdaContainerHandler.getAwsProxyHandler(jerseyApplication);
@@ -25,8 +27,5 @@ public class StreamLambdaHandler implements RequestStreamHandler {
     public void handleRequest(InputStream inputStream, OutputStream outputStream, Context context)
             throws IOException {
         handler.proxyStream(inputStream, outputStream, context);
-
-        // just in case it wasn't closed by the mapper
-        outputStream.close();
     }
 }

aws-serverless-spark-archetype/src/main/resources/archetype-resources/src/main/java/StreamLambdaHandler.java

@@ -33,8 +33,5 @@ public class StreamLambdaHandler implements RequestStreamHandler {
     public void handleRequest(InputStream inputStream, OutputStream outputStream, Context context)
             throws IOException {
         handler.proxyStream(inputStream, outputStream, context);
-
-        // just in case it wasn't closed by the mapper
-        outputStream.close();
     }
 }

aws-serverless-spring-archetype/src/main/resources/archetype-resources/src/main/java/StreamLambdaHandler.java

@@ -29,8 +29,5 @@ public class StreamLambdaHandler implements RequestStreamHandler {
     public void handleRequest(InputStream inputStream, OutputStream outputStream, Context context)
             throws IOException {
         handler.proxyStream(inputStream, outputStream, context);
-
-        // just in case it wasn't closed by the mapper
-        outputStream.close();
     }
 }

aws-serverless-springboot-archetype/src/main/resources/archetype-resources/src/main/java/StreamLambdaHandler.java

@@ -29,8 +29,5 @@ public class StreamLambdaHandler implements RequestStreamHandler {
     public void handleRequest(InputStream inputStream, OutputStream outputStream, Context context)
             throws IOException {
         handler.proxyStream(inputStream, outputStream, context);
-
-        // just in case it wasn't closed by the mapper
-        outputStream.close();
     }
 }

samples/jersey/pet-store/src/main/java/com/amazonaws/serverless/sample/jersey/StreamLambdaHandler.java

@@ -1,6 +1,7 @@
 package com.amazonaws.serverless.sample.jersey;
 
 
+import com.amazonaws.serverless.proxy.internal.LambdaContainerHandler;
 import com.amazonaws.serverless.proxy.internal.testutils.Timer;
 import com.amazonaws.serverless.proxy.jersey.JerseyLambdaContainerHandler;
 import com.amazonaws.serverless.proxy.model.AwsProxyRequest;
@@ -32,8 +33,5 @@ public StreamLambdaHandler() {
     public void handleRequest(InputStream inputStream, OutputStream outputStream, Context context)
             throws IOException {
         handler.proxyStream(inputStream, outputStream, context);
-
-        // just in case it wasn't closed by the mapper
-        outputStream.close();
     }
 }

samples/spark/pet-store/src/main/java/com/amazonaws/serverless/sample/spark/StreamLambdaHandler.java

@@ -50,8 +50,5 @@ public StreamLambdaHandler() {
     public void handleRequest(InputStream inputStream, OutputStream outputStream, Context context)
             throws IOException {
         handler.proxyStream(inputStream, outputStream, context);
-
-        // just in case it wasn't closed by the mapper
-        outputStream.close();
     }
 }

samples/spring/pet-store/src/main/java/com/amazonaws/serverless/sample/spring/StreamLambdaHandler.java

@@ -47,8 +47,5 @@ public StreamLambdaHandler() {
     public void handleRequest(InputStream inputStream, OutputStream outputStream, Context context)
             throws IOException {
         handler.proxyStream(inputStream, outputStream, context);
-
-        // just in case it wasn't closed by the mapper
-        outputStream.close();
     }
 }

samples/springboot/pet-store/src/main/java/com/amazonaws/serverless/sample/springboot/StreamLambdaHandler.java

@@ -46,8 +46,5 @@ public StreamLambdaHandler() {
     public void handleRequest(InputStream inputStream, OutputStream outputStream, Context context)
             throws IOException {
         handler.proxyStream(inputStream, outputStream, context);
-
-        // just in case it wasn't closed by the mapper
-        outputStream.close();
     }
 }