revert http headers

Author: jeromevdl

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

@@ -1,7 +1,5 @@
 package com.amazonaws.services.lambda.runtime.events;
 
-import com.amazonaws.services.lambda.runtime.events.models.HttpHeaders;
-
 import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
@@ -558,8 +556,8 @@ public boolean equals(Object obj) {
   private String resource;
   private String path;
   private String httpMethod;
-  private HttpHeaders<String> headers;
-  private HttpHeaders<List<String>> multiValueHeaders;
+  private Map<String, String> headers;
+  private Map<String, List<String>> multiValueHeaders;
   private Map<String, String> queryStringParameters;
   private Map<String, List<String>> multiValueQueryStringParameters;
   private Map<String, String> pathParameters;
@@ -597,31 +595,15 @@ public Map<String, String> getHeaders() {
   }
 
   public void setHeaders(Map<String, String> headers) {
-    if (headers == null || headers.isEmpty()) {
-      this.headers = null;
-      return;
-    }
-
-    if (this.headers == null) {
-      this.headers = new HttpHeaders<>();
-    }
-    this.headers.putAll(headers);
+    this.headers = headers;
   }
 
   public Map<String, List<String>> getMultiValueHeaders() {
     return multiValueHeaders;
   }
 
   public void setMultiValueHeaders(Map<String, List<String>> multiValueHeaders) {
-    if (multiValueHeaders == null || multiValueHeaders.isEmpty()) {
-      this.multiValueHeaders = null;
-      return;
-    }
-
-    if (this.multiValueHeaders == null) {
-      this.multiValueHeaders = new HttpHeaders<>();
-    }
-    this.multiValueHeaders.putAll(multiValueHeaders);
+    this.multiValueHeaders = multiValueHeaders;
   }
 
   public Map<String, String> getQueryStringParameters() {

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

@@ -39,31 +39,25 @@ public Map<String, String> getHeaders() {
   }
 
   public void setHeaders(Map<String, String> headers) {
-    if (headers == null || headers.isEmpty()) {
-      this.headers = null;
-      return;
-    }
-
-    if (this.headers == null) {
+    if (this.headers == null && headers != null && !headers.isEmpty()) {
       this.headers = new HttpHeaders<>();
     }
-    this.headers.putAll(headers);
+    if (headers != null && !headers.isEmpty()) {
+      this.headers.putAll(headers);
+    }
   }
 
   public Map<String, String[]> getMultiValueHeaders() {
     return multiValueHeaders;
   }
 
   public void setMultiValueHeaders(Map<String, String[]> multiValueHeaders) {
-    if (multiValueHeaders == null || multiValueHeaders.isEmpty()) {
-      this.multiValueHeaders = null;
-      return;
-    }
-
-    if (this.multiValueHeaders == null) {
+    if (this.multiValueHeaders == null && multiValueHeaders != null && !multiValueHeaders.isEmpty()) {
       this.multiValueHeaders = new HttpHeaders<>();
     }
-    this.multiValueHeaders.putAll(multiValueHeaders);
+    if (multiValueHeaders != null && !multiValueHeaders.isEmpty()) {
+      this.multiValueHeaders.putAll(multiValueHeaders);
+    }
   }
 
   public String getBody() {