Minor cleanup for default/standard parsing of number types, unify internal api of StdDeserializer

Author: cowtowncoder

src/main/java/tools/jackson/databind/deser/jdk/NumberDeserializers.java

@@ -628,11 +628,8 @@ protected final Float _parseFloat(JsonParser p, DeserializationContext ctxt)
             if (_checkTextualNull(ctxt, text)) {
                 return (Float) getNullValue(ctxt);
             }
-            try {
-                return NumberInput.parseFloat(text, p.isEnabled(StreamReadFeature.USE_FAST_DOUBLE_PARSER));
-            } catch (IllegalArgumentException iae) { }
-            return (Float) ctxt.handleWeirdStringValue(_valueClass, text,
-                    "not a valid `Float` value");
+            // No separate "_parseFloat()" so just call this (nulls handled above)
+            return _parseFloatPrimitive(p, ctxt, text);
         }
     }
 
@@ -725,11 +722,8 @@ protected final Double _parseDouble(JsonParser p, DeserializationContext ctxt) t
             if (_checkTextualNull(ctxt, text)) {
                 return (Double) getNullValue(ctxt);
             }
-            try {
-                return _parseDouble(text, p.isEnabled(StreamReadFeature.USE_FAST_DOUBLE_PARSER));
-            } catch (IllegalArgumentException iae) { }
-            return (Double) ctxt.handleWeirdStringValue(_valueClass, text,
-                    "not a valid `Double` value");
+            // No separate "_parseDouble()" so just call this (as nulls are handled)
+            return _parseDoublePrimitive(p, ctxt, text);
         }
     }
 

src/main/java/tools/jackson/databind/deser/std/StdDeserializer.java

@@ -236,13 +236,13 @@ protected T _deserializeFromString(JsonParser p, DeserializationContext ctxt)
             if (inst.canCreateFromInt()) {
                 if (ctxt.findCoercionAction(LogicalType.Integer, Integer.class,
                         CoercionInputShape.String) == CoercionAction.TryConvert) {
-                    return (T) inst.createFromInt(ctxt, _parseIntPrimitive(ctxt, value));
+                    return (T) inst.createFromInt(ctxt, _parseIntPrimitive(p, ctxt, value));
                 }
             }
             if (inst.canCreateFromLong()) {
                 if (ctxt.findCoercionAction(LogicalType.Integer, Long.class,
                         CoercionInputShape.String) == CoercionAction.TryConvert) {
-                    return (T) inst.createFromLong(ctxt, _parseLongPrimitive(ctxt, value));
+                    return (T) inst.createFromLong(ctxt, _parseLongPrimitive(p, ctxt, value));
                 }
             }
             if (inst.canCreateFromBoolean()) {
@@ -687,10 +687,11 @@ protected final int _parseIntPrimitive(JsonParser p, DeserializationContext ctxt
             _verifyNullForPrimitiveCoercion(ctxt, text);
             return 0;
         }
-        return _parseIntPrimitive(ctxt, text);
+        return _parseIntPrimitive(p, ctxt, text);
     }
 
-    protected final int _parseIntPrimitive(DeserializationContext ctxt, String text) throws JacksonException
+    protected final int _parseIntPrimitive(JsonParser p, DeserializationContext ctxt,
+            String text) throws JacksonException
     {
         try {
             if (text.length() > 9) {
@@ -757,10 +758,11 @@ protected final Integer _parseInteger(JsonParser p, DeserializationContext ctxt,
         if (_checkTextualNull(ctxt, text)) {
             return (Integer) getNullValue(ctxt);
         }
-        return _parseInteger(ctxt, text);
+        return _parseInteger(p, ctxt, text);
     }
 
-    protected final Integer _parseInteger(DeserializationContext ctxt, String text)
+    protected final Integer _parseInteger(JsonParser p, DeserializationContext ctxt,
+            String text)
     {
         try {
             if (text.length() > 9) {
@@ -832,10 +834,11 @@ protected final long _parseLongPrimitive(JsonParser p, DeserializationContext ct
             _verifyNullForPrimitiveCoercion(ctxt, text);
             return 0L;
         }
-        return _parseLongPrimitive(ctxt, text);
+        return _parseLongPrimitive(p, ctxt, text);
     }
 
-    protected final long _parseLongPrimitive(DeserializationContext ctxt, String text) throws JacksonException
+    protected final long _parseLongPrimitive(JsonParser p, DeserializationContext ctxt,
+            String text) throws JacksonException
     {
         try {
             return NumberInput.parseLong(text);
@@ -1093,18 +1096,6 @@ protected final double _parseDoublePrimitive(JsonParser p, DeserializationContex
         return _nonNullNumber(v).doubleValue();
     }
 
-    /**
-     * Helper method for encapsulating calls to low-level double value parsing; single place
-     * just because we need a work-around that must be applied to all calls.
-     * Does not use the new <code>useFastParser</code> support.
-     *
-     * @see #_parseDouble(String, boolean)
-     */
-    protected final static double _parseDouble(final String numStr) throws NumberFormatException
-    {
-        return _parseDouble(numStr, false);
-    }
-
     /**
      * Helper method for encapsulating calls to low-level double value parsing; single place
      * just because we need a work-around that must be applied to all calls.

src/main/java/tools/jackson/databind/ext/jdk8/OptionalIntDeserializer.java

@@ -45,7 +45,7 @@ public OptionalInt deserialize(JsonParser p, DeserializationContext ctxt)
             if (_checkTextualNull(ctxt, text)) {
                 return (OptionalInt) getNullValue(ctxt);
             }
-            return OptionalInt.of(_parseIntPrimitive(ctxt, text));
+            return OptionalInt.of(_parseIntPrimitive(p, ctxt, text));
         case JsonTokenId.ID_NUMBER_FLOAT:
             act = _checkFloatToIntCoercion(p, ctxt, _valueClass);
             if (act == CoercionAction.AsNull) {

src/main/java/tools/jackson/databind/ext/jdk8/OptionalLongDeserializer.java

@@ -45,7 +45,7 @@ public OptionalLong deserialize(JsonParser p, DeserializationContext ctxt)
             if (_checkTextualNull(ctxt, text)) {
                 return (OptionalLong) getNullValue(ctxt);
             }
-            return OptionalLong.of(_parseLongPrimitive(ctxt, text));
+            return OptionalLong.of(_parseLongPrimitive(p, ctxt, text));
         case JsonTokenId.ID_NUMBER_FLOAT:
             act = _checkFloatToIntCoercion(p, ctxt, _valueClass);
             if (act == CoercionAction.AsNull) {