Issue 382 (#537)

Author: pjfanning

src/main/scala/com/fasterxml/jackson/module/scala/deser/OptionDeserializerModule.scala

@@ -3,16 +3,18 @@ package com.fasterxml.jackson.module.scala.deser
 import com.fasterxml.jackson.core.{JsonParser, JsonToken}
 import com.fasterxml.jackson.databind._
 import com.fasterxml.jackson.databind.`type`.{ReferenceType, TypeFactory}
-import com.fasterxml.jackson.databind.deser.std.StdDeserializer
+import com.fasterxml.jackson.databind.deser.std.ReferenceTypeDeserializer
 import com.fasterxml.jackson.databind.deser.{ContextualDeserializer, Deserializers}
 import com.fasterxml.jackson.databind.jsontype.TypeDeserializer
 import com.fasterxml.jackson.module.scala.modifiers.OptionTypeModifierModule
 
+import scala.util.control.NonFatal
+
 private class OptionDeserializer(fullType: JavaType,
                                  valueTypeDeserializer: Option[TypeDeserializer],
                                  valueDeserializer: Option[JsonDeserializer[AnyRef]],
                                  beanProperty: Option[BeanProperty] = None)
-  extends StdDeserializer[Option[AnyRef]](fullType) with ContextualDeserializer {
+  extends ReferenceTypeDeserializer[Option[AnyRef]](fullType, valueTypeDeserializer.orNull, valueDeserializer.orNull) with ContextualDeserializer {
 
   override def getValueType: JavaType = fullType
 
@@ -27,9 +29,10 @@ private class OptionDeserializer(fullType: JavaType,
       typeDeser == this.valueTypeDeserializer &&
       valueDeser == this.valueDeserializer &&
       beanProperty == this.beanProperty) {
-      return this
+      this
+    } else {
+      new OptionDeserializer(fullType, typeDeser, valueDeser.asInstanceOf[Option[JsonDeserializer[AnyRef]]], beanProperty)
     }
-    new OptionDeserializer(fullType, typeDeser, valueDeser.asInstanceOf[Option[JsonDeserializer[AnyRef]]], beanProperty)
   }
 
   override def createContextual(ctxt: DeserializationContext, property: BeanProperty): JsonDeserializer[Option[AnyRef]] = {
@@ -69,9 +72,32 @@ private class OptionDeserializer(fullType: JavaType,
     if (t == JsonToken.VALUE_NULL) {
       getNullValue(ctxt)
     } else {
-      typeDeserializer.deserializeTypedFromAny(jp, ctxt).asInstanceOf[Option[AnyRef]]
+      valueTypeDeserializer match {
+        case Some(vtd) => Option(vtd.deserializeTypedFromAny(jp, ctxt))
+        case _ => {
+          typeDeserializer.deserializeTypedFromAny(jp, ctxt) match {
+            case Some(any) => referenceValue(any)
+            case any => referenceValue(any)
+          }
+        }
+      }
     }
   }
+
+  override def referenceValue(contents: Any): Option[AnyRef] = {
+    Option(contents) match {
+      case Some(anyRef: AnyRef) => Some(anyRef)
+      case _ => None
+    }
+  }
+
+  override def withResolved(typeDeser: TypeDeserializer, valueDeser: JsonDeserializer[_]): ReferenceTypeDeserializer[Option[AnyRef]] = {
+    new OptionDeserializer(fullType, Some(typeDeser), valueDeser.asInstanceOf[Option[JsonDeserializer[AnyRef]]], beanProperty)
+  }
+
+  override def updateReference(reference: Option[AnyRef], contents: Any): Option[AnyRef] = referenceValue(contents)
+
+  override def getReferenced(reference: Option[AnyRef]): AnyRef = reference.orNull
 }
 
 private object OptionDeserializerResolver extends Deserializers.Base {

src/test/scala/com/fasterxml/jackson/module/scala/deser/OptionDeserializerTest.scala

@@ -33,6 +33,10 @@ object OptionDeserializerTest {
 
   case class Foo(bar: String)
   case class Wrapper[T](t: T)
+
+  trait Marker
+  case class AMarker(a: Int) extends Marker
+  case class XMarker(x: Option[Marker])
 }
 
 class OptionDeserializerTest extends DeserializerTest {
@@ -98,4 +102,16 @@ class OptionDeserializerTest extends DeserializerTest {
     val result2 = mapper.readValue(json, classOf[OptionWrapper])
     result2 shouldEqual OptionWrapper(None)
   }
+
+  //https://github.com/FasterXML/jackson-module-scala/issues/382
+  it should "handle generics" in {
+    val mapper = new ObjectMapper
+    mapper.registerModule(DefaultScalaModule)
+    mapper.enableDefaultTypingAsProperty(ObjectMapper.DefaultTyping.OBJECT_AND_NON_CONCRETE, "_t")
+    val v = XMarker(Some(AMarker(1)))
+    val str = mapper.writeValueAsString(v)
+    println(str) // 1
+    val d = mapper.readValue(str, classOf[XMarker]) // 2
+    println(d)
+  }
 }