Add `JsonP
diff --git a/release-notes/VERSION b/release-notes/VERSION
index 076ec89..5d7c776 100644
--- a/release-notes/VERSION
+++ b/release-notes/VERSION
@@ -29,6 +29,9 @@
#276: Add support for serializing using `java.io.DataOutput`
#280: Add `JsonParser.finishToken()` to force full, non-lazy reading of current token
#282: Fail to report error for trying to write field name outside Object (root level)
+- Add `JsonParser.currentToken()` and `JsonParser.currentTokenId()` as replacements
+ for `getCurrentToken()` and `getCurrentTokenId()`, respectively. Existing methods
+ will likely be deprecated in 2.9.
2.7.5 (not yet released)
diff --git a/src/main/java/com/fasterxml/jackson/core/JsonParser.java b/src/main/java/com/fasterxml/jackson/core/JsonParser.java
index eea66e8..8e1aee1 100644
--- a/src/main/java/com/fasterxml/jackson/core/JsonParser.java
+++ b/src/main/java/com/fasterxml/jackson/core/JsonParser.java
@@ -834,8 +834,12 @@
* if any: null before any tokens have been read, and
* after end-of-input has been encountered, as well as
* if the current token has been explicitly cleared.
+ *
+ * @since 2.8
*/
- public abstract JsonToken getCurrentToken();
+ public JsonToken currentToken() {
+ return getCurrentToken();
+ }
/**
* Method similar to {@link #getCurrentToken()} but that returns an
@@ -846,10 +850,22 @@
* Note, however, that effect may not be big enough to matter: make sure
* to profile performance before deciding to use this method.
*
- * @since 2.3
+ * @since 2.8
*
* @return <code>int</code> matching one of constants from {@link JsonTokenId}.
*/
+ public int currentTokenId() {
+ return getCurrentTokenId();
+ }
+
+ /**
+ * Alias for {@link #currentToken()}, will be deprecated in Jackson 2.9
+ */
+ public abstract JsonToken getCurrentToken();
+
+ /**
+ * Alias for {@link #currentTokenId()}, will be deprecated in Jackson 2.9
+ */
public abstract int getCurrentTokenId();
/**
diff --git a/src/main/java/com/fasterxml/jackson/core/base/ParserMinimalBase.java b/src/main/java/com/fasterxml/jackson/core/base/ParserMinimalBase.java
index 431d43e..c4baa92 100644
--- a/src/main/java/com/fasterxml/jackson/core/base/ParserMinimalBase.java
+++ b/src/main/java/com/fasterxml/jackson/core/base/ParserMinimalBase.java
@@ -95,8 +95,14 @@
*/
@Override public abstract JsonToken nextToken() throws IOException;
- @Override public JsonToken getCurrentToken() { return _currToken; }
+ @Override public JsonToken currentToken() { return _currToken; }
+ @Override public int currentTokenId() {
+ final JsonToken t = _currToken;
+ return (t == null) ? JsonTokenId.ID_NO_TOKEN : t.id();
+ }
+
+ @Override public JsonToken getCurrentToken() { return _currToken; }
@Override public int getCurrentTokenId() {
final JsonToken t = _currToken;
return (t == null) ? JsonTokenId.ID_NO_TOKEN : t.id();
diff --git a/src/main/java/com/fasterxml/jackson/core/util/JsonParserDelegate.java b/src/main/java/com/fasterxml/jackson/core/util/JsonParserDelegate.java
index f527cd2..fc6c1ba 100644
--- a/src/main/java/com/fasterxml/jackson/core/util/JsonParserDelegate.java
+++ b/src/main/java/com/fasterxml/jackson/core/util/JsonParserDelegate.java
@@ -106,7 +106,10 @@
/* Public API, token accessors
/**********************************************************
*/
-
+
+ @Override public JsonToken currentToken() { return delegate.currentToken(); }
+ @Override public int currentTokenId() { return delegate.currentTokenId(); }
+
@Override public JsonToken getCurrentToken() { return delegate.getCurrentToken(); }
@Override public int getCurrentTokenId() { return delegate.getCurrentTokenId(); }
@Override public boolean hasCurrentToken() { return delegate.hasCurrentToken(); }
