fix issue #220, using treemap

Author: jeromevdl

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

@@ -1,8 +1,7 @@
 package com.amazonaws.services.lambda.runtime.events;
 
 import java.io.Serializable;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * Class that represents an APIGatewayProxyRequestEvent
@@ -17,9 +16,9 @@ public class APIGatewayProxyRequestEvent implements Serializable, Cloneable {
 
     private String httpMethod;
 
-    private Map<String, String> headers;
+    private Headers<String> headers = new Headers<>();
 
-    private Map<String, List<String>> multiValueHeaders;
+    private Headers<List<String>> multiValueHeaders = new Headers<>();
 
     private Map<String, String> queryStringParameters;
 
@@ -35,6 +34,77 @@ public class APIGatewayProxyRequestEvent implements Serializable, Cloneable {
 
     private Boolean isBase64Encoded;
 
+    /**
+     * Class that represents Http Headers.
+     *
+     * Not using a standard map, because we need insensitive case.
+     */
+    public static class Headers<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);
+
+        @Override
+        public int size() {
+            return map.size();
+        }
+
+        @Override
+        public boolean isEmpty() {
+            return map.isEmpty();
+        }
+
+        @Override
+        public boolean containsKey(Object key) {
+            return map.containsKey(key);
+        }
+
+        @Override
+        public boolean containsValue(Object value) {
+            return map.containsValue(value);
+        }
+
+        @Override
+        public T get(Object key) {
+            return map.get(key);
+        }
+
+        @Override
+        public T put(String key, T value) {
+            return map.put(key, value);
+        }
+
+        @Override
+        public T remove(Object key) {
+            return map.remove(key);
+        }
+
+        @Override
+        public void putAll(Map<? extends String, ? extends T> m) {
+            map.putAll(m);
+        }
+
+        @Override
+        public void clear() {
+            map.clear();
+        }
+
+        @Override
+        public Set<String> keySet() {
+            return map.keySet();
+        }
+
+        @Override
+        public Collection<T> values() {
+            return map.values();
+        }
+
+        @Override
+        public Set<Entry<String, T>> entrySet() {
+            return map.entrySet();
+        }
+    }
+
     /**
      * class that represents proxy request context
      */
@@ -67,7 +137,8 @@ public static class ProxyRequestContext implements Serializable, Cloneable {
         /**
          * default constructor
          */
-        public ProxyRequestContext() {}
+        public ProxyRequestContext() {
+        }
 
         /**
          * @return account id that owns Lambda function
@@ -101,7 +172,7 @@ public void setAuthorizer(final Map<String, Object> authorizer) {
         }
 
         /**
-         * @return  API Gateway stage name
+         * @return API Gateway stage name
          */
         public String getStage() {
             return stage;
@@ -286,14 +357,14 @@ public ProxyRequestContext withPath(String path) {
 
         /**
          * @return The name of the operation being performed
-         * */
+         */
         public String getOperationName() {
             return operationName;
         }
 
         /**
          * @param operationName The name of the operation being performed
-         * */
+         */
         public void setOperationName(String operationName) {
             this.operationName = operationName;
         }
@@ -307,7 +378,6 @@ public ProxyRequestContext withOperationName(String operationName) {
          * Returns a string representation of this object; useful for testing and debugging.
          *
          * @return A string representation of this object.
-         *
          * @see Object#toString()
          */
         @Override
@@ -412,7 +482,7 @@ public int hashCode() {
             hashCode = prime * hashCode + ((getApiId() == null) ? 0 : getApiId().hashCode());
             hashCode = prime * hashCode + ((getPath() == null) ? 0 : getPath().hashCode());
             hashCode = prime * hashCode + ((getAuthorizer() == null) ? 0 : getAuthorizer().hashCode());
-            hashCode = prime * hashCode + ((getOperationName() == null) ? 0: getOperationName().hashCode());
+            hashCode = prime * hashCode + ((getOperationName() == null) ? 0 : getOperationName().hashCode());
             return hashCode;
         }
 
@@ -457,7 +527,8 @@ public static class RequestIdentity implements Serializable, Cloneable {
         /**
          * default constructor
          */
-        public RequestIdentity() {}
+        public RequestIdentity() {
+        }
 
         /**
          * @return The Cognito identity pool id.
@@ -739,7 +810,6 @@ public RequestIdentity withAccessKey(String accessKey) {
          * Returns a string representation of this object; useful for testing and debugging.
          *
          * @return A string representation of this object.
-         *
          * @see Object#toString()
          */
         @Override
@@ -869,7 +939,8 @@ public RequestIdentity clone() {
     /**
      * default constructor
      */
-    public APIGatewayProxyRequestEvent() {}
+    public APIGatewayProxyRequestEvent() {
+    }
 
     /**
      * @return The resource path defined in API Gateway
@@ -944,14 +1015,14 @@ public APIGatewayProxyRequestEvent withHttpMethod(String httpMethod) {
      * @return The headers sent with the request
      */
     public Map<String, String> getHeaders() {
-        return headers;
+        return headers.map;
     }
 
     /**
      * @param headers The headers sent with the request
      */
     public void setHeaders(Map<String, String> headers) {
-        this.headers = headers;
+        this.headers.putAll(headers);
     }
 
     /**
@@ -974,7 +1045,7 @@ public Map<String, List<String>> getMultiValueHeaders() {
      * @param multiValueHeaders The multi value headers sent with the request
      */
     public void setMultiValueHeaders(Map<String, List<String>> multiValueHeaders) {
-        this.multiValueHeaders = multiValueHeaders;
+        this.multiValueHeaders.putAll(multiValueHeaders);
     }
 
     /**
@@ -1167,7 +1238,6 @@ public APIGatewayProxyRequestEvent withIsBase64Encoded(Boolean isBase64Encoded)
      * Returns a string representation of this object; useful for testing and debugging.
      *
      * @return A string representation of this object.
-     *
      * @see Object#toString()
      */
     @Override

aws-lambda-java-tests/src/test/java/com/amazonaws/services/lambda/runtime/tests/EventLoaderTest.java

@@ -26,6 +26,9 @@ public void testLoadApiGatewayRestEvent() {
 
         assertThat(event).isNotNull();
         assertThat(event.getBody()).isEqualTo("Hello from Lambda!");
+
+        assertThat(event.getHeaders().get("Header1")).isEqualTo("value1");
+        assertThat(event.getHeaders().get("header1")).isEqualTo("value1");
         assertThat(event.getHeaders()).hasSize(2);
     }
 

aws-lambda-java-tests/src/test/resources/apigw_rest_event.json

@@ -4,8 +4,9 @@
   "path": "/my/path",
   "httpMethod": "GET",
   "headers": {
-    "Header1": "value1",
-    "Header2": "value2"
+    "Header1": "Value1",
+    "Header2": "value2",
+    "header1": "value1"
   },
   "multiValueHeaders": {
     "Header1": [