Declared boolean and numeric scalars accept their native JSON token or the same token text in + * quotes without a configuration gate. Quoted common paths consume only the quotes around the + * existing token parser, so they retain its allocation and validation behavior. + * *
Readers are mutable and confined to one borrowed {@code ForyJson} state. Concrete reset
* methods borrow an input and reset the cursor, depth, and graph-memory budget; {@code clear()}
* detaches that input and clears the root state before the state returns to the pool. A failed
@@ -68,6 +72,7 @@
*/
public abstract class JsonReader {
private static final int MAX_BIG_NUMBER_LENGTH = 10_000;
+ private static final int INITIAL_BIG_DECIMAL_BUFFER_SIZE = 64;
private static final byte[] EMPTY_BYTES = new byte[0];
static final int MAX_BIG_DECIMAL_SCALE = 10_000;
private static final int COMPACT_DECIMAL_MAX_SCALE = 18;
@@ -263,9 +268,10 @@ && matchesScannedString(fieldStart, fieldEnd, info.property())) {
private final QuotedTextView quotedTextView = new QuotedTextView(this);
private final Object[] creatorArguments = new Object[1];
- // Primitive floating fallback reuses this exact-boundary workspace. Reader construction is the
- // cold owner so the first precision-sensitive scalar cannot allocate on the numeric hot path.
- private final byte[] decimalBoundaryDigits = new byte[DECIMAL_BOUNDARY_DIGITS];
+ // Keep all reusable numeric arrays behind the original single workspace reference: adding an
+ // inherited reference here shifts concrete readers' representation fields and measurably harms
+ // their native-token hot paths. Reader construction remains the cold allocation owner.
+ private final NumericWorkspace numericWorkspace = new NumericWorkspace();
protected JsonReader(JsonConfig config, JsonTypeResolver typeResolver) {
this.config = config;
@@ -689,6 +695,13 @@ public boolean tryReadNullToken() {
public final boolean readBoolean() {
skipWhitespace();
+ if (position < length() && charAt(position) == '"') {
+ return readQuotedBoolean();
+ }
+ return readBooleanToken();
+ }
+
+ private boolean readBooleanToken() {
if (startsWith("true")) {
position += 4;
return true;
@@ -699,6 +712,13 @@ public final boolean readBoolean() {
throw error("Expected boolean");
}
+ private boolean readQuotedBoolean() {
+ beginQuotedScalar();
+ boolean value = readBooleanToken();
+ finishQuotedScalar();
+ return value;
+ }
+
public final String readNumberAsString() {
skipWhitespace();
return readNumberToken();
@@ -709,6 +729,12 @@ public final Number readNumber() {
}
private String readNumberToken() {
+ int start = position;
+ scanNumberToken();
+ return slice(start, position);
+ }
+
+ private void scanNumberToken() {
int start = position;
if (position < length() && charAt(position) == '-') {
position++;
@@ -728,11 +754,17 @@ private String readNumberToken() {
if (start == position) {
throw error("Expected number");
}
- return slice(start, position);
}
public final int readInt() {
skipWhitespace();
+ if (position < length() && charAt(position) == '"') {
+ return readQuotedInt();
+ }
+ return readIntToken();
+ }
+
+ private int readIntToken() {
int start = position;
int result = 0;
int limit = -Integer.MAX_VALUE;
@@ -779,8 +811,22 @@ public final int readInt() {
return negative ? result : -result;
}
+ private int readQuotedInt() {
+ beginQuotedScalar();
+ int value = readIntToken();
+ finishQuotedScalar();
+ return value;
+ }
+
public final long readLong() {
skipWhitespace();
+ if (position < length() && charAt(position) == '"') {
+ return readQuotedLong();
+ }
+ return readLongToken();
+ }
+
+ private long readLongToken() {
int start = position;
long result = 0;
long limit = -Long.MAX_VALUE;
@@ -827,6 +873,13 @@ public final long readLong() {
return negative ? result : -result;
}
+ private long readQuotedLong() {
+ beginQuotedScalar();
+ long value = readLongToken();
+ finishQuotedScalar();
+ return value;
+ }
+
/** Reads one canonical unsigned 32-bit JSON integer and returns its raw bits. */
public final int readUnsignedInt() {
long value = readUnsignedLong();
@@ -881,13 +934,71 @@ private long readUnsignedDigits() {
public BigInteger readBigInteger() {
skipWhitespace();
- int mark = position;
- try {
- return BigInteger.valueOf(readLong());
- } catch (RuntimeException e) {
- position = mark;
- return parseBigInteger(readNumberAsString());
+ if (position < length() && charAt(position) == '"') {
+ return readQuotedBigInteger();
}
+ return readBigIntegerToken();
+ }
+
+ private BigInteger readBigIntegerToken() {
+ int start = position;
+ long result = 0;
+ long limit = -Long.MAX_VALUE;
+ boolean negative = false;
+ if (position < length() && charAt(position) == '-') {
+ negative = true;
+ limit = Long.MIN_VALUE;
+ position++;
+ }
+ if (position >= length()) {
+ throw error("Expected digit");
+ }
+ char ch = charAt(position);
+ if (ch == '0') {
+ position++;
+ rejectLeadingDigit();
+ rejectFractionOrExponent();
+ return BigInteger.ZERO;
+ }
+ if (ch < '1' || ch > '9') {
+ throw error("Expected digit");
+ }
+ long multmin = limit / 10;
+ boolean overflow = false;
+ while (position < length()) {
+ ch = charAt(position);
+ if (ch < '0' || ch > '9') {
+ break;
+ }
+ if (!overflow) {
+ int digit = ch - '0';
+ if (result < multmin) {
+ overflow = true;
+ } else {
+ result *= 10;
+ if (result < limit + digit) {
+ overflow = true;
+ } else {
+ result -= digit;
+ }
+ }
+ }
+ position++;
+ }
+ rejectFractionOrExponent();
+ if (!overflow) {
+ return BigInteger.valueOf(negative ? result : -result);
+ }
+ // Overflow is normal for this arbitrary-precision target. Keeping it out of exception control
+ // flow avoids a transient allocation whose captured stack would differ on the quoted path.
+ return parseBigInteger(slice(start, position));
+ }
+
+ private BigInteger readQuotedBigInteger() {
+ beginQuotedScalar();
+ BigInteger value = readBigIntegerToken();
+ finishQuotedScalar();
+ return value;
}
public char readChar() {
@@ -975,7 +1086,47 @@ public OffsetTime readOffsetTime() {
protected final BigDecimal readBigDecimalFallback(int start) {
position = start;
- return parseBigDecimal(readNumberAsString());
+ scanNumberToken();
+ int numberLength = position - start;
+ if (numberLength > MAX_BIG_NUMBER_LENGTH) {
+ throwBigNumberLengthExceeded(position);
+ }
+ char[] chars = numericWorkspace.bigDecimalBuffer;
+ if (chars.length < numberLength) {
+ chars = new char[Math.max(numberLength, chars.length << 1)];
+ numericWorkspace.bigDecimalBuffer = chars;
+ }
+ for (int i = 0; i < numberLength; i++) {
+ chars[i] = charAt(start + i);
+ }
+ BigDecimal value;
+ try {
+ value = new BigDecimal(chars, 0, numberLength);
+ } catch (NumberFormatException e) {
+ throw new ForyJsonException("Invalid JSON big decimal at JSON position " + position, e);
+ }
+ int scale = value.scale();
+ if (scale > MAX_BIG_DECIMAL_SCALE || scale < -MAX_BIG_DECIMAL_SCALE) {
+ throwBigDecimalScaleExceeded();
+ }
+ return value;
+ }
+
+ protected final void beginQuotedScalar() {
+ position++;
+ // Concrete token parsers also dispatch an opening quote. Reject another raw quote at this
+ // boundary so malformed nested quoting cannot recursively re-enter the quoted cold path.
+ if (position < length() && charAt(position) == '"') {
+ throw error("Expected quoted scalar value");
+ }
+ }
+
+ protected final void finishQuotedScalar() {
+ if (position < length() && charAt(position) == '"') {
+ position++;
+ return;
+ }
+ throw error("Expected closing quote");
}
protected final BigDecimal readBigDecimalExponentValue(
@@ -1392,23 +1543,6 @@ final BigInteger parseBigInteger(String number) {
}
}
- final BigDecimal parseBigDecimal(String number) {
- if (number.length() > MAX_BIG_NUMBER_LENGTH) {
- throwBigNumberLengthExceeded(position);
- }
- BigDecimal value;
- try {
- value = new BigDecimal(number);
- } catch (NumberFormatException e) {
- throw new ForyJsonException("Invalid JSON big decimal at JSON position " + position, e);
- }
- int scale = value.scale();
- if (scale > MAX_BIG_DECIMAL_SCALE || scale < -MAX_BIG_DECIMAL_SCALE) {
- throwBigDecimalScaleExceeded();
- }
- return value;
- }
-
final void throwBigDecimalScaleExceeded() {
throw error("JSON big decimal scale " + MAX_BIG_DECIMAL_SCALE + " exceeded");
}
@@ -1627,9 +1761,6 @@ private static int doubleBinaryExponent(long bits) {
protected final double readDoubleFallbackValue(int start) {
position = start;
- if (start < length() && charAt(start) == '"') {
- return readNonFiniteDoubleLiteral();
- }
return readDoubleNumberFallback(start);
}
@@ -1806,7 +1937,7 @@ private static double approximateDouble(long significand, long scale) {
private double correctDoubleToken(boolean negative, double estimate, int start, int end) {
long bits = Double.doubleToRawLongBits(estimate) & ~DOUBLE_SIGN_BIT;
- byte[] boundary = decimalBoundaryDigits;
+ byte[] boundary = numericWorkspace.decimalBoundaryDigits;
// Eighteen retained digits, one correctly rounded multiply/divide, and Math.pow's one-ULP
// contract keep the estimate within this local window. The exact search is a correctness-only
// fallback and is not expected on valid JDK implementations.
@@ -1940,9 +2071,6 @@ private long readExponentScale(int offset, long scale) {
protected final float readFloatFallbackValue(int start) {
position = start;
- if (start < length() && charAt(start) == '"') {
- return readNonFiniteFloatLiteral();
- }
return readFloatNumberFallback(start);
}
@@ -2110,7 +2238,7 @@ private static float approximateFloat(boolean negative, long significand, long s
private float correctFloatToken(boolean negative, float estimate, int start, int end) {
int bits = Float.floatToRawIntBits(estimate);
bits &= ~FLOAT_SIGN_BIT;
- byte[] boundary = decimalBoundaryDigits;
+ byte[] boundary = numericWorkspace.decimalBoundaryDigits;
for (int i = 0; i < 4; i++) {
if (bits == FLOAT_INFINITY_BITS) {
int packed = buildFloatBoundary(FLOAT_MAX_FINITE_BITS, FLOAT_INFINITY_BITS, boundary);
@@ -2481,9 +2609,7 @@ protected final double readNonFiniteDoubleLiteral() {
position += 11;
return Double.NEGATIVE_INFINITY;
}
- // Numeric strings are intentionally not coerced; only writer-emitted non-finite tokens
- // are accepted here.
- throw error("Expected finite JSON number or non-finite double string");
+ throw error("Expected quoted double");
}
protected final float readNonFiniteFloatLiteral() {
@@ -2499,9 +2625,13 @@ protected final float readNonFiniteFloatLiteral() {
position += 11;
return Float.NEGATIVE_INFINITY;
}
- // Numeric strings are intentionally not coerced; only writer-emitted non-finite tokens
- // are accepted here.
- throw error("Expected finite JSON number or non-finite float string");
+ throw error("Expected quoted float");
+ }
+
+ protected final boolean isQuotedNonFiniteNumber() {
+ return matchesQuotedAscii("NaN")
+ || matchesQuotedAscii("Infinity")
+ || matchesQuotedAscii("-Infinity");
}
private boolean matchesQuotedAscii(String value) {
@@ -3102,6 +3232,11 @@ private int hexValue(char ch) {
protected abstract String slice(int start, int end);
+ private static final class NumericWorkspace {
+ private final byte[] decimalBoundaryDigits = new byte[DECIMAL_BOUNDARY_DIGITS];
+ private char[] bigDecimalBuffer = new char[INITIAL_BIG_DECIMAL_BUFFER_SIZE];
+ }
+
private static final class QuotedTextView implements CharSequence {
private final JsonReader reader;
private byte[] decodedBytes;
diff --git a/java/fory-json/src/main/java/org/apache/fory/json/reader/Latin1JsonReader.java b/java/fory-json/src/main/java/org/apache/fory/json/reader/Latin1JsonReader.java
index fae818ec2c..5a7e9a8b90 100644
--- a/java/fory-json/src/main/java/org/apache/fory/json/reader/Latin1JsonReader.java
+++ b/java/fory-json/src/main/java/org/apache/fory/json/reader/Latin1JsonReader.java
@@ -512,7 +512,17 @@ public boolean readBooleanTokenValue() {
return readBooleanToken();
}
+ private boolean readQuotedBooleanValue() {
+ beginQuotedScalar();
+ boolean value = readBooleanToken();
+ finishQuotedScalar();
+ return value;
+ }
+
private boolean readBooleanToken() {
+ if (position < input.length && input[position] == '"') {
+ return readQuotedBooleanValue();
+ }
if (startsWithAscii("true")) {
position += 4;
return true;
@@ -539,6 +549,13 @@ public int readIntTokenValue() {
return readIntToken();
}
+ private int readQuotedIntValue() {
+ beginQuotedScalar();
+ int value = readIntToken();
+ finishQuotedScalar();
+ return value;
+ }
+
private int readIntToken() {
byte[] bytes = input;
int offset = position;
@@ -547,6 +564,9 @@ private int readIntToken() {
throw error("Expected digit");
}
int ch = bytes[offset];
+ if (ch == '"') {
+ return readQuotedIntValue();
+ }
if (ch == '-') {
return readNegativeIntToken(offset);
}
@@ -673,6 +693,13 @@ public long readLongTokenValue() {
return readLongToken();
}
+ private long readQuotedLongValue() {
+ beginQuotedScalar();
+ long value = readLongToken();
+ finishQuotedScalar();
+ return value;
+ }
+
private long readLongToken() {
byte[] bytes = input;
int offset = position;
@@ -681,6 +708,9 @@ private long readLongToken() {
throw error("Expected digit");
}
int ch = bytes[offset];
+ if (ch == '"') {
+ return readQuotedLongValue();
+ }
if (ch == '-') {
return readNegativeLongToken(offset);
}
@@ -839,6 +869,13 @@ public BigDecimal readBigDecimal() {
return readBigDecimalToken();
}
+ private BigDecimal readQuotedBigDecimalValue() {
+ beginQuotedScalar();
+ BigDecimal value = readBigDecimalToken();
+ finishQuotedScalar();
+ return value;
+ }
+
public UUID readUuid() {
skipWhitespaceFast();
int mark = position;
@@ -876,6 +913,16 @@ public double readDoubleTokenValue() {
return readDoubleToken();
}
+ private double readQuotedDoubleValue() {
+ if (isQuotedNonFiniteNumber()) {
+ return readNonFiniteDoubleLiteral();
+ }
+ beginQuotedScalar();
+ double value = readDoubleToken();
+ finishQuotedScalar();
+ return value;
+ }
+
public float readNextFloatValue() {
if (position < input.length) {
int ch = input[position];
@@ -890,6 +937,16 @@ public float readFloatTokenValue() {
return readFloatToken();
}
+ private float readQuotedFloatValue() {
+ if (isQuotedNonFiniteNumber()) {
+ return readNonFiniteFloatLiteral();
+ }
+ beginQuotedScalar();
+ float value = readFloatToken();
+ finishQuotedScalar();
+ return value;
+ }
+
private BigDecimal readBigDecimalToken() {
byte[] bytes = input;
int offset = position;
@@ -899,6 +956,9 @@ private BigDecimal readBigDecimalToken() {
return readBigDecimalFallback(start);
}
int ch = bytes[offset];
+ if (ch == '"') {
+ return readQuotedBigDecimalValue();
+ }
if (ch == '-') {
return readSignedBigDecimalToken(start);
}
@@ -1074,6 +1134,9 @@ private double readDoubleToken() {
return readDoubleFallback(offset);
}
int ch = bytes[offset];
+ if (ch == '"') {
+ return readQuotedDoubleValue();
+ }
if (ch == '-') {
return readSignedDoubleToken(offset);
}
@@ -1088,6 +1151,9 @@ private float readFloatToken() {
return readFloatFallback(offset);
}
int ch = bytes[offset];
+ if (ch == '"') {
+ return readQuotedFloatValue();
+ }
if (ch == '-') {
return readSignedFloatToken(offset);
}
diff --git a/java/fory-json/src/main/java/org/apache/fory/json/reader/Utf16JsonReader.java b/java/fory-json/src/main/java/org/apache/fory/json/reader/Utf16JsonReader.java
index a487558edb..b7ba219695 100644
--- a/java/fory-json/src/main/java/org/apache/fory/json/reader/Utf16JsonReader.java
+++ b/java/fory-json/src/main/java/org/apache/fory/json/reader/Utf16JsonReader.java
@@ -561,7 +561,17 @@ public boolean readBooleanTokenValue() {
return readBooleanToken();
}
+ private boolean readQuotedBooleanValue() {
+ beginQuotedScalar();
+ boolean value = readBooleanToken();
+ finishQuotedScalar();
+ return value;
+ }
+
private boolean readBooleanToken() {
+ if (position < length && charAtFast(position) == '"') {
+ return readQuotedBooleanValue();
+ }
if (startsWithAscii("true")) {
position += 4;
return true;
@@ -588,6 +598,13 @@ public int readIntTokenValue() {
return readIntToken();
}
+ private int readQuotedIntValue() {
+ beginQuotedScalar();
+ int value = readIntToken();
+ finishQuotedScalar();
+ return value;
+ }
+
private int readIntToken() {
int offset = position;
int inputLength = length;
@@ -595,6 +612,9 @@ private int readIntToken() {
throw error("Expected digit");
}
char ch = charAtFast(offset);
+ if (ch == '"') {
+ return readQuotedIntValue();
+ }
if (ch == '-') {
return readNegativeIntToken(offset);
}
@@ -705,6 +725,13 @@ public long readLongTokenValue() {
return readLongToken();
}
+ private long readQuotedLongValue() {
+ beginQuotedScalar();
+ long value = readLongToken();
+ finishQuotedScalar();
+ return value;
+ }
+
private long readLongToken() {
int offset = position;
int inputLength = length;
@@ -712,6 +739,9 @@ private long readLongToken() {
throw error("Expected digit");
}
char ch = charAtFast(offset);
+ if (ch == '"') {
+ return readQuotedLongValue();
+ }
if (ch == '-') {
return readNegativeLongToken(offset);
}
@@ -812,6 +842,13 @@ public BigDecimal readBigDecimal() {
return readBigDecimalToken();
}
+ private BigDecimal readQuotedBigDecimalValue() {
+ beginQuotedScalar();
+ BigDecimal value = readBigDecimalToken();
+ finishQuotedScalar();
+ return value;
+ }
+
private BigDecimal readBigDecimalToken() {
int offset = position;
int start = offset;
@@ -820,6 +857,9 @@ private BigDecimal readBigDecimalToken() {
return readBigDecimalFallback(start);
}
char ch = charAtFast(offset);
+ if (ch == '"') {
+ return readQuotedBigDecimalValue();
+ }
if (ch == '-') {
return readSignedBigDecimalToken(start);
}
@@ -962,6 +1002,16 @@ public double readDoubleTokenValue() {
return readDoubleToken();
}
+ private double readQuotedDoubleValue() {
+ if (isQuotedNonFiniteNumber()) {
+ return readNonFiniteDoubleLiteral();
+ }
+ beginQuotedScalar();
+ double value = readDoubleToken();
+ finishQuotedScalar();
+ return value;
+ }
+
@Override
public float readFloat() {
skipWhitespaceFast();
@@ -982,6 +1032,16 @@ public float readFloatTokenValue() {
return readFloatToken();
}
+ private float readQuotedFloatValue() {
+ if (isQuotedNonFiniteNumber()) {
+ return readNonFiniteFloatLiteral();
+ }
+ beginQuotedScalar();
+ float value = readFloatToken();
+ finishQuotedScalar();
+ return value;
+ }
+
private double readDoubleToken() {
int offset = position;
int inputLength = length;
@@ -989,6 +1049,9 @@ private double readDoubleToken() {
return readDoubleFallback(offset);
}
char ch = charAtFast(offset);
+ if (ch == '"') {
+ return readQuotedDoubleValue();
+ }
if (ch == '-') {
return readSignedDoubleToken(offset);
}
@@ -1002,6 +1065,9 @@ private float readFloatToken() {
return readFloatFallback(offset);
}
char ch = charAtFast(offset);
+ if (ch == '"') {
+ return readQuotedFloatValue();
+ }
if (ch == '-') {
return readSignedFloatToken(offset);
}
diff --git a/java/fory-json/src/main/java/org/apache/fory/json/reader/Utf8JsonReader.java b/java/fory-json/src/main/java/org/apache/fory/json/reader/Utf8JsonReader.java
index 8415c0e2f8..fbfcbe3060 100644
--- a/java/fory-json/src/main/java/org/apache/fory/json/reader/Utf8JsonReader.java
+++ b/java/fory-json/src/main/java/org/apache/fory/json/reader/Utf8JsonReader.java
@@ -750,9 +750,19 @@ public boolean readBooleanTokenValue() {
return readBooleanToken();
}
+ private boolean readQuotedBooleanValue() {
+ beginQuotedScalar();
+ boolean value = readBooleanToken();
+ finishQuotedScalar();
+ return value;
+ }
+
private boolean readBooleanToken() {
byte[] bytes = input;
int offset = position;
+ if (offset < inputLimit && bytes[offset] == '"') {
+ return readQuotedBooleanValue();
+ }
if (offset + 3 < inputLimit
&& bytes[offset] == 't'
&& bytes[offset + 1] == 'r'
@@ -791,6 +801,13 @@ public int readIntTokenValue() {
return readIntToken();
}
+ private int readQuotedIntValue() {
+ beginQuotedScalar();
+ int value = readIntToken();
+ finishQuotedScalar();
+ return value;
+ }
+
private int readIntToken() {
byte[] bytes = input;
int offset = position;
@@ -799,6 +816,9 @@ private int readIntToken() {
throw error("Expected digit");
}
int ch = bytes[offset];
+ if (ch == '"') {
+ return readQuotedIntValue();
+ }
if (ch == '-') {
return readNegativeIntToken(offset);
}
@@ -915,11 +935,25 @@ public long readLongTokenValue() {
return readLongToken();
}
+ private long readQuotedLongValue() {
+ beginQuotedScalar();
+ long value = readLongToken();
+ finishQuotedScalar();
+ return value;
+ }
+
public BigDecimal readBigDecimal() {
skipWhitespaceFast();
return readBigDecimalToken();
}
+ private BigDecimal readQuotedBigDecimalValue() {
+ beginQuotedScalar();
+ BigDecimal value = readBigDecimalToken();
+ finishQuotedScalar();
+ return value;
+ }
+
public UUID readUuid() {
skipWhitespaceFast();
int mark = position;
@@ -957,6 +991,16 @@ public double readDoubleTokenValue() {
return readDoubleToken();
}
+ private double readQuotedDoubleValue() {
+ if (isQuotedNonFiniteNumber()) {
+ return readNonFiniteDoubleLiteral();
+ }
+ beginQuotedScalar();
+ double value = readDoubleToken();
+ finishQuotedScalar();
+ return value;
+ }
+
public float readNextFloatValue() {
if (position < inputLimit) {
int ch = input[position];
@@ -971,6 +1015,16 @@ public float readFloatTokenValue() {
return readFloatToken();
}
+ private float readQuotedFloatValue() {
+ if (isQuotedNonFiniteNumber()) {
+ return readNonFiniteFloatLiteral();
+ }
+ beginQuotedScalar();
+ float value = readFloatToken();
+ finishQuotedScalar();
+ return value;
+ }
+
// Long parsing deliberately repeats the initial digit checks, zero handling, block scan, and
// short tail used by Int parsing instead of sharing one generic token loop. The widths have
// different safe digit counts, overflow rules, and runtime profiles; a small shared helper lets
@@ -986,6 +1040,9 @@ private long readLongToken() {
throw error("Expected digit");
}
int ch = bytes[offset];
+ if (ch == '"') {
+ return readQuotedLongValue();
+ }
if (ch == '-') {
return readNegativeLongToken(offset);
}
@@ -1207,6 +1264,9 @@ private BigDecimal readBigDecimalToken() {
return readBigDecimalFallback(start);
}
int ch = bytes[offset];
+ if (ch == '"') {
+ return readQuotedBigDecimalValue();
+ }
if (ch == '-') {
return readSignedBigDecimalToken(start);
}
@@ -1384,6 +1444,9 @@ private double readDoubleToken() {
return readDoubleFallback(offset);
}
int ch = bytes[offset];
+ if (ch == '"') {
+ return readQuotedDoubleValue();
+ }
if (ch == '-') {
return readSignedDoubleToken(offset);
}
@@ -1398,6 +1461,9 @@ private float readFloatToken() {
return readFloatFallback(offset);
}
int ch = bytes[offset];
+ if (ch == '"') {
+ return readQuotedFloatValue();
+ }
if (ch == '-') {
return readSignedFloatToken(offset);
}
diff --git a/java/fory-json/src/test/java/org/apache/fory/json/JsonScalarTest.java b/java/fory-json/src/test/java/org/apache/fory/json/JsonScalarTest.java
index 16dc0449be..14c422c4bc 100644
--- a/java/fory-json/src/test/java/org/apache/fory/json/JsonScalarTest.java
+++ b/java/fory-json/src/test/java/org/apache/fory/json/JsonScalarTest.java
@@ -183,7 +183,7 @@ public void writeReadNonFiniteFloats(boolean codegen) {
assertTrue(optional.isPresent());
assertEquals(optional.getAsDouble(), Double.POSITIVE_INFINITY);
- assertThrows(ForyJsonException.class, () -> json.fromJson("\"1.0\"", Double.class));
+ assertEquals(json.fromJson("\"1.0\"", Double.class), Double.valueOf(1.0d));
assertThrows(ForyJsonException.class, () -> json.fromJson("\"nan\"", Float.class));
assertThrows(ForyJsonException.class, () -> json.fromJson("NaN", Double.class));
}
@@ -241,6 +241,17 @@ public void readBoxedScalars(boolean codegen) {
"{\"bool\":false,\"byteValue\":6,\"charValue\":\"z\",\"doubleValue\":3.5,"
+ "\"floatValue\":2.5,\"intValue\":8,\"longValue\":9,\"shortValue\":7}",
BoxedScalars.class);
+ assertBoxedScalars(value);
+ value =
+ json.fromJson(
+ "{\"bool\":\"false\",\"byteValue\":\"6\",\"charValue\":\"z\","
+ + "\"doubleValue\":\"3.5\",\"floatValue\":\"2.5\",\"intValue\":\"8\","
+ + "\"longValue\":\"9\",\"shortValue\":\"7\"}",
+ BoxedScalars.class);
+ assertBoxedScalars(value);
+ }
+
+ private static void assertBoxedScalars(BoxedScalars value) {
assertEquals(value.bool, Boolean.FALSE);
assertEquals(value.byteValue, Byte.valueOf((byte) 6));
assertEquals(value.charValue, Character.valueOf('z'));
@@ -264,6 +275,18 @@ public void readPrimitiveFields(boolean codegen) {
assertPrimitiveFields(
json.fromJson(values.getBytes(StandardCharsets.UTF_8), PrimitiveFields.class));
+ String quotedValues =
+ "{\"bool\":\"true\",\"byteValue\":\"2\",\"shortValue\":\"3\",\"intValue\":\"4\","
+ + "\"longValue\":\"5\",\"floatValue\":\"1.5\",\"doubleValue\":\"2.5\","
+ + "\"charValue\":\"x\"}";
+ assertPrimitiveFields(json.fromJson(quotedValues, PrimitiveFields.class));
+ assertPrimitiveFields(
+ json.fromJson(
+ quotedValues.replace("}", ",\"text\":\"" + ZH_TEXT + "\"}"), PrimitiveFields.class));
+ assertPrimitiveFields(
+ json.fromJson(quotedValues.getBytes(StandardCharsets.UTF_8), PrimitiveFields.class));
+ assertGeneratedWhenSupported(json, PrimitiveFields.class, codegen);
+
String[] names = {
"bool",
"byteValue",
@@ -1040,6 +1063,17 @@ public void readScalarRoots() {
ForyJson json = newJson();
assertEquals(json.fromJson("7", int.class), Integer.valueOf(7));
assertEquals(json.fromJson("true", boolean.class), Boolean.TRUE);
+ assertEquals(json.fromJson("\"true\"", boolean.class), Boolean.TRUE);
+ assertEquals(json.fromJson("\"2\"", byte.class), Byte.valueOf((byte) 2));
+ assertEquals(json.fromJson("\"3\"", short.class), Short.valueOf((short) 3));
+ assertEquals(json.fromJson("\"4\"", int.class), Integer.valueOf(4));
+ assertEquals(json.fromJson("\"5\"", long.class), Long.valueOf(5));
+ assertEquals(json.fromJson("\"1.5\"", float.class), Float.valueOf(1.5f));
+ assertEquals(
+ json.fromJson("\"2.5\"".getBytes(StandardCharsets.UTF_8), double.class),
+ Double.valueOf(2.5d));
+ assertEquals(json.fromJson("\"123\"", BigInteger.class), BigInteger.valueOf(123));
+ assertEquals(json.fromJson("\"0.100\"", BigDecimal.class), new BigDecimal("0.100"));
assertEquals(json.fromJson("0.100", BigDecimal.class), new BigDecimal("0.100"));
assertEquals(json.fromJson("\"fory\"".getBytes(StandardCharsets.UTF_8), String.class), "fory");
assertEquals(
@@ -1128,6 +1162,54 @@ public void readCommonScalarReaders() {
assertEquals(utf16Reader(duration).readDuration(), expectedDuration);
}
+ @Test(dataProvider = "enableCodegen")
+ public void readQuotedBigNumbers(boolean codegen) {
+ ForyJson json = newJson(codegen);
+ BigInteger integer = new BigInteger("123456789012345678901234567890");
+ BigDecimal decimal = new BigDecimal("12345678901234567890.1234500");
+
+ assertEquals(json.fromJson("\"" + integer + "\"", BigInteger.class), integer);
+ assertEquals(
+ json.fromJson(("\"" + decimal + "\"").getBytes(StandardCharsets.UTF_8), BigDecimal.class),
+ decimal);
+
+ String input = "{\"decimal\":\"" + decimal + "\",\"integer\":\"" + integer + "\"}";
+ Utf8ScalarFields latin1 = json.fromJson(input, Utf8ScalarFields.class);
+ Utf8ScalarFields utf8 =
+ json.fromJson(input.getBytes(StandardCharsets.UTF_8), Utf8ScalarFields.class);
+ assertEquals(latin1.decimal, decimal);
+ assertEquals(latin1.integer, integer);
+ assertEquals(utf8.decimal, decimal);
+ assertEquals(utf8.integer, integer);
+ assertGeneratedWhenSupported(json, Utf8ScalarFields.class, codegen);
+
+ assertQuotedBigIntegerReaders("123456789012345678901234567890");
+ assertQuotedBigDecimalReaders("12345678901234567890.1234500");
+ }
+
+ @Test(dataProvider = "enableCodegen")
+ public void readQuotedScalarContainers(boolean codegen) {
+ ForyJson json = newJson(codegen);
+ assertEquals(
+ json.fromJson("[\"true\",\"false\"]".getBytes(StandardCharsets.UTF_8), boolean[].class),
+ new boolean[] {true, false});
+ assertEquals(json.fromJson("[\"2\",\"3\"]", byte[].class), new byte[] {2, 3});
+ assertEquals(json.fromJson("[\"4\",\"5\"]", short[].class), new short[] {4, 5});
+ assertEquals(json.fromJson("[\"6\",\"7\"]", int[].class), new int[] {6, 7});
+ assertEquals(
+ json.fromJson("[\"8\",\"9\"]".getBytes(StandardCharsets.UTF_8), long[].class),
+ new long[] {8, 9});
+ assertEquals(json.fromJson("[\"1.5\",\"2.5\"]", float[].class), new float[] {1.5f, 2.5f});
+ assertEquals(json.fromJson("[\"3.5\",\"4.5\"]", double[].class), new double[] {3.5d, 4.5d});
+ assertEquals(
+ json.fromJson(
+ "[\"10\",\"11\"]".getBytes(StandardCharsets.UTF_8), new TypeRef