Move ThreadFactory to a utility class

Dave Syer · Dave Syer · commit 52c6efdabbce · 2020-12-09T16:08:48.000Z
Signed-off-by: Dave Syer &lt;dsyer@vmware.com&gt;
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
@@ -15,6 +15,8 @@
 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.Executors;
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -51,16 +53,6 @@ Function<ApiType, Request> defaultReflectiveKeyFunc() {
    * @return the thread factory
    */
   public static ThreadFactory namedControllerThreadFactory(String controllerName) {
-    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;
-    };
+    return Threads.threadFactory(controllerName + "-%d");
   }
 }
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,7 +12,6 @@
 */
 package io.kubernetes.client.extended.leaderelection;
 
-import io.kubernetes.client.openapi.ApiException;
 import java.net.HttpURLConnection;
 import java.time.Duration;
 import java.util.Date;
@@ -25,15 +24,17 @@
 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;
+import io.kubernetes.client.util.Threads;
+
 public class LeaderElector implements AutoCloseable {
 
   private static final Logger log = LoggerFactory.getLogger(LeaderElector.class);
@@ -54,11 +55,11 @@ public class LeaderElector implements AutoCloseable {
 
   private final ScheduledExecutorService scheduledWorkers =
       Executors.newSingleThreadScheduledExecutor(
-          makeThreadFactory("leader-elector-scheduled-worker-%d"));
+          Threads.threadFactory("leader-elector-scheduled-worker-%d"));
   private final ExecutorService leaseWorkers =
-      Executors.newSingleThreadExecutor(makeThreadFactory("leader-elector-lease-worker-%d"));
+      Executors.newSingleThreadExecutor(Threads.threadFactory("leader-elector-lease-worker-%d"));
   private final ExecutorService hookWorkers =
-      Executors.newSingleThreadExecutor(makeThreadFactory("leader-elector-hook-worker-%d"));
+      Executors.newSingleThreadExecutor(Threads.threadFactory("leader-elector-hook-worker-%d"));
 
   public LeaderElector(LeaderElectionConfig config) {
     this(
@@ -343,19 +344,6 @@ private void maybeReportTransition() {
     }
   }
 
-  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
   public void close() {
     scheduledWorkers.shutdownNow();
diff --git a/util/src/main/java/io/kubernetes/client/informer/cache/Controller.java b/util/src/main/java/io/kubernetes/client/informer/cache/Controller.java
@@ -12,24 +12,25 @@
 */
 package io.kubernetes.client.informer.cache;
 
-import io.kubernetes.client.common.KubernetesListObject;
-import io.kubernetes.client.common.KubernetesObject;
-import io.kubernetes.client.informer.ListerWatcher;
-import io.kubernetes.client.informer.ResyncRunnable;
 import java.util.Deque;
 import java.util.concurrent.Executors;
 import java.util.concurrent.RejectedExecutionException;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
-import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
+
 import org.apache.commons.lang3.tuple.MutablePair;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import io.kubernetes.client.common.KubernetesListObject;
+import io.kubernetes.client.common.KubernetesObject;
+import io.kubernetes.client.informer.ListerWatcher;
+import io.kubernetes.client.informer.ResyncRunnable;
+import io.kubernetes.client.util.Threads;
+
 /**
  * Controller is a java port of k/client-go's informer#Controller. It plumbs reflector and the queue
  * implementation and it runs re-sync function periodically.
@@ -83,25 +84,12 @@ public Controller(
     // starts one daemon thread for reflector
     this.reflectExecutor =
         Executors.newSingleThreadScheduledExecutor(
-            threadFactory("controller-reflector-" + apiTypeClass.getName() + "-%d"));
+          Threads.threadFactory("controller-reflector-" + apiTypeClass.getName() + "-%d"));
 
     // starts one daemon thread for resync
     this.resyncExecutor =
         Executors.newSingleThreadScheduledExecutor(
-            threadFactory("controller-reflector-" + apiTypeClass.getName() + "-%d"));
-  }
-
-  private ThreadFactory threadFactory(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;
-    };
+          Threads.threadFactory("controller-reflector-" + apiTypeClass.getName() + "-%d"));
   }
 
   public Controller(
diff --git a/util/src/main/java/io/kubernetes/client/util/Threads.java b/util/src/main/java/io/kubernetes/client/util/Threads.java
@@ -0,0 +1,33 @@
+/*
+Copyright 2020 The Kubernetes Authors.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+package io.kubernetes.client.util;
+
+import java.util.concurrent.Executors;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.atomic.AtomicInteger;
+
+public class Threads {
+  
+  public static ThreadFactory threadFactory(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;
+    };
+  }
+}
