Skip to content

Commit 43fba13

Browse files
committed
Revert "uptake IterationType (#640)"
This reverts commit b70b62e.
1 parent b70b62e commit 43fba13

File tree

2 files changed

+2
-19
lines changed

2 files changed

+2
-19
lines changed

src/main/scala/com/fasterxml/jackson/module/scala/modifiers/ScalaTypeModifier.scala

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ class ScalaTypeModifier extends TypeModifier {
1818
private val longClass = classOf[Long]
1919
private val immutableLongMapClass = classOf[immutable.LongMap[_]]
2020
private val mutableLongMapClass = classOf[mutable.LongMap[_]]
21-
private val iteratorClass = classOf[Iterator[_]]
2221
private val iterableOnceClass = classOf[IterableOnce[_]]
2322

2423
override def modifyType(javaType: JavaType,
@@ -40,8 +39,6 @@ class ScalaTypeModifier extends TypeModifier {
4039
} else {
4140
MapLikeType.upgradeFrom(javaType, javaType.containedTypeOrUnknown(0), javaType.containedTypeOrUnknown(1))
4241
}
43-
} else if (javaType.isTypeOrSubTypeOf(iteratorClass)) {
44-
IterationType.upgradeFrom(javaType, javaType.containedTypeOrUnknown(0))
4542
} else if (javaType.isTypeOrSubTypeOf(iterableOnceClass)) {
4643
CollectionLikeType.upgradeFrom(javaType, javaType.containedTypeOrUnknown(0))
4744
} else if (javaType.isTypeOrSubTypeOf(eitherClass)) {

src/main/scala/com/fasterxml/jackson/module/scala/ser/IteratorSerializerModule.scala

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@ package module.scala
33
package ser
44

55
import java.{lang => jl}
6+
67
import com.fasterxml.jackson.core.JsonGenerator
78
import com.fasterxml.jackson.databind._
8-
import com.fasterxml.jackson.databind.`type`.{CollectionLikeType, IterationType}
9+
import com.fasterxml.jackson.databind.`type`.CollectionLikeType
910
import com.fasterxml.jackson.databind.jsontype.TypeSerializer
1011
import com.fasterxml.jackson.databind.ser.std.AsArraySerializerBase
1112
import com.fasterxml.jackson.databind.ser.Serializers
@@ -74,21 +75,6 @@ private object ScalaIteratorSerializerResolver extends Serializers.Base {
7475
if (!SCALAITERATOR_CLASS.isAssignableFrom(rawClass) || JSONSERIALIZABLE_CLASS.isAssignableFrom(rawClass)) None.orNull
7576
else new UnresolvedIteratorSerializer(rawClass, collectionType.getContentType, false, elementTypeSerializer, elementSerializer)
7677
}
77-
78-
override def findSerializer(config: SerializationConfig, `type`: JavaType, beanDesc: BeanDescription): JsonSerializer[_] = {
79-
`type` match {
80-
case it: IterationType => {
81-
val rawClass = it.getRawClass
82-
if (JSONSERIALIZABLE_CLASS.isAssignableFrom(rawClass)) {
83-
None.orNull
84-
} else {
85-
new UnresolvedIteratorSerializer(it.getRawClass, config.constructType(classOf[AnyRef]), false,
86-
None.orNull, None.orNull)
87-
}
88-
}
89-
case _ => None.orNull
90-
}
91-
}
9278
}
9379

9480
trait IteratorSerializerModule extends IteratorTypeModifierModule {

0 commit comments

Comments
 (0)