rework either hack - still not good

Author: pjfanning

src/main/scala/tools/jackson/module/scala/deser/EitherDeserializer.scala

@@ -34,9 +34,13 @@ private class EitherDeserializer(javaType: JavaType,
         val rightDeserializerConfig = deserializerConfigFor(1, property)
         new EitherDeserializer(javaType, deserializationConfig, leftDeserializerConfig, rightDeserializerConfig)
       case 1 =>
-        val leftDeserializerConfig = deserializerConfigFor(0, property)
-        val rightDeserializerConfig = deserializerConfigFor(0, property)
-        new EitherDeserializer(javaType, deserializationConfig, leftDeserializerConfig, rightDeserializerConfig)
+        if (javaType.getBindings.getBoundName(0) == "A") {
+          val leftDeserializerConfig = deserializerConfigFor(0, property)
+          new EitherDeserializer(javaType, deserializationConfig, leftDeserializerConfig, ElementDeserializerConfig.empty)
+        } else {
+          val rightDeserializerConfig = deserializerConfigFor(0, property)
+          new EitherDeserializer(javaType, deserializationConfig, ElementDeserializerConfig.empty, rightDeserializerConfig)
+        }
       case _ => this
     }
   }
@@ -59,10 +63,10 @@ private class EitherDeserializer(javaType: JavaType,
         val `type` = jp.nextToken()
 
         val result = key match {
-          case ("l") => Left(deserializeValue(`type`, leftDeserializerConfig, jp, ctxt))
-          case ("left") => Left(deserializeValue(`type`, leftDeserializerConfig, jp, ctxt))
-          case ("r") => Right(deserializeValue(`type`, rightDeserializerConfig, jp, ctxt))
-          case ("right") => Right(deserializeValue(`type`, rightDeserializerConfig, jp, ctxt))
+          case "l" => Left(deserializeValue(`type`, leftDeserializerConfig, jp, ctxt))
+          case "left" => Left(deserializeValue(`type`, leftDeserializerConfig, jp, ctxt))
+          case "r" => Right(deserializeValue(`type`, rightDeserializerConfig, jp, ctxt))
+          case "right" => Right(deserializeValue(`type`, rightDeserializerConfig, jp, ctxt))
           case _ => ctxt.handleUnexpectedToken(javaType, jp).asInstanceOf[Either[AnyRef, AnyRef]]
         }
 
@@ -75,10 +79,10 @@ private class EitherDeserializer(javaType: JavaType,
         val `type` = jp.nextToken()
 
         val result = key match {
-          case ("l") => Left(deserializeValue(`type`, leftDeserializerConfig, jp, ctxt))
-          case ("left") => Left(deserializeValue(`type`, leftDeserializerConfig, jp, ctxt))
-          case ("r") => Right(deserializeValue(`type`, rightDeserializerConfig, jp, ctxt))
-          case ("right") => Right(deserializeValue(`type`, rightDeserializerConfig, jp, ctxt))
+          case "l" => Left(deserializeValue(`type`, leftDeserializerConfig, jp, ctxt))
+          case "left" => Left(deserializeValue(`type`, leftDeserializerConfig, jp, ctxt))
+          case "r" => Right(deserializeValue(`type`, rightDeserializerConfig, jp, ctxt))
+          case "right" => Right(deserializeValue(`type`, rightDeserializerConfig, jp, ctxt))
           case _ => ctxt.handleUnexpectedToken(javaType, jp).asInstanceOf[Either[AnyRef, AnyRef]]
         }