Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Issue 382 master #538

Merged
merged 4 commits into from
Aug 1, 2021
Merged

Issue 382 master #538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e850313
Issue 382 (#537)
pjfanning Jul 31, 2021
4391e92
Update OptionDeserializerTest.scala
pjfanning Jul 31, 2021
9f9bf8b
Update OptionDeserializerTest.scala
pjfanning Aug 1, 2021
d52c360
Update OptionDeserializerTest.scala
pjfanning Aug 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 29 additions & 5 deletions src/main/scala/com/fasterxml/jackson/module/scala/deser/OptionDeserializerModule.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import com.fasterxml.jackson.core.{JsonParser, JsonToken}
import com.fasterxml.jackson.databind.JacksonModule.SetupContext
import com.fasterxml.jackson.databind._
import com.fasterxml.jackson.databind.`type`.{ReferenceType, TypeFactory}
import com.fasterxml.jackson.databind.deser.std.ReferenceTypeDeserializer
import com.fasterxml.jackson.databind.deser.Deserializers
import com.fasterxml.jackson.databind.deser.std.StdDeserializer
import com.fasterxml.jackson.databind.jsontype.TypeDeserializer
import com.fasterxml.jackson.module.scala.JacksonModule.InitializerBuilder
import com.fasterxml.jackson.module.scala.ScalaModule
Expand All @@ -15,7 +15,7 @@ private class OptionDeserializer(fullType: JavaType,
valueTypeDeserializer: Option[TypeDeserializer],
valueDeserializer: Option[ValueDeserializer[AnyRef]],
beanProperty: Option[BeanProperty] = None)
extends StdDeserializer[Option[AnyRef]](fullType) {
extends ReferenceTypeDeserializer[Option[AnyRef]](fullType, None.orNull, valueTypeDeserializer.orNull, valueDeserializer.orNull) {

override def getValueType: JavaType = fullType

Expand All @@ -29,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[ValueDeserializer[AnyRef]]], beanProperty)
}
new OptionDeserializer(fullType, typeDeser, valueDeser.asInstanceOf[Option[ValueDeserializer[AnyRef]]], beanProperty)
}

override def createContextual(ctxt: DeserializationContext, property: BeanProperty): ValueDeserializer[Option[AnyRef]] = {
Expand Down Expand Up @@ -71,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: ValueDeserializer[_]): ReferenceTypeDeserializer[Option[AnyRef]] = {
new OptionDeserializer(fullType, Some(typeDeser), valueDeser.asInstanceOf[Option[ValueDeserializer[AnyRef]]], beanProperty)
}

override def updateReference(reference: Option[AnyRef], contents: Any): Option[AnyRef] = referenceValue(contents)

override def getReferenced(reference: Option[AnyRef]): AnyRef = reference.orNull
}

private class OptionDeserializerResolver(config: ScalaModule.Config) extends Deserializers.Base {
Expand Down
20 changes: 20 additions & 0 deletions src/test/scala/com/fasterxml/jackson/module/scala/deser/OptionDeserializerTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ package com.fasterxml.jackson.module.scala.deser

import com.fasterxml.jackson.annotation._
import com.fasterxml.jackson.core.`type`.TypeReference
import com.fasterxml.jackson.databind.DefaultTyping
import com.fasterxml.jackson.databind.jsontype.BasicPolymorphicTypeValidator
import com.fasterxml.jackson.module.scala.DefaultScalaModule

import scala.annotation.meta.field
Expand Down Expand Up @@ -33,6 +35,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 {
Expand Down Expand Up @@ -97,4 +103,18 @@ 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 builder = newBuilder
val polymorphicTypeValidator = BasicPolymorphicTypeValidator.builder()
.allowIfBaseType(classOf[Any])
.build()
builder.activateDefaultTypingAsProperty(polymorphicTypeValidator, DefaultTyping.OBJECT_AND_NON_CONCRETE, "_t")
val mapper = builder.build()
val v = XMarker(Some(AMarker(1)))
val str = mapper.writeValueAsString(v)
val v2 = mapper.readValue(str, classOf[XMarker])
v2 shouldEqual v
}
}