fix issue with null handling in option deserializer

FasterXML · Apr 4, 2023 · eb55d7a · cowtowncoder · Apr 4, 2023 · eb55d7a
1 parent 48d06fd
commit eb55d7a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/main/scala/com/fasterxml/jackson/module/scala/deser/OptionDeserializerModule.scala b/src/main/scala/com/fasterxml/jackson/module/scala/deser/OptionDeserializerModule.scala
@@ -60,7 +60,8 @@ private class OptionDeserializer(fullType: JavaType,
     val deser = valueDeserializer.getOrElse(ctxt.findContextualValueDeserializer(fullType.getContentType, beanProperty.orNull))
     val refd: AnyRef = valueTypeDeserializer match {
       case Some(vtd) => deser.deserializeWithType(p, ctxt, vtd)
-      case None => deser.deserialize(p, ctxt)
+      case None if p.getCurrentToken == JsonToken.VALUE_NULL => null
+      case _ => deser.deserialize(p, ctxt)
     }
     Option(refd)
   }

diff --git a/src/test/scala/com/fasterxml/jackson/module/scala/deser/TupleDeserializerTest.scala b/src/test/scala/com/fasterxml/jackson/module/scala/deser/TupleDeserializerTest.scala
@@ -88,6 +88,13 @@ class TupleDeserializerTest extends DeserializerTest {
     result shouldEqual value
   }
 
+  it should "deserialize an OptionalTupleHolder with nulls" in {
+    val value = OptionalTupleHolder(None, None)
+    val json = newMapper.writeValueAsString(value)
+    val result = deserialize(json, classOf[OptionalTupleHolder])
+    result shouldEqual value
+  }
+
   it should "deserialize an OptionalTupleHolder2 with nulls" in {
     val value = OptionalTupleHolder2(None, None)
     val json = newMapper.writeValueAsString(value)