Fixes micronaut-projects#1861

Author: driverpt

function-aws-api-proxy-test/src/test/groovy/io/micronaut/function/aws/proxy/test/AwsApiProxyTestServerSpec.groovy

@@ -1,5 +1,6 @@
 package io.micronaut.function.aws.proxy.test
 
+import io.micronaut.http.HttpHeaders
 import io.micronaut.http.HttpRequest
 import io.micronaut.http.HttpResponse
 import io.micronaut.http.HttpStatus
@@ -79,6 +80,19 @@ class AwsApiProxyTestServerSpec extends Specification {
         response.body.get() == (1..256).collect { it as byte } as byte[]
     }
 
+    @Issue('https://github.com/micronaut-projects/micronaut-aws/issues/1861')
+    void 'ensure multiple headers are properly received'() {
+        when:
+        HttpResponse<Integer> response = client.toBlocking()
+                .exchange(HttpRequest.GET('/receive-multiple-headers')
+                            .header(HttpHeaders.ETAG, "A")
+                            .header(HttpHeaders.ETAG, "B"), Integer.class)
+
+        then:
+        response.status == HttpStatus.OK
+        response.body.get() == 2
+    }
+
     @Controller
     static class TestController {
         @Get(value = '/test', produces = MediaType.TEXT_PLAIN)
@@ -105,5 +119,10 @@ class AwsApiProxyTestServerSpec extends Specification {
         HttpResponse<byte[]> byteArray() {
             return HttpResponse.ok((1..256).collect { it as byte } as byte[])
         }
+
+        @Get(value = '/receive-multiple-headers', processes = MediaType.TEXT_PLAIN)
+        Integer receiveMultipleHeaders(HttpRequest<?> request) {
+            return request.headers.getAll(HttpHeaders.ETAG).size()
+        }
     }
 }

function-aws-api-proxy/src/main/java/io/micronaut/function/aws/proxy/payload2/APIGatewayV2HTTPEventServletRequest.java

@@ -20,6 +20,7 @@
 import io.micronaut.core.annotation.Internal;
 import io.micronaut.core.convert.ConversionService;
 import io.micronaut.function.aws.proxy.ApiGatewayServletRequest;
+import io.micronaut.http.CaseInsensitiveMutableHttpHeaders;
 import io.micronaut.http.MutableHttpHeaders;
 import io.micronaut.http.MutableHttpParameters;
 import io.micronaut.servlet.http.BodyBuilder;
@@ -29,6 +30,7 @@
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
+import java.util.Arrays;
 import java.util.Collections;
 
 /**
@@ -73,7 +75,11 @@ public byte[] getBodyBytes() throws IOException {
 
     @Override
     public MutableHttpHeaders getHeaders() {
-        return getHeaders(requestEvent::getHeaders, Collections::emptyMap);
+        CaseInsensitiveMutableHttpHeaders headers = new CaseInsensitiveMutableHttpHeaders(conversionService);
+        requestEvent.getHeaders()
+                .forEach((key, value) -> Arrays.stream(value.split(","))
+                        .forEach(headerValue -> headers.add(key, headerValue)));
+        return headers;
     }
 
     @Override