Cleanup names for TypeAdapters.
This commit is contained in:
parent
2da01fb183
commit
26ab404599
@ -179,7 +179,7 @@ public final class RuntimeTypeAdapterFactory<T> implements TypeAdapter.Factory {
|
||||
return registerSubtype(type, type.getSimpleName());
|
||||
}
|
||||
|
||||
public <T> TypeAdapter<T> create(Gson context, TypeToken<T> type) {
|
||||
public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> type) {
|
||||
if (type.getRawType() != baseType) {
|
||||
return null;
|
||||
}
|
||||
@ -189,7 +189,7 @@ public final class RuntimeTypeAdapterFactory<T> implements TypeAdapter.Factory {
|
||||
final Map<Class<?>, TypeAdapter<?>> subtypeToDelegate
|
||||
= new LinkedHashMap<Class<?>, TypeAdapter<?>>();
|
||||
for (Map.Entry<String, Class<?>> entry : labelToSubtype.entrySet()) {
|
||||
TypeAdapter<?> delegate = context.getNextAdapter(this, TypeToken.get(entry.getValue()));
|
||||
TypeAdapter<?> delegate = gson.getNextAdapter(this, TypeToken.get(entry.getValue()));
|
||||
labelToDelegate.put(entry.getKey(), delegate);
|
||||
subtypeToDelegate.put(entry.getValue(), delegate);
|
||||
}
|
||||
@ -209,7 +209,7 @@ public final class RuntimeTypeAdapterFactory<T> implements TypeAdapter.Factory {
|
||||
throw new JsonParseException("cannot deserialize " + baseType + " subtype named "
|
||||
+ label + "; did you forget to register a subtype?");
|
||||
}
|
||||
return delegate.fromJsonElement(jsonElement);
|
||||
return delegate.fromJsonTree(jsonElement);
|
||||
}
|
||||
|
||||
@Override public void write(JsonWriter writer, T value) throws IOException {
|
||||
@ -221,7 +221,7 @@ public final class RuntimeTypeAdapterFactory<T> implements TypeAdapter.Factory {
|
||||
throw new JsonParseException("cannot serialize " + srcType.getName()
|
||||
+ "; did you forget to register a subtype?");
|
||||
}
|
||||
JsonObject jsonObject = delegate.toJsonElement(value).getAsJsonObject();
|
||||
JsonObject jsonObject = delegate.toJsonTree(value).getAsJsonObject();
|
||||
if (jsonObject.has(typeFieldName)) {
|
||||
throw new JsonParseException("cannot serialize " + srcType.getName()
|
||||
+ " because it already defines a field named " + typeFieldName);
|
||||
|
@ -125,13 +125,13 @@ final class TreeTypeAdapter<T> extends TypeAdapter<T> {
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked") // guarded by typeToken.equals() call
|
||||
public <T> TypeAdapter<T> create(Gson context, TypeToken<T> type) {
|
||||
public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> type) {
|
||||
boolean matches = exactType != null
|
||||
? exactType.equals(type) || matchRawType && exactType.getType() == type.getRawType()
|
||||
: hierarchyType.isAssignableFrom(type.getRawType());
|
||||
return matches
|
||||
? new TreeTypeAdapter<T>((JsonSerializer<T>) serializer,
|
||||
(JsonDeserializer<T>) deserializer, context, type, this)
|
||||
(JsonDeserializer<T>) deserializer, gson, type, this)
|
||||
: null;
|
||||
}
|
||||
}
|
||||
|
@ -35,26 +35,26 @@ public abstract class TypeAdapter<T> {
|
||||
|
||||
public final String toJson(T value) throws IOException {
|
||||
StringWriter stringWriter = new StringWriter();
|
||||
write(stringWriter, value);
|
||||
toJson(stringWriter, value);
|
||||
return stringWriter.toString();
|
||||
}
|
||||
|
||||
public final void write(Writer out, T value) throws IOException {
|
||||
public final void toJson(Writer out, T value) throws IOException {
|
||||
JsonWriter writer = new JsonWriter(out);
|
||||
write(writer, value);
|
||||
}
|
||||
|
||||
public final T fromJson(String json) throws IOException {
|
||||
return read(new StringReader(json));
|
||||
return fromJson(new StringReader(json));
|
||||
}
|
||||
|
||||
public final T read(Reader in) throws IOException {
|
||||
public final T fromJson(Reader in) throws IOException {
|
||||
JsonReader reader = new JsonReader(in);
|
||||
reader.setLenient(true);
|
||||
return read(reader);
|
||||
}
|
||||
|
||||
public JsonElement toJsonElement(T src) {
|
||||
public JsonElement toJsonTree(T src) {
|
||||
try {
|
||||
JsonElementWriter jsonWriter = new JsonElementWriter();
|
||||
jsonWriter.setLenient(true);
|
||||
@ -65,7 +65,7 @@ public abstract class TypeAdapter<T> {
|
||||
}
|
||||
}
|
||||
|
||||
public T fromJsonElement(JsonElement json) {
|
||||
public T fromJsonTree(JsonElement json) {
|
||||
try {
|
||||
JsonReader jsonReader = new JsonElementReader(json);
|
||||
jsonReader.setLenient(true);
|
||||
|
@ -107,7 +107,7 @@ public final class Excluder implements TypeAdapter.Factory, Cloneable {
|
||||
return result;
|
||||
}
|
||||
|
||||
public <T> TypeAdapter<T> create(final Gson context, final TypeToken<T> type) {
|
||||
public <T> TypeAdapter<T> create(final Gson gson, final TypeToken<T> type) {
|
||||
Class<?> rawType = type.getRawType();
|
||||
final boolean skipSerialize = excludeClass(rawType, true);
|
||||
final boolean skipDeserialize = excludeClass(rawType, false);
|
||||
@ -140,7 +140,7 @@ public final class Excluder implements TypeAdapter.Factory, Cloneable {
|
||||
TypeAdapter<T> d = delegate;
|
||||
return d != null
|
||||
? d
|
||||
: (delegate = context.getNextAdapter(Excluder.this, type));
|
||||
: (delegate = gson.getNextAdapter(Excluder.this, type));
|
||||
}
|
||||
};
|
||||
}
|
||||
|
@ -37,16 +37,16 @@ import com.google.gson.stream.JsonWriter;
|
||||
public final class ArrayTypeAdapter<E> extends TypeAdapter<Object> {
|
||||
public static final Factory FACTORY = new Factory() {
|
||||
@SuppressWarnings({"unchecked", "rawtypes"})
|
||||
public <T> TypeAdapter<T> create(Gson context, TypeToken<T> typeToken) {
|
||||
public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> typeToken) {
|
||||
Type type = typeToken.getType();
|
||||
if (!(type instanceof GenericArrayType || type instanceof Class && ((Class<?>) type).isArray())) {
|
||||
return null;
|
||||
}
|
||||
|
||||
Type componentType = $Gson$Types.getArrayComponentType(type);
|
||||
TypeAdapter<?> componentTypeAdapter = context.getAdapter(TypeToken.get(componentType));
|
||||
TypeAdapter<?> componentTypeAdapter = gson.getAdapter(TypeToken.get(componentType));
|
||||
return new ArrayTypeAdapter(
|
||||
context, componentTypeAdapter, $Gson$Types.getRawType(componentType));
|
||||
gson, componentTypeAdapter, $Gson$Types.getRawType(componentType));
|
||||
}
|
||||
};
|
||||
|
||||
|
@ -39,7 +39,7 @@ public final class CollectionTypeAdapterFactory implements TypeAdapter.Factory {
|
||||
this.constructorConstructor = constructorConstructor;
|
||||
}
|
||||
|
||||
public <T> TypeAdapter<T> create(Gson context, TypeToken<T> typeToken) {
|
||||
public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> typeToken) {
|
||||
Type type = typeToken.getType();
|
||||
|
||||
Class<? super T> rawType = typeToken.getRawType();
|
||||
@ -48,11 +48,11 @@ public final class CollectionTypeAdapterFactory implements TypeAdapter.Factory {
|
||||
}
|
||||
|
||||
Type elementType = $Gson$Types.getCollectionElementType(type, rawType);
|
||||
TypeAdapter<?> elementTypeAdapter = context.getAdapter(TypeToken.get(elementType));
|
||||
TypeAdapter<?> elementTypeAdapter = gson.getAdapter(TypeToken.get(elementType));
|
||||
ObjectConstructor<T> constructor = constructorConstructor.getConstructor(typeToken);
|
||||
|
||||
@SuppressWarnings({"unchecked", "rawtypes"}) // create() doesn't define a type parameter
|
||||
TypeAdapter<T> result = new Adapter(context, elementType, elementTypeAdapter, constructor);
|
||||
TypeAdapter<T> result = new Adapter(gson, elementType, elementTypeAdapter, constructor);
|
||||
return result;
|
||||
}
|
||||
|
||||
|
@ -40,7 +40,7 @@ import java.util.TimeZone;
|
||||
public final class DateTypeAdapter extends TypeAdapter<Date> {
|
||||
public static final Factory FACTORY = new Factory() {
|
||||
@SuppressWarnings("unchecked") // we use a runtime check to make sure the 'T's equal
|
||||
public <T> TypeAdapter<T> create(Gson context, TypeToken<T> typeToken) {
|
||||
public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> typeToken) {
|
||||
return typeToken.getRawType() == Date.class ? (TypeAdapter<T>) new DateTypeAdapter() : null;
|
||||
}
|
||||
};
|
||||
|
@ -111,7 +111,7 @@ public final class MapTypeAdapterFactory implements TypeAdapter.Factory {
|
||||
this.complexMapKeySerialization = complexMapKeySerialization;
|
||||
}
|
||||
|
||||
public <T> TypeAdapter<T> create(Gson context, TypeToken<T> typeToken) {
|
||||
public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> typeToken) {
|
||||
Type type = typeToken.getType();
|
||||
|
||||
Class<? super T> rawType = typeToken.getRawType();
|
||||
@ -121,13 +121,13 @@ public final class MapTypeAdapterFactory implements TypeAdapter.Factory {
|
||||
|
||||
Class<?> rawTypeOfSrc = $Gson$Types.getRawType(type);
|
||||
Type[] keyAndValueTypes = $Gson$Types.getMapKeyAndValueTypes(type, rawTypeOfSrc);
|
||||
TypeAdapter<?> keyAdapter = getKeyAdapter(context, keyAndValueTypes[0]);
|
||||
TypeAdapter<?> valueAdapter = context.getAdapter(TypeToken.get(keyAndValueTypes[1]));
|
||||
TypeAdapter<?> keyAdapter = getKeyAdapter(gson, keyAndValueTypes[0]);
|
||||
TypeAdapter<?> valueAdapter = gson.getAdapter(TypeToken.get(keyAndValueTypes[1]));
|
||||
ObjectConstructor<T> constructor = constructorConstructor.getConstructor(typeToken);
|
||||
|
||||
@SuppressWarnings({"unchecked", "rawtypes"})
|
||||
// we don't define a type parameter for the key or value types
|
||||
TypeAdapter<T> result = new Adapter(context, keyAndValueTypes[0], keyAdapter,
|
||||
TypeAdapter<T> result = new Adapter(gson, keyAndValueTypes[0], keyAdapter,
|
||||
keyAndValueTypes[1], valueAdapter, constructor);
|
||||
return result;
|
||||
}
|
||||
@ -215,7 +215,7 @@ public final class MapTypeAdapterFactory implements TypeAdapter.Factory {
|
||||
|
||||
List<V> values = new ArrayList<V>(map.size());
|
||||
for (Map.Entry<K, V> entry : map.entrySet()) {
|
||||
JsonElement keyElement = keyTypeAdapter.toJsonElement(entry.getKey());
|
||||
JsonElement keyElement = keyTypeAdapter.toJsonTree(entry.getKey());
|
||||
keys.add(keyElement);
|
||||
values.add(entry.getValue());
|
||||
hasComplexKeys |= keyElement.isJsonArray() || keyElement.isJsonObject();
|
||||
|
@ -35,9 +35,9 @@ import java.util.Map;
|
||||
public final class ObjectTypeAdapter extends TypeAdapter<Object> {
|
||||
public static final Factory FACTORY = new Factory() {
|
||||
@SuppressWarnings("unchecked")
|
||||
public <T> TypeAdapter<T> create(Gson context, TypeToken<T> type) {
|
||||
public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> type) {
|
||||
if (type.getRawType() == Object.class) {
|
||||
return (TypeAdapter<T>) new ObjectTypeAdapter(context);
|
||||
return (TypeAdapter<T>) new ObjectTypeAdapter(gson);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
@ -61,7 +61,7 @@ public final class ReflectiveTypeAdapterFactory implements TypeAdapter.Factory {
|
||||
return serializedName == null ? fieldNamingPolicy.translateName(f) : serializedName.value();
|
||||
}
|
||||
|
||||
public <T> TypeAdapter<T> create(Gson context, final TypeToken<T> type) {
|
||||
public <T> TypeAdapter<T> create(Gson gson, final TypeToken<T> type) {
|
||||
Class<? super T> raw = type.getRawType();
|
||||
|
||||
if (!Object.class.isAssignableFrom(raw)) {
|
||||
@ -69,7 +69,7 @@ public final class ReflectiveTypeAdapterFactory implements TypeAdapter.Factory {
|
||||
}
|
||||
|
||||
ObjectConstructor<T> constructor = constructorConstructor.getConstructor(type);
|
||||
return new Adapter<T>(constructor, getBoundFields(context, type, raw));
|
||||
return new Adapter<T>(constructor, getBoundFields(gson, type, raw));
|
||||
}
|
||||
|
||||
private ReflectiveTypeAdapterFactory.BoundField createBoundField(
|
||||
|
@ -37,7 +37,7 @@ import java.text.SimpleDateFormat;
|
||||
public final class SqlDateTypeAdapter extends TypeAdapter<java.sql.Date> {
|
||||
public static final Factory FACTORY = new Factory() {
|
||||
@SuppressWarnings("unchecked") // we use a runtime check to make sure the 'T's equal
|
||||
public <T> TypeAdapter<T> create(Gson context, TypeToken<T> typeToken) {
|
||||
public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> typeToken) {
|
||||
return typeToken.getRawType() == java.sql.Date.class
|
||||
? (TypeAdapter<T>) new SqlDateTypeAdapter() : null;
|
||||
}
|
||||
|
@ -39,7 +39,7 @@ import java.util.Date;
|
||||
public final class TimeTypeAdapter extends TypeAdapter<Time> {
|
||||
public static final Factory FACTORY = new Factory() {
|
||||
@SuppressWarnings("unchecked") // we use a runtime check to make sure the 'T's equal
|
||||
public <T> TypeAdapter<T> create(Gson context, TypeToken<T> typeToken) {
|
||||
public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> typeToken) {
|
||||
return typeToken.getRawType() == Time.class ? (TypeAdapter<T>) new TimeTypeAdapter() : null;
|
||||
}
|
||||
};
|
||||
|
@ -444,12 +444,12 @@ public final class TypeAdapters {
|
||||
|
||||
public static final TypeAdapter.Factory TIMESTAMP_FACTORY = new TypeAdapter.Factory() {
|
||||
@SuppressWarnings("unchecked") // we use a runtime check to make sure the 'T's equal
|
||||
public <T> TypeAdapter<T> create(Gson context, TypeToken<T> typeToken) {
|
||||
public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> typeToken) {
|
||||
if (typeToken.getRawType() != Timestamp.class) {
|
||||
return null;
|
||||
}
|
||||
|
||||
final TypeAdapter<Date> dateTypeAdapter = context.getAdapter(Date.class);
|
||||
final TypeAdapter<Date> dateTypeAdapter = gson.getAdapter(Date.class);
|
||||
return (TypeAdapter<T>) new TypeAdapter<Timestamp>() {
|
||||
@Override public Timestamp read(JsonReader reader) throws IOException {
|
||||
Date date = dateTypeAdapter.read(reader);
|
||||
@ -667,7 +667,7 @@ public final class TypeAdapters {
|
||||
public static <TT> TypeAdapter.Factory newEnumTypeHierarchyFactory(final Class<TT> clazz) {
|
||||
return new TypeAdapter.Factory() {
|
||||
@SuppressWarnings({"rawtypes", "unchecked"})
|
||||
public <T> TypeAdapter<T> create(Gson context, TypeToken<T> typeToken) {
|
||||
public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> typeToken) {
|
||||
Class<? super T> rawType = typeToken.getRawType();
|
||||
return clazz.isAssignableFrom(rawType)
|
||||
? (TypeAdapter<T>) new EnumTypeAdapter(rawType) : null;
|
||||
@ -679,7 +679,7 @@ public final class TypeAdapters {
|
||||
final TypeToken<TT> type, final TypeAdapter<TT> typeAdapter) {
|
||||
return new TypeAdapter.Factory() {
|
||||
@SuppressWarnings("unchecked") // we use a runtime check to make sure the 'T's equal
|
||||
public <T> TypeAdapter<T> create(Gson context, TypeToken<T> typeToken) {
|
||||
public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> typeToken) {
|
||||
return typeToken.equals(type) ? (TypeAdapter<T>) typeAdapter : null;
|
||||
}
|
||||
};
|
||||
@ -689,7 +689,7 @@ public final class TypeAdapters {
|
||||
final Class<TT> type, final TypeAdapter<TT> typeAdapter) {
|
||||
return new TypeAdapter.Factory() {
|
||||
@SuppressWarnings("unchecked") // we use a runtime check to make sure the 'T's equal
|
||||
public <T> TypeAdapter<T> create(Gson context, TypeToken<T> typeToken) {
|
||||
public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> typeToken) {
|
||||
return typeToken.getRawType() == type ? (TypeAdapter<T>) typeAdapter : null;
|
||||
}
|
||||
@Override public String toString() {
|
||||
@ -702,7 +702,7 @@ public final class TypeAdapters {
|
||||
final Class<TT> unboxed, final Class<TT> boxed, final TypeAdapter<? super TT> typeAdapter) {
|
||||
return new TypeAdapter.Factory() {
|
||||
@SuppressWarnings("unchecked") // we use a runtime check to make sure the 'T's equal
|
||||
public <T> TypeAdapter<T> create(Gson context, TypeToken<T> typeToken) {
|
||||
public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> typeToken) {
|
||||
Class<? super T> rawType = typeToken.getRawType();
|
||||
return (rawType == unboxed || rawType == boxed) ? (TypeAdapter<T>) typeAdapter : null;
|
||||
}
|
||||
@ -717,7 +717,7 @@ public final class TypeAdapters {
|
||||
final Class<TT> base, final Class<? extends TT> sub, final TypeAdapter<? super TT> typeAdapter) {
|
||||
return new TypeAdapter.Factory() {
|
||||
@SuppressWarnings("unchecked") // we use a runtime check to make sure the 'T's equal
|
||||
public <T> TypeAdapter<T> create(Gson context, TypeToken<T> typeToken) {
|
||||
public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> typeToken) {
|
||||
Class<? super T> rawType = typeToken.getRawType();
|
||||
return (rawType == base || rawType == sub) ? (TypeAdapter<T>) typeAdapter : null;
|
||||
}
|
||||
@ -732,7 +732,7 @@ public final class TypeAdapters {
|
||||
final Class<TT> clazz, final TypeAdapter<TT> typeAdapter) {
|
||||
return new TypeAdapter.Factory() {
|
||||
@SuppressWarnings("unchecked")
|
||||
public <T> TypeAdapter<T> create(Gson context, TypeToken<T> typeToken) {
|
||||
public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> typeToken) {
|
||||
return clazz.isAssignableFrom(typeToken.getRawType()) ? (TypeAdapter<T>) typeAdapter : null;
|
||||
}
|
||||
@Override public String toString() {
|
||||
|
Loading…
Reference in New Issue
Block a user