Skip to content
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

Jump to bottom

Fix for https:/DominoKit/domino-jackson/issues/68 #69

Closed
wants to merge 2 commits into from
Closed

Fix for https:/DominoKit/domino-jackson/issues/68 #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f8b9d8
serialize NaN and +/-Infinity as strings in lenient mode
tobias-hammerschmidt Nov 3, 2023
a030d51
add test cases for NaN/Infinity (de)serialization
tobias-hammerschmidt Nov 5, 2023
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
9 changes: 7 additions & 2 deletions domino-jackson/src/main/java/org/dominokit/jackson/stream/impl/DefaultJsonWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,12 +433,17 @@ public DefaultJsonWriter value(boolean value) {
/** {@inheritDoc} */
@Override
public DefaultJsonWriter value(double value) {
if (Double.isNaN(value) || Double.isInfinite(value)) {
final boolean isNaNorInfinity = Double.isNaN(value) || Double.isInfinite(value);
if (!lenient && isNaNorInfinity) {
throw new IllegalArgumentException("Numeric values must be finite, but was " + value);
}
writeDeferredName();
beforeValue(false);
out.append(value);
if (isNaNorInfinity) {
string(Double.toString(value));
} else {
out.append(value);
}
return this;
}

Expand Down
9 changes: 7 additions & 2 deletions domino-jackson/src/main/java/org/dominokit/jackson/stream/impl/FastJsonWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,12 +301,17 @@ public FastJsonWriter value(boolean value) {
/** {@inheritDoc} */
@Override
public FastJsonWriter value(double value) {
if (Double.isNaN(value) || Double.isInfinite(value)) {
final boolean isNaNorInfinity = Double.isNaN(value) || Double.isInfinite(value);
if (!lenient && isNaNorInfinity) {
throw new IllegalArgumentException("Numeric values must be finite, but was " + value);
}
writeDeferredName();
beforeValue(false);
out.append(value);
if (isNaNorInfinity) {
string(Double.toString(value));
} else {
out.append(value);
}
return this;
}

Expand Down
3 changes: 3 additions & 0 deletions ...n/src/test/java/org/dominokit/jackson/client/deser/number/DoubleJsonDeserializerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,8 @@ public void testDeserializeValue() {
assertDeserialization(-784.15454d, "\"-784.15454\"");
assertDeserialization(Double.MIN_VALUE, "4.9E-324");
assertDeserialization(Double.MAX_VALUE, "1.7976931348623157e+308");
// FIXME can not get this to run: "expected: <NaN>, actual: <NaN>"
//assertDeserialization(Double.NaN, "\"NaN\"");
assertDeserialization(Double.NEGATIVE_INFINITY, "\"-Infinity\"");
}
}
2 changes: 2 additions & 0 deletions ...ckson/src/test/java/org/dominokit/jackson/client/ser/number/DoubleJsonSerializerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,7 @@ public void testSerializeValue() {
? "1.7976931348623157e+308"
: "1.7976931348623157E308"),
Double.MAX_VALUE);
assertSerialization("\"NaN\"", Double.NaN);
assertSerialization("\"-Infinity\"", Double.NEGATIVE_INFINITY);
}
}
2 changes: 2 additions & 0 deletions ...n/src/test/java/org/dominokit/jackson/server/deser/number/DoubleJsonDeserializerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,7 @@ public void testDeserializeValue() {
assertDeserialization(-784.15454d, "\"-784.15454\"");
assertDeserialization(Double.MIN_VALUE, "4.9E-324");
assertDeserialization(Double.MAX_VALUE, "1.7976931348623157e+308");
assertDeserialization(Double.NaN, "NaN");
assertDeserialization(Double.NEGATIVE_INFINITY, "-Infinity");
}
}
2 changes: 2 additions & 0 deletions ...ckson/src/test/java/org/dominokit/jackson/server/ser/number/DoubleJsonSerializerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,7 @@ public void testSerializeValue() {
assertSerialization("-784.15454", -784.15454d);
assertSerialization("4.9E-324", Double.MIN_VALUE);
assertSerialization("1.7976931348623157E308", Double.MAX_VALUE);
assertSerialization("\"NaN\"", Double.NaN);
assertSerialization("\"-Infinity\"", Double.NEGATIVE_INFINITY);
}
}