diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/std/NumberDeserializers.java b/src/main/java/com/fasterxml/jackson/databind/deser/std/NumberDeserializers.java index 3a1800a672..d21404b0e8 100644 --- a/src/main/java/com/fasterxml/jackson/databind/deser/std/NumberDeserializers.java +++ b/src/main/java/com/fasterxml/jackson/databind/deser/std/NumberDeserializers.java @@ -334,10 +334,10 @@ public Short deserialize(JsonParser p, DeserializationContext ctxt) if (_primitive) { return _parseShortPrimitive(p, ctxt); } - return _parseShort(ctxt, p); + return _parseShort(p, ctxt); } - protected Short _parseShort(DeserializationContext ctxt, JsonParser p) + protected Short _parseShort(JsonParser p, DeserializationContext ctxt) throws IOException { CoercionAction act; @@ -472,7 +472,7 @@ public Integer deserialize(JsonParser p, DeserializationContext ctxt) throws IOE if (_primitive) { return _parseIntPrimitive(p, ctxt); } - return _parseInteger(ctxt, p); + return _parseInteger(p, ctxt); } // Since we can never have type info ("natural type"; String, Boolean, Integer, Double): @@ -487,10 +487,10 @@ public Integer deserializeWithType(JsonParser p, DeserializationContext ctxt, if (_primitive) { return _parseIntPrimitive(p, ctxt); } - return _parseInteger(ctxt, p); + return _parseInteger(p, ctxt); } - protected final Integer _parseInteger(DeserializationContext ctxt, JsonParser p) + protected final Integer _parseInteger(JsonParser p, DeserializationContext ctxt) throws IOException { CoercionAction act; @@ -566,10 +566,10 @@ public Long deserialize(JsonParser p, DeserializationContext ctxt) throws IOExce if (_primitive) { return _parseLongPrimitive(p, ctxt); } - return _parseLong(ctxt, p); + return _parseLong(p, ctxt); } - protected final Long _parseLong(DeserializationContext ctxt, JsonParser p) + protected final Long _parseLong(JsonParser p, DeserializationContext ctxt) throws IOException { CoercionAction act; 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 index 99604358c9..20a00ee1af 100644 --- a/src/main/java/com/fasterxml/jackson/databind/deser/std/StdDeserializer.java +++ b/src/main/java/com/fasterxml/jackson/databind/deser/std/StdDeserializer.java @@ -322,7 +322,7 @@ protected final boolean _parseBooleanPrimitive(JsonParser p, DeserializationCont // may accept ints too, (0 == false, otherwise true) if (t == JsonToken.VALUE_NUMBER_INT) { - Boolean b = _coerceBooleanFromInt(ctxt, p, Boolean.TYPE); + Boolean b = _coerceBooleanFromInt(p, ctxt, Boolean.TYPE); // may get `null`, Boolean.TRUE or Boolean.FALSE so: return (b == Boolean.TRUE); } @@ -419,7 +419,7 @@ protected final Boolean _parseBoolean(JsonParser p, DeserializationContext ctxt, return null; case JsonTokenId.ID_NUMBER_INT: // may accept ints too, (0 == false, otherwise true) - return _coerceBooleanFromInt(ctxt, p, targetType); + return _coerceBooleanFromInt(p, ctxt, targetType); case JsonTokenId.ID_START_ARRAY: // unwrapping / from-empty-array coercion? return (Boolean) _deserializeFromArray(p, ctxt); } @@ -1029,7 +1029,7 @@ protected CoercionAction _checkFloatToIntCoercion(JsonParser p, DeserializationC /** * @since 2.12 */ - protected Boolean _coerceBooleanFromInt(DeserializationContext ctxt, JsonParser p, + protected Boolean _coerceBooleanFromInt(JsonParser p, DeserializationContext ctxt, Class rawTargetType) throws IOException {