Merge pull request #195 from aarondav/tuple

Close #194, allow deserialization of tuples contianing abstract types

Author: christophercurrie

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

@@ -31,12 +31,14 @@ private class TupleDeserializer(javaType: JavaType,
 
     val paramDesers = paramTypes map (ctxt.findContextualValueDeserializer(_, property))
 
-    val typeDesers = Option(property).map { p =>
+    val typeDesers: Seq[TypeDeserializer] = {
       val factory = BeanDeserializerFactory.instance
-      paramTypes map { pt =>
-        factory.findPropertyTypeDeserializer(ctxt.getConfig, pt, property.getMember)
+      if (property != null) {
+        paramTypes map (factory.findPropertyTypeDeserializer(ctxt.getConfig, _, property.getMember))
+      } else {
+        paramTypes map (factory.findTypeDeserializer(config, _))
       }
-    } getOrElse Stream.fill(paramTypes.size)(null)
+    }
 
     new TupleDeserializer(javaType, config, paramDesers, typeDesers)
   }

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

@@ -75,4 +75,11 @@ class TupleDeserializerTest extends DeserializerTest {
     val result = deserialize[TupleContainer](json)
     result should be (value)
   }
+
+  it should "deserialize using type information outside of field" in {
+    val value = (TupleValueLong(1), TupleValueString("foo"))
+    val json = mapper.writeValueAsString(value)
+    val result = deserialize[(TupleValueBase, TupleValueBase)](json)
+    result should be (value)
+  }
 }