diff options
| author | Tatu Saloranta <tatu.saloranta@iki.fi> | 2020-06-30 20:40:50 -0700 |
|---|---|---|
| committer | Tatu Saloranta <tatu.saloranta@iki.fi> | 2020-06-30 20:40:50 -0700 |
| commit | eb000de91d532141122a7507c63e05639b22d7bc (patch) | |
| tree | e014fa5c6fab689d6badafda16ab24db137a9c80 | |
| parent | 1d7581bc28e28620cf9df69bb497fb35252bec40 (diff) | |
| download | jackson-databind-eb000de91d532141122a7507c63e05639b22d7bc.tar.gz | |
minor refactoring
| -rw-r--r-- | src/main/java/com/fasterxml/jackson/databind/ObjectMapper.java | 29 |
1 files changed, 11 insertions, 18 deletions
diff --git a/src/main/java/com/fasterxml/jackson/databind/ObjectMapper.java b/src/main/java/com/fasterxml/jackson/databind/ObjectMapper.java index 64be32b28..899149f69 100644 --- a/src/main/java/com/fasterxml/jackson/databind/ObjectMapper.java +++ b/src/main/java/com/fasterxml/jackson/databind/ObjectMapper.java @@ -4485,13 +4485,12 @@ public class ObjectMapper JavaType valueType) throws IOException { - /* First: may need to read the next token, to initialize - * state (either before first read from parser, or after - * previous token has been cleared) - */ - Object result; + // First: may need to read the next token, to initialize + // state (either before first read from parser, or after + // previous token has been cleared) + final Object result; JsonToken t = _initForReading(p, valueType); - final DeserializationContext ctxt = createDeserializationContext(p, cfg); + final DefaultDeserializationContext ctxt = createDeserializationContext(p, cfg); if (t == JsonToken.VALUE_NULL) { // Ask JsonDeserializer what 'null value' to use: result = _findRootDeserializer(ctxt, valueType).getNullValue(ctxt); @@ -4518,10 +4517,10 @@ public class ObjectMapper throws IOException { try (JsonParser p = p0) { - Object result; - JsonToken t = _initForReading(p, valueType); + final Object result; final DeserializationConfig cfg = getDeserializationConfig(); - final DeserializationContext ctxt = createDeserializationContext(p, cfg); + final DefaultDeserializationContext ctxt = createDeserializationContext(p, cfg); + JsonToken t = _initForReading(p, valueType); if (t == JsonToken.VALUE_NULL) { // Ask JsonDeserializer what 'null value' to use: result = _findRootDeserializer(ctxt, valueType).getNullValue(ctxt); @@ -4568,18 +4567,12 @@ public class ObjectMapper return cfg.getNodeFactory().missingNode(); } } - final boolean checkTrailing = cfg.isEnabled(DeserializationFeature.FAIL_ON_TRAILING_TOKENS); - DeserializationContext ctxt; - JsonNode resultNode; + final JsonNode resultNode; + final DefaultDeserializationContext ctxt = createDeserializationContext(p, cfg); if (t == JsonToken.VALUE_NULL) { resultNode = cfg.getNodeFactory().nullNode(); - if (!checkTrailing) { - return resultNode; - } - ctxt = createDeserializationContext(p, cfg); } else { - ctxt = createDeserializationContext(p, cfg); JsonDeserializer<Object> deser = _findRootDeserializer(ctxt, valueType); if (cfg.useRootWrapping()) { resultNode = (JsonNode) _unwrapAndDeserialize(p, ctxt, cfg, valueType, deser); @@ -4587,7 +4580,7 @@ public class ObjectMapper resultNode = (JsonNode) deser.deserialize(p, ctxt); } } - if (checkTrailing) { + if (cfg.isEnabled(DeserializationFeature.FAIL_ON_TRAILING_TOKENS)) { _verifyNoTrailingTokens(p, ctxt, valueType); } // No ObjectIds so can ignore |