Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
May 30, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
182869c
Sync with core#1434 change wrt JsonParser.getNumberType()
cowtowncoder May 30, 2025
329cef3
Convert Smile backend
cowtowncoder May 30, 2025
2ca8372
Convert Avro
cowtowncoder May 30, 2025
951f884
Protobuf convered
cowtowncoder May 30, 2025
eaa5f62
Complete conversions
cowtowncoder May 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 17 additions & 16 deletions avro/src/main/java/tools/jackson/dataformat/avro/deser/AvroParserImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,8 +210,9 @@ public final boolean isNaN() {
public final 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) {
if ((_numTypesValid & NR_INT) != 0) {
Expand Down Expand Up @@ -249,9 +250,6 @@ public final Number getNumberValueExact() throws JacksonException {
@Override
public final 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;
Expand All @@ -265,13 +263,17 @@ public final NumberType getNumberType() throws JacksonException
// And then floating point types. Here optimal type should 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
Expand All @@ -295,7 +297,7 @@ public final float getFloatValue() throws JacksonException
{
if ((_numTypesValid & NR_FLOAT) == 0) {
if (_numTypesValid == NR_UNKNOWN) {
_checkNumericValue(NR_FLOAT);
_checkNumericValue();
}
if ((_numTypesValid & NR_FLOAT) == 0) {
convertNumberToFloat();
Expand All @@ -316,13 +318,12 @@ public final float getFloatValue() throws JacksonException
/**********************************************************************
*/

protected final void _checkNumericValue(int expType) throws JacksonException
protected final 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) {
throw _constructReadException("Current token (%s) not numeric, cannot use numeric value accessors", _currToken);
}
_reportError("Current token ("+currentToken()+") not numeric, can not use numeric value accessors");
}

@Override
Expand All @@ -333,7 +334,7 @@ protected final void convertNumberToInt() throws JacksonException
// Let's verify it's lossless conversion by simple roundtrip
int result = (int) _numberLong;
if (((long) result) != _numberLong) {
_reportError("Numeric value ("+getString()+") out of range of int");
_reportError("Numeric value ("+getString()+") out of range of `int`");
}
_numberInt = result;
} else if ((_numTypesValid & NR_BIGINT) != 0) {
Expand Down
37 changes: 17 additions & 20 deletions cbor/src/main/java/tools/jackson/dataformat/cbor/CBORParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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;
Expand All @@ -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) {
Expand Down Expand Up @@ -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...
/*
Expand Down Expand Up @@ -2144,13 +2141,13 @@ 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) {
throw _constructReadException("Current token (%s) not numeric, cannot use numeric value accessors",
_currToken);
}
_reportError("Current token ("+currentToken()+") not numeric, can not use numeric value accessors");
}

@Override // due to addition of Float as type
Expand Down
10 changes: 2 additions & 8 deletions cbor/src/test/java/tools/jackson/dataformat/cbor/parse/CBORNumberParsingGetType1433Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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() {
Expand Down
64 changes: 26 additions & 38 deletions protobuf/src/main/java/tools/jackson/dataformat/protobuf/ProtobufParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1597,7 +1597,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) {
Expand Down Expand Up @@ -1636,9 +1636,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_LONG) != 0) {
return NumberType.LONG;
Expand All @@ -1655,13 +1652,17 @@ public NumberType getNumberType() throws JacksonException
* 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
Expand All @@ -1686,11 +1687,9 @@ public int getIntValue() throws JacksonException
{
if ((_numTypesValid & NR_INT) == 0) {
if (_numTypesValid == NR_UNKNOWN) { // not parsed at all
_checkNumericValue(NR_INT); // will also check event type
}
if ((_numTypesValid & NR_INT) == 0) { // wasn't an int natively?
convertNumberToInt(); // let's make it so, if possible
_checkNumericValue(); // will also check event type
}
convertNumberToInt(); // let's make it so, if possible
}
return _numberInt;
}
Expand All @@ -1700,11 +1699,9 @@ public long getLongValue() throws JacksonException
{
if ((_numTypesValid & NR_LONG) == 0) {
if (_numTypesValid == NR_UNKNOWN) {
_checkNumericValue(NR_LONG);
}
if ((_numTypesValid & NR_LONG) == 0) {
convertNumberToLong();
_checkNumericValue();
}
convertNumberToLong();
}
return _numberLong;
}
Expand All @@ -1714,11 +1711,9 @@ public BigInteger getBigIntegerValue() throws JacksonException
{
if ((_numTypesValid & NR_BIGINT) == 0) {
if (_numTypesValid == NR_UNKNOWN) {
_checkNumericValue(NR_BIGINT);
}
if ((_numTypesValid & NR_BIGINT) == 0) {
convertNumberToBigInteger();
_checkNumericValue();
}
convertNumberToBigInteger();
}
return _numberBigInt;
}
Expand All @@ -1728,11 +1723,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...
/*
Expand All @@ -1748,11 +1741,9 @@ public double getDoubleValue() throws JacksonException
{
if ((_numTypesValid & NR_DOUBLE) == 0) {
if (_numTypesValid == NR_UNKNOWN) {
_checkNumericValue(NR_DOUBLE);
}
if ((_numTypesValid & NR_DOUBLE) == 0) {
convertNumberToDouble();
_checkNumericValue();
}
convertNumberToDouble();
}
return _numberDouble;
}
Expand All @@ -1762,11 +1753,9 @@ public BigDecimal getDecimalValue() throws JacksonException
{
if ((_numTypesValid & NR_BIGDECIMAL) == 0) {
if (_numTypesValid == NR_UNKNOWN) {
_checkNumericValue(NR_BIGDECIMAL);
}
if ((_numTypesValid & NR_BIGDECIMAL) == 0) {
convertNumberToBigDecimal();
_checkNumericValue();
}
convertNumberToBigDecimal();
}
return _numberBigDecimal;
}
Expand All @@ -1777,13 +1766,12 @@ public BigDecimal getDecimalValue() 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) {
throw _constructReadException("Current token (%s) not numeric, cannot use numeric value accessors", _currToken);
}
_reportError("Current token ("+_currToken+") not numeric, can not use numeric value accessors");
}

protected void convertNumberToInt() throws JacksonException
Expand Down
15 changes: 15 additions & 0 deletions smile/src/main/java/tools/jackson/dataformat/smile/SmileParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
18 changes: 17 additions & 1 deletion smile/src/main/java/tools/jackson/dataformat/smile/SmileParserBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down Expand Up @@ -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;
}
Expand Down
Loading