corrections after real test

Author: jeromevdl

aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/APIGatewayV2HTTPEvent.java

@@ -43,6 +43,19 @@ public class APIGatewayV2HTTPEvent {
     private boolean isBase64Encoded;
     private RequestContext requestContext;
 
+    public void setHeaders(Map<String, String> headers) {
+        System.out.println("setHeaders");
+        if (headers == null || headers.isEmpty()) {
+            this.headers = null;
+            return;
+        }
+
+        if (this.headers == null) {
+            this.headers = new HttpHeaders<>();
+        }
+        this.headers.putAll(headers);
+    }
+
     @AllArgsConstructor
     @Builder(setterPrefix = "with")
     @Data

aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/APIGatewayV2HTTPResponse.java

@@ -33,4 +33,39 @@ public class APIGatewayV2HTTPResponse {
     private List<String> cookies;
     private String body;
     private boolean isBase64Encoded;
+
+    public static APIGatewayV2HTTPResponseBuilder builder() {
+        return new APIGatewayV2HTTPResponseBuilder();
+    }
+
+    public static class APIGatewayV2HTTPResponseBuilder {
+        private HttpHeaders<String> headers;
+        private HttpHeaders<List<String>> multiValueHeaders;
+
+        public APIGatewayV2HTTPResponseBuilder withHeaders(Map<String, String> headers) {
+            if (headers == null || headers.isEmpty()) {
+                this.headers = null;
+                return this;
+            }
+
+            if (this.headers == null) {
+                this.headers = new HttpHeaders<>();
+            }
+            this.headers.putAll(headers);
+            return this;
+        }
+
+        public APIGatewayV2HTTPResponseBuilder withMultiValueHeaders(Map<String, List<String>> multiValueHeaders) {
+            if (multiValueHeaders == null || multiValueHeaders.isEmpty()) {
+                this.multiValueHeaders = null;
+                return this;
+            }
+
+            if (this.multiValueHeaders == null) {
+                this.multiValueHeaders = new HttpHeaders<>();
+            }
+            this.multiValueHeaders.putAll(multiValueHeaders);
+            return this;
+        }
+    }
 }

aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/models/HttpHeaders.java

@@ -13,7 +13,7 @@
 public class HttpHeaders<T> implements Map<String, T> {
 
     // Headers are case insensitive (https://www.w3.org/Protocols/rfc2616/rfc2616-sec4.html#sec4.2)
-    private Map<String, T> map = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
+    private final Map<String, T> map = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
 
     @Override
     public int size() {