Merge branch '2.12'

Author: cowtowncoder

release-notes/VERSION-2.x

@@ -20,6 +20,7 @@ JSON library.
  (contributed by Jendrik J)
 #619: Add `StreamReadCapability` for further format-based/format-agnostic
   handling improvements
+#627: Add `JsonParser.isExpectedNumberIntToken()` convenience method
 - Deprecate `JsonParser.getCurrentTokenId()` (use `#currentTokenId()` instead)
 
 2.11.1 (25-Jun-2020)

src/main/java/com/fasterxml/jackson/core/JsonParser.java

@@ -632,13 +632,22 @@ public Boolean nextBooleanValue() throws IOException {
      *   start-array marker (such {@link JsonToken#START_ARRAY});
      *   false if not.
      */
-    public boolean isExpectedStartArrayToken() { return currentToken() == JsonToken.START_ARRAY; }
+    public abstract boolean isExpectedStartArrayToken();
 
     /**
      * Similar to {@link #isExpectedStartArrayToken()}, but checks whether stream
      * currently points to {@link JsonToken#START_OBJECT}.
      */
-    public boolean isExpectedStartObjectToken() { return currentToken() == JsonToken.START_OBJECT; }
+    public abstract boolean isExpectedStartObjectToken();
+
+    /**
+     * Similar to {@link #isExpectedStartArrayToken()}, but checks whether stream
+     * currently points to {@link JsonToken#VALUE_NUMBER_INT}.
+     *<p>
+     * The initial use case is for XML backend to efficiently (attempt to) coerce
+     * textual content into numbers.
+     */
+    public abstract boolean isExpectedNumberIntToken();
 
     /**
      * Access for checking whether current token is a numeric value token, but
@@ -648,9 +657,7 @@ public Boolean nextBooleanValue() throws IOException {
      * NOTE: roughly equivalent to calling <code>!Double.isFinite()</code>
      * on value you would get from calling {@link #getDoubleValue()}.
      */
-    public boolean isNaN() throws IOException {
-        return false;
-    }
+    public abstract boolean isNaN() throws IOException;
 
     /*
     /**********************************************************************

src/main/java/com/fasterxml/jackson/core/StreamReadCapability.java

@@ -13,7 +13,7 @@
  * @since 2.12
  */
 public enum StreamReadCapability
-    implements JacksonFeature // since 2.12
+    implements JacksonFeature
 {
     /**
      * Capability that indicates that data format can expose multiple properties

src/main/java/com/fasterxml/jackson/core/base/ParserMinimalBase.java

@@ -295,6 +295,7 @@ public ObjectReadContext getObjectReadContext() {
 
     @Override public boolean isExpectedStartArrayToken() { return _currToken == JsonToken.START_ARRAY; }
     @Override public boolean isExpectedStartObjectToken() { return _currToken == JsonToken.START_OBJECT; }
+    @Override public boolean isExpectedNumberIntToken() { return _currToken == JsonToken.VALUE_NUMBER_INT; }
 
     @Override
     public JsonToken nextValue() throws IOException {

src/main/java/com/fasterxml/jackson/core/util/JsonParserDelegate.java

@@ -109,6 +109,8 @@ public JsonParser disable(StreamReadFeature f) {
     @Override public TokenStreamContext getParsingContext() { return delegate.getParsingContext(); }
     @Override public boolean isExpectedStartArrayToken() { return delegate.isExpectedStartArrayToken(); }
     @Override public boolean isExpectedStartObjectToken() { return delegate.isExpectedStartObjectToken(); }
+    @Override public boolean isExpectedNumberIntToken() { return delegate.isExpectedNumberIntToken(); }
+
     @Override public boolean isNaN() throws IOException { return delegate.isNaN(); }
 
     /*

src/test/java/com/fasterxml/jackson/core/read/NumberParsingTest.java

@@ -70,6 +70,7 @@ private void _testSimpleInt(int EXP_I, int mode) throws Exception
         assertToken(JsonToken.START_ARRAY, p.nextToken());
         assertToken(JsonToken.VALUE_NUMBER_INT, p.nextToken());
         assertEquals(JsonParser.NumberType.INT, p.getNumberType());
+        assertTrue(p.isExpectedNumberIntToken());
         assertEquals(""+EXP_I, p.getText());
 
         if (((short) EXP_I) == EXP_I) {
@@ -109,6 +110,7 @@ private void _testSimpleInt(int EXP_I, int mode) throws Exception
         DOC = String.valueOf(EXP_I);
         p = createParser(mode, DOC + " "); // DataInput requires separator
         assertToken(JsonToken.VALUE_NUMBER_INT, p.nextToken());
+        assertTrue(p.isExpectedNumberIntToken());
         assertEquals(DOC, p.getText());
 
         int i = p.getIntValue();
@@ -123,6 +125,7 @@ private void _testSimpleInt(int EXP_I, int mode) throws Exception
         DOC = String.valueOf(EXP_I)+".0";
         p = createParser(mode, DOC + " ");
         assertToken(JsonToken.VALUE_NUMBER_FLOAT, p.nextToken());
+        assertFalse(p.isExpectedNumberIntToken());
         assertEquals(EXP_I, p.getValueAsInt());
         p.close();
 

src/test/java/com/fasterxml/jackson/core/util/TestDelegates.java

@@ -148,6 +148,7 @@ public void testParserDelegate() throws IOException
         assertFalse(del.hasTokenId(JsonTokenId.ID_START_OBJECT));
         assertTrue(del.isExpectedStartArrayToken());
         assertFalse(del.isExpectedStartObjectToken());
+        assertFalse(del.isExpectedNumberIntToken());
         assertEquals("[", del.getText());
         assertNotNull(del.getParsingContext());
         assertSame(parser.getParsingContext(), del.getParsingContext());
@@ -168,6 +169,7 @@ public void testParserDelegate() throws IOException
         assertEquals((short)1, del.getShortValue());
         assertEquals(1f, del.getFloatValue());
         assertFalse(del.isNaN());
+        assertTrue(del.isExpectedNumberIntToken());
         assertEquals(NumberType.INT, del.getNumberType());
         assertEquals(Integer.valueOf(1), del.getNumberValue());
         assertNull(del.getEmbeddedObject());