diff options
author | Tatu Saloranta <tatu.saloranta@iki.fi> | 2020-07-24 11:43:58 -0700 |
---|---|---|
committer | Tatu Saloranta <tatu.saloranta@iki.fi> | 2020-07-24 11:43:58 -0700 |
commit | b793a30d80c5b77a82c653ff94e9303c97bcd8c5 (patch) | |
tree | 340e0f2da799adc55a0759c7fc3dae4b5f97b852 | |
parent | 7a249f80e19709365764d8ea273fb46f55a8af1b (diff) | |
download | jackson-databind-b793a30d80c5b77a82c653ff94e9303c97bcd8c5.tar.gz |
Minor refactoring for 3.0 compatiblity
12 files changed, 49 insertions, 46 deletions
diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializer.java b/src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializer.java index 81dbc97d5..dc7bddb3d 100644 --- a/src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializer.java +++ b/src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializer.java @@ -267,7 +267,7 @@ public class BeanDeserializer } } else { if (p.hasTokenId(JsonTokenId.ID_FIELD_NAME)) { - propName = p.getCurrentName(); + propName = p.currentName(); } else { return bean; } @@ -313,7 +313,7 @@ public class BeanDeserializer // [databind#631]: Assign current value, to be accessible by custom serializers p.setCurrentValue(bean); if (p.hasTokenId(JsonTokenId.ID_FIELD_NAME)) { - String propName = p.getCurrentName(); + String propName = p.currentName(); do { p.nextToken(); SettableBeanProperty prop = _beanProperties.find(propName); @@ -347,7 +347,7 @@ public class BeanDeserializer */ if ((_objectIdReader != null) && _objectIdReader.maySerializeAsObject()) { if (p.hasTokenId(JsonTokenId.ID_FIELD_NAME) - && _objectIdReader.isValidReferencePropertyName(p.getCurrentName(), p)) { + && _objectIdReader.isValidReferencePropertyName(p.currentName(), p)) { return deserializeFromObjectId(p, ctxt); } } @@ -392,7 +392,7 @@ public class BeanDeserializer } } if (p.hasTokenId(JsonTokenId.ID_FIELD_NAME)) { - String propName = p.getCurrentName(); + String propName = p.currentName(); do { p.nextToken(); SettableBeanProperty prop = _beanProperties.find(propName); @@ -431,7 +431,7 @@ public class BeanDeserializer JsonToken t = p.currentToken(); List<BeanReferring> referrings = null; for (; t == JsonToken.FIELD_NAME; t = p.nextToken()) { - String propName = p.getCurrentName(); + String propName = p.currentName(); p.nextToken(); // to point to value // Object Id property? if (buffer.readIdProperty(propName)) { @@ -651,7 +651,7 @@ public class BeanDeserializer throws IOException { if (p.hasTokenId(JsonTokenId.ID_FIELD_NAME)) { - String propName = p.getCurrentName(); + String propName = p.currentName(); do { p.nextToken(); // TODO: 06-Jan-2015, tatu: try streamlining call sequences here as well @@ -705,7 +705,7 @@ public class BeanDeserializer injectValues(ctxt, bean); } final Class<?> activeView = _needViewProcesing ? ctxt.getActiveView() : null; - String propName = p.hasTokenId(JsonTokenId.ID_FIELD_NAME) ? p.getCurrentName() : null; + String propName = p.hasTokenId(JsonTokenId.ID_FIELD_NAME) ? p.currentName() : null; for (; propName != null; propName = p.nextFieldName()) { p.nextToken(); @@ -765,7 +765,7 @@ public class BeanDeserializer tokens.writeStartObject(); final Class<?> activeView = _needViewProcesing ? ctxt.getActiveView() : null; for (; t == JsonToken.FIELD_NAME; t = p.nextToken()) { - String propName = p.getCurrentName(); + String propName = p.currentName(); SettableBeanProperty prop = _beanProperties.find(propName); p.nextToken(); if (prop != null) { // normal case @@ -826,7 +826,7 @@ public class BeanDeserializer JsonToken t = p.currentToken(); for (; t == JsonToken.FIELD_NAME; t = p.nextToken()) { - String propName = p.getCurrentName(); + String propName = p.currentName(); p.nextToken(); // to point to value // creator property? SettableBeanProperty creatorProp = creator.findCreatorProperty(propName); @@ -951,7 +951,7 @@ public class BeanDeserializer final ExternalTypeHandler ext = _externalTypeIdHandler.start(); for (JsonToken t = p.currentToken(); t == JsonToken.FIELD_NAME; t = p.nextToken()) { - String propName = p.getCurrentName(); + String propName = p.currentName(); t = p.nextToken(); SettableBeanProperty prop = _beanProperties.find(propName); if (prop != null) { // normal case @@ -1008,7 +1008,7 @@ public class BeanDeserializer JsonToken t = p.currentToken(); for (; t == JsonToken.FIELD_NAME; t = p.nextToken()) { - String propName = p.getCurrentName(); + String propName = p.currentName(); p.nextToken(); // to point to value // creator property? SettableBeanProperty creatorProp = creator.findCreatorProperty(propName); diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializerBase.java b/src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializerBase.java index 4a4952cf0..b2c6c3547 100644 --- a/src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializerBase.java +++ b/src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializerBase.java @@ -1269,7 +1269,7 @@ public abstract class BeanDeserializerBase t = p.nextToken(); } if ((t == JsonToken.FIELD_NAME) && _objectIdReader.maySerializeAsObject() - && _objectIdReader.isValidReferencePropertyName(p.getCurrentName(), p)) { + && _objectIdReader.isValidReferencePropertyName(p.currentName(), p)) { return deserializeFromObjectId(p, ctxt); } } @@ -1631,7 +1631,7 @@ public abstract class BeanDeserializerBase // note: buffer does NOT have starting START_OBJECT JsonParser bufferParser = unknownTokens.asParser(); while (bufferParser.nextToken() != JsonToken.END_OBJECT) { - String propName = bufferParser.getCurrentName(); + String propName = bufferParser.currentName(); // Unknown: let's call handler method bufferParser.nextToken(); handleUnknownProperty(bufferParser, ctxt, bean, propName); diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/BuilderBasedDeserializer.java b/src/main/java/com/fasterxml/jackson/databind/deser/BuilderBasedDeserializer.java index 44bff9d3c..d89ddeb07 100644 --- a/src/main/java/com/fasterxml/jackson/databind/deser/BuilderBasedDeserializer.java +++ b/src/main/java/com/fasterxml/jackson/databind/deser/BuilderBasedDeserializer.java @@ -283,7 +283,7 @@ public class BuilderBasedDeserializer { Object bean = _valueInstantiator.createUsingDefault(ctxt); for (; p.currentToken() == JsonToken.FIELD_NAME; p.nextToken()) { - String propName = p.getCurrentName(); + String propName = p.currentName(); // Skip field name: p.nextToken(); SettableBeanProperty prop = _beanProperties.find(propName); @@ -328,7 +328,7 @@ public class BuilderBasedDeserializer } } for (; p.currentToken() == JsonToken.FIELD_NAME; p.nextToken()) { - String propName = p.getCurrentName(); + String propName = p.currentName(); // Skip field name: p.nextToken(); SettableBeanProperty prop = _beanProperties.find(propName); @@ -370,7 +370,7 @@ public class BuilderBasedDeserializer JsonToken t = p.currentToken(); for (; t == JsonToken.FIELD_NAME; t = p.nextToken()) { - String propName = p.getCurrentName(); + String propName = p.currentName(); p.nextToken(); // to point to value // creator property? SettableBeanProperty creatorProp = creator.findCreatorProperty(propName); @@ -478,7 +478,7 @@ public class BuilderBasedDeserializer t = p.nextToken(); } for (; t == JsonToken.FIELD_NAME; t = p.nextToken()) { - String propName = p.getCurrentName(); + String propName = p.currentName(); // Skip field name: p.nextToken(); SettableBeanProperty prop = _beanProperties.find(propName); @@ -549,7 +549,7 @@ public class BuilderBasedDeserializer { JsonToken t = p.currentToken(); for (; t == JsonToken.FIELD_NAME; t = p.nextToken()) { - String propName = p.getCurrentName(); + String propName = p.currentName(); // Skip field name: p.nextToken(); SettableBeanProperty prop = _beanProperties.find(propName); @@ -600,7 +600,7 @@ public class BuilderBasedDeserializer final Class<?> activeView = _needViewProcesing ? ctxt.getActiveView() : null; for (; p.currentToken() == JsonToken.FIELD_NAME; p.nextToken()) { - String propName = p.getCurrentName(); + String propName = p.currentName(); p.nextToken(); SettableBeanProperty prop = _beanProperties.find(propName); if (prop != null) { // normal case @@ -651,7 +651,7 @@ public class BuilderBasedDeserializer JsonToken t = p.currentToken(); for (; t == JsonToken.FIELD_NAME; t = p.nextToken()) { - String propName = p.getCurrentName(); + String propName = p.currentName(); p.nextToken(); // to point to value // creator property? SettableBeanProperty creatorProp = creator.findCreatorProperty(propName); @@ -712,7 +712,7 @@ public class BuilderBasedDeserializer { final Class<?> activeView = _needViewProcesing ? ctxt.getActiveView() : null; for (JsonToken t = p.currentToken(); t == JsonToken.FIELD_NAME; t = p.nextToken()) { - String propName = p.getCurrentName(); + String propName = p.currentName(); SettableBeanProperty prop = _beanProperties.find(propName); p.nextToken(); if (prop != null) { // normal case @@ -767,7 +767,7 @@ public class BuilderBasedDeserializer final ExternalTypeHandler ext = _externalTypeIdHandler.start(); for (JsonToken t = p.currentToken(); t == JsonToken.FIELD_NAME; t = p.nextToken()) { - String propName = p.getCurrentName(); + String propName = p.currentName(); t = p.nextToken(); SettableBeanProperty prop = _beanProperties.find(propName); if (prop != null) { // normal case diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/DefaultDeserializationContext.java b/src/main/java/com/fasterxml/jackson/databind/deser/DefaultDeserializationContext.java index cf43d1f56..cfb4517c5 100644 --- a/src/main/java/com/fasterxml/jackson/databind/deser/DefaultDeserializationContext.java +++ b/src/main/java/com/fasterxml/jackson/databind/deser/DefaultDeserializationContext.java @@ -342,7 +342,7 @@ public abstract class DefaultDeserializationContext "Current token not FIELD_NAME (to contain expected root name '%s'), but %s", expSimpleName, p.currentToken()); } - String actualName = p.getCurrentName(); + String actualName = p.currentName(); if (!expSimpleName.equals(actualName)) { reportPropertyInputMismatch(rootType, actualName, "Root name '%s' does not match expected ('%s') for type %s", 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 8fde2a371..59ed40745 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 @@ -283,7 +283,7 @@ public class EnumMapDeserializer } ctxt.reportWrongTokenException(this, JsonToken.FIELD_NAME, null); } - keyStr = p.getCurrentName(); + keyStr = p.currentName(); } for (; keyStr != null; keyStr = p.nextFieldName()) { @@ -360,7 +360,7 @@ public class EnumMapDeserializer if (p.isExpectedStartObjectToken()) { keyName = p.nextFieldName(); } else if (p.hasToken(JsonToken.FIELD_NAME)) { - keyName = p.getCurrentName(); + keyName = p.currentName(); } else { keyName = null; } diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/std/FactoryBasedEnumDeserializer.java b/src/main/java/com/fasterxml/jackson/databind/deser/std/FactoryBasedEnumDeserializer.java index 06488b195..00c3dbdea 100644 --- a/src/main/java/com/fasterxml/jackson/databind/deser/std/FactoryBasedEnumDeserializer.java +++ b/src/main/java/com/fasterxml/jackson/databind/deser/std/FactoryBasedEnumDeserializer.java @@ -185,7 +185,7 @@ ClassUtil.getTypeDescription(targetType), _factory, p.currentToken()); JsonToken t = p.currentToken(); for (; t == JsonToken.FIELD_NAME; t = p.nextToken()) { - String propName = p.getCurrentName(); + String propName = p.currentName(); p.nextToken(); // to point to value SettableBeanProperty creatorProp = creator.findCreatorProperty(propName); diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/std/JsonNodeDeserializer.java b/src/main/java/com/fasterxml/jackson/databind/deser/std/JsonNodeDeserializer.java index 26de3c29a..f93054941 100644 --- a/src/main/java/com/fasterxml/jackson/databind/deser/std/JsonNodeDeserializer.java +++ b/src/main/java/com/fasterxml/jackson/databind/deser/std/JsonNodeDeserializer.java @@ -319,7 +319,7 @@ abstract class BaseNodeDeserializer<T extends JsonNode> final JsonNodeFactory nodeFactory) throws IOException { final ObjectNode node = nodeFactory.objectNode(); - String key = p.getCurrentName(); + String key = p.currentName(); for (; key != null; key = p.nextFieldName()) { JsonNode value; JsonToken t = p.nextToken(); @@ -379,7 +379,7 @@ abstract class BaseNodeDeserializer<T extends JsonNode> if (!p.hasToken(JsonToken.FIELD_NAME)) { return deserialize(p, ctxt); } - key = p.getCurrentName(); + key = p.currentName(); } for (; key != null; key = p.nextFieldName()) { // If not, fall through to regular handling 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 a88fea8f9..b31a2fbc1 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 @@ -506,7 +506,7 @@ public class MapDeserializer } ctxt.reportWrongTokenException(this, JsonToken.FIELD_NAME, null); } - keyStr = p.getCurrentName(); + keyStr = p.currentName(); } for (; keyStr != null; keyStr = p.nextFieldName()) { @@ -570,7 +570,7 @@ public class MapDeserializer if (t != JsonToken.FIELD_NAME) { ctxt.reportWrongTokenException(this, JsonToken.FIELD_NAME, null); } - key = p.getCurrentName(); + key = p.currentName(); } for (; key != null; key = p.nextFieldName()) { @@ -620,7 +620,7 @@ public class MapDeserializer if (p.isExpectedStartObjectToken()) { key = p.nextFieldName(); } else if (p.hasToken(JsonToken.FIELD_NAME)) { - key = p.getCurrentName(); + key = p.currentName(); } else { key = null; } @@ -709,7 +709,7 @@ public class MapDeserializer if (t != JsonToken.FIELD_NAME) { ctxt.reportWrongTokenException(this, JsonToken.FIELD_NAME, null); } - keyStr = p.getCurrentName(); + keyStr = p.currentName(); } for (; keyStr != null; keyStr = p.nextFieldName()) { @@ -778,7 +778,7 @@ public class MapDeserializer if (t != JsonToken.FIELD_NAME) { ctxt.reportWrongTokenException(this, JsonToken.FIELD_NAME, null); } - key = p.getCurrentName(); + key = p.currentName(); } for (; key != null; key = p.nextFieldName()) { diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/std/MapEntryDeserializer.java b/src/main/java/com/fasterxml/jackson/databind/deser/std/MapEntryDeserializer.java index 2aa0e9adf..d0027288f 100644 --- a/src/main/java/com/fasterxml/jackson/databind/deser/std/MapEntryDeserializer.java +++ b/src/main/java/com/fasterxml/jackson/databind/deser/std/MapEntryDeserializer.java @@ -199,7 +199,7 @@ public class MapEntryDeserializer final JsonDeserializer<Object> valueDes = _valueDeserializer; final TypeDeserializer typeDeser = _valueTypeDeserializer; - final String keyStr = p.getCurrentName(); + final String keyStr = p.currentName(); Object key = keyDes.deserializeKey(keyStr, ctxt); Object value = null; // And then the value... @@ -223,7 +223,7 @@ public class MapEntryDeserializer if (t == JsonToken.FIELD_NAME) { // most likely ctxt.reportInputMismatch(this, "Problem binding JSON into Map.Entry: more than one entry in JSON (second field: '%s')", - p.getCurrentName()); + p.currentName()); } else { // how would this occur? ctxt.reportInputMismatch(this, diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/std/UntypedObjectDeserializer.java b/src/main/java/com/fasterxml/jackson/databind/deser/std/UntypedObjectDeserializer.java index ec949d469..e20b0663d 100644 --- a/src/main/java/com/fasterxml/jackson/databind/deser/std/UntypedObjectDeserializer.java +++ b/src/main/java/com/fasterxml/jackson/databind/deser/std/UntypedObjectDeserializer.java @@ -500,7 +500,7 @@ public class UntypedObjectDeserializer if (t == JsonToken.START_OBJECT) { key1 = p.nextFieldName(); } else if (t == JsonToken.FIELD_NAME) { - key1 = p.getCurrentName(); + key1 = p.currentName(); } else { if (t != JsonToken.END_OBJECT) { return ctxt.handleUnexpectedToken(handledType(), p); @@ -629,7 +629,7 @@ public class UntypedObjectDeserializer return m; } // NOTE: we are guaranteed to point to FIELD_NAME - String key = p.getCurrentName(); + String key = p.currentName(); do { p.nextToken(); // and possibly recursive merge here @@ -823,7 +823,7 @@ public class UntypedObjectDeserializer if (intoValue instanceof Map<?,?>) { Map<Object,Object> m = (Map<Object,Object>) intoValue; // NOTE: we are guaranteed to point to FIELD_NAME - String key = p.getCurrentName(); + String key = p.currentName(); do { p.nextToken(); // and possibly recursive merge here diff --git a/src/main/java/com/fasterxml/jackson/databind/jsontype/impl/AsPropertyTypeDeserializer.java b/src/main/java/com/fasterxml/jackson/databind/jsontype/impl/AsPropertyTypeDeserializer.java index 414245ea0..cd5ef251c 100644 --- a/src/main/java/com/fasterxml/jackson/databind/jsontype/impl/AsPropertyTypeDeserializer.java +++ b/src/main/java/com/fasterxml/jackson/databind/jsontype/impl/AsPropertyTypeDeserializer.java @@ -92,7 +92,7 @@ public class AsPropertyTypeDeserializer extends AsArrayTypeDeserializer boolean ignoreCase = ctxt.isEnabled(MapperFeature.ACCEPT_CASE_INSENSITIVE_PROPERTIES); for (; t == JsonToken.FIELD_NAME; t = p.nextToken()) { - final String name = p.getCurrentName(); + final String name = p.currentName(); p.nextToken(); // to point to the value if (name.equals(_typePropertyName) || (ignoreCase && name.equalsIgnoreCase(_typePropertyName))) { // gotcha! @@ -117,7 +117,7 @@ public class AsPropertyTypeDeserializer extends AsArrayTypeDeserializer if (tb == null) { tb = new TokenBuffer(p, ctxt); } - tb.writeFieldName(p.getCurrentName()); + tb.writeFieldName(p.currentName()); tb.writeString(typeId); } if (tb != null) { // need to put back skipped properties? diff --git a/src/main/java/com/fasterxml/jackson/databind/util/TokenBuffer.java b/src/main/java/com/fasterxml/jackson/databind/util/TokenBuffer.java index 8fa86e7df..d8ae30f01 100644 --- a/src/main/java/com/fasterxml/jackson/databind/util/TokenBuffer.java +++ b/src/main/java/com/fasterxml/jackson/databind/util/TokenBuffer.java @@ -536,7 +536,7 @@ sb.append("NativeObjectIds=").append(_hasNativeObjectIds).append(","); sb.append(t.toString()); if (t == JsonToken.FIELD_NAME) { sb.append('('); - sb.append(jp.getCurrentName()); + sb.append(jp.currentName()); sb.append(')'); } } @@ -1045,7 +1045,7 @@ sb.append("NativeObjectIds=").append(_hasNativeObjectIds).append(","); writeEndArray(); break; case FIELD_NAME: - writeFieldName(p.getCurrentName()); + writeFieldName(p.currentName()); break; case VALUE_STRING: if (p.hasTextCharacters()) { @@ -1113,7 +1113,7 @@ sb.append("NativeObjectIds=").append(_hasNativeObjectIds).append(","); if (_mayHaveNativeIds) { _checkNativeIds(p); } - writeFieldName(p.getCurrentName()); + writeFieldName(p.currentName()); t = p.nextToken(); // fall-through to copy the associated value } else if (t == null) { @@ -1160,7 +1160,7 @@ sb.append("NativeObjectIds=").append(_hasNativeObjectIds).append(","); if (_mayHaveNativeIds) { _checkNativeIds(p); } - writeFieldName(p.getCurrentName()); + writeFieldName(p.currentName()); break; case START_ARRAY: @@ -1617,7 +1617,7 @@ sb.append("NativeObjectIds=").append(_hasNativeObjectIds).append(","); _parsingContext.setCurrentName(name); return name; } - return (nextToken() == JsonToken.FIELD_NAME) ? getCurrentName() : null; + return (nextToken() == JsonToken.FIELD_NAME) ? currentName() : null; } @Override @@ -1641,7 +1641,7 @@ sb.append("NativeObjectIds=").append(_hasNativeObjectIds).append(","); } @Override - public String getCurrentName() { + public String currentName() { // 25-Jun-2015, tatu: as per [databind#838], needs to be same as ParserBase if (_currToken == JsonToken.START_OBJECT || _currToken == JsonToken.START_ARRAY) { JsonStreamContext parent = _parsingContext.getParent(); @@ -1650,6 +1650,9 @@ sb.append("NativeObjectIds=").append(_hasNativeObjectIds).append(","); return _parsingContext.getCurrentName(); } + @Override // since 2.12 delegate to the new method + public String getCurrentName() { return currentName(); } + @Override public void overrideCurrentName(String name) { |