Merge pull request #16007 from richiethom/quarkus_15909

Copy Content-Type from Netty HttpResponse to APIGatewayV2HTTPResponse
quarkusio · Mar 29, 2021 · 674b4cf · 674b4cf
2 parents ac45657 + 7dbfae1
commit 674b4cf
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 12 deletions.
diff --git a/...on-lambda-http/runtime/src/main/java/io/quarkus/amazon/lambda/http/LambdaHttpHandler.java b/...on-lambda-http/runtime/src/main/java/io/quarkus/amazon/lambda/http/LambdaHttpHandler.java
@@ -8,7 +8,10 @@
 import java.nio.channels.WritableByteChannel;
 import java.nio.charset.StandardCharsets;
 import java.util.Base64;
+import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
@@ -94,12 +97,21 @@ public void handleMessage(Object msg) {
                     HttpResponse res = (HttpResponse) msg;
                     responseBuilder.setStatusCode(res.status().code());
 
-                    Headers multiValueHeaders = new Headers();
-                    responseBuilder.setMultiValueHeaders(multiValueHeaders);
+                    final Map<String, String> headers = new HashMap<>();
+                    responseBuilder.setHeaders(headers);
                     for (String name : res.headers().names()) {
-                        for (String v : res.headers().getAll(name)) {
-                            multiValueHeaders.add(name, v);
+                        final List<String> allForName = res.headers().getAll(name);
+                        if (allForName == null || allForName.isEmpty()) {
+                            continue;
                         }
+                        final StringBuilder sb = new StringBuilder();
+                        for (Iterator<String> valueIterator = allForName.iterator(); valueIterator.hasNext();) {
+                            sb.append(valueIterator.next());
+                            if (valueIterator.hasNext()) {
+                                sb.append(",");
+                            }
+                        }
+                        headers.put(name, sb.toString());
                     }
                 }
                 if (msg instanceof HttpContent) {
@@ -124,7 +136,7 @@ public void handleMessage(Object msg) {
                 }
                 if (msg instanceof LastHttpContent) {
                     if (baos != null) {
-                        if (isBinary(((Headers) responseBuilder.getMultiValueHeaders()).getFirst("Content-Type"))) {
+                        if (isBinary(responseBuilder.getHeaders().get("Content-Type"))) {
                             responseBuilder.setIsBase64Encoded(true);
                             responseBuilder.setBody(Base64.getMimeEncoder().encodeToString(baos.toByteArray()));
                         } else {

diff --git a/...a-http-resteasy/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaSimpleTestCase.java b/...a-http-resteasy/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaSimpleTestCase.java
@@ -44,7 +44,7 @@ private void testGetText(String path) {
         APIGatewayV2HTTPResponse out = LambdaClient.invoke(APIGatewayV2HTTPResponse.class, request);
         Assertions.assertEquals(out.getStatusCode(), 200);
         Assertions.assertEquals(body(out), "hello");
-        Assertions.assertTrue(out.getMultiValueHeaders().get("Content-Type").get(0).startsWith("text/plain"));
+        Assertions.assertTrue(out.getHeaders().get("Content-Type").startsWith("text/plain"));
     }
 
     private APIGatewayV2HTTPEvent request(String path) {
@@ -77,7 +77,7 @@ private void testPostText(String path) {
         APIGatewayV2HTTPResponse out = LambdaClient.invoke(APIGatewayV2HTTPResponse.class, request);
         Assertions.assertEquals(out.getStatusCode(), 200);
         Assertions.assertEquals(body(out), "hello Bill");
-        Assertions.assertTrue(out.getMultiValueHeaders().get("Content-Type").get(0).startsWith("text/plain"));
+        Assertions.assertTrue(out.getHeaders().get("Content-Type").startsWith("text/plain"));
     }
 
     @Test
@@ -92,7 +92,7 @@ public void testPostBinary() throws Exception {
         request.setIsBase64Encoded(true);
         APIGatewayV2HTTPResponse out = LambdaClient.invoke(APIGatewayV2HTTPResponse.class, request);
         Assertions.assertEquals(out.getStatusCode(), 200);
-        Assertions.assertEquals(out.getMultiValueHeaders().get("Content-Type").get(0),
+        Assertions.assertEquals(out.getHeaders().get("Content-Type"),
                 MediaType.APPLICATION_OCTET_STREAM);
         Assertions.assertTrue(out.getIsBase64Encoded());
         byte[] rtn = Base64.decodeBase64(out.getBody());

diff --git a/...zon-lambda-http/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaSimpleTestCase.java b/...zon-lambda-http/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaSimpleTestCase.java
@@ -58,7 +58,7 @@ private void testGetText(String path) {
         APIGatewayV2HTTPResponse out = LambdaClient.invoke(APIGatewayV2HTTPResponse.class, request);
         Assertions.assertEquals(out.getStatusCode(), 200);
         Assertions.assertEquals(body(out), "hello");
-        Assertions.assertTrue(out.getMultiValueHeaders().get("Content-Type").get(0).startsWith("text/plain"));
+        Assertions.assertTrue(out.getHeaders().get("Content-Type").startsWith("text/plain"));
     }
 
     private APIGatewayV2HTTPEvent request(String path) {
@@ -93,7 +93,7 @@ private void testPostText(String path) {
         APIGatewayV2HTTPResponse out = LambdaClient.invoke(APIGatewayV2HTTPResponse.class, request);
         Assertions.assertEquals(out.getStatusCode(), 200);
         Assertions.assertEquals(body(out), "hello Bill");
-        Assertions.assertTrue(out.getMultiValueHeaders().get("Content-Type").get(0).startsWith("text/plain"));
+        Assertions.assertTrue(out.getHeaders().get("Content-Type").startsWith("text/plain"));
     }
 
     @Test
@@ -108,7 +108,7 @@ public void testPostBinary() throws Exception {
         request.setIsBase64Encoded(true);
         APIGatewayV2HTTPResponse out = LambdaClient.invoke(APIGatewayV2HTTPResponse.class, request);
         Assertions.assertEquals(out.getStatusCode(), 200);
-        Assertions.assertEquals(out.getMultiValueHeaders().get("Content-Type").get(0),
+        Assertions.assertEquals(out.getHeaders().get("Content-Type"),
                 MediaType.APPLICATION_OCTET_STREAM);
         Assertions.assertTrue(out.getIsBase64Encoded());
         byte[] rtn = Base64.decodeBase64(out.getBody());
@@ -138,7 +138,7 @@ public void testFunqy(String path) {
         APIGatewayV2HTTPResponse out = LambdaClient.invoke(APIGatewayV2HTTPResponse.class, request);
         Assertions.assertEquals(out.getStatusCode(), 200);
         Assertions.assertEquals(body(out), "\"Make it funqy Bill\"");
-        Assertions.assertTrue(out.getMultiValueHeaders().get("Content-Type").get(0).startsWith("application/json"));
+        Assertions.assertTrue(out.getHeaders().get("Content-Type").startsWith("application/json"));
     }
 
     @Test