issue when fields have default values (#600)

Author: pjfanning

src/main/scala/tools/jackson/module/scala/introspect/ScalaAnnotationIntrospectorModule.scala

@@ -214,23 +214,22 @@ class ScalaAnnotationIntrospectorInstance(scalaAnnotationIntrospectorModule: Sca
               // Locate the constructor param that matches it
               descriptor.properties.find(_.param.exists(_.index == creator.getCreatorIndex)) match {
                 case Some(pd) => {
-                  val mappedCreator = overrides.get(pd.name) match {
-                    case Some(refHolder) => WrappedCreatorProperty(creator, refHolder)
-                    case _ => creator
-                  }
                   if (applyDefaultValues) {
                     pd match {
                       case PropertyDescriptor(_, Some(ConstructorParameter(_, _, Some(defaultValue))), _, _, _, _, _) => {
-                        mappedCreator.withNullProvider(new NullValueProvider {
+                        val updatedCreator = creator.withNullProvider(new NullValueProvider {
                           override def getNullValue(ctxt: DeserializationContext): AnyRef = defaultValue()
-
                           override def getNullAccessPattern: AccessPattern = AccessPattern.DYNAMIC
                         })
+                        updatedCreator match {
+                          case cp: CreatorProperty => applyOverrides(cp, pd.name, overrides)
+                          case cp => cp
+                        }
                       }
-                      case _ => mappedCreator
+                      case _ => applyOverrides(creator, pd.name, overrides)
                     }
                   } else {
-                    mappedCreator
+                    applyOverrides(creator, pd.name, overrides)
                   }
                 }
                 case _ => creator
@@ -246,6 +245,14 @@ class ScalaAnnotationIntrospectorInstance(scalaAnnotationIntrospectorModule: Sca
     override def getFromObjectArguments(config: DeserializationConfig): Array[SettableBeanProperty] = {
       overriddenConstructorArguments
     }
+
+    private def applyOverrides(creator: CreatorProperty, propertyName: String,
+                               overrides: Map[String, ClassHolder]): CreatorProperty = {
+      overrides.get(propertyName) match {
+        case Some(refHolder) => WrappedCreatorProperty(creator, refHolder)
+        case _ => creator
+      }
+    }
   }
 }
 

src/test/scala/tools/jackson/module/scala/deser/OptionWithNumberDeserializerTest.scala

@@ -55,8 +55,8 @@ class OptionWithNumberDeserializerTest extends DeserializerTest {
   it should "deserialize OptionLongWithDefault when registerReferencedValueType is used" in {
     ScalaAnnotationIntrospectorModule.registerReferencedValueType(classOf[OptionLongWithDefault], "valueLong", classOf[Long])
     try {
-      val v1 = deserialize("""{"valueLong":151}""", classOf[OptionLong])
-      v1 shouldBe OptionLong(Some(151L))
+      val v1 = deserialize("""{"valueLong":151}""", classOf[OptionLongWithDefault])
+      v1 shouldBe OptionLongWithDefault(Some(151L))
       v1.valueLong.get shouldBe 151L
       //this next call will fail with a Scala unboxing exception unless you call ScalaAnnotationIntrospectorModule.registerReferencedValueType
       //or use one of the equivalent classes in OptionWithNumberDeserializerTest