Merge pull request kubernetes-client#1417 from dsyer/guavaless

Factor out usage of Guava in shared libraries

Author: k8s-ci-robot

examples/examples-release-10/.google

@@ -10,13 +10,14 @@
 <relativePath>../pom.xml</relativePath>
 </parent>
 
- <version>1.0.0-SNAPSHOT</version>
+<version>1.0.0-SNAPSHOT</version>
 
 <artifactId>client-java-examples-parent</artifactId>
 <packaging>pom</packaging>
 <name>client-java-examples-parent</name>
 
 <properties>
+<guava.version>30.0-jre</guava.version>
 <kubernetes.client.version>10.0.1-SNAPSHOT</kubernetes.client.version>
 </properties>
 
@@ -25,6 +26,16 @@
 <module>examples-release-10</module>
 </modules>
 
+<dependencyManagement>
+<dependencies>
+<dependency>
+<groupId>com.google.guava</groupId>
+<artifactId>guava</artifactId>
+<version>${guava.version}</version>
+</dependency>
+</dependencies>
+</dependencyManagement>
+
 <build>
 <plugins>
 <plugin>

examples/examples-release-11/.google

@@ -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>

examples/pom.xml

@@ -12,10 +12,10 @@
 */
 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 io.kubernetes.client.util.Threads;
 import java.util.concurrent.ThreadFactory;
 import java.util.function.Function;
 import org.slf4j.Logger;
@@ -50,6 +50,6 @@ Function<ApiType, Request> defaultReflectiveKeyFunc() {
  * @return the thread factory
  */
  public static ThreadFactory namedControllerThreadFactory(String controllerName) {
- return new ThreadFactoryBuilder().setNameFormat(controllerName + "-%d").build();
+ return Threads.threadFactory(controllerName + "-%d");
  }
 }

extended/pom.xml

@@ -12,16 +12,15 @@
 */
 package io.kubernetes.client.extended.event.legacy;
 
-import com.google.common.cache.Cache;
-import com.google.common.cache.CacheBuilder;
+import com.github.benmanes.caffeine.cache.Cache;
+import com.github.benmanes.caffeine.cache.Caffeine;
 import io.kubernetes.client.fluent.Function;
 import io.kubernetes.client.openapi.models.CoreV1Event;
 import io.kubernetes.client.openapi.models.CoreV1EventBuilder;
 import io.kubernetes.client.openapi.models.V1ObjectMetaBuilder;
 import java.util.HashSet;
 import java.util.Objects;
 import java.util.Set;
-import java.util.concurrent.ExecutionException;
 import org.apache.commons.lang3.tuple.MutablePair;
 import org.joda.time.DateTime;
 
@@ -39,7 +38,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 +57,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);
 

extended/src/main/java/io/kubernetes/client/extended/controller/Controllers.java

@@ -12,8 +12,8 @@
 */
 package io.kubernetes.client.extended.event.legacy;
 
-import com.google.common.cache.Cache;
-import com.google.common.cache.CacheBuilder;
+import com.github.benmanes.caffeine.cache.Cache;
+import com.github.benmanes.caffeine.cache.Caffeine;
 import io.kubernetes.client.custom.V1Patch;
 import io.kubernetes.client.openapi.Configuration;
 import io.kubernetes.client.openapi.models.CoreV1Event;
@@ -23,7 +23,7 @@
 
 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;
  }
 

extended/src/main/java/io/kubernetes/client/extended/event/legacy/EventAggregator.java

@@ -12,16 +12,15 @@
 */
 package io.kubernetes.client.extended.event.legacy;
 
-import com.google.common.cache.Cache;
-import com.google.common.cache.CacheBuilder;
+import com.github.benmanes.caffeine.cache.Cache;
+import com.github.benmanes.caffeine.cache.Caffeine;
 import io.github.bucket4j.Bandwidth;
 import io.github.bucket4j.Bucket4j;
 import io.github.bucket4j.Refill;
 import io.github.bucket4j.local.LocalBucket;
 import io.github.bucket4j.local.SynchronizationStrategy;
 import io.kubernetes.client.openapi.models.CoreV1Event;
 import java.time.Duration;
-import java.util.concurrent.ExecutionException;
 import java.util.function.Function;
 
 public class EventSpamFilter {
@@ -49,7 +48,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 +59,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);
  }
 

extended/src/main/java/io/kubernetes/client/extended/event/legacy/EventLogger.java

@@ -12,7 +12,6 @@
 */
 package io.kubernetes.client.extended.event.legacy;
 
-import com.google.common.base.Strings;
 import io.kubernetes.client.common.KubernetesObject;
 import io.kubernetes.client.extended.event.EventType;
 import io.kubernetes.client.openapi.models.CoreV1Event;
@@ -22,6 +21,7 @@
 import io.kubernetes.client.openapi.models.V1ObjectMetaBuilder;
 import io.kubernetes.client.openapi.models.V1ObjectReference;
 import io.kubernetes.client.openapi.models.V1ObjectReferenceBuilder;
+import io.kubernetes.client.util.Strings;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.BlockingQueue;

extended/src/main/java/io/kubernetes/client/extended/event/legacy/EventSpamFilter.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;