From 5f215eb28b74decfdcae793030f55faf899c4bde Mon Sep 17 00:00:00 2001 From: aavanathan Date: Sun, 17 Feb 2019 20:39:37 -0800 Subject: [PATCH 1/5] Adding authorizer field to collect context properites from authorizer --- .../runtime/events/APIGatewayProxyRequestEvent.java | 10 ++++++++++ 1 file changed, 10 insertions(+) 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 index 71ea238d..28dba93d 100644 --- 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 @@ -29,6 +29,8 @@ public class APIGatewayProxyRequestEvent implements Serializable, Cloneable { private Map stageVariables; + private Map authorizer; + private ProxyRequestContext requestContext; private String body; @@ -919,6 +921,14 @@ public APIGatewayProxyRequestEvent withHeaders(Map headers) { return this; } + private Map getAuthorizer() { + return authorizer; + } + + private void setAuthorizer(final Map authorizer) { + this.authorizer = authorizer; + } + /** * @return The multi value headers sent with the request */ From fe6bf8920e8c1a8c0a363e7b7f0902107cd8e3b9 Mon Sep 17 00:00:00 2001 From: aavanathan Date: Sun, 17 Feb 2019 21:04:32 -0800 Subject: [PATCH 2/5] Updating toString() method --- .../lambda/runtime/events/APIGatewayProxyRequestEvent.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 index 28dba93d..f7092a6b 100644 --- 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 @@ -921,11 +921,11 @@ public APIGatewayProxyRequestEvent withHeaders(Map headers) { return this; } - private Map getAuthorizer() { + public Map getAuthorizer() { return authorizer; } - private void setAuthorizer(final Map authorizer) { + public void setAuthorizer(final Map authorizer) { this.authorizer = authorizer; } @@ -1148,6 +1148,8 @@ public String toString() { sb.append("httpMethod: ").append(getHttpMethod()).append(","); if (getHeaders() != null) sb.append("headers: ").append(getHeaders().toString()).append(","); + if (getAuthorizer() != null) + sb.append("authorizer: ").append(getAuthorizer().toString()).append(","); if (getMultiValueHeaders() != null) sb.append("multiValueHeaders: ").append(getMultiValueHeaders().toString()).append(","); if (getQueryStringParameters() != null) From b0c27dd0d3332689ffa01917119770c5030f8b6a Mon Sep 17 00:00:00 2001 From: aavanathan Date: Sun, 17 Feb 2019 21:21:31 -0800 Subject: [PATCH 3/5] Adding authorizer to equals() & hashCode() --- .../events/APIGatewayProxyRequestEvent.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) 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 index f7092a6b..dad7dfa7 100644 --- 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 @@ -952,6 +952,16 @@ public APIGatewayProxyRequestEvent withMultiValueHeaders(Map authorizer) { + this.setAuthorizer(authorizer); + return this; + } + + /** * @return The query string parameters that were part of the request */ @@ -1200,6 +1210,10 @@ public boolean equals(Object obj) { return false; if (other.getMultiValueHeaders() != null && other.getMultiValueHeaders().equals(this.getMultiValueHeaders()) == false) return false; + if (other.getAuthorizer() == null ^ this.getAuthorizer() == null) + return false; + if (other.getAuthorizer() != null && !other.getAuthorizer().equals(this.getAuthorizer())) + return false; if (other.getQueryStringParameters() == null ^ this.getQueryStringParameters() == null) return false; if (other.getQueryStringParameters() != null && other.getQueryStringParameters().equals(this.getQueryStringParameters()) == false) @@ -1248,6 +1262,7 @@ public int hashCode() { hashCode = prime * hashCode + ((getRequestContext() == null) ? 0 : getRequestContext().hashCode()); hashCode = prime * hashCode + ((getBody() == null) ? 0 : getBody().hashCode()); hashCode = prime * hashCode + ((getIsBase64Encoded() == null) ? 0 : getIsBase64Encoded().hashCode()); + hashCode = prime * hashCode + ((getAuthorizer() == null) ? 0 : getAuthorizer().hashCode()); return hashCode; } From a3aa4b29d860b38574292982ca6565dfe1d2a7e9 Mon Sep 17 00:00:00 2001 From: aavanathan Date: Sun, 17 Feb 2019 21:36:12 -0800 Subject: [PATCH 4/5] Moving authorizer under ProxyRequestContext --- .../events/APIGatewayProxyRequestEvent.java | 48 ++++++++----------- 1 file changed, 19 insertions(+), 29 deletions(-) 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 index dad7dfa7..4828f340 100644 --- 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 @@ -29,8 +29,6 @@ public class APIGatewayProxyRequestEvent implements Serializable, Cloneable { private Map stageVariables; - private Map authorizer; - private ProxyRequestContext requestContext; private String body; @@ -62,6 +60,8 @@ public static class ProxyRequestContext implements Serializable, Cloneable { private String path; + private Map authorizer; + /** * default constructor */ @@ -90,6 +90,14 @@ public ProxyRequestContext withAccountId(String accountId) { return this; } + public Map getAuthorizer() { + return authorizer; + } + + public void setAuthorizer(final Map authorizer) { + this.authorizer = authorizer; + } + /** * @return API Gateway stage name */ @@ -302,7 +310,9 @@ public String toString() { if (getApiId() != null) sb.append("apiId: ").append(getApiId()).append(","); if (getPath() != null) - sb.append("path: ").append(getPath()); + sb.append("path: ").append(getPath()).append(","); + if (getAuthorizer() != null) + sb.append("authorizer: ").append(getAuthorizer().toString()); sb.append("}"); return sb.toString(); } @@ -353,6 +363,10 @@ public boolean equals(Object obj) { return false; if (other.getPath() != null && other.getPath().equals(this.getPath()) == false) return false; + if (other.getAuthorizer() == null ^ this.getAuthorizer() == null) + return false; + if (other.getAuthorizer() != null && !other.getAuthorizer().equals(this.getAuthorizer())) + return false; return true; } @@ -370,6 +384,7 @@ public int hashCode() { hashCode = prime * hashCode + ((getHttpMethod() == null) ? 0 : getHttpMethod().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()); return hashCode; } @@ -921,14 +936,6 @@ public APIGatewayProxyRequestEvent withHeaders(Map headers) { return this; } - public Map getAuthorizer() { - return authorizer; - } - - public void setAuthorizer(final Map authorizer) { - this.authorizer = authorizer; - } - /** * @return The multi value headers sent with the request */ @@ -951,17 +958,7 @@ public APIGatewayProxyRequestEvent withMultiValueHeaders(Map authorizer) { - this.setAuthorizer(authorizer); - return this; - } - - + /** * @return The query string parameters that were part of the request */ @@ -1158,8 +1155,6 @@ public String toString() { sb.append("httpMethod: ").append(getHttpMethod()).append(","); if (getHeaders() != null) sb.append("headers: ").append(getHeaders().toString()).append(","); - if (getAuthorizer() != null) - sb.append("authorizer: ").append(getAuthorizer().toString()).append(","); if (getMultiValueHeaders() != null) sb.append("multiValueHeaders: ").append(getMultiValueHeaders().toString()).append(","); if (getQueryStringParameters() != null) @@ -1210,10 +1205,6 @@ public boolean equals(Object obj) { return false; if (other.getMultiValueHeaders() != null && other.getMultiValueHeaders().equals(this.getMultiValueHeaders()) == false) return false; - if (other.getAuthorizer() == null ^ this.getAuthorizer() == null) - return false; - if (other.getAuthorizer() != null && !other.getAuthorizer().equals(this.getAuthorizer())) - return false; if (other.getQueryStringParameters() == null ^ this.getQueryStringParameters() == null) return false; if (other.getQueryStringParameters() != null && other.getQueryStringParameters().equals(this.getQueryStringParameters()) == false) @@ -1262,7 +1253,6 @@ public int hashCode() { hashCode = prime * hashCode + ((getRequestContext() == null) ? 0 : getRequestContext().hashCode()); hashCode = prime * hashCode + ((getBody() == null) ? 0 : getBody().hashCode()); hashCode = prime * hashCode + ((getIsBase64Encoded() == null) ? 0 : getIsBase64Encoded().hashCode()); - hashCode = prime * hashCode + ((getAuthorizer() == null) ? 0 : getAuthorizer().hashCode()); return hashCode; } From 891997cc32bec7f02d2a1f7c8c89aef2c79943e9 Mon Sep 17 00:00:00 2001 From: aavanathan Date: Thu, 21 Feb 2019 12:29:34 -0800 Subject: [PATCH 5/5] Switching to Map for authorizer --- .../lambda/runtime/events/APIGatewayProxyRequestEvent.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 index 4828f340..68ca91da 100644 --- 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 @@ -60,7 +60,7 @@ public static class ProxyRequestContext implements Serializable, Cloneable { private String path; - private Map authorizer; + private Map authorizer; /** * default constructor @@ -90,11 +90,11 @@ public ProxyRequestContext withAccountId(String accountId) { return this; } - public Map getAuthorizer() { + public Map getAuthorizer() { return authorizer; } - public void setAuthorizer(final Map authorizer) { + public void setAuthorizer(final Map authorizer) { this.authorizer = authorizer; }