From 26ab404599643fac25442646b829a65a7f86bca1 Mon Sep 17 00:00:00 2001 From: Jesse Wilson Date: Fri, 2 Dec 2011 22:57:30 +0000 Subject: [PATCH] Cleanup names for TypeAdapters. --- .../typeadapters/RuntimeTypeAdapterFactory.java | 8 ++++---- .../java/com/google/gson/TreeTypeAdapter.java | 4 ++-- .../main/java/com/google/gson/TypeAdapter.java | 12 ++++++------ .../java/com/google/gson/internal/Excluder.java | 4 ++-- .../gson/internal/bind/ArrayTypeAdapter.java | 6 +++--- .../bind/CollectionTypeAdapterFactory.java | 6 +++--- .../gson/internal/bind/DateTypeAdapter.java | 2 +- .../internal/bind/MapTypeAdapterFactory.java | 10 +++++----- .../gson/internal/bind/ObjectTypeAdapter.java | 4 ++-- .../bind/ReflectiveTypeAdapterFactory.java | 4 ++-- .../gson/internal/bind/SqlDateTypeAdapter.java | 2 +- .../gson/internal/bind/TimeTypeAdapter.java | 2 +- .../google/gson/internal/bind/TypeAdapters.java | 16 ++++++++-------- 13 files changed, 40 insertions(+), 40 deletions(-) diff --git a/extras/src/main/java/com/google/gson/typeadapters/RuntimeTypeAdapterFactory.java b/extras/src/main/java/com/google/gson/typeadapters/RuntimeTypeAdapterFactory.java index e703625a..7d542498 100644 --- a/extras/src/main/java/com/google/gson/typeadapters/RuntimeTypeAdapterFactory.java +++ b/extras/src/main/java/com/google/gson/typeadapters/RuntimeTypeAdapterFactory.java @@ -179,7 +179,7 @@ public final class RuntimeTypeAdapterFactory implements TypeAdapter.Factory { return registerSubtype(type, type.getSimpleName()); } - public TypeAdapter create(Gson context, TypeToken type) { + public TypeAdapter create(Gson gson, TypeToken type) { if (type.getRawType() != baseType) { return null; } @@ -189,7 +189,7 @@ public final class RuntimeTypeAdapterFactory implements TypeAdapter.Factory { final Map, TypeAdapter> subtypeToDelegate = new LinkedHashMap, TypeAdapter>(); for (Map.Entry> 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 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 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); diff --git a/gson/src/main/java/com/google/gson/TreeTypeAdapter.java b/gson/src/main/java/com/google/gson/TreeTypeAdapter.java index 36eb9afd..8521de54 100644 --- a/gson/src/main/java/com/google/gson/TreeTypeAdapter.java +++ b/gson/src/main/java/com/google/gson/TreeTypeAdapter.java @@ -125,13 +125,13 @@ final class TreeTypeAdapter extends TypeAdapter { } @SuppressWarnings("unchecked") // guarded by typeToken.equals() call - public TypeAdapter create(Gson context, TypeToken type) { + public TypeAdapter create(Gson gson, TypeToken type) { boolean matches = exactType != null ? exactType.equals(type) || matchRawType && exactType.getType() == type.getRawType() : hierarchyType.isAssignableFrom(type.getRawType()); return matches ? new TreeTypeAdapter((JsonSerializer) serializer, - (JsonDeserializer) deserializer, context, type, this) + (JsonDeserializer) deserializer, gson, type, this) : null; } } diff --git a/gson/src/main/java/com/google/gson/TypeAdapter.java b/gson/src/main/java/com/google/gson/TypeAdapter.java index 66771399..a0737619 100644 --- a/gson/src/main/java/com/google/gson/TypeAdapter.java +++ b/gson/src/main/java/com/google/gson/TypeAdapter.java @@ -35,26 +35,26 @@ public abstract class TypeAdapter { 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 { } } - public T fromJsonElement(JsonElement json) { + public T fromJsonTree(JsonElement json) { try { JsonReader jsonReader = new JsonElementReader(json); jsonReader.setLenient(true); diff --git a/gson/src/main/java/com/google/gson/internal/Excluder.java b/gson/src/main/java/com/google/gson/internal/Excluder.java index 25d30d1f..2b28ab5d 100644 --- a/gson/src/main/java/com/google/gson/internal/Excluder.java +++ b/gson/src/main/java/com/google/gson/internal/Excluder.java @@ -107,7 +107,7 @@ public final class Excluder implements TypeAdapter.Factory, Cloneable { return result; } - public TypeAdapter create(final Gson context, final TypeToken type) { + public TypeAdapter create(final Gson gson, final TypeToken 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 d = delegate; return d != null ? d - : (delegate = context.getNextAdapter(Excluder.this, type)); + : (delegate = gson.getNextAdapter(Excluder.this, type)); } }; } diff --git a/gson/src/main/java/com/google/gson/internal/bind/ArrayTypeAdapter.java b/gson/src/main/java/com/google/gson/internal/bind/ArrayTypeAdapter.java index 0ad87d93..48ee91f4 100644 --- a/gson/src/main/java/com/google/gson/internal/bind/ArrayTypeAdapter.java +++ b/gson/src/main/java/com/google/gson/internal/bind/ArrayTypeAdapter.java @@ -37,16 +37,16 @@ import com.google.gson.stream.JsonWriter; public final class ArrayTypeAdapter extends TypeAdapter { public static final Factory FACTORY = new Factory() { @SuppressWarnings({"unchecked", "rawtypes"}) - public TypeAdapter create(Gson context, TypeToken typeToken) { + public TypeAdapter create(Gson gson, TypeToken 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)); } }; diff --git a/gson/src/main/java/com/google/gson/internal/bind/CollectionTypeAdapterFactory.java b/gson/src/main/java/com/google/gson/internal/bind/CollectionTypeAdapterFactory.java index 669a8d4d..82b21699 100644 --- a/gson/src/main/java/com/google/gson/internal/bind/CollectionTypeAdapterFactory.java +++ b/gson/src/main/java/com/google/gson/internal/bind/CollectionTypeAdapterFactory.java @@ -39,7 +39,7 @@ public final class CollectionTypeAdapterFactory implements TypeAdapter.Factory { this.constructorConstructor = constructorConstructor; } - public TypeAdapter create(Gson context, TypeToken typeToken) { + public TypeAdapter create(Gson gson, TypeToken typeToken) { Type type = typeToken.getType(); Class 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 constructor = constructorConstructor.getConstructor(typeToken); @SuppressWarnings({"unchecked", "rawtypes"}) // create() doesn't define a type parameter - TypeAdapter result = new Adapter(context, elementType, elementTypeAdapter, constructor); + TypeAdapter result = new Adapter(gson, elementType, elementTypeAdapter, constructor); return result; } diff --git a/gson/src/main/java/com/google/gson/internal/bind/DateTypeAdapter.java b/gson/src/main/java/com/google/gson/internal/bind/DateTypeAdapter.java index ef130745..06328f1d 100644 --- a/gson/src/main/java/com/google/gson/internal/bind/DateTypeAdapter.java +++ b/gson/src/main/java/com/google/gson/internal/bind/DateTypeAdapter.java @@ -40,7 +40,7 @@ import java.util.TimeZone; public final class DateTypeAdapter extends TypeAdapter { public static final Factory FACTORY = new Factory() { @SuppressWarnings("unchecked") // we use a runtime check to make sure the 'T's equal - public TypeAdapter create(Gson context, TypeToken typeToken) { + public TypeAdapter create(Gson gson, TypeToken typeToken) { return typeToken.getRawType() == Date.class ? (TypeAdapter) new DateTypeAdapter() : null; } }; diff --git a/gson/src/main/java/com/google/gson/internal/bind/MapTypeAdapterFactory.java b/gson/src/main/java/com/google/gson/internal/bind/MapTypeAdapterFactory.java index 88102474..0920e72b 100644 --- a/gson/src/main/java/com/google/gson/internal/bind/MapTypeAdapterFactory.java +++ b/gson/src/main/java/com/google/gson/internal/bind/MapTypeAdapterFactory.java @@ -111,7 +111,7 @@ public final class MapTypeAdapterFactory implements TypeAdapter.Factory { this.complexMapKeySerialization = complexMapKeySerialization; } - public TypeAdapter create(Gson context, TypeToken typeToken) { + public TypeAdapter create(Gson gson, TypeToken typeToken) { Type type = typeToken.getType(); Class 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 constructor = constructorConstructor.getConstructor(typeToken); @SuppressWarnings({"unchecked", "rawtypes"}) // we don't define a type parameter for the key or value types - TypeAdapter result = new Adapter(context, keyAndValueTypes[0], keyAdapter, + TypeAdapter 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 values = new ArrayList(map.size()); for (Map.Entry 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(); diff --git a/gson/src/main/java/com/google/gson/internal/bind/ObjectTypeAdapter.java b/gson/src/main/java/com/google/gson/internal/bind/ObjectTypeAdapter.java index 88211eb0..ee7d1296 100644 --- a/gson/src/main/java/com/google/gson/internal/bind/ObjectTypeAdapter.java +++ b/gson/src/main/java/com/google/gson/internal/bind/ObjectTypeAdapter.java @@ -35,9 +35,9 @@ import java.util.Map; public final class ObjectTypeAdapter extends TypeAdapter { public static final Factory FACTORY = new Factory() { @SuppressWarnings("unchecked") - public TypeAdapter create(Gson context, TypeToken type) { + public TypeAdapter create(Gson gson, TypeToken type) { if (type.getRawType() == Object.class) { - return (TypeAdapter) new ObjectTypeAdapter(context); + return (TypeAdapter) new ObjectTypeAdapter(gson); } return null; } diff --git a/gson/src/main/java/com/google/gson/internal/bind/ReflectiveTypeAdapterFactory.java b/gson/src/main/java/com/google/gson/internal/bind/ReflectiveTypeAdapterFactory.java index 0459eff0..36476e23 100644 --- a/gson/src/main/java/com/google/gson/internal/bind/ReflectiveTypeAdapterFactory.java +++ b/gson/src/main/java/com/google/gson/internal/bind/ReflectiveTypeAdapterFactory.java @@ -61,7 +61,7 @@ public final class ReflectiveTypeAdapterFactory implements TypeAdapter.Factory { return serializedName == null ? fieldNamingPolicy.translateName(f) : serializedName.value(); } - public TypeAdapter create(Gson context, final TypeToken type) { + public TypeAdapter create(Gson gson, final TypeToken type) { Class raw = type.getRawType(); if (!Object.class.isAssignableFrom(raw)) { @@ -69,7 +69,7 @@ public final class ReflectiveTypeAdapterFactory implements TypeAdapter.Factory { } ObjectConstructor constructor = constructorConstructor.getConstructor(type); - return new Adapter(constructor, getBoundFields(context, type, raw)); + return new Adapter(constructor, getBoundFields(gson, type, raw)); } private ReflectiveTypeAdapterFactory.BoundField createBoundField( diff --git a/gson/src/main/java/com/google/gson/internal/bind/SqlDateTypeAdapter.java b/gson/src/main/java/com/google/gson/internal/bind/SqlDateTypeAdapter.java index 83508783..87283d03 100644 --- a/gson/src/main/java/com/google/gson/internal/bind/SqlDateTypeAdapter.java +++ b/gson/src/main/java/com/google/gson/internal/bind/SqlDateTypeAdapter.java @@ -37,7 +37,7 @@ import java.text.SimpleDateFormat; public final class SqlDateTypeAdapter extends TypeAdapter { public static final Factory FACTORY = new Factory() { @SuppressWarnings("unchecked") // we use a runtime check to make sure the 'T's equal - public TypeAdapter create(Gson context, TypeToken typeToken) { + public TypeAdapter create(Gson gson, TypeToken typeToken) { return typeToken.getRawType() == java.sql.Date.class ? (TypeAdapter) new SqlDateTypeAdapter() : null; } diff --git a/gson/src/main/java/com/google/gson/internal/bind/TimeTypeAdapter.java b/gson/src/main/java/com/google/gson/internal/bind/TimeTypeAdapter.java index c91f4a3a..e38a0b93 100644 --- a/gson/src/main/java/com/google/gson/internal/bind/TimeTypeAdapter.java +++ b/gson/src/main/java/com/google/gson/internal/bind/TimeTypeAdapter.java @@ -39,7 +39,7 @@ import java.util.Date; public final class TimeTypeAdapter extends TypeAdapter