diff options
| author | Tatu Saloranta <tatu.saloranta@iki.fi> | 2020-06-18 19:57:16 -0700 |
|---|---|---|
| committer | Tatu Saloranta <tatu.saloranta@iki.fi> | 2020-06-18 19:57:16 -0700 |
| commit | 73222382419e3cb42d234e52e94963b16c200509 (patch) | |
| tree | 2eed3afe2d067a52fb71ef448118bed0f4e47537 /src/main/java | |
| parent | 943f073d6e279550c340ee9fc097dbb0337e7329 (diff) | |
| parent | 67764a75e3689111b91f40be7507ec3de9e130a5 (diff) | |
| download | jackson-databind-73222382419e3cb42d234e52e94963b16c200509.tar.gz | |
Merge branch '2.11' into 2.12
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/com/fasterxml/jackson/databind/deser/std/EnumMapDeserializer.java | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/std/EnumMapDeserializer.java b/src/main/java/com/fasterxml/jackson/databind/deser/std/EnumMapDeserializer.java index 3012b5760..8fde2a371 100644 --- a/src/main/java/com/fasterxml/jackson/databind/deser/std/EnumMapDeserializer.java +++ b/src/main/java/com/fasterxml/jackson/databind/deser/std/EnumMapDeserializer.java @@ -125,7 +125,7 @@ public class EnumMapDeserializer /* Validation, post-processing (ResolvableDeserializer) /********************************************************** */ - + @Override public void resolve(DeserializationContext ctxt) throws JsonMappingException { @@ -244,19 +244,19 @@ public class EnumMapDeserializer return (EnumMap<?,?>) _valueInstantiator.createUsingDelegate(ctxt, _delegateDeserializer.deserialize(p, ctxt)); } - // Ok: must point to START_OBJECT - JsonToken t = p.currentToken(); - if ((t == JsonToken.START_OBJECT) || (t == JsonToken.FIELD_NAME) - || (t == JsonToken.END_OBJECT)) { + + switch (p.currentTokenId()) { + case JsonTokenId.ID_START_OBJECT: + case JsonTokenId.ID_END_OBJECT: + case JsonTokenId.ID_FIELD_NAME: return deserialize(p, ctxt, constructMap(ctxt)); - } - // (empty) String may be ok however; or single-String-arg ctor - if (t == JsonToken.VALUE_STRING) { + case JsonTokenId.ID_STRING: + // (empty) String may be ok however; or single-String-arg ctor return _deserializeFromString(p, ctxt); - } - // Empty array, or single-value wrapped in array? - if (t == JsonToken.START_ARRAY) { + case JsonTokenId.ID_START_ARRAY: + // Empty array, or single-value wrapped in array? return _deserializeFromArray(p, ctxt); + default: } return (EnumMap<?,?>) ctxt.handleUnexpectedToken(getValueType(ctxt), p); } |