From a4d17eeb335915635b31ec0551427ec44806aed8 Mon Sep 17 00:00:00 2001 From: Mitsunori Komatsu Date: Sat, 30 Nov 2024 16:22:02 +0900 Subject: [PATCH] Bump the version of `jackson-databind` --- build.sbt | 2 +- .../jackson/dataformat/JsonArrayFormat.java | 18 ------------------ 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/build.sbt b/build.sbt index ff396aa20..4a4b23015 100644 --- a/build.sbt +++ b/build.sbt @@ -109,7 +109,7 @@ lazy val msgpackJackson = "org.msgpack.jackson.dataformat" ), libraryDependencies ++= Seq( - "com.fasterxml.jackson.core" % "jackson-databind" % "2.16.2", + "com.fasterxml.jackson.core" % "jackson-databind" % "2.18.2", junitInterface, "org.apache.commons" % "commons-math3" % "3.6.1" % "test" ), diff --git a/msgpack-jackson/src/main/java/org/msgpack/jackson/dataformat/JsonArrayFormat.java b/msgpack-jackson/src/main/java/org/msgpack/jackson/dataformat/JsonArrayFormat.java index 9711e1b88..39155030e 100644 --- a/msgpack-jackson/src/main/java/org/msgpack/jackson/dataformat/JsonArrayFormat.java +++ b/msgpack-jackson/src/main/java/org/msgpack/jackson/dataformat/JsonArrayFormat.java @@ -2,7 +2,6 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.introspect.Annotated; -import com.fasterxml.jackson.databind.introspect.AnnotatedClass; import com.fasterxml.jackson.databind.introspect.JacksonAnnotationIntrospector; import static com.fasterxml.jackson.annotation.JsonFormat.Shape.ARRAY; @@ -33,21 +32,4 @@ public JsonFormat.Value findFormat(Annotated ann) return ARRAY_FORMAT; } - - /** - * Defines that unknown properties will be ignored, and won't fail the un-marshalling process. - * Happens in case of de-serialization of a payload that contains more properties than the actual - * value type - */ - @Override - public Boolean findIgnoreUnknownProperties(AnnotatedClass ac) - { - // If the entity contains JsonIgnoreProperties annotation, give it higher priority. - final Boolean precedenceIgnoreUnknownProperties = super.findIgnoreUnknownProperties(ac); - if (precedenceIgnoreUnknownProperties != null) { - return precedenceIgnoreUnknownProperties; - } - - return true; - } }