Replace most of Guava in extended jar

Dave Syer · Dave Syer · commit 6eb8df2ca118 · 2020-12-09T16:08:48.000Z
Signed-off-by: Dave Syer &lt;dsyer@vmware.com&gt;
diff --git a/extended/pom.xml b/extended/pom.xml
@@ -34,10 +34,6 @@
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.github.vladimir-bukhtoyarov</groupId>
             <artifactId>bucket4j-core</artifactId>
@@ -46,6 +42,10 @@
             <groupId>com.flipkart.zjsonpatch</groupId>
             <artifactId>zjsonpatch</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.github.ben-manes.caffeine</groupId>
+            <artifactId>caffeine</artifactId>
+        </dependency>
         <!-- test dependencies -->
         <dependency>
             <groupId>junit</groupId>
diff --git a/extended/src/main/java/io/kubernetes/client/extended/controller/Controllers.java b/extended/src/main/java/io/kubernetes/client/extended/controller/Controllers.java
@@ -12,15 +12,18 @@
 */
 package io.kubernetes.client.extended.controller;
 
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
-import io.kubernetes.client.common.KubernetesObject;
-import io.kubernetes.client.extended.controller.reconciler.Request;
-import io.kubernetes.client.openapi.models.V1ObjectMeta;
+import java.util.concurrent.Executors;
 import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Function;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import io.kubernetes.client.common.KubernetesObject;
+import io.kubernetes.client.extended.controller.reconciler.Request;
+import io.kubernetes.client.openapi.models.V1ObjectMeta;
+
 /** The Controllers is a set of commonly used utility functions for constructing controller. */
 public class Controllers {
 
@@ -50,6 +53,16 @@ Function<ApiType, Request> defaultReflectiveKeyFunc() {
    * @return the thread factory
    */
   public static ThreadFactory namedControllerThreadFactory(String controllerName) {
-    return new ThreadFactoryBuilder().setNameFormat(controllerName + "-%d").build();
+    final ThreadFactory defaultFactory = Executors.defaultThreadFactory();
+    final AtomicInteger threadNumber = new AtomicInteger(1);
+    String format = controllerName + "-%d";
+    return r -> {
+      Thread thread = defaultFactory.newThread(r);
+      if (!thread.isDaemon()) {
+        thread.setDaemon(true);
+      }
+      thread.setName(String.format(format, threadNumber.getAndIncrement()));
+      return thread;
+    };
   }
 }
diff --git a/extended/src/main/java/io/kubernetes/client/extended/event/legacy/EventAggregator.java b/extended/src/main/java/io/kubernetes/client/extended/event/legacy/EventAggregator.java
@@ -12,8 +12,6 @@
 */
 package io.kubernetes.client.extended.event.legacy;
 
-import com.google.common.cache.Cache;
-import com.google.common.cache.CacheBuilder;
 import io.kubernetes.client.fluent.Function;
 import io.kubernetes.client.openapi.models.CoreV1Event;
 import io.kubernetes.client.openapi.models.CoreV1EventBuilder;
@@ -22,6 +20,10 @@
 import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.ExecutionException;
+
+import com.github.benmanes.caffeine.cache.Cache;
+import com.github.benmanes.caffeine.cache.Caffeine;
+
 import org.apache.commons.lang3.tuple.MutablePair;
 import org.joda.time.DateTime;
 
@@ -39,7 +41,7 @@ public EventAggregator(
     this.messageFunc = messageFunc;
     this.maxEvents = DEFAULT_MAX_EVENT_LOCAL_KEYS;
     this.spammingCache =
-        CacheBuilder.newBuilder()
+        Caffeine.newBuilder()
             .maximumSize(maxLRUCacheEntries)
             .expireAfterWrite(DEFAULT_EVENT_AGGREGATE_CACHE_EXPIRATION)
             .build();
@@ -58,12 +60,7 @@ public synchronized MutablePair<CoreV1Event, String> aggregate(CoreV1Event event
     String aggregatedKey = aggregatedKeys.getLeft();
     String localKey = aggregatedKeys.getRight();
 
-    AggregatedRecord record;
-    try {
-      record = this.spammingCache.get(aggregatedKey, AggregatedRecord::new);
-    } catch (ExecutionException e) {
-      throw new IllegalStateException(e);
-    }
+    AggregatedRecord record = this.spammingCache.get(aggregatedKey, k -> new AggregatedRecord());
     record.lastTimestamp = now;
     record.localKeys.add(localKey);
 
diff --git a/extended/src/main/java/io/kubernetes/client/extended/event/legacy/EventLogger.java b/extended/src/main/java/io/kubernetes/client/extended/event/legacy/EventLogger.java
@@ -12,18 +12,20 @@
 */
 package io.kubernetes.client.extended.event.legacy;
 
-import com.google.common.cache.Cache;
-import com.google.common.cache.CacheBuilder;
 import io.kubernetes.client.custom.V1Patch;
 import io.kubernetes.client.openapi.Configuration;
 import io.kubernetes.client.openapi.models.CoreV1Event;
 import java.util.function.Function;
+
+import com.github.benmanes.caffeine.cache.Cache;
+import com.github.benmanes.caffeine.cache.Caffeine;
+
 import org.apache.commons.lang3.tuple.MutablePair;
 import org.joda.time.DateTime;
 
 public class EventLogger {
   public EventLogger(int lruCacheEntries, Function<CoreV1Event, String> eventKeyFunc) {
-    this.eventCache = CacheBuilder.newBuilder().maximumSize(lruCacheEntries).build();
+    this.eventCache = Caffeine.newBuilder().maximumSize(lruCacheEntries).build();
     this.eventKeyFunc = eventKeyFunc;
   }
 
diff --git a/extended/src/main/java/io/kubernetes/client/extended/event/legacy/EventSpamFilter.java b/extended/src/main/java/io/kubernetes/client/extended/event/legacy/EventSpamFilter.java
@@ -12,8 +12,6 @@
 */
 package io.kubernetes.client.extended.event.legacy;
 
-import com.google.common.cache.Cache;
-import com.google.common.cache.CacheBuilder;
 import io.github.bucket4j.Bandwidth;
 import io.github.bucket4j.Bucket4j;
 import io.github.bucket4j.Refill;
@@ -24,6 +22,9 @@
 import java.util.concurrent.ExecutionException;
 import java.util.function.Function;
 
+import com.github.benmanes.caffeine.cache.Cache;
+import com.github.benmanes.caffeine.cache.Caffeine;
+
 public class EventSpamFilter {
 
   public static final Duration DEFAULT_TOKEN_BUCKET_REFILLING_PERIOD = Duration.ofMinutes(5);
@@ -49,7 +50,7 @@ public EventSpamFilter(
     this.capacity = tokenBucketCapacity;
     this.refillingTokensPerPeriod = refillingTokensPerPeriod;
     this.refillingPeriod = refillingPeriod;
-    this.spamRecordCache = CacheBuilder.newBuilder().maximumSize(maxLRUCacheEntries).build();
+    this.spamRecordCache = Caffeine.newBuilder().maximumSize(maxLRUCacheEntries).build();
   }
 
   private final long capacity;
@@ -60,12 +61,7 @@ public EventSpamFilter(
 
   public boolean filter(CoreV1Event event) {
     String spamKey = spamKeyFunc.apply(event);
-    SpamRecord record;
-    try {
-      record = spamRecordCache.get(spamKey, SpamRecord::new);
-    } catch (ExecutionException e) {
-      throw new IllegalStateException(e);
-    }
+    SpamRecord record = spamRecordCache.get(spamKey, k -> new SpamRecord());
     return record.tokenBucket.tryConsume(1);
   }
 
diff --git a/extended/src/main/java/io/kubernetes/client/extended/event/legacy/ObjectReferenceResolvingEventRecorder.java b/extended/src/main/java/io/kubernetes/client/extended/event/legacy/ObjectReferenceResolvingEventRecorder.java
@@ -12,7 +12,15 @@
 */
 package io.kubernetes.client.extended.event.legacy;
 
-import com.google.common.base.Strings;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.TimeUnit;
+
+import org.joda.time.DateTime;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import io.kubernetes.client.common.KubernetesObject;
 import io.kubernetes.client.extended.event.EventType;
 import io.kubernetes.client.openapi.models.CoreV1Event;
@@ -22,13 +30,7 @@
 import io.kubernetes.client.openapi.models.V1ObjectMetaBuilder;
 import io.kubernetes.client.openapi.models.V1ObjectReference;
 import io.kubernetes.client.openapi.models.V1ObjectReferenceBuilder;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.TimeUnit;
-import org.joda.time.DateTime;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import io.kubernetes.client.util.Strings;
 
 public class ObjectReferenceResolvingEventRecorder implements EventRecorder {
 
diff --git a/extended/src/main/java/io/kubernetes/client/extended/kubectl/KubectlApply.java b/extended/src/main/java/io/kubernetes/client/extended/kubectl/KubectlApply.java
@@ -12,14 +12,14 @@
 */
 package io.kubernetes.client.extended.kubectl;
 
-import com.google.common.base.Strings;
 import io.kubernetes.client.common.KubernetesListObject;
 import io.kubernetes.client.common.KubernetesObject;
 import io.kubernetes.client.custom.V1Patch;
 import io.kubernetes.client.extended.kubectl.exception.KubectlException;
 import io.kubernetes.client.openapi.ApiException;
 import io.kubernetes.client.util.ModelMapper;
 import io.kubernetes.client.util.Namespaces;
+import io.kubernetes.client.util.Strings;
 import io.kubernetes.client.util.generic.GenericKubernetesApi;
 import io.kubernetes.client.util.generic.KubernetesApiResponse;
 import io.kubernetes.client.util.generic.options.PatchOptions;
diff --git a/extended/src/main/java/io/kubernetes/client/extended/kubectl/KubectlCopy.java b/extended/src/main/java/io/kubernetes/client/extended/kubectl/KubectlCopy.java
@@ -12,7 +12,7 @@
 */
 package io.kubernetes.client.extended.kubectl;
 
-import static com.google.common.base.Strings.isNullOrEmpty;
+import static io.kubernetes.client.util.Strings.isNullOrEmpty;
 
 import io.kubernetes.client.Copy;
 import io.kubernetes.client.extended.kubectl.exception.KubectlException;
diff --git a/extended/src/main/java/io/kubernetes/client/extended/kubectl/KubectlCreate.java b/extended/src/main/java/io/kubernetes/client/extended/kubectl/KubectlCreate.java
@@ -12,13 +12,13 @@
 */
 package io.kubernetes.client.extended.kubectl;
 
-import com.google.common.base.Strings;
 import io.kubernetes.client.common.KubernetesListObject;
 import io.kubernetes.client.common.KubernetesObject;
 import io.kubernetes.client.extended.kubectl.exception.KubectlException;
 import io.kubernetes.client.openapi.ApiException;
 import io.kubernetes.client.util.ModelMapper;
 import io.kubernetes.client.util.Namespaces;
+import io.kubernetes.client.util.Strings;
 import io.kubernetes.client.util.generic.GenericKubernetesApi;
 import io.kubernetes.client.util.generic.options.CreateOptions;
 
diff --git a/extended/src/main/java/io/kubernetes/client/extended/kubectl/KubectlExec.java b/extended/src/main/java/io/kubernetes/client/extended/kubectl/KubectlExec.java
@@ -12,15 +12,16 @@
 */
 package io.kubernetes.client.extended.kubectl;
 
-import com.google.common.io.ByteStreams;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
 import io.kubernetes.client.Exec;
 import io.kubernetes.client.extended.kubectl.exception.KubectlException;
 import io.kubernetes.client.openapi.ApiException;
 import io.kubernetes.client.openapi.models.V1ObjectMeta;
 import io.kubernetes.client.openapi.models.V1Pod;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
+import io.kubernetes.client.util.Streams;
 
 public class KubectlExec extends Kubectl.ResourceAndContainerBuilder<V1Pod, KubectlExec>
     implements Kubectl.Executable<Integer> {
@@ -71,7 +72,7 @@ protected static Thread copyAsync(InputStream in, OutputStream out) {
             new Runnable() {
               public void run() {
                 try {
-                  ByteStreams.copy(in, out);
+                  Streams.copy(in, out);
                 } catch (IOException ex) {
                   ex.printStackTrace();
                 }
diff --git a/extended/src/main/java/io/kubernetes/client/extended/kubectl/KubectlLog.java b/extended/src/main/java/io/kubernetes/client/extended/kubectl/KubectlLog.java
@@ -12,7 +12,7 @@
 */
 package io.kubernetes.client.extended.kubectl;
 
-import static com.google.common.base.Strings.isNullOrEmpty;
+import static io.kubernetes.client.util.Strings.isNullOrEmpty;
 
 import io.kubernetes.client.PodLogs;
 import io.kubernetes.client.extended.kubectl.exception.KubectlException;
diff --git a/extended/src/main/java/io/kubernetes/client/extended/leaderelection/LeaderElector.java b/extended/src/main/java/io/kubernetes/client/extended/leaderelection/LeaderElector.java
@@ -12,19 +12,30 @@
 */
 package io.kubernetes.client.extended.leaderelection;
 
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
-import io.kubernetes.client.openapi.ApiException;
 import java.net.HttpURLConnection;
 import java.time.Duration;
 import java.util.Date;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.concurrent.*;
+import java.util.concurrent.CancellationException;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Consumer;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import io.kubernetes.client.openapi.ApiException;
+
 public class LeaderElector implements AutoCloseable {
 
   private static final Logger log = LoggerFactory.getLogger(LeaderElector.class);
@@ -334,8 +345,17 @@ private void maybeReportTransition() {
     }
   }
 
-  private ThreadFactory makeThreadFactory(String nameFormat) {
-    return new ThreadFactoryBuilder().setDaemon(true).setNameFormat(nameFormat).build();
+  private ThreadFactory makeThreadFactory(String format) {
+      final ThreadFactory defaultFactory = Executors.defaultThreadFactory();
+      final AtomicInteger threadNumber = new AtomicInteger(1);
+      return r -> {
+        Thread thread = defaultFactory.newThread(r);
+        if (!thread.isDaemon()) {
+          thread.setDaemon(true);
+        }
+        thread.setName(String.format(format, threadNumber.getAndIncrement()));
+        return thread;
+      };
   }
 
   @Override
diff --git a/extended/src/main/java/io/kubernetes/client/extended/workqueue/DefaultDelayingQueue.java b/extended/src/main/java/io/kubernetes/client/extended/workqueue/DefaultDelayingQueue.java
@@ -12,7 +12,6 @@
 */
 package io.kubernetes.client.extended.workqueue;
 
-import com.google.common.primitives.Longs;
 import java.time.Duration;
 import java.time.Instant;
 import java.time.temporal.Temporal;
@@ -143,7 +142,7 @@ public long getDelay(TimeUnit unit) {
 
     @Override
     public int compareTo(Delayed o) {
-      return Longs.compare(getDelay(TimeUnit.MILLISECONDS), o.getDelay(TimeUnit.MILLISECONDS));
+      return Long.compare(getDelay(TimeUnit.MILLISECONDS), o.getDelay(TimeUnit.MILLISECONDS));
     }
   }
 }
diff --git a/extended/src/main/java/io/kubernetes/client/extended/workqueue/DefaultWorkQueue.java b/extended/src/main/java/io/kubernetes/client/extended/workqueue/DefaultWorkQueue.java
@@ -12,8 +12,7 @@
 */
 package io.kubernetes.client.extended.workqueue;
 
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
+import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.Set;
 
@@ -42,9 +41,9 @@ public class DefaultWorkQueue<T> implements WorkQueue<T> {
   private boolean shuttingDown = false;
 
   public DefaultWorkQueue() {
-    this.queue = Lists.newLinkedList();
-    this.dirty = Sets.newHashSet();
-    this.processing = Sets.newHashSet();
+    this.queue = new LinkedList<>();
+    this.dirty = new HashSet<>();
+    this.processing = new HashSet<>();
   }
 
   @Override
diff --git a/extended/src/main/java/io/kubernetes/client/extended/workqueue/ratelimiter/ItemExponentialFailureRateLimiter.java b/extended/src/main/java/io/kubernetes/client/extended/workqueue/ratelimiter/ItemExponentialFailureRateLimiter.java
diff --git a/extended/src/main/java/io/kubernetes/client/extended/workqueue/ratelimiter/ItemFastSlowRateLimiter.java b/extended/src/main/java/io/kubernetes/client/extended/workqueue/ratelimiter/ItemFastSlowRateLimiter.java
diff --git a/pom.xml b/pom.xml
