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

Merge pull request #212 from square/jwilson.1023.nulls_in_readers

Browse Source 
Adapter methods get nulls if they accept JsonReader/JsonWriter.
This commit is contained in:
Jake Wharton
2016-10-23 11:17:36 -04:00
committed by GitHub
parent e1809aa6f9 4c973d1aef
commit b024b6a1cb
2 changed files with 32 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
moshi/src/main/java/com/squareup/moshi/AdapterMethodsFactory.java
View File

@@ -154,7 +154,7 @@ final class AdapterMethodsFactory implements JsonAdapter.Factory {
// void pointToJson(JsonWriter jsonWriter, Point point, JsonAdapter<?> adapter, ...) { // void pointToJson(JsonWriter jsonWriter, Point point, JsonAdapter<?> adapter, ...) {
Set<? extends Annotation> qualifierAnnotations = jsonAnnotations(parameterAnnotations[1]); Set<? extends Annotation> qualifierAnnotations = jsonAnnotations(parameterAnnotations[1]);
return new AdapterMethod(parameterTypes[1], qualifierAnnotations, adapter, method, return new AdapterMethod(parameterTypes[1], qualifierAnnotations, adapter, method,
parameterTypes.length, 2, false) { parameterTypes.length, 2, true) {
@Override public void toJson(Moshi moshi, JsonWriter writer, Object value) @Override public void toJson(Moshi moshi, JsonWriter writer, Object value)
throws IOException, InvocationTargetException { throws IOException, InvocationTargetException {
invoke(writer, value); invoke(writer, value);
@@ -217,7 +217,7 @@ final class AdapterMethodsFactory implements JsonAdapter.Factory {
// Point pointFromJson(JsonReader jsonReader) { // Point pointFromJson(JsonReader jsonReader) {
// Point pointFromJson(JsonReader jsonReader, JsonAdapter<?> adapter, ...) { // Point pointFromJson(JsonReader jsonReader, JsonAdapter<?> adapter, ...) {
return new AdapterMethod(returnType, returnTypeAnnotations, adapter, method, return new AdapterMethod(returnType, returnTypeAnnotations, adapter, method,
parameterTypes.length, 1, false) { parameterTypes.length, 1, true) {
@Override public Object fromJson(Moshi moshi, JsonReader reader) @Override public Object fromJson(Moshi moshi, JsonReader reader)
throws IOException, InvocationTargetException { throws IOException, InvocationTargetException {
return invoke(reader); return invoke(reader);

31
moshi/src/test/java/com/squareup/moshi/AdapterMethodsTest.java
View File

@@ -294,6 +294,33 @@ public final class AdapterMethodsTest {
@interface Nullable { @interface Nullable {
} }
@Test public void toAndFromNullJsonWithWriterAndReader() throws Exception {
Moshi moshi = new Moshi.Builder()
.add(new NullableIntToJsonAdapter())
.build();
JsonAdapter<Point> pointAdapter = moshi.adapter(Point.class);
assertThat(pointAdapter.fromJson("{\"x\":null,\"y\":3}")).isEqualTo(new Point(-1, 3));
assertThat(pointAdapter.toJson(new Point(-1, 3))).isEqualTo("{\"y\":3}");
}
static class NullableIntToJsonAdapter {
@FromJson int intToJson(JsonReader reader) throws IOException {
if (reader.peek() == JsonReader.Token.NULL) {
reader.nextNull();
return -1;
}
return reader.nextInt();
}
@ToJson void jsonToInt(JsonWriter writer, int value) throws IOException {
if (value == -1) {
writer.nullValue();
} else {
writer.value(value);
}
}
}
@Test public void adapterThrows() throws Exception { @Test public void adapterThrows() throws Exception {
Moshi moshi = new Moshi.Builder() Moshi moshi = new Moshi.Builder()
.add(new ExceptionThrowingPointJsonAdapter()) .add(new ExceptionThrowingPointJsonAdapter())
@@ -317,10 +344,12 @@ public final class AdapterMethodsTest {
static class ExceptionThrowingPointJsonAdapter { static class ExceptionThrowingPointJsonAdapter {
@ToJson void pointToJson(JsonWriter writer, Point point) throws Exception { @ToJson void pointToJson(JsonWriter writer, Point point) throws Exception {
throw new Exception("pointToJson fail!"); if (point != null) throw new Exception("pointToJson fail!");
writer.nullValue();
} }
@FromJson Point pointFromJson(JsonReader reader) throws Exception { @FromJson Point pointFromJson(JsonReader reader) throws Exception {
if (reader.peek() == JsonReader.Token.NULL) return reader.nextNull();
throw new Exception("pointFromJson fail!"); throw new Exception("pointFromJson fail!");
} }
} }