...

sp4ce · Jun 13, 2020 · 62c8ae6 · 62c8ae6
1 parent d6510b8
commit 62c8ae6
Showing 1 changed file with 52 additions and 52 deletions.
diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/std/StdDeserializer.java b/src/main/java/com/fasterxml/jackson/databind/deser/std/StdDeserializer.java
@@ -1211,58 +1211,6 @@ protected Object _coerceIntegral(JsonParser p, DeserializationContext ctxt) thro
         return p.getNumberValue(); // should be optimal, whatever it is
     }
 
-    /*
-    /**********************************************************************
-    /* Helper methods for sub-classes, coercions, older (pre-2.12), deprecated
-    /**********************************************************************
-     */
-
-    /**
-     * @deprecated Since 2.12 use {@link #_checkFromStringCoercion} instead
-     */
-    @Deprecated
-    protected void _verifyStringForScalarCoercion(DeserializationContext ctxt, String str) throws JsonMappingException
-    {
-        MapperFeature feat = MapperFeature.ALLOW_COERCION_OF_SCALARS;
-        if (!ctxt.isEnabled(feat)) {
-            ctxt.reportInputMismatch(this, "Cannot coerce String \"%s\" to %s (enable `%s.%s` to allow)",
-                str, _coercedTypeDesc(), feat.getClass().getSimpleName(), feat.name());
-        }
-    }
-
-    /**
-     * Method called when JSON String with value "" (that is, zero length) is encountered.
-     *
-     * @deprecated Since 2.12
-     */
-    @Deprecated
-    protected Object _coerceEmptyString(DeserializationContext ctxt, boolean isPrimitive) throws JsonMappingException
-    {
-        Enum<?> feat;
-        boolean enable;
-
-        if (!ctxt.isEnabled(MapperFeature.ALLOW_COERCION_OF_SCALARS)) {
-            feat = MapperFeature.ALLOW_COERCION_OF_SCALARS;
-            enable = true;
-        } else if (isPrimitive && ctxt.isEnabled(DeserializationFeature.FAIL_ON_NULL_FOR_PRIMITIVES)) {
-            feat = DeserializationFeature.FAIL_ON_NULL_FOR_PRIMITIVES;
-            enable = false;
-        } else {
-            return getNullValue(ctxt);
-        }
-        _reportFailedNullCoerce(ctxt, enable, feat, "empty String (\"\")");
-        return null;
-    }
-
-    @Deprecated // since 2.12
-    protected void _failDoubleToIntCoercion(JsonParser p, DeserializationContext ctxt,
-            String type) throws IOException
-    {
-        ctxt.reportInputMismatch(handledType(),
-"Cannot coerce a floating-point value ('%s') into %s (enable `DeserializationFeature.ACCEPT_FLOAT_AS_INT` to allow)",
-                p.getValueAsString(), type);
-    }
-
     /**
      * Method to call when JSON `null` token is encountered. Note: only called when
      * this deserializer encounters it but NOT when reached via property
@@ -1330,6 +1278,58 @@ protected final void _verifyNullForPrimitiveCoercion(DeserializationContext ctxt
         _reportFailedNullCoerce(ctxt, enable, feat, strDesc);
     }
 
+    /*
+    /**********************************************************************
+    /* Helper methods for sub-classes, coercions, older (pre-2.12), deprecated
+    /**********************************************************************
+     */
+
+    /**
+     * @deprecated Since 2.12 use {@link #_checkFromStringCoercion} instead
+     */
+    @Deprecated
+    protected void _verifyStringForScalarCoercion(DeserializationContext ctxt, String str) throws JsonMappingException
+    {
+        MapperFeature feat = MapperFeature.ALLOW_COERCION_OF_SCALARS;
+        if (!ctxt.isEnabled(feat)) {
+            ctxt.reportInputMismatch(this, "Cannot coerce String \"%s\" to %s (enable `%s.%s` to allow)",
+                str, _coercedTypeDesc(), feat.getClass().getSimpleName(), feat.name());
+        }
+    }
+
+    /**
+     * Method called when JSON String with value "" (that is, zero length) is encountered.
+     *
+     * @deprecated Since 2.12
+     */
+    @Deprecated
+    protected Object _coerceEmptyString(DeserializationContext ctxt, boolean isPrimitive) throws JsonMappingException
+    {
+        Enum<?> feat;
+        boolean enable;
+
+        if (!ctxt.isEnabled(MapperFeature.ALLOW_COERCION_OF_SCALARS)) {
+            feat = MapperFeature.ALLOW_COERCION_OF_SCALARS;
+            enable = true;
+        } else if (isPrimitive && ctxt.isEnabled(DeserializationFeature.FAIL_ON_NULL_FOR_PRIMITIVES)) {
+            feat = DeserializationFeature.FAIL_ON_NULL_FOR_PRIMITIVES;
+            enable = false;
+        } else {
+            return getNullValue(ctxt);
+        }
+        _reportFailedNullCoerce(ctxt, enable, feat, "empty String (\"\")");
+        return null;
+    }
+
+    @Deprecated // since 2.12
+    protected void _failDoubleToIntCoercion(JsonParser p, DeserializationContext ctxt,
+            String type) throws IOException
+    {
+        ctxt.reportInputMismatch(handledType(),
+"Cannot coerce a floating-point value ('%s') into %s (enable `DeserializationFeature.ACCEPT_FLOAT_AS_INT` to allow)",
+                p.getValueAsString(), type);
+    }
+
     @Deprecated // since 2.12
     protected final void _verifyNullForScalarCoercion(DeserializationContext ctxt, String str) throws JsonMappingException
     {