fix fabric8io#4662: refining the client to not use static deserializa…

…tion logic
shawkins · Apr 12, 2023 · f6e9ace · f6e9ace
1 parent 3237246
commit f6e9ace
Show file tree

Hide file tree

Showing 78 changed files with 912 additions and 996 deletions.
diff --git a/extensions/camel-k/client/src/test/java/io/fabric8/camelk/client/CamelKClientAdaptTest.java b/extensions/camel-k/client/src/test/java/io/fabric8/camelk/client/CamelKClientAdaptTest.java
@@ -25,6 +25,7 @@
 import io.fabric8.kubernetes.client.dsl.internal.OperationSupport;
 import io.fabric8.kubernetes.client.http.HttpClient;
 import io.fabric8.kubernetes.client.impl.KubernetesClientImpl;
+import io.fabric8.kubernetes.client.utils.KubernetesSerialization;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -47,7 +48,8 @@ class CamelKClientAdaptTest {
   public void setUp() {
     HttpClient mockClient = mock(HttpClient.class, Mockito.RETURNS_DEEP_STUBS);
     Config config = new ConfigBuilder().withMasterUrl("https://localhost:8443/").build();
-    kubernetesClient = new KubernetesClientImpl(mockClient, config);
+    kubernetesClient = new KubernetesClientImpl(mockClient, config, () -> Runnable::run,
+        new KubernetesSerialization());
   }
 
   @AfterEach

diff --git a/.../chaosmesh/client/src/test/java/io/fabric8/chaosmesh/client/ChaosMeshClientAdaptTest.java b/.../chaosmesh/client/src/test/java/io/fabric8/chaosmesh/client/ChaosMeshClientAdaptTest.java
@@ -25,6 +25,7 @@
 import io.fabric8.kubernetes.client.dsl.internal.OperationSupport;
 import io.fabric8.kubernetes.client.http.HttpClient;
 import io.fabric8.kubernetes.client.impl.KubernetesClientImpl;
+import io.fabric8.kubernetes.client.utils.KubernetesSerialization;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -46,7 +47,8 @@ class ChaosMeshClientAdaptTest {
   public void setUp() {
     HttpClient mockClient = Mockito.mock(HttpClient.class, Mockito.RETURNS_DEEP_STUBS);
     Config config = new ConfigBuilder().withMasterUrl("https://localhost:8443/").build();
-    kubernetesClient = new KubernetesClientImpl(mockClient, config);
+    kubernetesClient = new KubernetesClientImpl(mockClient, config, () -> Runnable::run,
+        new KubernetesSerialization());
   }
 
   @AfterEach

diff --git a/extensions/istio/client/src/test/java/io/fabric8/istio/client/IstioClientAdaptTest.java b/extensions/istio/client/src/test/java/io/fabric8/istio/client/IstioClientAdaptTest.java
@@ -25,6 +25,7 @@
 import io.fabric8.kubernetes.client.dsl.internal.OperationSupport;
 import io.fabric8.kubernetes.client.http.HttpClient;
 import io.fabric8.kubernetes.client.impl.KubernetesClientImpl;
+import io.fabric8.kubernetes.client.utils.KubernetesSerialization;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -46,7 +47,8 @@ class IstioClientAdaptTest {
   public void setUp() {
     HttpClient mockClient = Mockito.mock(HttpClient.class, Mockito.RETURNS_DEEP_STUBS);
     Config config = new ConfigBuilder().withMasterUrl("https://localhost:8443/").build();
-    kubernetesClient = new KubernetesClientImpl(mockClient, config);
+    kubernetesClient = new KubernetesClientImpl(mockClient, config, () -> Runnable::run,
+        new KubernetesSerialization());
   }
 
   @AfterEach

diff --git a/...nsions/knative/client/src/test/java/io/fabric8/knative/client/KnativeClientAdaptTest.java b/...nsions/knative/client/src/test/java/io/fabric8/knative/client/KnativeClientAdaptTest.java
@@ -25,6 +25,7 @@
 import io.fabric8.kubernetes.client.dsl.internal.OperationSupport;
 import io.fabric8.kubernetes.client.http.HttpClient;
 import io.fabric8.kubernetes.client.impl.KubernetesClientImpl;
+import io.fabric8.kubernetes.client.utils.KubernetesSerialization;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -46,7 +47,8 @@ class KnativeClientAdaptTest {
   public void setUp() {
     HttpClient mockClient = Mockito.mock(HttpClient.class, Mockito.RETURNS_DEEP_STUBS);
     Config config = new ConfigBuilder().withMasterUrl("https://localhost:8443/").build();
-    kubernetesClient = new KubernetesClientImpl(mockClient, config);
+    kubernetesClient = new KubernetesClientImpl(mockClient, config, () -> Runnable::run,
+        new KubernetesSerialization());
   }
 
   @AfterEach

diff --git a/...st/java/io/fabric8/openclustermanagement/client/OpenClusterManagementClientAdaptTest.java b/...st/java/io/fabric8/openclustermanagement/client/OpenClusterManagementClientAdaptTest.java
@@ -25,6 +25,7 @@
 import io.fabric8.kubernetes.client.dsl.internal.OperationSupport;
 import io.fabric8.kubernetes.client.http.HttpClient;
 import io.fabric8.kubernetes.client.impl.KubernetesClientImpl;
+import io.fabric8.kubernetes.client.utils.KubernetesSerialization;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -46,7 +47,8 @@ class OpenClusterManagementClientAdaptTest {
   public void setUp() {
     HttpClient mockClient = Mockito.mock(HttpClient.class, Mockito.RETURNS_DEEP_STUBS);
     Config config = new ConfigBuilder().withMasterUrl("https://localhost:8443/").build();
-    kubernetesClient = new KubernetesClientImpl(mockClient, config);
+    kubernetesClient = new KubernetesClientImpl(mockClient, config, () -> Runnable::run,
+        new KubernetesSerialization());
   }
 
   @AfterEach

diff --git a/.../client/src/test/java/io/fabric8/servicecatalog/client/ServiceCatalogClientAdaptTest.java b/.../client/src/test/java/io/fabric8/servicecatalog/client/ServiceCatalogClientAdaptTest.java
@@ -25,6 +25,7 @@
 import io.fabric8.kubernetes.client.dsl.internal.OperationSupport;
 import io.fabric8.kubernetes.client.http.HttpClient;
 import io.fabric8.kubernetes.client.impl.KubernetesClientImpl;
+import io.fabric8.kubernetes.client.utils.KubernetesSerialization;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -46,7 +47,8 @@ class ServiceCatalogClientAdaptTest {
   public void setUp() {
     HttpClient mockClient = Mockito.mock(HttpClient.class, Mockito.RETURNS_DEEP_STUBS);
     Config config = new ConfigBuilder().withMasterUrl("https://localhost:8443/").build();
-    kubernetesClient = new KubernetesClientImpl(mockClient, config);
+    kubernetesClient = new KubernetesClientImpl(mockClient, config, () -> Runnable::run,
+        new KubernetesSerialization());
   }
 
   @AfterEach

diff --git a/extensions/tekton/client/src/test/java/io/fabric8/tekton/client/TektonClientAdaptTest.java b/extensions/tekton/client/src/test/java/io/fabric8/tekton/client/TektonClientAdaptTest.java
@@ -25,6 +25,7 @@
 import io.fabric8.kubernetes.client.dsl.internal.OperationSupport;
 import io.fabric8.kubernetes.client.http.HttpClient;
 import io.fabric8.kubernetes.client.impl.KubernetesClientImpl;
+import io.fabric8.kubernetes.client.utils.KubernetesSerialization;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -46,7 +47,8 @@ class TektonClientAdaptTest {
   public void setUp() {
     HttpClient mockClient = Mockito.mock(HttpClient.class, Mockito.RETURNS_DEEP_STUBS);
     Config config = new ConfigBuilder().withMasterUrl("https://localhost:8443/").build();
-    kubernetesClient = new KubernetesClientImpl(mockClient, config);
+    kubernetesClient = new KubernetesClientImpl(mockClient, config, () -> Runnable::run,
+        new KubernetesSerialization());
   }
 
   @AfterEach

diff --git a/...st/java/io/fabric8/verticalpodautoscaler/client/VerticalPodAutoscalerClientAdaptTest.java b/...st/java/io/fabric8/verticalpodautoscaler/client/VerticalPodAutoscalerClientAdaptTest.java
@@ -25,6 +25,7 @@
 import io.fabric8.kubernetes.client.dsl.internal.OperationSupport;
 import io.fabric8.kubernetes.client.http.HttpClient;
 import io.fabric8.kubernetes.client.impl.KubernetesClientImpl;
+import io.fabric8.kubernetes.client.utils.KubernetesSerialization;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -46,7 +47,8 @@ class VerticalPodAutoscalerClientAdaptTest {
   public void setUp() {
     HttpClient mockClient = Mockito.mock(HttpClient.class, Mockito.RETURNS_DEEP_STUBS);
     Config config = new ConfigBuilder().withMasterUrl("https://localhost:8443/").build();
-    kubernetesClient = new KubernetesClientImpl(mockClient, config);
+    kubernetesClient = new KubernetesClientImpl(mockClient, config, () -> Runnable::run,
+        new KubernetesSerialization());
   }
 
   @AfterEach

diff --git a/...nsions/volcano/client/src/test/java/io/fabric8/volcano/client/VolcanoClientAdaptTest.java b/...nsions/volcano/client/src/test/java/io/fabric8/volcano/client/VolcanoClientAdaptTest.java
@@ -25,6 +25,7 @@
 import io.fabric8.kubernetes.client.dsl.internal.OperationSupport;
 import io.fabric8.kubernetes.client.http.HttpClient;
 import io.fabric8.kubernetes.client.impl.KubernetesClientImpl;
+import io.fabric8.kubernetes.client.utils.KubernetesSerialization;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -46,7 +47,8 @@ class VolcanoClientAdaptTest {
   public void setUp() {
     HttpClient mockClient = Mockito.mock(HttpClient.class, Mockito.RETURNS_DEEP_STUBS);
     Config config = new ConfigBuilder().withMasterUrl("https://localhost:8443/").build();
-    kubernetesClient = new KubernetesClientImpl(mockClient, config);
+    kubernetesClient = new KubernetesClientImpl(mockClient, config, () -> Runnable::run,
+        new KubernetesSerialization());
   }
 
   @AfterEach

diff --git a/.../client/src/test/java/io/fabric8/volumesnapshot/client/VolumeSnapshotClientAdaptTest.java b/.../client/src/test/java/io/fabric8/volumesnapshot/client/VolumeSnapshotClientAdaptTest.java
@@ -25,6 +25,7 @@
 import io.fabric8.kubernetes.client.dsl.internal.OperationSupport;
 import io.fabric8.kubernetes.client.http.HttpClient;
 import io.fabric8.kubernetes.client.impl.KubernetesClientImpl;
+import io.fabric8.kubernetes.client.utils.KubernetesSerialization;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -46,7 +47,8 @@ class VolumeSnapshotClientAdaptTest {
   public void setUp() {
     HttpClient mockClient = Mockito.mock(HttpClient.class, Mockito.RETURNS_DEEP_STUBS);
     Config config = new ConfigBuilder().withMasterUrl("https://localhost:8443/").build();
-    kubernetesClient = new KubernetesClientImpl(mockClient, config);
+    kubernetesClient = new KubernetesClientImpl(mockClient, config, () -> Runnable::run,
+        new KubernetesSerialization());
   }
 
   @AfterEach

diff --git a/...client-vertx/src/main/java/io/fabric8/kubernetes/client/vertx/VertxHttpClientBuilder.java b/...client-vertx/src/main/java/io/fabric8/kubernetes/client/vertx/VertxHttpClientBuilder.java
@@ -51,6 +51,7 @@ public VertxHttpClient<F> build() {
     options.setMaxPoolSize(MAX_CONNECTIONS);
     options.setMaxWebSockets(MAX_CONNECTIONS);
     options.setIdleTimeoutUnit(TimeUnit.SECONDS);
+    options.setMaxWebSocketFrameSize(344131);
 
     if (this.connectTimeout != null) {
       options.setConnectTimeout((int) this.connectTimeout.toMillis());

diff --git a/...rnetes-client-api/src/main/java/io/fabric8/kubernetes/client/DefaultKubernetesClient.java b/...rnetes-client-api/src/main/java/io/fabric8/kubernetes/client/DefaultKubernetesClient.java
@@ -21,9 +21,6 @@
 import io.fabric8.kubernetes.client.http.HttpClient.Factory;
 import io.fabric8.kubernetes.client.http.StandardHttpClientBuilder;
 import io.fabric8.kubernetes.client.utils.HttpClientUtils;
-import io.fabric8.kubernetes.client.utils.Serialization;
-
-import java.io.InputStream;
 
 /**
  * Class for Default Kubernetes Client implementing KubernetesClient interface.
@@ -36,14 +33,6 @@ public class DefaultKubernetesClient extends NamespacedKubernetesClientAdapter<N
 
   public static final String KUBERNETES_VERSION_ENDPOINT = "version";
 
-  public static DefaultKubernetesClient fromConfig(String config) {
-    return new DefaultKubernetesClient(Serialization.unmarshal(config, Config.class));
-  }
-
-  public static DefaultKubernetesClient fromConfig(InputStream is) {
-    return new DefaultKubernetesClient(Serialization.unmarshal(is, Config.class));
-  }
-
   public DefaultKubernetesClient() {
     this(new ConfigBuilder().build());
   }

diff --git a/kubernetes-client-api/src/main/java/io/fabric8/kubernetes/client/KubernetesClient.java b/kubernetes-client-api/src/main/java/io/fabric8/kubernetes/client/KubernetesClient.java
@@ -77,7 +77,6 @@
 import io.fabric8.kubernetes.client.dsl.NamespaceableResource;
 import io.fabric8.kubernetes.client.dsl.NetworkAPIGroupDSL;
 import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation;
-import io.fabric8.kubernetes.client.dsl.ParameterNamespaceListVisitFromServerGetDeleteRecreateWaitApplicable;
 import io.fabric8.kubernetes.client.dsl.PodResource;
 import io.fabric8.kubernetes.client.dsl.PolicyAPIGroupDSL;
 import io.fabric8.kubernetes.client.dsl.RbacAPIGroupDSL;
@@ -300,15 +299,15 @@ MixedOperation<GenericKubernetesResource, GenericKubernetesResourceList, Resourc
    * @param is the input stream containing JSON/YAML content
    * @return an operation instance to work on the list of Kubernetes Resource objects
    */
-  ParameterNamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata> load(InputStream is);
+  NamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata> load(InputStream is);
 
   /**
    * Load a Kubernetes list object
    *
    * @param s kubernetes list as string
    * @return an operation instance to work on the deserialized KubernetesList objects
    */
-  ParameterNamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata> resourceList(String s);
+  NamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata> resourceList(String s);
 
   /**
    * KubernetesResourceList operations

diff --git a/...rnetes-client-api/src/main/java/io/fabric8/kubernetes/client/KubernetesClientBuilder.java b/...rnetes-client-api/src/main/java/io/fabric8/kubernetes/client/KubernetesClientBuilder.java
@@ -16,10 +16,11 @@
 
 package io.fabric8.kubernetes.client;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import io.fabric8.kubernetes.client.http.HttpClient;
 import io.fabric8.kubernetes.client.informers.ResourceEventHandler;
 import io.fabric8.kubernetes.client.utils.HttpClientUtils;
-import io.fabric8.kubernetes.client.utils.Serialization;
+import io.fabric8.kubernetes.client.utils.KubernetesSerialization;
 
 import java.io.InputStream;
 import java.lang.reflect.InvocationTargetException;
@@ -47,6 +48,7 @@ default void onClose(Executor executor) {
   private Class<KubernetesClient> clazz;
   private ExecutorSupplier executorSupplier;
   private Consumer<HttpClient.Builder> builderConsumer;
+  private KubernetesSerialization kubernetesSerialization = new KubernetesSerialization(new ObjectMapper());
 
   public KubernetesClientBuilder() {
     // basically the same logic as in KubernetesResourceUtil for finding list types
@@ -75,8 +77,9 @@ public KubernetesClient build() {
         this.factory = HttpClientUtils.getHttpClientFactory();
       }
       HttpClient client = getHttpClient();
-      return clazz.getConstructor(HttpClient.class, Config.class, ExecutorSupplier.class).newInstance(client, config,
-          executorSupplier);
+      return clazz.getConstructor(HttpClient.class, Config.class, ExecutorSupplier.class, KubernetesSerialization.class)
+          .newInstance(client, config,
+              executorSupplier, kubernetesSerialization);
     } catch (InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException
         | NoSuchMethodException | SecurityException e) {
       throw KubernetesClientException.launderThrowable(e);
@@ -96,13 +99,18 @@ public KubernetesClientBuilder withConfig(Config config) {
     return this;
   }
 
+  public KubernetesClientBuilder withKubernetesSerialization(KubernetesSerialization kubernetesSerialization) {
+    this.kubernetesSerialization = kubernetesSerialization;
+    return this;
+  }
+
   public KubernetesClientBuilder withConfig(String config) {
-    this.config = Serialization.unmarshal(config, Config.class);
+    this.config = kubernetesSerialization.unmarshal(config, Config.class);
     return this;
   }
 
   public KubernetesClientBuilder withConfig(InputStream config) {
-    this.config = Serialization.unmarshal(config, Config.class);
+    this.config = kubernetesSerialization.unmarshal(config, Config.class);
     return this;
   }
 

diff --git a/...ent-api/src/main/java/io/fabric8/kubernetes/client/NamespacedKubernetesClientAdapter.java b/...ent-api/src/main/java/io/fabric8/kubernetes/client/NamespacedKubernetesClientAdapter.java
@@ -78,7 +78,6 @@
 import io.fabric8.kubernetes.client.dsl.NamespaceableResource;
 import io.fabric8.kubernetes.client.dsl.NetworkAPIGroupDSL;
 import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation;
-import io.fabric8.kubernetes.client.dsl.ParameterNamespaceListVisitFromServerGetDeleteRecreateWaitApplicable;
 import io.fabric8.kubernetes.client.dsl.PodResource;
 import io.fabric8.kubernetes.client.dsl.PolicyAPIGroupDSL;
 import io.fabric8.kubernetes.client.dsl.RbacAPIGroupDSL;
@@ -255,12 +254,12 @@ public NonNamespaceOperation<ComponentStatus, ComponentStatusList, Resource<Comp
   }
 
   @Override
-  public ParameterNamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata> load(InputStream is) {
+  public NamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata> load(InputStream is) {
     return getClient().load(is);
   }
 
   @Override
-  public ParameterNamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata> resourceList(String s) {
+  public NamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata> resourceList(String s) {
     return getClient().resourceList(s);
   }
 

diff --git a/...etes/client/dsl/ParameterNamespaceListVisitFromServerGetDeleteRecreateWaitApplicable.java b/...etes/client/dsl/ParameterNamespaceListVisitFromServerGetDeleteRecreateWaitApplicable.java
diff --git a/...api/src/main/java/io/fabric8/kubernetes/client/informers/cache/ReducedStateItemStore.java b/...api/src/main/java/io/fabric8/kubernetes/client/informers/cache/ReducedStateItemStore.java
@@ -18,7 +18,7 @@
 
 import io.fabric8.kubernetes.api.model.GenericKubernetesResource;
 import io.fabric8.kubernetes.api.model.HasMetadata;
-import io.fabric8.kubernetes.client.utils.Serialization;
+import io.fabric8.kubernetes.client.utils.KubernetesSerialization;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -42,6 +42,7 @@ public class ReducedStateItemStore<V extends HasMetadata> implements ItemStore<V
   private final List<String[]> fields = new ArrayList<>();
   private final Class<V> typeClass;
   private final KeyState keyState;
+  private KubernetesSerialization serialization;
 
   public static class KeyState {
 
@@ -101,7 +102,8 @@ public KeyState(Function<HasMetadata, String> keyFunction, Function<String, Stri
    * @param typeClass the expected type
    * @param valueFields the additional fields to save
    */
-  public ReducedStateItemStore(KeyState keyState, Class<V> typeClass, String... valueFields) {
+  public ReducedStateItemStore(KeyState keyState, Class<V> typeClass, KubernetesSerialization serialization,
+      String... valueFields) {
     this.keyState = keyState;
     fields.add(new String[] { METADATA, "resourceVersion" });
     if (valueFields != null) {
@@ -110,13 +112,14 @@ public ReducedStateItemStore(KeyState keyState, Class<V> typeClass, String... va
       }
     }
     this.typeClass = typeClass;
+    this.serialization = serialization;
   }
 
   Object[] store(V value) {
     if (value == null) {
       return null;
     }
-    Map<String, Object> raw = Serialization.jsonMapper().convertValue(value, Map.class);
+    Map<String, Object> raw = serialization.convertValue(value, Map.class);
     return fields.stream().map(f -> GenericKubernetesResource.get(raw, (Object[]) f)).toArray();
   }
 
@@ -129,7 +132,7 @@ V restore(String key, Object[] values) {
     String[] keyParts = this.keyState.keyFieldFunction.apply(key);
     applyFields(keyParts, raw, this.keyState.keyFields);
 
-    return Serialization.jsonMapper().convertValue(raw, typeClass);
+    return serialization.convertValue(raw, typeClass);
   }
 
   private static void applyFields(Object[] values, Map<String, Object> raw, List<String[]> fields) {