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

Disallow Object for RuntimeJsonAdapterFactory's base type.

Browse Source
This commit is contained in:
Eric Cochran
2018-09-18 17:55:28 -07:00
parent e0cdcd4ff8
commit 810199a442
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
adapters/src/main/java/com/squareup/moshi/adapters/RuntimeJsonAdapterFactory.java
View File

@@ -21,7 +21,6 @@ import com.squareup.moshi.JsonReader;
import com.squareup.moshi.JsonWriter; import com.squareup.moshi.JsonWriter;
import com.squareup.moshi.Moshi; import com.squareup.moshi.Moshi;
import com.squareup.moshi.Types; import com.squareup.moshi.Types;
import com.squareup.moshi.internal.Util;
import java.io.IOException; import java.io.IOException;
import java.lang.annotation.Annotation; import java.lang.annotation.Annotation;
import java.lang.reflect.Type; import java.lang.reflect.Type;
@@ -41,7 +40,7 @@ public final class RuntimeJsonAdapterFactory<T> implements JsonAdapter.Factory {
final Map<String, Type> labelToType = new LinkedHashMap<>(); final Map<String, Type> labelToType = new LinkedHashMap<>();
/** /**
* @param baseType The base type for which this factory will create adapters. * @param baseType The base type for which this factory will create adapters. Cannot be Object.
* @param labelKey The key in the JSON object whose value determines the type to which to map the * @param labelKey The key in the JSON object whose value determines the type to which to map the
* JSON object. * JSON object.
*/ */
@@ -49,6 +48,10 @@ public final class RuntimeJsonAdapterFactory<T> implements JsonAdapter.Factory {
public static <T> RuntimeJsonAdapterFactory<T> of(Class<T> baseType, String labelKey) { public static <T> RuntimeJsonAdapterFactory<T> of(Class<T> baseType, String labelKey) {
if (baseType == null) throw new NullPointerException("baseType == null"); if (baseType == null) throw new NullPointerException("baseType == null");
if (labelKey == null) throw new NullPointerException("labelKey == null"); if (labelKey == null) throw new NullPointerException("labelKey == null");
if (baseType == Object.class) {
throw new IllegalArgumentException(
"The base type must not be Object. Consider using a marker interface.");
}
return new RuntimeJsonAdapterFactory<>(baseType, labelKey); return new RuntimeJsonAdapterFactory<>(baseType, labelKey);
} }
@@ -86,10 +89,9 @@ public final class RuntimeJsonAdapterFactory<T> implements JsonAdapter.Factory {
typeToLabel.put(typeValue, label); typeToLabel.put(typeValue, label);
labelToAdapter.put(label, moshi.adapter(typeValue)); labelToAdapter.put(label, moshi.adapter(typeValue));
} }
JsonAdapter<Object> objectJsonAdapter = moshi.nextAdapter( JsonAdapter<Object> objectJsonAdapter = moshi.adapter(Object.class);
this, Object.class, Util.NO_ANNOTATIONS); return new RuntimeJsonAdapter(labelKey, labelToAdapter, typeToLabel,
return new RuntimeJsonAdapter(labelKey, labelToAdapter, typeToLabel, objectJsonAdapter) objectJsonAdapter).nullSafe();
.nullSafe();
} }
static final class RuntimeJsonAdapter extends JsonAdapter<Object> { static final class RuntimeJsonAdapter extends JsonAdapter<Object> {

10
adapters/src/test/java/com/squareup/moshi/adapters/RuntimeJsonAdapterFactoryTest.java
View File

@@ -171,6 +171,16 @@ public final class RuntimeJsonAdapterFactoryTest {
assertThat(reader.peek()).isEqualTo(JsonReader.Token.END_DOCUMENT); assertThat(reader.peek()).isEqualTo(JsonReader.Token.END_DOCUMENT);
} }
@Test public void disallowObjectBaseType() {
try {
RuntimeJsonAdapterFactory.of(Object.class, "type");
fail();
} catch (IllegalArgumentException expected) {
assertThat(expected).hasMessage(
"The base type must not be Object. Consider using a marker interface.");
}
}
interface Message { interface Message {
} }