fankes/moshi
2
0
Fork 0
mirror of https://github.com/fankes/moshi.git synced 2025-10-20 00:19:21 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add comments, fix nits

Browse Source
This commit is contained in:
Scott Blum
2014-08-14 01:38:44 -04:00
parent 1e4f375e75
commit 9a713f80ed
3 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
moshi/src/main/java/com/squareup/moshi/JsonReader.java
View File

@@ -899,7 +899,7 @@ public class JsonReader implements Closeable {
peeked = PEEKED_BUFFERED; peeked = PEEKED_BUFFERED;
double result = Double.parseDouble(peekedString); // don't catch this NumberFormatException. double result = Double.parseDouble(peekedString); // don't catch this NumberFormatException.
if (!lenient && (Double.isNaN(result) || Double.isInfinite(result))) { if (!lenient && (Double.isNaN(result) || Double.isInfinite(result))) {
throw new IOException("JSON forbids NaN and infinities: " + result throw new NumberFormatException("JSON forbids NaN and infinities: " + result
+ " at path " + getPath()); + " at path " + getPath());
} }
peekedString = null; peekedString = null;

6
moshi/src/main/java/com/squareup/moshi/StandardJsonAdapters.java
View File

@@ -103,18 +103,20 @@ final class StandardJsonAdapters {
static final JsonAdapter<Float> FLOAT_JSON_ADAPTER = new JsonAdapter<Float>() { static final JsonAdapter<Float> FLOAT_JSON_ADAPTER = new JsonAdapter<Float>() {
@Override public Float fromJson(JsonReader reader) throws IOException { @Override public Float fromJson(JsonReader reader) throws IOException {
float value = (float) reader.nextDouble(); float value = (float) reader.nextDouble();
// Double check for infinity after float conversion; many doubles > Float.MAX
if (!reader.isLenient() && Float.isInfinite(value)) { if (!reader.isLenient() && Float.isInfinite(value)) {
throw new IOException("JSON forbids NaN and infinities: " + value throw new NumberFormatException("JSON forbids NaN and infinities: " + value
+ " at path " + reader.getPath()); + " at path " + reader.getPath());
} }
return value; return value;
} }
@Override public void toJson(JsonWriter writer, Float value) throws IOException { @Override public void toJson(JsonWriter writer, Float value) throws IOException {
// Use the Number overload. // Manual null pointer check for the float.class adapter.
if (value == null) { if (value == null) {
throw new NullPointerException(); throw new NullPointerException();
} }
// Use the Number overload so we write out float precision instead of double precision.
writer.value(value); writer.value(value);
} }
}; };

12
moshi/src/test/java/com/squareup/moshi/MoshiTest.java
View File

@@ -269,8 +269,7 @@ public final class MoshiTest {
try { try {
adapter.fromJson(reader); adapter.fromJson(reader);
fail(); fail();
} catch (IOException expected) { } catch (NumberFormatException expected) {
// TODO: should this really be NumberFormatException?
assertThat(expected.getMessage()).isEqualTo("JSON forbids NaN and infinities: Infinity at path $[0]"); assertThat(expected.getMessage()).isEqualTo("JSON forbids NaN and infinities: Infinity at path $[0]");
} }
@@ -279,8 +278,7 @@ public final class MoshiTest {
try { try {
adapter.fromJson(reader); adapter.fromJson(reader);
fail(); fail();
} catch (IOException expected) { } catch (NumberFormatException expected) {
// TODO: should this really be NumberFormatException?
assertThat(expected.getMessage()).isEqualTo("JSON forbids NaN and infinities: -Infinity at path $[0]"); assertThat(expected.getMessage()).isEqualTo("JSON forbids NaN and infinities: -Infinity at path $[0]");
} }
} }
@@ -339,8 +337,7 @@ public final class MoshiTest {
try { try {
adapter.fromJson(reader); adapter.fromJson(reader);
fail(); fail();
} catch (IOException expected) { } catch (NumberFormatException expected) {
// TODO: should this really be NumberFormatException?
assertThat(expected.getMessage()).isEqualTo("JSON forbids NaN and infinities: Infinity at path $[1]"); assertThat(expected.getMessage()).isEqualTo("JSON forbids NaN and infinities: Infinity at path $[1]");
} }
@@ -349,8 +346,7 @@ public final class MoshiTest {
try { try {
adapter.fromJson(reader); adapter.fromJson(reader);
fail(); fail();
} catch (IOException expected) { } catch (NumberFormatException expected) {
// TODO: should this really be NumberFormatException?
assertThat(expected.getMessage()).isEqualTo("JSON forbids NaN and infinities: -Infinity at path $[1]"); assertThat(expected.getMessage()).isEqualTo("JSON forbids NaN and infinities: -Infinity at path $[1]");
} }
} }