wip

Author: pjfanning

src/main/scala/com/fasterxml/jackson/module/scala/introspect/BeanIntrospector.scala

@@ -37,10 +37,6 @@ import scala.reflect.NameTransformer
 
 object BeanIntrospector {
 
-  private case class FieldKey(clazz: Class[_], fieldName: String)
-
-  private val overrideMap = scala.collection.mutable.Map[FieldKey, Class[_]]()
-
   def apply[T <: AnyRef](cls: Class[_]) = {
 
     /**
@@ -246,20 +242,6 @@ object BeanIntrospector {
     BeanDescriptor(cls, fields ++ methods ++ lazyValMethods)
   }
 
-  /**
-   * jackson-module-scala does not always properly handle deserialization of Options or Collections wrapping
-   * Scala primitives (eg Int, Long, Boolean). There are general issues with serializing and deserializing
-   * Scala 2 Enumerations. These issues can be worked around by adding Jackson annotations on the affected fields.
-   * This function is designed to be used when it is not possible to apply Jackson annotations.
-   *
-   * @param clazz
-   * @param fieldName
-   * @param referencedType
-   */
-  def registerReferencedType(clazz: Class[_], fieldName: String, referencedType: Class[_]): Unit = {
-    overrideMap.update(FieldKey(clazz, fieldName), referencedType)
-  }
-
   private def getCtorParams(ctor: Constructor[_]): Seq[String] = {
     val names = JavaParameterIntrospector.getCtorParamNames(ctor)
     names.map(NameTransformer.decode)

src/main/scala/com/fasterxml/jackson/module/scala/introspect/ScalaAnnotationIntrospectorModule.scala

@@ -16,6 +16,28 @@ object ScalaAnnotationIntrospector extends NopAnnotationIntrospector with ValueI
   private [this] var _descriptorCache: LookupCache[ClassKey, BeanDescriptor] =
     new LRUMap[ClassKey, BeanDescriptor](16, 100)
 
+  private case class FieldKey(clazz: Class[_], fieldName: String)
+
+  private val overrideMap = scala.collection.mutable.Map[FieldKey, Class[_]]()
+
+  /**
+   * jackson-module-scala does not always properly handle deserialization of Options or Collections wrapping
+   * Scala primitives (eg Int, Long, Boolean). There are general issues with serializing and deserializing
+   * Scala 2 Enumerations. These issues can be worked around by adding Jackson annotations on the affected fields.
+   * This function is designed to be used when it is not possible to apply Jackson annotations.
+   *
+   * @param clazz
+   * @param fieldName
+   * @param referencedType
+   */
+  def registerReferencedType(clazz: Class[_], fieldName: String, referencedType: Class[_]): Unit = {
+    overrideMap.update(FieldKey(clazz, fieldName), referencedType)
+  }
+
+  def clearRegisteredReferencedTypes(): Unit = {
+    overrideMap.clear()
+  }
+
   def setDescriptorCache(cache: LookupCache[ClassKey, BeanDescriptor]): LookupCache[ClassKey, BeanDescriptor] = {
     val existingCache = _descriptorCache
     _descriptorCache = cache
@@ -109,27 +131,33 @@ object ScalaAnnotationIntrospector extends NopAnnotationIntrospector with ValueI
       val applyDefaultValues = config.isEnabled(MapperFeature.APPLY_DEFAULT_VALUES)
       val args = delegate.getFromObjectArguments(config)
       Option(args) match {
-        case Some(array) => {
+        case Some(array) if (applyDefaultValues || overrideMap.nonEmpty) => {
           array.map {
             case creator: CreatorProperty => {
-              if (applyDefaultValues) {
-                // Locate the constructor param that matches it
-                descriptor.properties.find(_.param.exists(_.index == creator.getCreatorIndex)) match {
-                  case Some(PropertyDescriptor(name, Some(ConstructorParameter(_, _, Some(defaultValue))), _, _, _, _, _)) =>
-                    creator.withNullProvider(new NullValueProvider {
-                      override def getNullValue(ctxt: DeserializationContext): AnyRef = defaultValue()
-
-                      override def getNullAccessPattern: AccessPattern = AccessPattern.DYNAMIC
-                    })
-                  case _ => creator
+              // Locate the constructor param that matches it
+              descriptor.properties.find(_.param.exists(_.index == creator.getCreatorIndex)) match {
+                case Some(pd) => {
+                  if (applyDefaultValues) {
+                    pd match {
+                      case PropertyDescriptor(_, Some(ConstructorParameter(_, _, Some(defaultValue))), _, _, _, _, _) => {
+                        creator.withNullProvider(new NullValueProvider {
+                          override def getNullValue(ctxt: DeserializationContext): AnyRef = defaultValue()
+
+                          override def getNullAccessPattern: AccessPattern = AccessPattern.DYNAMIC
+                        })
+                      }
+                      case _ => creator
+                    }
+                  } else {
+                    creator
+                  }
                 }
-              } else {
-                creator
+                case _ => creator
               }
             }
-            case other => other
           }
         }
+        case Some(array) => array
         case _ => Array.empty
       }
     }

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

@@ -2,7 +2,8 @@ package com.fasterxml.jackson.module.scala.deser
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize
 import com.fasterxml.jackson.module.scala.DefaultScalaModule
-import com.fasterxml.jackson.module.scala.introspect.BeanIntrospector
+import com.fasterxml.jackson.module.scala.introspect.ScalaAnnotationIntrospector
+import org.scalatest.BeforeAndAfterEach
 
 object OptionWithNumberDeserializerTest {
   case class AnnotatedOptionLong(@JsonDeserialize(contentAs = classOf[java.lang.Long]) valueLong: Option[Long])
@@ -12,14 +13,19 @@ object OptionWithNumberDeserializerTest {
   case class OptionBigInt(value: Option[BigInt])
 }
 
-class OptionWithNumberDeserializerTest extends DeserializerTest {
+class OptionWithNumberDeserializerTest extends DeserializerTest with BeforeAndAfterEach {
   lazy val module: DefaultScalaModule.type = DefaultScalaModule
   import OptionWithNumberDeserializerTest._
 
   private def useOptionLong(v: Option[Long]): Long = v.map(_ * 2).getOrElse(0L)
   private def useOptionJavaLong(v: Option[java.lang.Long]): Long = v.map(_ * 2).getOrElse(0L)
   private def useOptionBigInt(v: Option[BigInt]): Long = v.map(_ * 2).map(_.toLong).getOrElse(0L)
 
+  override def afterEach(): Unit = {
+    super.afterEach()
+    ScalaAnnotationIntrospector.clearRegisteredReferencedTypes()
+  }
+
   "JacksonModuleScala" should "support AnnotatedOptionLong" in {
     val v1 = deserialize("""{"valueLong":151}""", classOf[AnnotatedOptionLong])
     v1 shouldBe AnnotatedOptionLong(Some(151L))
@@ -35,7 +41,7 @@ class OptionWithNumberDeserializerTest extends DeserializerTest {
   }
 
   it should "support OptionLong" in {
-    BeanIntrospector.registerReferencedType(classOf[OptionLong], "valueLong", classOf[Long])
+    ScalaAnnotationIntrospector.registerReferencedType(classOf[OptionLong], "valueLong", classOf[Long])
     val v1 = deserialize("""{"valueLong":151}""", classOf[OptionLong])
     v1 shouldBe OptionLong(Some(151L))
     v1.valueLong.get shouldBe 151L