Revert "Crazy workaround for https://github.com/scala/scala-dev/issues/623"

adriaanm · adriaanm · commit 3178a86eeab2 · 2019-05-08T11:50:54.000+02:00
This reverts commit b23140e.
diff --git a/src/main/scala/com/fasterxml/jackson/module/scala/deser/GenericFactoryDeserializerResolver.scala b/src/main/scala/com/fasterxml/jackson/module/scala/deser/GenericFactoryDeserializerResolver.scala
@@ -63,9 +63,6 @@ abstract class GenericFactoryDeserializerResolver[CC[_], CF[X[_]]] extends Deser
     extends ContainerDeserializerBase[CC[_]](collectionType)
       with ContextualDeserializer {
 
-    // Crazy workaround for https://github.com/scala/scala-dev/issues/623
-    override def getNullValue(ctx: DeserializationContext): CC[_] with Object = super.getNullValue.asInstanceOf[CC[_] with Object]
-
     def this(collectionType: JavaType, valueDeser: JsonDeserializer[Object], valueTypeDeser: TypeDeserializer, valueInstantiator: ValueInstantiator) {
       this(collectionType, new CollectionDeserializer(collectionType, valueDeser, valueTypeDeser, valueInstantiator))
     }
diff --git a/src/main/scala/com/fasterxml/jackson/module/scala/deser/GenericMapFactoryDeserializerResolver.scala b/src/main/scala/com/fasterxml/jackson/module/scala/deser/GenericMapFactoryDeserializerResolver.scala
@@ -55,9 +55,6 @@ abstract class GenericMapFactoryDeserializerResolver[CC[K, V], CF[X[_, _]]] exte
   private class Deserializer(mapType: MapLikeType, containerDeserializer: MapDeserializer)
     extends ContainerDeserializerBase[CC[_, _]](mapType) with ContextualDeserializer {
 
-    // Crazy workaround for https://github.com/scala/scala-dev/issues/623
-    override def getNullValue(ctx: DeserializationContext): CC[_, _] with Object = super.getNullValue.asInstanceOf[CC[_, _] with Object]
-
     def this(mapType: MapLikeType, valueInstantiator: ValueInstantiator, keyDeser: KeyDeserializer, valueDeser: JsonDeserializer[_], valueTypeDeser: TypeDeserializer) = {
       this(mapType, new MapDeserializer(mapType, valueInstantiator, keyDeser, valueDeser.asInstanceOf[JsonDeserializer[AnyRef]], valueTypeDeser))
     }
diff --git a/src/main/scala/com/fasterxml/jackson/module/scala/deser/ScalaNumberDeserializersModule.scala b/src/main/scala/com/fasterxml/jackson/module/scala/deser/ScalaNumberDeserializersModule.scala
@@ -14,9 +14,6 @@ import scala.reflect.{ClassTag, classTag}
 private abstract class BigNumberDeserializer[T >: Null : ClassTag](creator: (String) => T)
   extends StdScalarDeserializer[T](classTag[T].runtimeClass)
 {
-  // Crazy workaround for https://github.com/scala/scala-dev/issues/623
-  override def getNullValue(ctx: DeserializationContext): T with Object = super.getNullValue.asInstanceOf[T with Object]
-
   override def deserialize(jp: JsonParser, ctxt: DeserializationContext): T = {
     val t = jp.getCurrentToken
     t match {
diff --git a/src/main/scala/com/fasterxml/jackson/module/scala/deser/TupleDeserializerModule.scala b/src/main/scala/com/fasterxml/jackson/module/scala/deser/TupleDeserializerModule.scala
@@ -18,9 +18,6 @@ private class TupleDeserializer(javaType: JavaType,
   if (ctors.length > 1) throw new IllegalStateException("Tuple should have only one constructor")
   val ctor = ctors.head
 
-  // Crazy workaround for https://github.com/scala/scala-dev/issues/623
-  override def getNullValue(ctx: DeserializationContext): Product with Object = super.getNullValue.asInstanceOf[Product with Object]
-
   def createContextual(ctxt: DeserializationContext, property: BeanProperty) = {
     // For now, the dumb and simple route of assuming we don't have the right deserializers.
     // This will probably result in duplicate deserializers, but it's safer than assuming

Original file line number	Diff line number	Diff line change
`@@ -63,9 +63,6 @@ abstract class GenericFactoryDeserializerResolver[CC[_], CF[X[_]]] extends Deser`
`63`	`63`	`extends ContainerDeserializerBase[CC[_]](collectionType)`
`64`	`64`	`with ContextualDeserializer {`
`65`	`65`
`66`		`- // Crazy workaround for https://github.com/scala/scala-dev/issues/623`
`67`		`- override def getNullValue(ctx: DeserializationContext): CC[_] with Object = super.getNullValue.asInstanceOf[CC[_] with Object]`
`68`		`-`
`69`	`66`	`def this(collectionType: JavaType, valueDeser: JsonDeserializer[Object], valueTypeDeser: TypeDeserializer, valueInstantiator: ValueInstantiator) {`
`70`	`67`	`this(collectionType, new CollectionDeserializer(collectionType, valueDeser, valueTypeDeser, valueInstantiator))`
`71`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,9 +55,6 @@ abstract class GenericMapFactoryDeserializerResolver[CC[K, V], CF[X[_, _]]] exte`
`55`	`55`	`private class Deserializer(mapType: MapLikeType, containerDeserializer: MapDeserializer)`
`56`	`56`	`extends ContainerDeserializerBase[CC[_, _]](mapType) with ContextualDeserializer {`
`57`	`57`
`58`		`- // Crazy workaround for https://github.com/scala/scala-dev/issues/623`
`59`		`- override def getNullValue(ctx: DeserializationContext): CC[_, _] with Object = super.getNullValue.asInstanceOf[CC[_, _] with Object]`
`60`		`-`
`61`	`58`	`def this(mapType: MapLikeType, valueInstantiator: ValueInstantiator, keyDeser: KeyDeserializer, valueDeser: JsonDeserializer[_], valueTypeDeser: TypeDeserializer) = {`
`62`	`59`	`this(mapType, new MapDeserializer(mapType, valueInstantiator, keyDeser, valueDeser.asInstanceOf[JsonDeserializer[AnyRef]], valueTypeDeser))`
`63`	`60`	`}`