Convert Smile backend

Author: cowtowncoder

smile/src/main/java/tools/jackson/dataformat/smile/SmileParser.java

@@ -2264,6 +2264,21 @@ protected void _parseNumericValue() throws JacksonException
         throw _constructReadException("Current token (%s) not numeric, cannot use numeric value accessors", _currToken);
     }
 
+    @Override
+    protected boolean _parseNumericValueIfNumber() throws JacksonException
+    {
+        if (_tokenIncomplete) {
+            _tokenIncomplete = false;
+            int tb = _typeAsInt;
+             // ensure we got a numeric type with value that is lazily parsed
+            if ((tb >> 5) == 1) {
+                _finishNumberToken(tb);
+                return true;
+            }
+        }
+        return false;
+    }
+
     /*
     @Override // since 2.6
     protected int _parseIntValue() throws JacksonException

smile/src/main/java/tools/jackson/dataformat/smile/SmileParserBase.java

@@ -253,8 +253,22 @@ public final boolean mayContainRawBinary() {
     @Override
     protected abstract void _closeInput() throws JacksonException;
 
+    /**
+     * Method called to complete parsing of a numeric value: will throw
+     * {@link StreamReadException} if current token is not numeric.
+     *
+     * @throws StreamReadException if current token is not numeric
+     */
     protected abstract void _parseNumericValue() throws JacksonException;
 
+    /**
+     * Similar to {@link #_parseNumericValue()}, but will not throw exception
+     * if the current token is not a numeric value.
+     *
+     * @return {@code true} if current token is numeric; {@code false} otherwise
+     */
+    protected abstract boolean _parseNumericValueIfNumber() throws JacksonException;
+    
 //  public abstract int releaseBuffered(OutputStream out) throws JacksonException;
 //  public abstract Object getInputSource();
 
@@ -391,7 +405,9 @@ public final Number getNumberValueExact() throws JacksonException {
     public final NumberType getNumberType() throws JacksonException
     {
         if (_numTypesValid == NR_UNKNOWN) {
-            _parseNumericValue(); // will also check event type
+            if (!_parseNumericValueIfNumber()) {
+                return null;
+            }
         }
         return _numberType;
     }

smile/src/main/java/tools/jackson/dataformat/smile/async/NonBlockingParserBase.java

@@ -210,10 +210,16 @@ protected void _closeInput() {
     // in future
     @Override
     protected void _parseNumericValue() throws JacksonException {
-        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 (%s) not numeric, can not use numeric value accessors", _currToken);
         }
-        _reportError("Current token (%s) not numeric, can not use numeric value accessors", _currToken);
+    }
+
+    @Override
+    protected boolean _parseNumericValueIfNumber() throws JacksonException
+    {
+        // No incomplete values so just return
+        return false;
     }
 
     /*

smile/src/test/java/tools/jackson/dataformat/smile/parse/SmileNumberParsingGetType1433Test.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.smile.SmileFactory;
 import tools.jackson.dataformat.smile.BaseTestForSmile;
 
 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 SmileNumberParsingGetType1433Test
     extends BaseTestForSmile
@@ -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, cannot use numeric");
-        }
+        // In 2.x got exception; in 3.x null
+        assertNull(p.getNumberType());
     }
 
     private SmileFactory jsonFactory() {