Minor changes from review

* Removed unused variable
* Removed methods parsing issue and expiration time for token
* Changed exp and iat getters and setters  to friendly names

Author: sapessi

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

@@ -15,7 +15,6 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
 
 
@@ -31,22 +30,14 @@
  *     "auth_time": "1492467169",
  *     "iss": "https://cognito-idp.us-east-2.amazonaws.com/us-east-2_Adx5ZHePg",
  *     "cognito:username": "sapessi",
- *     "exp": "Mon Apr 17 23:12:49 UTC 2017",
- *     "iat": "Mon Apr 17 22:12:49 UTC 2017",
+ *     "expiration": "Mon Apr 17 23:12:49 UTC 2017",
+ *     "issuedAt": "Mon Apr 17 22:12:49 UTC 2017",
  *     "email": "bulianis@amazon.com"
  * }
  * </pre>
  */
 public class CognitoAuthorizerClaims {
 
-    //-------------------------------------------------------------
-    // Constants
-    //-------------------------------------------------------------
-
-    // Mon Apr 17 23:12:49 UTC 2017
-    static final DateTimeFormatter TOKEN_DATE_FORMATTER = DateTimeFormatter.ofPattern("EEE MMM dd HH:mm:ss zzz yyyy");
-
-
     //-------------------------------------------------------------
     // Variables - Private
     //-------------------------------------------------------------
@@ -66,8 +57,10 @@ public class CognitoAuthorizerClaims {
     private boolean emailVerified;
     @JsonProperty(value = "auth_time")
     private Long authTime;
-    private String exp;
-    private String iat;
+    @JsonProperty(value = "exp")
+    private String expiration;
+    @JsonProperty(value = "iat")
+    private String issuedAt;
 
 
     //-------------------------------------------------------------
@@ -152,42 +145,22 @@ public void setAuthTime(Long authTime) {
     }
 
 
-    public String getExp() {
-        return exp;
-    }
-
-
-    public void setExp(String expiration) {
-        this.exp = expiration;
-    }
-
-
-    /**
-     * Returns the expiration time for the token as a <code>ZonedDateTime</code> from the <code>exp</code> property
-     * of the token.
-     * @return The parsed expiration time for the token.
-     */
-    public ZonedDateTime getExpirationTime() {
-        return ZonedDateTime.from(TOKEN_DATE_FORMATTER.parse(getExp()));
+    public String getExpiration() {
+        return expiration;
     }
 
 
-    public String getIat() {
-        return iat;
+    public void setExpiration(String expiration) {
+        this.expiration = expiration;
     }
 
 
-    public void setIat(String issuedAt) {
-        this.iat = issuedAt;
+    public String getIssuedAt() {
+        return issuedAt;
     }
 
 
-    /**
-     * Returns the parsed issued time for the token as a <code>ZonedDateTime</code> object. This is taken from the <code>iat</code>
-     * property of the token.
-     * @return The parsed issue time of the token
-     */
-    public ZonedDateTime getIssueTime() {
-        return ZonedDateTime.from((TOKEN_DATE_FORMATTER.parse(getIat())));
+    public void setIssuedAt(String issuedAt) {
+        this.issuedAt = issuedAt;
     }
 }

aws-serverless-java-container-core/src/main/java/com/amazonaws/serverless/proxy/internal/servlet/AwsHttpServletRequest.java

@@ -280,7 +280,7 @@ protected List<Map.Entry<String, String>> parseHeaderValue(String headerValue) {
         if (headerValue == null) {
             return values;
         }
-        int entryCounter = 1;
+
         for (String kv : headerValue.split(HEADER_VALUE_SEPARATOR)) {
             String[] kvSplit = kv.split(HEADER_KEY_VALUE_SEPARATOR);
 

aws-serverless-java-container-core/src/test/java/com/amazonaws/serverless/proxy/internal/model/CognitoAuthorizerClaimsTest.java

@@ -6,6 +6,7 @@
 
 import java.io.IOException;
 import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
 
 import static org.junit.Assert.*;
 
@@ -18,6 +19,7 @@ public class CognitoAuthorizerClaimsTest {
 
     private static final String EXP_TIME = "Mon Apr 17 23:12:49 UTC 2017";
     private static final String ISSUE_TIME = "Mon Apr 17 22:12:49 UTC 2017";
+    static final DateTimeFormatter TOKEN_DATE_FORMATTER = DateTimeFormatter.ofPattern("EEE MMM dd HH:mm:ss zzz yyyy");
 
     private static final String USER_POOLS_REQUEST = "{\n"
                                                      + "    \"resource\": \"/restaurants\",\n"
@@ -92,12 +94,12 @@ public void claims_dateParse_issueTime() {
         try {
             AwsProxyRequest req = new AwsProxyRequestBuilder().fromJsonString(USER_POOLS_REQUEST).build();
 
-            assertEquals(EXP_TIME, req.getRequestContext().getAuthorizer().getClaims().getExp());
-            assertNotNull(req.getRequestContext().getAuthorizer().getClaims().getExp());
+            assertEquals(EXP_TIME, req.getRequestContext().getAuthorizer().getClaims().getExpiration());
+            assertNotNull(req.getRequestContext().getAuthorizer().getClaims().getExpiration());
 
-            ZonedDateTime expTime = ZonedDateTime.from(CognitoAuthorizerClaims.TOKEN_DATE_FORMATTER.parse(EXP_TIME));
-            ZonedDateTime issueTime = ZonedDateTime.from(CognitoAuthorizerClaims.TOKEN_DATE_FORMATTER.parse(ISSUE_TIME));
-            assertEquals(expTime, req.getRequestContext().getAuthorizer().getClaims().getExpirationTime());
+            ZonedDateTime expTime = ZonedDateTime.from(TOKEN_DATE_FORMATTER.parse(EXP_TIME));
+            ZonedDateTime issueTime = ZonedDateTime.from(TOKEN_DATE_FORMATTER.parse(ISSUE_TIME));
+            assertEquals(expTime, ZonedDateTime.from(TOKEN_DATE_FORMATTER.parse(req.getRequestContext().getAuthorizer().getClaims().getExpiration())));
 
             assertEquals(expTime, issueTime.plusHours(1));
         } catch (IOException e) {