Merge pull request kubernetes-client#2553 from eamonnmcmanus/typeadapterfactory

k8s-ci-robot · web-flow · commit 0cd0c6dbaeaa · 2023-02-09T13:08:17.000-08:00
Fix `DynamicKubernetesTypeAdaptorFactory` when it does not apply.
diff --git a/util/src/main/java/io/kubernetes/client/util/generic/dynamic/DynamicKubernetesTypeAdaptorFactory.java b/util/src/main/java/io/kubernetes/client/util/generic/dynamic/DynamicKubernetesTypeAdaptorFactory.java
@@ -34,7 +34,7 @@ public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> typeToken) {
     if (shouldHandleAsListObject(typeToken)) {
       return (TypeAdapter<T>) (new GenericListObjectCreator(gson));
     }
-    return gson.getDelegateAdapter(this, typeToken);
+    return null;
   }
 
   private boolean shouldHandleAsSingleObject(TypeToken typeToken) {
diff --git a/util/src/test/java/io/kubernetes/client/util/generic/dynamic/DynamicKubernetesTypeAdaptorFactoryTest.java b/util/src/test/java/io/kubernetes/client/util/generic/dynamic/DynamicKubernetesTypeAdaptorFactoryTest.java
@@ -19,6 +19,8 @@
 import io.kubernetes.client.common.KubernetesListObject;
 import io.kubernetes.client.common.KubernetesObject;
 import io.kubernetes.client.openapi.models.V1ObjectMeta;
+import java.util.Collections;
+import java.util.Map;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -37,13 +39,12 @@ public class DynamicKubernetesTypeAdaptorFactoryTest {
           .append("}")
           .toString();
 
+  private final DynamicKubernetesTypeAdaptorFactory factory =
+      new DynamicKubernetesTypeAdaptorFactory();
+
   @Before
   public void setup() {
-    gson =
-        new Gson()
-            .newBuilder()
-            .registerTypeAdapterFactory(new DynamicKubernetesTypeAdaptorFactory())
-            .create();
+    gson = new Gson().newBuilder().registerTypeAdapterFactory(factory).create();
   }
 
   @Test
@@ -79,4 +80,13 @@ public void testListDynamicObjectRoundTrip() {
     String dumped = gson.toJson(dynamicListObj);
     assertEquals(listJsonContent, dumped);
   }
+
+  // Registering the same factory twice is not a good idea, but we should not explode if it happens.
+  // See https://github.com/google/gson/issues/2312
+  @Test
+  public void testMultipleRegistration() {
+    Gson badGson = gson.newBuilder().registerTypeAdapterFactory(factory).create();
+    Object x = badGson.fromJson("{}", Map.class);
+    assertEquals(Collections.emptyMap(), x);
+  }
 }

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> typeToken) {`
`34`	`34`	`if (shouldHandleAsListObject(typeToken)) {`
`35`	`35`	`return (TypeAdapter<T>) (new GenericListObjectCreator(gson));`
`36`	`36`	`}`
`37`		`- return gson.getDelegateAdapter(this, typeToken);`
	`37`	`+ return null;`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`private boolean shouldHandleAsSingleObject(TypeToken typeToken) {`