refactor + headers in websocket event

jeromevdl · jeromevdl · commit 28333c0ae761 · 2021-03-29T10:09:06.000+02:00
diff --git a/aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/APIGatewayProxyRequestEvent.java b/aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/APIGatewayProxyRequestEvent.java
@@ -953,12 +953,15 @@ public Map<String, String> getHeaders() {
      * @param headers The headers sent with the request
      */
     public void setHeaders(Map<String, String> headers) {
-        if (this.headers == null && headers != null && !headers.isEmpty()) {
-            this.headers = new HttpHeaders<>();
+        if (headers == null || headers.isEmpty()) {
+            this.headers = null;
+            return;
         }
-        if (headers != null && !headers.isEmpty()) {
-            this.headers.putAll(headers);
+
+        if (this.headers == null) {
+            this.headers = new HttpHeaders<>();
         }
+        this.headers.putAll(headers);
     }
 
     /**
@@ -981,12 +984,15 @@ public Map<String, List<String>> getMultiValueHeaders() {
      * @param multiValueHeaders The multi value headers sent with the request
      */
     public void setMultiValueHeaders(Map<String, List<String>> multiValueHeaders) {
-        if (this.multiValueHeaders == null && multiValueHeaders != null && !multiValueHeaders.isEmpty()) {
-            this.multiValueHeaders = new HttpHeaders<>();
+        if (multiValueHeaders == null || multiValueHeaders.isEmpty()) {
+            this.multiValueHeaders = null;
+            return;
         }
-        if (multiValueHeaders != null && !multiValueHeaders.isEmpty()) {
-            this.multiValueHeaders.putAll(multiValueHeaders);
+
+        if (this.multiValueHeaders == null) {
+            this.multiValueHeaders = new HttpHeaders<>();
         }
+        this.multiValueHeaders.putAll(multiValueHeaders);
     }
 
     /**
diff --git a/aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/APIGatewayProxyResponseEvent.java b/aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/APIGatewayProxyResponseEvent.java
@@ -62,12 +62,15 @@ public Map<String, String> getHeaders() {
      * @param headers The Http headers return in the response
      */
     public void setHeaders(Map<String, String> headers) {
-        if (this.headers == null && headers != null && !headers.isEmpty()) {
-            this.headers = new HttpHeaders<>();
+        if (headers == null || headers.isEmpty()) {
+            this.headers = null;
+            return;
         }
-        if (headers != null && !headers.isEmpty()) {
-            this.headers.putAll(headers);
+
+        if (this.headers == null) {
+            this.headers = new HttpHeaders<>();
         }
+        this.headers.putAll(headers);
     }
 
     /**
@@ -90,12 +93,15 @@ public Map<String, List<String>> getMultiValueHeaders() {
      * @param multiValueHeaders the Http multi value headers to return in the response
      */
     public void setMultiValueHeaders(Map<String, List<String>> multiValueHeaders) {
-        if (this.multiValueHeaders == null && multiValueHeaders != null && !multiValueHeaders.isEmpty()) {
-            this.multiValueHeaders = new HttpHeaders<>();
+        if (multiValueHeaders == null || multiValueHeaders.isEmpty()) {
+            this.multiValueHeaders = null;
+            return;
         }
-        if (multiValueHeaders != null && !multiValueHeaders.isEmpty()) {
-            this.multiValueHeaders.putAll(multiValueHeaders);
+
+        if (this.multiValueHeaders == null) {
+            this.multiValueHeaders = new HttpHeaders<>();
         }
+        this.multiValueHeaders.putAll(multiValueHeaders);
     }
 
     /**
diff --git a/aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/APIGatewayV2WebSocketEvent.java b/aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/APIGatewayV2WebSocketEvent.java
@@ -1,5 +1,7 @@
 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;
@@ -556,8 +558,8 @@ public boolean equals(Object obj) {
   private String resource;
   private String path;
   private String httpMethod;
-  private Map<String, String> headers;
-  private Map<String, List<String>> multiValueHeaders;
+  private HttpHeaders<String> headers;
+  private HttpHeaders<List<String>> multiValueHeaders;
   private Map<String, String> queryStringParameters;
   private Map<String, List<String>> multiValueQueryStringParameters;
   private Map<String, String> pathParameters;
@@ -595,15 +597,31 @@ public Map<String, String> getHeaders() {
   }
 
   public void setHeaders(Map<String, String> headers) {
-    this.headers = headers;
+    if (headers == null || headers.isEmpty()) {
+      this.headers = null;
+      return;
+    }
+
+    if (this.headers == null) {
+      this.headers = new HttpHeaders<>();
+    }
+    this.headers.putAll(headers);
   }
 
   public Map<String, List<String>> getMultiValueHeaders() {
     return multiValueHeaders;
   }
 
   public void setMultiValueHeaders(Map<String, List<String>> multiValueHeaders) {
-    this.multiValueHeaders = multiValueHeaders;
+    if (multiValueHeaders == null || multiValueHeaders.isEmpty()) {
+      this.multiValueHeaders = null;
+      return;
+    }
+
+    if (this.multiValueHeaders == null) {
+      this.multiValueHeaders = new HttpHeaders<>();
+    }
+    this.multiValueHeaders.putAll(multiValueHeaders);
   }
 
   public Map<String, String> getQueryStringParameters() {
diff --git a/aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/APIGatewayV2WebSocketResponse.java b/aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/APIGatewayV2WebSocketResponse.java
@@ -39,25 +39,31 @@ public Map<String, String> getHeaders() {
   }
 
   public void setHeaders(Map<String, String> headers) {
-    if (this.headers == null && headers != null && !headers.isEmpty()) {
-      this.headers = new HttpHeaders<>();
+    if (headers == null || headers.isEmpty()) {
+      this.headers = null;
+      return;
     }
-    if (headers != null && !headers.isEmpty()) {
-      this.headers.putAll(headers);
+
+    if (this.headers == null) {
+      this.headers = new HttpHeaders<>();
     }
+    this.headers.putAll(headers);
   }
 
   public Map<String, String[]> getMultiValueHeaders() {
     return multiValueHeaders;
   }
 
   public void setMultiValueHeaders(Map<String, String[]> multiValueHeaders) {
-    if (this.multiValueHeaders == null && multiValueHeaders != null && !multiValueHeaders.isEmpty()) {
-      this.multiValueHeaders = new HttpHeaders<>();
+    if (multiValueHeaders == null || multiValueHeaders.isEmpty()) {
+      this.multiValueHeaders = null;
+      return;
     }
-    if (multiValueHeaders != null && !multiValueHeaders.isEmpty()) {
-      this.multiValueHeaders.putAll(multiValueHeaders);
+
+    if (this.multiValueHeaders == null) {
+      this.multiValueHeaders = new HttpHeaders<>();
     }
+    this.multiValueHeaders.putAll(multiValueHeaders);
   }
 
   public String getBody() {

Original file line number	Diff line number	Diff line change
`@@ -39,25 +39,31 @@ public Map<String, String> getHeaders() {`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`public void setHeaders(Map<String, String> headers) {`
`42`		`- if (this.headers == null && headers != null && !headers.isEmpty()) {`
`43`		`- this.headers = new HttpHeaders<>();`
	`42`	`+ if (headers == null \|\| headers.isEmpty()) {`
	`43`	`+ this.headers = null;`
	`44`	`+ return;`
`44`	`45`	`}`
`45`		`- if (headers != null && !headers.isEmpty()) {`
`46`		`- this.headers.putAll(headers);`
	`46`	`+`
	`47`	`+ if (this.headers == null) {`
	`48`	`+ this.headers = new HttpHeaders<>();`
`47`	`49`	`}`
	`50`	`+ this.headers.putAll(headers);`
`48`	`51`	`}`
`49`	`52`
`50`	`53`	`public Map<String, String[]> getMultiValueHeaders() {`
`51`	`54`	`return multiValueHeaders;`
`52`	`55`	`}`
`53`	`56`
`54`	`57`	`public void setMultiValueHeaders(Map<String, String[]> multiValueHeaders) {`
`55`		`- if (this.multiValueHeaders == null && multiValueHeaders != null && !multiValueHeaders.isEmpty()) {`
`56`		`- this.multiValueHeaders = new HttpHeaders<>();`
	`58`	`+ if (multiValueHeaders == null \|\| multiValueHeaders.isEmpty()) {`
	`59`	`+ this.multiValueHeaders = null;`
	`60`	`+ return;`
`57`	`61`	`}`
`58`		`- if (multiValueHeaders != null && !multiValueHeaders.isEmpty()) {`
`59`		`- this.multiValueHeaders.putAll(multiValueHeaders);`
	`62`	`+`
	`63`	`+ if (this.multiValueHeaders == null) {`
	`64`	`+ this.multiValueHeaders = new HttpHeaders<>();`
`60`	`65`	`}`
	`66`	`+ this.multiValueHeaders.putAll(multiValueHeaders);`
`61`	`67`	`}`
`62`	`68`
`63`	`69`	`public String getBody() {`