diff --git a/gson/src/main/java/com/google/gson/Gson.java b/gson/src/main/java/com/google/gson/Gson.java index aaef5de2..a04a5da6 100644 --- a/gson/src/main/java/com/google/gson/Gson.java +++ b/gson/src/main/java/com/google/gson/Gson.java @@ -683,7 +683,7 @@ public final class Gson { */ public T fromJson(Reader json, Type typeOfT) throws JsonIOException, JsonSyntaxException { JsonReader jsonReader = new JsonReader(json); - T object = fromJson(jsonReader, typeOfT); + T object = (T) fromJson(jsonReader, typeOfT); assertFullConsumption(object, jsonReader); return object; } @@ -780,7 +780,7 @@ public final class Gson { if (json == null) { return null; } - return fromJson(new JsonElementReader(json), typeOfT); + return (T) fromJson(new JsonElementReader(json), typeOfT); } @Override diff --git a/gson/src/main/java/com/google/gson/GsonToMiniGsonTypeAdapterFactory.java b/gson/src/main/java/com/google/gson/GsonToMiniGsonTypeAdapterFactory.java index 086619f2..0d872965 100644 --- a/gson/src/main/java/com/google/gson/GsonToMiniGsonTypeAdapterFactory.java +++ b/gson/src/main/java/com/google/gson/GsonToMiniGsonTypeAdapterFactory.java @@ -39,7 +39,7 @@ final class GsonToMiniGsonTypeAdapterFactory implements TypeAdapter.Factory { this.deserializationContext = new JsonDeserializationContext() { public T deserialize(JsonElement json, Type typeOfT) throws JsonParseException { - return gson.fromJson(json, typeOfT); + return (T) gson.fromJson(json, typeOfT); } };