Fix a class loading deadlock involving TypeAdapters.

Fixes #2739.
google · Sep 13, 2024 · e96abc5 · e96abc5
1 parent 48889db
commit e96abc5
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 18 deletions.
diff --git a/gson/src/main/java/com/google/gson/Gson.java b/gson/src/main/java/com/google/gson/Gson.java
@@ -26,9 +26,7 @@
 import com.google.gson.internal.bind.ArrayTypeAdapter;
 import com.google.gson.internal.bind.CollectionTypeAdapterFactory;
 import com.google.gson.internal.bind.DefaultDateTypeAdapter;
-import com.google.gson.internal.bind.EnumTypeAdapter;
 import com.google.gson.internal.bind.JsonAdapterAnnotationTypeAdapterFactory;
-import com.google.gson.internal.bind.JsonElementTypeAdapter;
 import com.google.gson.internal.bind.JsonTreeReader;
 import com.google.gson.internal.bind.JsonTreeWriter;
 import com.google.gson.internal.bind.MapTypeAdapterFactory;
@@ -325,7 +323,9 @@ public Gson() {
     List<TypeAdapterFactory> factories = new ArrayList<>();
 
     // built-in type adapters that cannot be overridden
-    factories.add(JsonElementTypeAdapter.FACTORY);
+    @SuppressWarnings("deprecation")
+    TypeAdapterFactory jsonElementFactory = TypeAdapters.JSON_ELEMENT_FACTORY;
+    factories.add(jsonElementFactory);
     factories.add(ObjectTypeAdapter.getFactory(objectToNumberStrategy));
 
     // the excluder must precede all adapters that handle user-defined types
@@ -388,7 +388,9 @@ public Gson() {
     factories.add(new MapTypeAdapterFactory(constructorConstructor, complexMapKeySerialization));
     this.jsonAdapterFactory = new JsonAdapterAnnotationTypeAdapterFactory(constructorConstructor);
     factories.add(jsonAdapterFactory);
-    factories.add(EnumTypeAdapter.FACTORY);
+    @SuppressWarnings("deprecation")
+    TypeAdapterFactory enumFactory = TypeAdapters.ENUM_FACTORY;
+    factories.add(enumFactory);
     factories.add(
         new ReflectiveTypeAdapterFactory(
             constructorConstructor,

diff --git a/gson/src/main/java/com/google/gson/internal/Streams.java b/gson/src/main/java/com/google/gson/internal/Streams.java
@@ -21,7 +21,7 @@
 import com.google.gson.JsonNull;
 import com.google.gson.JsonParseException;
 import com.google.gson.JsonSyntaxException;
-import com.google.gson.internal.bind.JsonElementTypeAdapter;
+import com.google.gson.internal.bind.TypeAdapters;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonToken;
 import com.google.gson.stream.JsonWriter;
@@ -43,7 +43,9 @@ public static JsonElement parse(JsonReader reader) throws JsonParseException {
     try {
       JsonToken unused = reader.peek();
       isEmpty = false;
-      return JsonElementTypeAdapter.ADAPTER.read(reader);
+      @SuppressWarnings("deprecation")
+      JsonElement element = TypeAdapters.JSON_ELEMENT.read(reader);
+      return element;
     } catch (EOFException e) {
       /*
        * For compatibility with JSON 1.5 and earlier, we return a JsonNull for
@@ -64,8 +66,9 @@ public static JsonElement parse(JsonReader reader) throws JsonParseException {
   }
 
   /** Writes the JSON element to the writer, recursively. */
+  @SuppressWarnings("deprecation")
   public static void write(JsonElement element, JsonWriter writer) throws IOException {
-    JsonElementTypeAdapter.ADAPTER.write(writer, element);
+    TypeAdapters.JSON_ELEMENT.write(writer, element);
   }
 
   public static Writer writerForAppendable(Appendable appendable) {

diff --git a/gson/src/main/java/com/google/gson/internal/bind/EnumTypeAdapter.java b/gson/src/main/java/com/google/gson/internal/bind/EnumTypeAdapter.java
@@ -32,8 +32,8 @@
 import java.util.Map;
 
 /** Adapter for enum classes (but not for the base class {@code java.lang.Enum}). */
-public class EnumTypeAdapter<T extends Enum<T>> extends TypeAdapter<T> {
-  public static final TypeAdapterFactory FACTORY =
+class EnumTypeAdapter<T extends Enum<T>> extends TypeAdapter<T> {
+  static final TypeAdapterFactory FACTORY =
       new TypeAdapterFactory() {
         @Override
         public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> typeToken) {

diff --git a/gson/src/main/java/com/google/gson/internal/bind/JsonElementTypeAdapter.java b/gson/src/main/java/com/google/gson/internal/bind/JsonElementTypeAdapter.java
@@ -33,10 +33,10 @@
 import java.util.Map;
 
 /** Adapter for {@link JsonElement} and subclasses. */
-public class JsonElementTypeAdapter extends TypeAdapter<JsonElement> {
-  public static final JsonElementTypeAdapter ADAPTER = new JsonElementTypeAdapter();
+class JsonElementTypeAdapter extends TypeAdapter<JsonElement> {
+  static final JsonElementTypeAdapter ADAPTER = new JsonElementTypeAdapter();
 
-  public static final TypeAdapterFactory FACTORY =
+  static final TypeAdapterFactory FACTORY =
       TypeAdapters.newTypeHierarchyFactory(JsonElement.class, ADAPTER);
 
   private JsonElementTypeAdapter() {}

diff --git a/gson/src/main/java/com/google/gson/internal/bind/TypeAdapters.java b/gson/src/main/java/com/google/gson/internal/bind/TypeAdapters.java
@@ -806,12 +806,6 @@ public void write(JsonWriter out, Locale value) throws IOException {
 
   public static final TypeAdapterFactory LOCALE_FACTORY = newFactory(Locale.class, LOCALE);
 
-  /*
-   * The following adapter and factory fields have not been removed yet and are only deprecated
-   * for now because external projects might be using them, despite being part of Gson's internal
-   * implementation.
-   */
-
   /**
    * @deprecated {@code TypeAdapters} is an internal Gson class. To obtain the adapter for {@link
    *     JsonElement} and subclasses use instead: