Sync with core#1434 change wrt JsonParser.getNumberType()

Author: cowtowncoder

cbor/src/main/java/tools/jackson/dataformat/cbor/CBORParser.java

@@ -2011,7 +2011,7 @@ public boolean isNaN() {
     public Number getNumberValue() throws JacksonException
     {
         if (_numTypesValid == NR_UNKNOWN) {
-            _checkNumericValue(NR_UNKNOWN); // will also check event type
+            _checkNumericValue(); // will also check event type
         }
         // Separate types for int types
         if (_currToken == JsonToken.VALUE_NUMBER_INT) {
@@ -2050,9 +2050,6 @@ public final Number getNumberValueExact() throws JacksonException {
     @Override
     public NumberType getNumberType() throws JacksonException
     {
-        if (_numTypesValid == NR_UNKNOWN) {
-            _checkNumericValue(NR_UNKNOWN); // will also check event type
-        }
         if (_currToken == JsonToken.VALUE_NUMBER_INT) {
             if ((_numTypesValid & NR_INT) != 0) {
                 return NumberType.INT;
@@ -2062,23 +2059,25 @@ public NumberType getNumberType() throws JacksonException
             }
             return NumberType.BIG_INTEGER;
         }
-
         /* And then floating point types. Here optimal type
          * needs to be big decimal, to avoid losing any data?
          * However... using BD is slow, so let's allow returning
          * double as type if no explicit call has been made to access
          * data as BD?
          */
-        if ((_numTypesValid & NR_BIGDECIMAL) != 0) {
-            return NumberType.BIG_DECIMAL;
-        }
-        if ((_numTypesValid & NR_DOUBLE) != 0) {
-            return NumberType.DOUBLE;
+        if (_currToken == JsonToken.VALUE_NUMBER_FLOAT) {
+            if ((_numTypesValid & NR_BIGDECIMAL) != 0) {
+                return NumberType.BIG_DECIMAL;
+            }
+            if ((_numTypesValid & NR_DOUBLE) != 0) {
+                return NumberType.DOUBLE;
+            }
+            return NumberType.FLOAT;
         }
-        return NumberType.FLOAT;
+        return null;
     }
 
-    @Override // since 2.17
+    @Override
     public NumberTypeFP getNumberTypeFP() throws JacksonException
     {
         if (_currToken == JsonToken.VALUE_NUMBER_FLOAT) {
@@ -2106,11 +2105,9 @@ public float getFloatValue() throws JacksonException
     {
         if ((_numTypesValid & NR_FLOAT) == 0) {
             if (_numTypesValid == NR_UNKNOWN) {
-                _checkNumericValue(NR_FLOAT);
-            }
-            if ((_numTypesValid & NR_FLOAT) == 0) {
-                convertNumberToFloat();
+                _checkNumericValue();
             }
+            convertNumberToFloat();
         }
         // Bounds/range checks would be tricky here, so let's not bother even trying...
         /*
@@ -2144,13 +2141,12 @@ protected int _parseIntValue() throws JacksonException {
     /**********************************************************************
      */
 
-    protected void _checkNumericValue(int expType) throws JacksonException
+    protected void _checkNumericValue() throws JacksonException
     {
         // Int or float?
-        if (_currToken == JsonToken.VALUE_NUMBER_INT || _currToken == JsonToken.VALUE_NUMBER_FLOAT) {
-            return;
+        if (_currToken != JsonToken.VALUE_NUMBER_INT && _currToken != JsonToken.VALUE_NUMBER_FLOAT) {
+            _reportError("Current token ("+_currToken+") not numeric, can not use numeric value accessors");
         }
-        _reportError("Current token ("+currentToken()+") not numeric, can not use numeric value accessors");
     }
 
     @Override // due to addition of Float as type

cbor/src/test/java/tools/jackson/dataformat/cbor/parse/CBORNumberParsingGetType1433Test.java

@@ -3,13 +3,11 @@
 import org.junit.jupiter.api.Test;
 
 import tools.jackson.core.*;
-import tools.jackson.core.exc.StreamReadException;
 import tools.jackson.dataformat.cbor.CBORFactory;
 import tools.jackson.dataformat.cbor.CBORTestBase;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.fail;
 
 public class CBORNumberParsingGetType1433Test
     extends CBORTestBase
@@ -59,12 +57,8 @@ void getNumberType() throws Exception
 
     private void _verifyGetNumberTypeFail(JsonParser p, String token) throws Exception
     {
-        try {
-            p.getNumberType();
-            fail("Should not pass");
-        } catch (StreamReadException e) {
-            verifyException(e, "Current token ("+token+") not numeric, can not use numeric");
-        }
+        // In 2.x got exception; in 3.x null
+        assertNull(p.getNumberType());
     }
 
     private CBORFactory jsonFactory() {