Merge pull request #413 from philcali/master

Fixing the cookies field in the v2 request object.

Author: Dennis Kieselhorst

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

@@ -75,6 +75,13 @@ public String getAuthType() {
 
     @Override
     public Cookie[] getCookies() {
+        if (request.getCookies() != null && !request.getCookies().isEmpty()) {
+            return request.getCookies().stream()
+                    .map(cookie -> cookie.split("=", 2))
+                    .map(parts -> new Cookie(SecurityUtils.crlf(parts[0]), SecurityUtils.crlf(parts[1])))
+                    .toArray(Cookie[]::new);
+        }
+
         if (headers == null || !headers.containsKey(HttpHeaders.COOKIE)) {
             return new Cookie[0];
         }

aws-serverless-java-container-core/src/test/java/com/amazonaws/serverless/proxy/internal/servlet/AwsHttpApiV2HttpServletRequestReaderTest.java

@@ -7,6 +7,7 @@
 import com.amazonaws.serverless.proxy.model.HttpApiV2ProxyRequestContext;
 import org.junit.Test;
 
+import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 
 import static org.junit.Assert.*;
@@ -25,13 +26,18 @@ public void baseRequest_read_populatesSuccessfully() {
                 .referer("localhost")
                 .queryString("param1", "value1")
                 .header("custom", "value")
+                .cookie("_cookie", "baked")
                 .apiId("test").toHttpApiV2Request();
         AwsHttpApiV2HttpServletRequestReader reader = new AwsHttpApiV2HttpServletRequestReader();
         try {
             HttpServletRequest servletRequest = reader.readRequest(req, null, null, LambdaContainerHandler.getContainerConfig());
             assertEquals("/hello", servletRequest.getPathInfo());
             assertEquals("value1", servletRequest.getParameter("param1"));
             assertEquals("value", servletRequest.getHeader("CUSTOM"));
+            Cookie[] cookies = servletRequest.getCookies();
+            assertEquals(1, cookies.length);
+            assertEquals("_cookie", cookies[0].getName());
+            assertEquals("baked", cookies[0].getValue());
 
             assertNotNull(servletRequest.getAttribute(AwsHttpApiV2HttpServletRequestReader.HTTP_API_CONTEXT_PROPERTY));
             assertEquals("test",