From 04301fae16ea4010c910293cb809873996077098 Mon Sep 17 00:00:00 2001 From: Ricky Chow Date: Tue, 26 Mar 2024 17:14:46 +0800 Subject: [PATCH] Merge branch 'master' of github.com:s-string/java-jwt # Conflicts: # lib/build.gradle # lib/src/main/java/com/auth0/jwt/impl/JWTParser.java # settings.gradle add java8 datatype and java time support --- lib/build.gradle | 3 +++ lib/src/main/java/com/auth0/jwt/impl/JWTParser.java | 11 ++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/lib/build.gradle b/lib/build.gradle index c4e11764..68ac2ccf 100644 --- a/lib/build.gradle +++ b/lib/build.gradle @@ -73,6 +73,9 @@ javadoc { dependencies { implementation 'com.fasterxml.jackson.core:jackson-databind:2.14.2' + implementation("com.fasterxml.jackson.module:jackson-module-parameter-names:2.14.2") + implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.14.2") + implementation("com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.14.2") testImplementation 'org.bouncycastle:bcprov-jdk15on:1.70' testImplementation 'junit:junit:4.13.2' diff --git a/lib/src/main/java/com/auth0/jwt/impl/JWTParser.java b/lib/src/main/java/com/auth0/jwt/impl/JWTParser.java index 022520f5..17264aaf 100644 --- a/lib/src/main/java/com/auth0/jwt/impl/JWTParser.java +++ b/lib/src/main/java/com/auth0/jwt/impl/JWTParser.java @@ -5,10 +5,15 @@ import com.auth0.jwt.interfaces.JWTPartsParser; import com.auth0.jwt.interfaces.Payload; import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectReader; import com.fasterxml.jackson.databind.SerializationFeature; import com.fasterxml.jackson.databind.module.SimpleModule; +import com.fasterxml.jackson.datatype.jdk8.Jdk8Module; +import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; +import com.fasterxml.jackson.module.paramnames.ParameterNamesModule; + import java.io.IOException; /** @@ -73,7 +78,11 @@ static ObjectMapper getDefaultObjectMapper() { } private static ObjectMapper createDefaultObjectMapper() { - ObjectMapper mapper = new ObjectMapper(); + ObjectMapper mapper = new ObjectMapper() + .registerModule(new ParameterNamesModule()) + .registerModule(new Jdk8Module()) + .registerModule(new JavaTimeModule()) + .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); mapper.disable(SerializationFeature.FAIL_ON_EMPTY_BEANS); mapper.setSerializationInclusion(JsonInclude.Include.NON_EMPTY);