Kill GsonInternalAccess. Clients to this were all broken because nobo…

…dy was ever assigning INSTANCE.
rida1148 · Jan 1, 2012 · 796a381 · 796a381
1 parent 323dfa0
commit 796a381
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 75 deletions.
diff --git a/extras/src/main/java/com/google/gson/graph/GraphTypeAdapterFactory.java b/extras/src/main/java/com/google/gson/graph/GraphTypeAdapterFactory.java
@@ -20,7 +20,6 @@
 import com.google.gson.JsonElement;
 import com.google.gson.TypeAdapter;
 import com.google.gson.TypeAdapterFactory;
-import com.google.gson.internal.GsonInternalAccess;
 import com.google.gson.internal.bind.JsonTreeReader;
 import com.google.gson.reflect.TypeToken;
 import com.google.gson.stream.JsonReader;
@@ -59,7 +58,7 @@ public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> type) {
       return null;
     }
 
-    final TypeAdapter<T> typeAdapter = GsonInternalAccess.INSTANCE.getNextAdapter(gson, this, type);
+    final TypeAdapter<T> typeAdapter = gson.getNextAdapter(this, type);
     final TypeAdapter<JsonElement> elementAdapter = gson.getAdapter(JsonElement.class);
     return new TypeAdapter<T>() {
       @Override public void write(JsonWriter out, T value) throws IOException {

diff --git a/extras/src/main/java/com/google/gson/typeadapters/RuntimeTypeAdapterFactory.java b/extras/src/main/java/com/google/gson/typeadapters/RuntimeTypeAdapterFactory.java
@@ -18,16 +18,12 @@
 
 import com.google.gson.Gson;
 import com.google.gson.JsonElement;
-import com.google.gson.JsonIOException;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
 import com.google.gson.JsonPrimitive;
 import com.google.gson.TypeAdapter;
 import com.google.gson.TypeAdapterFactory;
-import com.google.gson.internal.GsonInternalAccess;
 import com.google.gson.internal.Streams;
-import com.google.gson.internal.bind.JsonTreeWriter;
-import com.google.gson.internal.bind.JsonTreeReader;
 import com.google.gson.reflect.TypeToken;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
@@ -194,8 +190,7 @@ public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> type) {
     final Map<Class<?>, TypeAdapter<?>> subtypeToDelegate
         = new LinkedHashMap<Class<?>, TypeAdapter<?>>();
     for (Map.Entry<String, Class<?>> entry : labelToSubtype.entrySet()) {
-      TypeAdapter<?> delegate = GsonInternalAccess.INSTANCE
-          .getNextAdapter(gson, this, TypeToken.get(entry.getValue()));
+      TypeAdapter<?> delegate = gson.getNextAdapter(this, TypeToken.get(entry.getValue()));
       labelToDelegate.put(entry.getKey(), delegate);
       subtypeToDelegate.put(entry.getValue(), delegate);
     }
@@ -215,18 +210,7 @@ public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> type) {
           throw new JsonParseException("cannot deserialize " + baseType + " subtype named "
               + label + "; did you forget to register a subtype?");
         }
-        return fromJsonTree(delegate, jsonElement);
-      }
-
-      // TODO: remove this when TypeAdapter.fromJsonTree() is public
-      private T fromJsonTree(TypeAdapter<T> delegate, JsonElement jsonTree) {
-        try {
-          JsonReader jsonReader = new JsonTreeReader(jsonTree);
-          jsonReader.setLenient(true);
-          return delegate.read(jsonReader);
-        } catch (IOException e) {
-          throw new JsonIOException(e);
-        }
+        return delegate.fromJsonTree(jsonElement);
       }
 
       @Override public void write(JsonWriter out, T value) throws IOException {
@@ -238,7 +222,7 @@ private T fromJsonTree(TypeAdapter<T> delegate, JsonElement jsonTree) {
           throw new JsonParseException("cannot serialize " + srcType.getName()
               + "; did you forget to register a subtype?");
         }
-        JsonObject jsonObject = toJsonTree(delegate, 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);
@@ -250,18 +234,6 @@ private T fromJsonTree(TypeAdapter<T> delegate, JsonElement jsonTree) {
         }
         Streams.write(clone, out);
       }
-
-      // TODO: remove this when TypeAdapter.toJsonTree() is public
-      private JsonElement toJsonTree(TypeAdapter<T> delegate, T value) {
-        try {
-          JsonTreeWriter jsonWriter = new JsonTreeWriter();
-          jsonWriter.setLenient(true);
-          delegate.write(jsonWriter, value);
-          return jsonWriter.get();
-        } catch (IOException e) {
-          throw new JsonIOException(e);
-        }
-      }
     };
   }
 }
diff --git a/gson/src/main/java/com/google/gson/Gson.java b/gson/src/main/java/com/google/gson/Gson.java
@@ -18,7 +18,6 @@
 
 import com.google.gson.internal.ConstructorConstructor;
 import com.google.gson.internal.Excluder;
-import com.google.gson.internal.GsonInternalAccess;
 import com.google.gson.internal.Primitives;
 import com.google.gson.internal.Streams;
 import com.google.gson.internal.bind.ArrayTypeAdapter;

diff --git a/gson/src/main/java/com/google/gson/TreeTypeAdapter.java b/gson/src/main/java/com/google/gson/TreeTypeAdapter.java
@@ -17,7 +17,6 @@
 package com.google.gson;
 
 import com.google.gson.internal.$Gson$Preconditions;
-import com.google.gson.internal.GsonInternalAccess;
 import com.google.gson.internal.Streams;
 import com.google.gson.reflect.TypeToken;
 import com.google.gson.stream.JsonReader;

diff --git a/gson/src/main/java/com/google/gson/internal/Excluder.java b/gson/src/main/java/com/google/gson/internal/Excluder.java
@@ -141,7 +141,7 @@ private TypeAdapter<T> delegate() {
         TypeAdapter<T> d = delegate;
         return d != null
             ? d
-            : (delegate = GsonInternalAccess.INSTANCE.getNextAdapter(gson, Excluder.this, type));
+            : (delegate = gson.getNextAdapter(Excluder.this, type));
       }
     };
   }

diff --git a/gson/src/main/java/com/google/gson/internal/GsonInternalAccess.java b/gson/src/main/java/com/google/gson/internal/GsonInternalAccess.java