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

Merge pull request #994 from square/z/defaultToJson

Browse Source 
Don't allow toJson() serialization on polymorphic default values
This commit is contained in:
Zac Sweers
2019-11-03 15:32:50 -05:00
committed by GitHub
parent 7cf365cdbf 6323a0b7c8
commit 3c0e3edff3
2 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
adapters/src/main/java/com/squareup/moshi/adapters/PolymorphicJsonAdapterFactory.java
View File

@@ -275,6 +275,9 @@ public final class PolymorphicJsonAdapterFactory<T> implements JsonAdapter.Facto
}
@Override public void toJson(JsonWriter writer, Object value) throws IOException {
if (defaultValueSet && value == defaultValue) {
throw new IllegalArgumentException("Cannot serialize default value instance: " + value);
}
Class<?> type = value.getClass();
int labelIndex = subtypes.indexOf(type);
if (labelIndex == -1) {

18
adapters/src/test/java/com/squareup/moshi/adapters/PolymorphicJsonAdapterFactoryTest.java
View File

@@ -105,6 +105,24 @@ public final class PolymorphicJsonAdapterFactoryTest {
assertThat(message).isNull();
}
@Test public void toJsonDefaultValue() {
Error fallbackError = new Error(Collections.<String, Object>emptyMap());
Moshi moshi = new Moshi.Builder()
.add(PolymorphicJsonAdapterFactory.of(Message.class, "type")
.withSubtype(Success.class, "success")
.withSubtype(Error.class, "error")
.withDefaultValue(fallbackError))
.build();
JsonAdapter<Message> adapter = moshi.adapter(Message.class);
try {
String json = adapter.toJson(fallbackError);
fail();
} catch (IllegalArgumentException e) {
assertThat(e).hasMessageContaining("Cannot serialize default value instance");
}
}
@Test public void unregisteredSubtype() {
Moshi moshi = new Moshi.Builder()
.add(PolymorphicJsonAdapterFactory.of(Message.class, "type")