@@ -19,8 +19,8 @@ private trait ContextualEnumerationDeserializer extends ContextualDeserializer {
19
19
* This class is mostly legacy logic to be deprecated/removed in 3.0
20
20
*/
21
21
private 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 ) {
24
24
ctxt.handleUnexpectedToken(theType.getRawClass, jp).asInstanceOf [Enumeration # Value ]
25
25
} else {
26
26
val (eclass, eclassName) = parsePair(jp)
@@ -36,9 +36,9 @@ private class EnumerationDeserializer(theType:JavaType) extends JsonDeserializer
36
36
}
37
37
}
38
38
}
39
- }
39
+ }
40
40
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})
42
42
}
43
43
44
44
private class AnnotatedEnumerationDeserializer (r : EnumResolver ) extends JsonDeserializer [Enumeration # Value ] with ContextualEnumerationDeserializer {
@@ -58,13 +58,13 @@ private object EnumerationDeserializerResolver extends Deserializers.Base {
58
58
config : DeserializationConfig ,
59
59
beanDesc : BeanDescription ) = {
60
60
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 {
65
65
None .orNull
66
66
}
67
- }
67
+ }
68
68
}
69
69
70
70
private class EnumerationKeyDeserializer (r : Option [EnumResolver ]) extends KeyDeserializer with ContextualKeyDeserializer {
0 commit comments