Static import methods from Executors and MoreExecutors.

RELNOTES=n/a
PiperOrigin-RevId: 782057653

Author: cpovirk

android/guava-testlib/src/com/google/common/util/concurrent/testing/AbstractListenableFutureTest.java

@@ -16,6 +16,8 @@
 
 package com.google.common.util.concurrent.testing;
 
+import static java.util.concurrent.Executors.newCachedThreadPool;
+import static java.util.concurrent.Executors.newSingleThreadExecutor;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.junit.Assert.assertThrows;
@@ -26,7 +28,6 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
@@ -71,7 +72,7 @@ public void testGetBlocksUntilValueAvailable() throws Throwable {
     assertFalse(future.isDone());
     assertFalse(future.isCancelled());
 
-    ExecutorService executor = Executors.newSingleThreadExecutor();
+    ExecutorService executor = newSingleThreadExecutor();
 
     try {
       Future<Boolean> getResult = executor.submit(() -> future.get());
@@ -138,7 +139,7 @@ public void testListenersNotifiedOnError() throws Exception {
     CountDownLatch successLatch = new CountDownLatch(1);
     CountDownLatch listenerLatch = new CountDownLatch(1);
 
-    ExecutorService exec = Executors.newCachedThreadPool();
+    ExecutorService exec = newCachedThreadPool();
 
     future.addListener(listenerLatch::countDown, exec);
 
@@ -171,7 +172,7 @@ public void testListenersNotifiedOnError() throws Exception {
   public void testAllListenersCompleteSuccessfully()
       throws InterruptedException, ExecutionException {
 
-    ExecutorService exec = Executors.newCachedThreadPool();
+    ExecutorService exec = newCachedThreadPool();
 
     int listenerCount = 20;
     CountDownLatch listenerLatch = new CountDownLatch(listenerCount);

android/guava-testlib/src/com/google/common/util/concurrent/testing/SameThreadScheduledExecutorService.java

@@ -17,6 +17,7 @@
 package com.google.common.util.concurrent.testing;
 
 import static com.google.common.util.concurrent.MoreExecutors.newDirectExecutorService;
+import static java.util.concurrent.Executors.callable;
 
 import com.google.common.annotations.GwtIncompatible;
 import com.google.common.base.Preconditions;
@@ -31,7 +32,6 @@
 import java.util.concurrent.Callable;
 import java.util.concurrent.Delayed;
 import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
@@ -136,7 +136,7 @@ public void execute(Runnable command) {
   public ListenableScheduledFuture<?> schedule(Runnable command, long delay, TimeUnit unit) {
     Preconditions.checkNotNull(command, "command must not be null");
     Preconditions.checkNotNull(unit, "unit must not be null!");
-    return schedule(Executors.callable(command), delay, unit);
+    return schedule(callable(command), delay, unit);
   }
 
   @Override

android/guava-testlib/test/com/google/common/testing/FakeTickerTest.java

@@ -17,6 +17,7 @@
 package com.google.common.testing;
 
 import static com.google.common.testing.ReflectionFreeAssertThrows.assertThrows;
+import static java.util.concurrent.Executors.newFixedThreadPool;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static java.util.concurrent.TimeUnit.NANOSECONDS;
 import static java.util.concurrent.TimeUnit.SECONDS;
@@ -27,7 +28,6 @@
 import java.util.concurrent.Callable;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import junit.framework.TestCase;
@@ -166,7 +166,7 @@ public void testConcurrentAutoIncrementStep() throws Exception {
   @GwtIncompatible // concurrency
   private void runConcurrentTest(int numberOfThreads, Callable<@Nullable Void> callable)
       throws Exception {
-    ExecutorService executorService = Executors.newFixedThreadPool(numberOfThreads);
+    ExecutorService executorService = newFixedThreadPool(numberOfThreads);
     CountDownLatch startLatch = new CountDownLatch(numberOfThreads);
     CountDownLatch doneLatch = new CountDownLatch(numberOfThreads);
     for (int i = numberOfThreads; i > 0; i--) {

android/guava-tests/benchmark/com/google/common/collect/ConcurrentHashMultisetBenchmark.java

@@ -19,6 +19,7 @@
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.collect.CollectPreconditions.checkNonnegative;
 import static com.google.common.collect.Lists.newArrayListWithExpectedSize;
+import static java.util.concurrent.Executors.newFixedThreadPool;
 
 import com.google.caliper.BeforeExperiment;
 import com.google.caliper.Benchmark;
@@ -36,7 +37,6 @@
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import org.jspecify.annotations.NullUnmarked;
 import org.jspecify.annotations.Nullable;
@@ -68,8 +68,7 @@ void setUp() throws Exception {
       builder.add(i);
     }
     keys = builder.build();
-    threadPool =
-        Executors.newFixedThreadPool(threads, new ThreadFactoryBuilder().setDaemon(true).build());
+    threadPool = newFixedThreadPool(threads, new ThreadFactoryBuilder().setDaemon(true).build());
   }
 
   @Benchmark

android/guava-tests/test/com/google/common/cache/CacheBuilderTest.java

@@ -24,6 +24,7 @@
 import static com.google.common.cache.TestingRemovalListeners.queuingRemovalListener;
 import static com.google.common.cache.TestingWeighers.constantWeigher;
 import static com.google.common.truth.Truth.assertThat;
+import static java.util.concurrent.Executors.newFixedThreadPool;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static java.util.concurrent.TimeUnit.NANOSECONDS;
 import static java.util.concurrent.TimeUnit.SECONDS;
@@ -43,7 +44,6 @@
 import java.util.Set;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -445,7 +445,7 @@ public void testRemovalNotification_clear_basher() throws InterruptedException {
     computationShouldWait.set(true);
 
     AtomicInteger computedCount = new AtomicInteger();
-    ExecutorService threadPool = Executors.newFixedThreadPool(nThreads);
+    ExecutorService threadPool = newFixedThreadPool(nThreads);
     CountDownLatch tasksFinished = new CountDownLatch(nTasks);
     for (int i = 0; i < nTasks; i++) {
       String s = "a" + i;
@@ -545,7 +545,7 @@ public String load(String key) throws InterruptedException {
             .maximumSize(5000)
             .build(countingIdentityLoader);
 
-    ExecutorService threadPool = Executors.newFixedThreadPool(nThreads);
+    ExecutorService threadPool = newFixedThreadPool(nThreads);
     for (int i = 0; i < nTasks; i++) {
       @SuppressWarnings("unused") // https://errorprone.info/bugpattern/FutureReturnValueIgnored
       Future<?> possiblyIgnoredError =

android/guava-tests/test/com/google/common/collect/ConcurrentHashMultisetBasherTest.java

@@ -19,6 +19,7 @@
 import static com.google.common.collect.Lists.newArrayListWithExpectedSize;
 import static com.google.common.collect.Lists.transform;
 import static java.lang.Math.min;
+import static java.util.concurrent.Executors.newFixedThreadPool;
 
 import com.google.common.base.Function;
 import com.google.common.primitives.Ints;
@@ -30,7 +31,6 @@
 import java.util.concurrent.ConcurrentSkipListMap;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.concurrent.atomic.AtomicInteger;
 import junit.framework.TestCase;
@@ -70,7 +70,7 @@ private void testAddAndRemove(ConcurrentMap<String, AtomicInteger> map)
     int nThreads = 20;
     int tasksPerThread = 10;
     int nTasks = nThreads * tasksPerThread;
-    ExecutorService pool = Executors.newFixedThreadPool(nThreads);
+    ExecutorService pool = newFixedThreadPool(nThreads);
     ImmutableList<String> keys = ImmutableList.of("a", "b", "c");
     try {
       List<Future<int[]>> futures = newArrayListWithExpectedSize(nTasks);

android/guava-tests/test/com/google/common/eventbus/EventBusTest.java

@@ -16,6 +16,7 @@
 
 package com.google.common.eventbus;
 
+import static java.util.concurrent.Executors.newFixedThreadPool;
 import static org.junit.Assert.assertThrows;
 
 import com.google.common.collect.ImmutableList;
@@ -24,7 +25,6 @@
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.concurrent.atomic.AtomicInteger;
 import junit.framework.TestCase;
@@ -233,7 +233,7 @@ public void testUnregister() {
   public void testRegisterThreadSafety() throws Exception {
     List<StringCatcher> catchers = new CopyOnWriteArrayList<>();
     List<Future<?>> futures = new ArrayList<>();
-    ExecutorService executor = Executors.newFixedThreadPool(10);
+    ExecutorService executor = newFixedThreadPool(10);
     int numberOfCatchers = 10000;
     for (int i = 0; i < numberOfCatchers; i++) {
       futures.add(executor.submit(new Registrator(bus, catchers)));

android/guava-tests/test/com/google/common/io/MoreFilesTest.java

@@ -23,6 +23,7 @@
 import static com.google.common.truth.Truth.assertThat;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.nio.file.LinkOption.NOFOLLOW_LINKS;
+import static java.util.concurrent.Executors.newSingleThreadExecutor;
 import static org.junit.Assert.assertThrows;
 
 import com.google.common.collect.ObjectArrays;
@@ -43,7 +44,6 @@
 import java.nio.file.attribute.FileTime;
 import java.util.EnumSet;
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import junit.framework.TestCase;
 import org.jspecify.annotations.NullUnmarked;
@@ -577,7 +577,7 @@ public void testDirectoryDeletion_directorySymlinkRace() throws IOException {
         Path changingFile = dirToDelete.resolve("j/l");
         Path symlinkTarget = fs.getPath("/dontdelete");
 
-        ExecutorService executor = Executors.newSingleThreadExecutor();
+        ExecutorService executor = newSingleThreadExecutor();
         startDirectorySymlinkSwitching(changingFile, symlinkTarget, executor);
 
         try {

android/guava-tests/test/com/google/common/util/concurrent/AbstractClosingFutureTest.java

@@ -25,6 +25,7 @@
 import static com.google.common.util.concurrent.Futures.immediateFailedFuture;
 import static com.google.common.util.concurrent.Futures.immediateFuture;
 import static com.google.common.util.concurrent.MoreExecutors.directExecutor;
+import static com.google.common.util.concurrent.MoreExecutors.listeningDecorator;
 import static com.google.common.util.concurrent.MoreExecutors.shutdownAndAwaitTermination;
 import static com.google.common.util.concurrent.Uninterruptibles.awaitUninterruptibly;
 import static com.google.common.util.concurrent.Uninterruptibles.getUninterruptibly;
@@ -97,8 +98,7 @@ public void fail(AssertionError failure) {
             }
           });
 
-  final ListeningExecutorService executor =
-      MoreExecutors.listeningDecorator(newSingleThreadExecutor());
+  final ListeningExecutorService executor = listeningDecorator(newSingleThreadExecutor());
   final ExecutorService closingExecutor = newSingleThreadExecutor();
 
   final TestCloseable closeable1 = new TestCloseable("closeable1");

android/guava-tests/test/com/google/common/util/concurrent/AbstractExecutionThreadServiceTest.java

@@ -17,6 +17,7 @@
 package com.google.common.util.concurrent;
 
 import static com.google.common.truth.Truth.assertThat;
+import static java.util.concurrent.Executors.newSingleThreadExecutor;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static org.junit.Assert.assertThrows;
 
@@ -27,7 +28,6 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.Executor;
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeoutException;
 import junit.framework.TestCase;
@@ -379,7 +379,7 @@ protected String serviceName() {
 
   private class FakeService extends AbstractExecutionThreadService implements TearDown {
 
-    private final ExecutorService executor = Executors.newSingleThreadExecutor();
+    private final ExecutorService executor = newSingleThreadExecutor();
 
     FakeService() {
       tearDownStack.addTearDown(this);