Switched from json annotations to custom deserializer

Author: sapessi

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

@@ -13,9 +13,9 @@
 package com.amazonaws.serverless.proxy.internal.model;
 
 
-import com.fasterxml.jackson.annotation.JsonProperty;
+import com.amazonaws.serverless.proxy.internal.serialization.CognitoAuthorizerClaimsDeserializer;
 
-import java.time.format.DateTimeFormatter;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 
 
 /**
@@ -36,31 +36,25 @@
  * }
  * </pre>
  */
+@JsonDeserialize(using = CognitoAuthorizerClaimsDeserializer.class)
 public class CognitoAuthorizerClaims {
 
     //-------------------------------------------------------------
     // Variables - Private
     //-------------------------------------------------------------
 
-    @JsonProperty(value = "sub")
     private String subject;
-    @JsonProperty(value = "aud")
     private String audience;
-    @JsonProperty(value = "iss")
     private String issuer;
-    @JsonProperty(value = "token_use")
     private String tokenUse;
-    @JsonProperty(value = "cognito:username")
     private String username;
     private String email;
-    @JsonProperty(value = "email_verified")
     private boolean emailVerified;
-    @JsonProperty(value = "auth_time")
     private Long authTime;
-    @JsonProperty(value = "exp")
     private String expiration;
-    @JsonProperty(value = "iat")
     private String issuedAt;
+    private String phoneNumber;
+    private boolean phoneNumberVerified;
 
 
     //-------------------------------------------------------------
@@ -163,4 +157,24 @@ public String getIssuedAt() {
     public void setIssuedAt(String issuedAt) {
         this.issuedAt = issuedAt;
     }
+
+
+    public String getPhoneNumber() {
+        return phoneNumber;
+    }
+
+
+    public void setPhoneNumber(String phoneNumber) {
+        this.phoneNumber = phoneNumber;
+    }
+
+
+    public boolean isPhoneNumberVerified() {
+        return phoneNumberVerified;
+    }
+
+
+    public void setPhoneNumberVerified(boolean phoneNumberVerified) {
+        this.phoneNumberVerified = phoneNumberVerified;
+    }
 }

aws-serverless-java-container-core/src/main/java/com/amazonaws/serverless/proxy/internal/serialization/CognitoAuthorizerClaimsDeserializer.java

@@ -0,0 +1,47 @@
+package com.amazonaws.serverless.proxy.internal.serialization;
+
+
+import com.amazonaws.serverless.proxy.internal.model.CognitoAuthorizerClaims;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
+
+import java.io.IOException;
+
+
+/**
+ * Created by bulianis on 5/2/17.
+ */
+public class CognitoAuthorizerClaimsDeserializer extends JsonDeserializer<CognitoAuthorizerClaims> {
+    @Override
+    public CognitoAuthorizerClaims deserialize(JsonParser jsonParser, DeserializationContext deserializationContext)
+            throws IOException, JsonProcessingException {
+        CognitoAuthorizerClaims output = new CognitoAuthorizerClaims();
+        JsonNode node = jsonParser.getCodec().readTree(jsonParser);
+
+        output.setSubject(node.get("sub").asText());
+        output.setUsername(node.get("cognito:username").asText());
+        output.setIssuer(node.get("iss").asText());
+        output.setAuthTime(node.get("auth_time").asLong());
+        output.setAudience(node.get("aud").asText());
+        output.setExpiration(node.get("exp").asText());
+        output.setTokenUse(node.get("token_use").asText());
+        output.setIssuedAt(node.get("iat").asText());
+
+        if (node.get("email") != null) {
+            output.setEmailVerified(node.get("email_verified").asBoolean());
+            output.setEmail(node.get("email").asText());
+        }
+
+        if (node.get("phone_number")  != null) {
+            output.setPhoneNumber(node.get("phone_number").asText());
+            output.setPhoneNumberVerified(node.get("phone_number_verified").asBoolean());
+        }
+
+        return output;
+    }
+}