diff options
| author | Tatu Saloranta <tatu.saloranta@iki.fi> | 2020-06-18 20:18:40 -0700 |
|---|---|---|
| committer | Tatu Saloranta <tatu.saloranta@iki.fi> | 2020-06-18 20:18:40 -0700 |
| commit | 5536e40b9edeea4d2625f62caa8cf0e767b2232a (patch) | |
| tree | 8c193e32525e27518409f0f65d11cbfeb5f30ae7 /src | |
| parent | 74baf5ff3b2861974db0309e66d29bac46584606 (diff) | |
| parent | 987ab8c97b4f5308f8e016052c75fa09d7ee8725 (diff) | |
| download | jackson-databind-5536e40b9edeea4d2625f62caa8cf0e767b2232a.tar.gz | |
Merge branch '2.11' into 2.12
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/com/fasterxml/jackson/databind/deser/std/MapDeserializer.java | 20 | ||||
| -rw-r--r-- | src/test/java/com/fasterxml/jackson/databind/struct/UnwrapSingleArrayMiscTest.java (renamed from src/test/java/com/fasterxml/jackson/failing/UnwrapSingleArrayMiscTest.java) | 2 |
2 files changed, 10 insertions, 12 deletions
diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/std/MapDeserializer.java b/src/main/java/com/fasterxml/jackson/databind/deser/std/MapDeserializer.java index a474cbac3..cba73fb4a 100644 --- a/src/main/java/com/fasterxml/jackson/databind/deser/std/MapDeserializer.java +++ b/src/main/java/com/fasterxml/jackson/databind/deser/std/MapDeserializer.java @@ -355,10 +355,10 @@ public class MapDeserializer getValueInstantiator(), p, "no default constructor found"); } - // Ok: must point to START_OBJECT, FIELD_NAME or END_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: final Map<Object,Object> result = (Map<Object,Object>) _valueInstantiator.createUsingDefault(ctxt); if (_standardStringKey) { _readAndBindStringKeyMap(p, ctxt, result); @@ -366,15 +366,13 @@ public class MapDeserializer } _readAndBind(p, ctxt, result); return result; - } - - // (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 (Map<Object,Object>) ctxt.handleUnexpectedToken(getValueType(ctxt), p); } diff --git a/src/test/java/com/fasterxml/jackson/failing/UnwrapSingleArrayMiscTest.java b/src/test/java/com/fasterxml/jackson/databind/struct/UnwrapSingleArrayMiscTest.java index f00485e49..6167862f3 100644 --- a/src/test/java/com/fasterxml/jackson/failing/UnwrapSingleArrayMiscTest.java +++ b/src/test/java/com/fasterxml/jackson/databind/struct/UnwrapSingleArrayMiscTest.java @@ -1,4 +1,4 @@ -package com.fasterxml.jackson.failing; +package com.fasterxml.jackson.databind.struct; import java.util.Collections; import java.util.EnumMap; |