Merge pull request #1963 from HubSpot/watch-use-serialization

fabric8io · Jan 24, 2020 · 1afea0c · 1afea0c
2 parents 30c0656 + 06b1b81
commit 1afea0c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/...lient/src/main/java/io/fabric8/kubernetes/client/dsl/internal/WatchConnectionManager.java b/...lient/src/main/java/io/fabric8/kubernetes/client/dsl/internal/WatchConnectionManager.java
@@ -51,7 +51,6 @@ public class WatchConnectionManager<T extends HasMetadata, L extends KubernetesR
 
   private static final Logger logger = LoggerFactory.getLogger(WatchConnectionManager.class);
 
-  private static final ObjectMapper mapper = new ObjectMapper();
   private final AtomicBoolean forceClosed = new AtomicBoolean();
   private final AtomicReference<String> resourceVersion;
   private final BaseOperation<T, L, ?, ?> baseOperation;

diff --git a/...etes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/WatchHTTPManager.java b/...etes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/WatchHTTPManager.java
@@ -16,7 +16,6 @@
 
 package io.fabric8.kubernetes.client.dsl.internal;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.fabric8.kubernetes.api.model.KubernetesResource;
 import io.fabric8.kubernetes.api.model.KubernetesResourceList;
@@ -27,6 +26,7 @@
 import io.fabric8.kubernetes.client.Watcher;
 import io.fabric8.kubernetes.client.dsl.base.BaseOperation;
 import io.fabric8.kubernetes.client.dsl.base.OperationSupport;
+import io.fabric8.kubernetes.client.utils.Serialization;
 import io.fabric8.kubernetes.client.utils.Utils;
 import okhttp3.*;
 import okhttp3.logging.HttpLoggingInterceptor;
@@ -48,7 +48,6 @@
 public class WatchHTTPManager<T extends HasMetadata, L extends KubernetesResourceList<T>> implements
   Watch {
   private static final Logger logger = LoggerFactory.getLogger(WatchHTTPManager.class);
-  private static final ObjectMapper mapper = new ObjectMapper();
 
   private final BaseOperation<T, L, ?, ?> baseOperation;
   private final Watcher<T> watcher;
@@ -288,7 +287,7 @@ public void onMessage(String messageSource) throws IOException {
   }
 
   protected static WatchEvent readWatchEvent(String messageSource) throws IOException {
-    WatchEvent event = mapper.readValue(messageSource, WatchEvent.class);
+    WatchEvent event = Serialization.unmarshal(messageSource, WatchEvent.class);
     KubernetesResource object = null;
     if (event != null) {
       object = event.getObject();;
@@ -298,7 +297,7 @@ protected static WatchEvent readWatchEvent(String messageSource) throws IOExcept
     // so lets try parse the message as a KubernetesResource
     // as it will probably be a list of resources like a BuildList
     if (object == null) {
-      object = mapper.readValue(messageSource, KubernetesResource.class);
+      object = Serialization.unmarshal(messageSource, KubernetesResource.class);
       if (event == null) {
         event = new WatchEvent(object, "MODIFIED");
       } else {