Merge branch '2.11' into 2.12
diff --git a/.travis.yml b/.travis.yml
index 9a362c4..1590a80 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,7 @@
branches:
only:
- master
- - "2.11"
+ - "2.12"
env:
global:
diff --git a/pom.xml b/pom.xml
index febcfb0..b6e7f63 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,13 +3,13 @@
<parent>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-base</artifactId>
- <version>2.11.1-SNAPSHOT</version>
+ <version>2.12.0-SNAPSHOT</version>
</parent>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<name>Jackson-core</name>
- <version>2.11.1-SNAPSHOT</version>
+ <version>2.12.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<description>Core Jackson processing abstractions (aka Streaming API), implementation for JSON</description>
<licenses>
diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
index 76df75b..5208630 100644
--- a/release-notes/VERSION-2.x
+++ b/release-notes/VERSION-2.x
@@ -14,6 +14,10 @@
=== Releases ===
------------------------------------------------------------------------
+2.12.0 (not yet released)
+
+- Deprecate `JsonParser.getCurrentTokenId()` (use `#currentTokenId()` instead)
+
2.11.0 (26-Apr-2020)
#504: Add a String Array write method in the Streaming API
diff --git a/src/main/java/com/fasterxml/jackson/core/JsonParser.java b/src/main/java/com/fasterxml/jackson/core/JsonParser.java
index c4955a3..560fb7b 100644
--- a/src/main/java/com/fasterxml/jackson/core/JsonParser.java
+++ b/src/main/java/com/fasterxml/jackson/core/JsonParser.java
@@ -1009,15 +1009,19 @@
}
/**
- * Alias for {@link #currentToken()}, will be deprecated in Jackson 2.9
+ * Alias for {@link #currentToken()}, may be deprecated sometime after
+ * Jackson 2.12 (will be removed from 3.0).
*/
public abstract JsonToken getCurrentToken();
/**
- * Alias for {@link #currentTokenId()}, will be deprecated in Jackson 2.9
+ * Alias for {@link #currentTokenId()}.
+ *
+ * @deprecated Since 2.12 use {@link #currentTokenId} instead
*/
+ @Deprecated
public abstract int getCurrentTokenId();
-
+
/**
* Method for checking whether parser currently points to
* a token (and data for that token is available).
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 c4b336b..ea1e1a6 100644
--- a/src/main/java/com/fasterxml/jackson/core/base/ParserMinimalBase.java
+++ b/src/main/java/com/fasterxml/jackson/core/base/ParserMinimalBase.java
@@ -188,8 +188,10 @@
final JsonToken t = _currToken;
return (t == null) ? JsonTokenId.ID_NO_TOKEN : t.id();
}
-
+
@Override public JsonToken getCurrentToken() { return _currToken; }
+
+ @Deprecated
@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 e244c9c..7f34f43 100644
--- a/src/main/java/com/fasterxml/jackson/core/util/JsonParserDelegate.java
+++ b/src/main/java/com/fasterxml/jackson/core/util/JsonParserDelegate.java
@@ -112,7 +112,10 @@
@Override public int currentTokenId() { return delegate.currentTokenId(); }
@Override public JsonToken getCurrentToken() { return delegate.getCurrentToken(); }
+
+ @Deprecated // since 2.12
@Override public int getCurrentTokenId() { return delegate.getCurrentTokenId(); }
+
@Override public boolean hasCurrentToken() { return delegate.hasCurrentToken(); }
@Override public boolean hasTokenId(int id) { return delegate.hasTokenId(id); }
@Override public boolean hasToken(JsonToken t) { return delegate.hasToken(t); }
