Added apiKeyId field to address #136 and moved initialization of request fields to the constructor

Author: sapessi

aws-serverless-java-container-core/src/main/java/com/amazonaws/serverless/proxy/model/ApiGatewayRequestIdentity.java

@@ -33,6 +33,7 @@ public class ApiGatewayRequestIdentity {
     //-------------------------------------------------------------
 
     private String apiKey;
+    private String apiKeyId;
     private String userArn;
     private String cognitoAuthenticationType;
     private String caller;
@@ -60,6 +61,16 @@ public void setApiKey(String apiKey) {
     }
 
 
+    public String getApiKeyId() {
+        return apiKeyId;
+    }
+
+
+    public void setApiKeyId(String apiKeyId) {
+        this.apiKeyId = apiKeyId;
+    }
+
+
     public String getUserArn() {
         return userArn;
     }

aws-serverless-java-container-core/src/main/java/com/amazonaws/serverless/proxy/model/AwsProxyRequest.java

@@ -32,13 +32,20 @@ public class AwsProxyRequest {
     private String resource;
     private ApiGatewayRequestContext requestContext;
     private Map<String, String> queryStringParameters;
-    private Map<String, String> headers = new HashMap<>(); // avoid NPE
+    private Map<String, String> headers;
     private Map<String, String> pathParameters;
     private String httpMethod;
     private Map<String, String> stageVariables;
     private String path;
     private boolean isBase64Encoded;
 
+    public AwsProxyRequest() {
+        queryStringParameters = new HashMap<>();
+        headers = new HashMap<>();
+        pathParameters = new HashMap<>();
+        stageVariables = new HashMap<>();
+    }
+
 
     //-------------------------------------------------------------
     // Methods - Getter/Setter