@@ -19,8 +19,8 @@ private trait ContextualEnumerationDeserializer extends ContextualDeserializer {
1919 * This class is mostly legacy logic to be deprecated/removed in 3.0
2020 */
2121private class EnumerationDeserializer (theType: JavaType ) extends JsonDeserializer [Enumeration # Value ] with ContextualEnumerationDeserializer {
22- override def deserialize (jp: JsonParser , ctxt: DeserializationContext ): Enumeration # Value = {
23- if (jp.getCurrentToken != JsonToken .START_OBJECT ) {
22+ override def deserialize (jp: JsonParser , ctxt: DeserializationContext ): Enumeration # Value = {
23+ if (jp.getCurrentToken != JsonToken .START_OBJECT ) {
2424 ctxt.handleUnexpectedToken(theType.getRawClass, jp).asInstanceOf [Enumeration # Value ]
2525 } else {
2626 val (eclass, eclassName) = parsePair(jp)
@@ -36,9 +36,9 @@ private class EnumerationDeserializer(theType:JavaType) extends JsonDeserializer
3636 }
3737 }
3838 }
39- }
39+ }
4040
41- private def parsePair ( jp: JsonParser ) = ({jp.nextToken; jp.getText}, {jp.nextToken; jp.getText})
41+ private def parsePair ( jp: JsonParser ) = ({jp.nextToken; jp.getText}, {jp.nextToken; jp.getText})
4242}
4343
4444private class AnnotatedEnumerationDeserializer (r : EnumResolver ) extends JsonDeserializer [Enumeration # Value ] with ContextualEnumerationDeserializer {
@@ -58,13 +58,13 @@ private object EnumerationDeserializerResolver extends Deserializers.Base {
5858 config : DeserializationConfig ,
5959 beanDesc : BeanDescription ) = {
6060
61- val clazz = javaType.getRawClass
62- if (ENUMERATION .isAssignableFrom(clazz)) {
63- new EnumerationDeserializer (javaType)
64- } else {
61+ val clazz = javaType.getRawClass
62+ if (ENUMERATION .isAssignableFrom(clazz)) {
63+ new EnumerationDeserializer (javaType)
64+ } else {
6565 None .orNull
6666 }
67- }
67+ }
6868}
6969
7070private class EnumerationKeyDeserializer (r : Option [EnumResolver ]) extends KeyDeserializer with ContextualKeyDeserializer {
0 commit comments