Skip to content

Commit

Permalink
Update release notes wrt #828
Browse files Browse the repository at this point in the history
  • Loading branch information
@cowtowncoder
cowtowncoder committed Oct 23, 2022
1 parent 351de07 commit f14d2ed
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 23 deletions.
2 changes: 2 additions & 0 deletions release-notes/VERSION-2.x
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,8 @@ JSON library.
throws `StackOverflowErrror`
#822: Declare osgi.serviceloader.registrar requirement as optional
(contributed by Chris R)
#828: Make `BigInteger` parsing lazy
(contributed by @pjfanning)

2.13.4 (03-Sep-2022)

Expand Down
59 changes: 36 additions & 23 deletions src/main/java/com/fasterxml/jackson/core/base/ParserBase.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,14 @@ public abstract class ParserBase extends ParserMinimalBase

protected BigDecimal _numberBigDecimal;

/**
* Textual number representation captured from input in cases lazy-parsing
* is desired.
*<p>
* As of 2.14 this only applies to {@link BigInteger}.
*
* @since 2.14
*/
protected String _numberString;

// And then other information about value itself
Expand Down Expand Up @@ -609,7 +617,7 @@ public Number getNumberValue() throws IOException
return _numberLong;
}
if ((_numTypesValid & NR_BIGINT) != 0) {
return getBigInteger();
return _getBigInteger();
}
_throwInternal();
}
Expand Down Expand Up @@ -643,7 +651,7 @@ public Number getNumberValueExact() throws IOException
return _numberLong;
}
if ((_numTypesValid & NR_BIGINT) != 0) {
return getBigInteger();
return _getBigInteger();
}
_throwInternal();
}
Expand Down Expand Up @@ -733,7 +741,7 @@ public BigInteger getBigIntegerValue() throws IOException
convertNumberToBigInteger();
}
}
return getBigInteger();
return _getBigInteger();
}

@Override
Expand Down Expand Up @@ -971,7 +979,7 @@ protected void convertNumberToInt() throws IOException
}
_numberInt = result;
} else if ((_numTypesValid & NR_BIGINT) != 0) {
final BigInteger bigInteger = getBigInteger();
final BigInteger bigInteger = _getBigInteger();
if (BI_MIN_INT.compareTo(bigInteger) > 0
|| BI_MAX_INT.compareTo(bigInteger) < 0) {
reportOverflowInt();
Expand Down Expand Up @@ -1000,7 +1008,7 @@ protected void convertNumberToLong() throws IOException
if ((_numTypesValid & NR_INT) != 0) {
_numberLong = (long) _numberInt;
} else if ((_numTypesValid & NR_BIGINT) != 0) {
final BigInteger bigInteger = getBigInteger();
final BigInteger bigInteger = _getBigInteger();
if (BI_MIN_LONG.compareTo(bigInteger) > 0
|| BI_MAX_LONG.compareTo(bigInteger) < 0) {
reportOverflowLong();
Expand Down Expand Up @@ -1052,7 +1060,7 @@ protected void convertNumberToDouble() throws IOException
if ((_numTypesValid & NR_BIGDECIMAL) != 0) {
_numberDouble = _numberBigDecimal.doubleValue();
} else if ((_numTypesValid & NR_BIGINT) != 0) {
_numberDouble = getBigInteger().doubleValue();
_numberDouble = _getBigInteger().doubleValue();
} else if ((_numTypesValid & NR_LONG) != 0) {
_numberDouble = (double) _numberLong;
} else if ((_numTypesValid & NR_INT) != 0) {
Expand All @@ -1076,7 +1084,7 @@ protected void convertNumberToFloat() throws IOException
if ((_numTypesValid & NR_BIGDECIMAL) != 0) {
_numberFloat = _numberBigDecimal.floatValue();
} else if ((_numTypesValid & NR_BIGINT) != 0) {
_numberFloat = getBigInteger().floatValue();
_numberFloat = _getBigInteger().floatValue();
} else if ((_numTypesValid & NR_LONG) != 0) {
_numberFloat = (float) _numberLong;
} else if ((_numTypesValid & NR_INT) != 0) {
Expand All @@ -1098,12 +1106,11 @@ protected void convertNumberToBigDecimal() throws IOException
*/

if ((_numTypesValid & NR_DOUBLE) != 0) {
/* Let's actually parse from String representation, to avoid
* rounding errors that non-decimal floating operations could incur
*/
// Let's actually parse from String representation, to avoid
// rounding errors that non-decimal floating operations could incur
_numberBigDecimal = NumberInput.parseBigDecimal(getText());
} else if ((_numTypesValid & NR_BIGINT) != 0) {
_numberBigDecimal = new BigDecimal(getBigInteger());
_numberBigDecimal = new BigDecimal(_getBigInteger());
} else if ((_numTypesValid & NR_LONG) != 0) {
_numberBigDecimal = BigDecimal.valueOf(_numberLong);
} else if ((_numTypesValid & NR_INT) != 0) {
Expand All @@ -1114,6 +1121,23 @@ protected void convertNumberToBigDecimal() throws IOException
_numTypesValid |= NR_BIGDECIMAL;
}

/**
* Internal accessor that needs to be used for accessing number value of type
* {@link BigInteger} which -- as of 2.14 -- is typically lazily parsed.
*
* @since 2.14
*/
protected BigInteger _getBigInteger() {
if (_numberBigInt != null) {
return _numberBigInt;
} else if (_numberString == null) {
throw new IllegalStateException("cannot get BigInteger from current parser state");
}
_numberBigInt = NumberInput.parseBigInteger(_numberString);
_numberString = null;
return _numberBigInt;
}

/*
/**********************************************************
/* Internal/package methods: Error reporting
Expand Down Expand Up @@ -1332,7 +1356,7 @@ protected static int[] growArrayBy(int[] arr, int more)
}
return Arrays.copyOf(arr, arr.length + more);
}

/*
/**********************************************************
/* Stuff that was abstract and required before 2.8, but that
Expand All @@ -1350,15 +1374,4 @@ protected void loadMoreGuaranteed() throws IOException {

// Can't declare as deprecated, for now, but shouldn't be needed
protected void _finishString() throws IOException { }

private BigInteger getBigInteger() {
if (_numberBigInt != null) {
return _numberBigInt;
} else if (_numberString == null) {
throw new IllegalStateException("cannot get BigInteger from current parser state");
}
_numberBigInt = NumberInput.parseBigInteger(_numberString);
_numberString = null;
return _numberBigInt;
}
}

0 comments on commit f14d2ed

Please sign in to comment.