Skip to content

Commit 8ea88f6

Browse files
committed
temp hack to try fix either deserializer tests
1 parent a4f7c4b commit 8ea88f6

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

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

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ private class EitherDeserializer(javaType: JavaType,
1818

1919
override def createContextual(ctxt: DeserializationContext, property: BeanProperty): JsonDeserializer[Either[AnyRef, AnyRef]] = {
2020

21-
def deserializerConfigFor(param: Int, inType: JavaType, property: BeanProperty): ElementDeserializerConfig = {
21+
def deserializerConfigFor(param: Int, property: BeanProperty): ElementDeserializerConfig = {
2222
val containedType = javaType.containedType(param)
2323

2424
val paramDeserializer = Option( ctxt.findContextualValueDeserializer(containedType, property) )
@@ -29,8 +29,12 @@ private class EitherDeserializer(javaType: JavaType,
2929

3030
javaType.containedTypeCount match {
3131
case 2 =>
32-
val leftDeserializerConfig = deserializerConfigFor(0, javaType, property)
33-
val rightDeserializerConfig = deserializerConfigFor(1, javaType, property)
32+
val leftDeserializerConfig = deserializerConfigFor(0, property)
33+
val rightDeserializerConfig = deserializerConfigFor(1, property)
34+
new EitherDeserializer(javaType, config, leftDeserializerConfig, rightDeserializerConfig)
35+
case 1 =>
36+
val leftDeserializerConfig = deserializerConfigFor(0, property)
37+
val rightDeserializerConfig = deserializerConfigFor(0, property)
3438
new EitherDeserializer(javaType, config, leftDeserializerConfig, rightDeserializerConfig)
3539
case _ => this
3640
}

0 commit comments

Comments
 (0)