diff options
Diffstat (limited to 'src/main/java/com/fasterxml/jackson/databind/util/TokenBuffer.java')
| -rw-r--r-- | src/main/java/com/fasterxml/jackson/databind/util/TokenBuffer.java | 15 |
1 files changed, 9 insertions, 6 deletions
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) { |