Use some static imports.

RELNOTES=n/a
PiperOrigin-RevId: 687437051

Author: cpovirk

android/guava-testlib/test/com/google/common/util/concurrent/testing/TestingExecutorsTest.java

@@ -16,6 +16,7 @@
 
 package com.google.common.util.concurrent.testing;
 
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static org.junit.Assert.assertThrows;
 
 import com.google.common.collect.ImmutableList;
@@ -26,7 +27,6 @@
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.concurrent.ScheduledFuture;
-import java.util.concurrent.TimeUnit;
 import junit.framework.TestCase;
 
 /**
@@ -47,7 +47,7 @@ public void run() {
           }
         };
     ScheduledFuture<?> future =
-        TestingExecutors.noOpScheduledExecutor().schedule(task, 10, TimeUnit.MILLISECONDS);
+        TestingExecutors.noOpScheduledExecutor().schedule(task, 10, MILLISECONDS);
     Thread.sleep(20);
     assertFalse(taskDone);
     assertFalse(future.isDone());
@@ -73,8 +73,7 @@ public Boolean call() {
             return taskDone;
           }
         };
-    List<Future<Boolean>> futureList =
-        executor.invokeAll(ImmutableList.of(task), 10, TimeUnit.MILLISECONDS);
+    List<Future<Boolean>> futureList = executor.invokeAll(ImmutableList.of(task), 10, MILLISECONDS);
     Future<Boolean> future = futureList.get(0);
     assertFalse(taskDone);
     assertTrue(future.isDone());
@@ -92,7 +91,7 @@ public Integer call() {
           }
         };
     Future<Integer> future =
-        TestingExecutors.sameThreadScheduledExecutor().schedule(task, 10000, TimeUnit.MILLISECONDS);
+        TestingExecutors.sameThreadScheduledExecutor().schedule(task, 10000, MILLISECONDS);
     assertTrue("Should run callable immediately", taskDone);
     assertEquals(6, (int) future.get());
   }

android/guava-tests/benchmark/com/google/common/util/concurrent/ExecutionListBenchmark.java

@@ -17,6 +17,7 @@
 package com.google.common.util.concurrent;
 
 import static com.google.common.util.concurrent.MoreExecutors.directExecutor;
+import static java.util.concurrent.TimeUnit.SECONDS;
 
 import com.google.caliper.AfterExperiment;
 import com.google.caliper.BeforeExperiment;
@@ -38,7 +39,6 @@
 import java.util.concurrent.Executor;
 import java.util.concurrent.Future;
 import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -251,7 +251,7 @@ void setUp() throws Exception {
             NUM_THREADS,
             NUM_THREADS,
             Long.MAX_VALUE,
-            TimeUnit.SECONDS,
+            SECONDS,
             new ArrayBlockingQueue<Runnable>(1000));
     executorService.prestartAllCoreThreads();
     final AtomicInteger integer = new AtomicInteger();

android/guava-tests/benchmark/com/google/common/util/concurrent/SingleThreadAbstractFutureBenchmark.java

@@ -16,6 +16,9 @@
 
 package com.google.common.util.concurrent;
 
+import static java.util.concurrent.TimeUnit.NANOSECONDS;
+import static java.util.concurrent.TimeUnit.SECONDS;
+
 import com.google.caliper.BeforeExperiment;
 import com.google.caliper.Benchmark;
 import com.google.caliper.Param;
@@ -26,7 +29,6 @@
 import java.util.List;
 import java.util.concurrent.CancellationException;
 import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
 /** A benchmark that times how long it takes to add a given number of */
@@ -105,7 +107,7 @@ public long timeGetWith0Timeout(long reps) throws Exception {
     long r = 0;
     for (int i = 0; i < reps; i++) {
       try {
-        f.get(0, TimeUnit.SECONDS);
+        f.get(0, SECONDS);
         r += 1;
       } catch (TimeoutException e) {
         r += 2;
@@ -120,7 +122,7 @@ public long timeGetWithSmallTimeout(long reps) throws Exception {
     long r = 0;
     for (int i = 0; i < reps; i++) {
       try {
-        f.get(500, TimeUnit.NANOSECONDS);
+        f.get(500, NANOSECONDS);
         r += 1;
       } catch (TimeoutException e) {
         r += 2;

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

@@ -17,10 +17,10 @@
 package com.google.common.util.concurrent;
 
 import static com.google.common.truth.Truth.assertThat;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static org.junit.Assert.assertThrows;
 
 import com.google.common.util.concurrent.testing.MockFutureListener;
-import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import junit.framework.TestCase;
 
@@ -50,7 +50,7 @@ protected void setUp() throws Exception {
 
   public void testFutureGetBeforeCallback() throws Exception {
     // Verify that get throws a timeout exception before the callback is called.
-    assertThrows(TimeoutException.class, () -> resultFuture.get(1L, TimeUnit.MILLISECONDS));
+    assertThrows(TimeoutException.class, () -> resultFuture.get(1L, MILLISECONDS));
   }
 
   public void testFutureGetThrowsWrappedException() throws Exception {

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

@@ -20,6 +20,7 @@
 import static com.google.common.collect.Lists.asList;
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertWithMessage;
+import static com.google.common.util.concurrent.ClosingFuture.withoutCloser;
 import static com.google.common.util.concurrent.Futures.immediateCancelledFuture;
 import static com.google.common.util.concurrent.Futures.immediateFailedFuture;
 import static com.google.common.util.concurrent.Futures.immediateFuture;
@@ -693,7 +694,7 @@ public TestCloseable call(DeferredCloser closer) throws Exception {
                 },
                 executor)
             .transformAsync(
-                ClosingFuture.withoutCloser(
+                withoutCloser(
                     new AsyncFunction<TestCloseable, String>() {
                       @Override
                       public ListenableFuture<String> apply(TestCloseable v) throws Exception {
@@ -1490,7 +1491,7 @@ public void testCatchingAsync_preventsFurtherOperations() {
     ClosingFuture<String> unused =
         closingFuture.catchingAsync(
             Exception.class,
-            ClosingFuture.withoutCloser(
+            withoutCloser(
                 new AsyncFunction<Exception, String>() {
                   @Override
                   public ListenableFuture<String> apply(Exception x) throws Exception {

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.TimeUnit.MILLISECONDS;
 import static org.junit.Assert.assertThrows;
 
 import com.google.common.testing.TearDown;
@@ -28,7 +29,6 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import junit.framework.TestCase;
 
@@ -297,8 +297,7 @@ public void testServiceTimeoutOnStartUp() throws Exception {
 
     TimeoutException e =
         assertThrows(
-            TimeoutException.class,
-            () -> service.startAsync().awaitRunning(1, TimeUnit.MILLISECONDS));
+            TimeoutException.class, () -> service.startAsync().awaitRunning(1, MILLISECONDS));
     assertThat(e.getMessage()).contains(Service.State.STARTING.toString());
   }
 
@@ -370,8 +369,7 @@ protected String serviceName() {
         };
     TimeoutException e =
         assertThrows(
-            TimeoutException.class,
-            () -> service.startAsync().awaitRunning(1, TimeUnit.MILLISECONDS));
+            TimeoutException.class, () -> service.startAsync().awaitRunning(1, MILLISECONDS));
     assertThat(e)
         .hasMessageThat()
         .isEqualTo("Timed out waiting for Foo [STARTING] to reach the RUNNING state.");

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

@@ -20,7 +20,13 @@
 import static com.google.common.base.StandardSystemProperty.OS_NAME;
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertWithMessage;
+import static com.google.common.util.concurrent.Futures.immediateCancelledFuture;
+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 java.util.concurrent.TimeUnit.MILLISECONDS;
+import static java.util.concurrent.TimeUnit.NANOSECONDS;
+import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.junit.Assert.assertThrows;
 
 import com.google.common.annotations.GwtIncompatible;
@@ -134,7 +140,7 @@ public void testGetWithTimeoutDoneFuture() throws Exception {
             set("foo");
           }
         };
-    assertEquals("foo", future.get(0, TimeUnit.SECONDS));
+    assertEquals("foo", future.get(0, SECONDS));
   }
 
   public void testEvilFuture_setFuture() throws Exception {
@@ -255,8 +261,7 @@ public String pendingToString() {
     assertThat(testFuture.toString())
         .matches(
             "[^\\[]+\\[status=PENDING, info=\\[cause=\\[Because this test isn't done\\]\\]\\]");
-    TimeoutException e =
-        assertThrows(TimeoutException.class, () -> testFuture.get(1, TimeUnit.NANOSECONDS));
+    TimeoutException e = assertThrows(TimeoutException.class, () -> testFuture.get(1, NANOSECONDS));
     assertThat(e.getMessage()).contains("1 nanoseconds");
     assertThat(e.getMessage()).contains("Because this test isn't done");
   }
@@ -290,13 +295,12 @@ public void testToString_delayedTimeout() throws Exception {
       // TODO(b/261217224, b/361604053): Make this test work under newer JDKs.
       return;
     }
-    TimedWaiterThread thread =
-        new TimedWaiterThread(new AbstractFuture<Object>() {}, 2, TimeUnit.SECONDS);
+    TimedWaiterThread thread = new TimedWaiterThread(new AbstractFuture<Object>() {}, 2, SECONDS);
     thread.start();
     thread.awaitWaiting();
     Thread.class.getMethod("suspend").invoke(thread);
     // Sleep for enough time to add 1500 milliseconds of overwait to the get() call.
-    long toWaitMillis = 3500 - TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - thread.startTime);
+    long toWaitMillis = 3500 - NANOSECONDS.toMillis(System.nanoTime() - thread.startTime);
     Thread.sleep(toWaitMillis);
     thread.setPriority(Thread.MAX_PRIORITY);
     Thread.class.getMethod("resume").invoke(thread);
@@ -306,12 +310,11 @@ public void testToString_delayedTimeout() throws Exception {
     // being resumed. To avoid a flake in this scenario, calculate how long that thread actually
     // waited and assert based on that time. Empirically, the race where the thread ends up waiting
     // for 5.5 seconds happens about 2% of the time.
-    boolean longWait = TimeUnit.NANOSECONDS.toSeconds(thread.timeSpentBlocked) >= 5;
+    boolean longWait = NANOSECONDS.toSeconds(thread.timeSpentBlocked) >= 5;
     // Count how long it actually took to return; we'll accept any number between the expected delay
     // and the approximate actual delay, to be robust to variance in thread scheduling.
     char overWaitNanosFirstDigit =
-        Long.toString(
-                thread.timeSpentBlocked - TimeUnit.MILLISECONDS.toNanos(longWait ? 5000 : 3000))
+        Long.toString(thread.timeSpentBlocked - MILLISECONDS.toNanos(longWait ? 5000 : 3000))
             .charAt(0);
     if (overWaitNanosFirstDigit < '4') {
       overWaitNanosFirstDigit = '9';
@@ -349,12 +352,11 @@ public String pendingToString() {
   }
 
   public void testToString_cancelled() throws Exception {
-    assertThat(Futures.immediateCancelledFuture().toString())
-        .matches("[^\\[]+\\[status=CANCELLED\\]");
+    assertThat(immediateCancelledFuture().toString()).matches("[^\\[]+\\[status=CANCELLED\\]");
   }
 
   public void testToString_failed() {
-    assertThat(Futures.immediateFailedFuture(new RuntimeException("foo")).toString())
+    assertThat(immediateFailedFuture(new RuntimeException("foo")).toString())
         .matches("[^\\[]+\\[status=FAILURE, cause=\\[java.lang.RuntimeException: foo\\]\\]");
   }
 
@@ -472,7 +474,7 @@ public void testFutureBash() {
         };
     Callable<@Nullable Void> setFutureCompleteSuccessfullyRunnable =
         new Callable<@Nullable Void>() {
-          ListenableFuture<String> future = Futures.immediateFuture("setFuture");
+          ListenableFuture<String> future = immediateFuture("setFuture");
 
           @Override
           public @Nullable Void call() {
@@ -485,8 +487,7 @@ public void testFutureBash() {
         };
     Callable<@Nullable Void> setFutureCompleteExceptionallyRunnable =
         new Callable<@Nullable Void>() {
-          ListenableFuture<String> future =
-              Futures.immediateFailedFuture(new Exception("setFuture"));
+          ListenableFuture<String> future = immediateFailedFuture(new Exception("setFuture"));
 
           @Override
           public @Nullable Void call() {
@@ -499,7 +500,7 @@ public void testFutureBash() {
         };
     Callable<@Nullable Void> setFutureCancelRunnable =
         new Callable<@Nullable Void>() {
-          ListenableFuture<String> future = Futures.immediateCancelledFuture();
+          ListenableFuture<String> future = immediateCancelledFuture();
 
           @Override
           public @Nullable Void call() {
@@ -534,7 +535,7 @@ public void run() {
             Future<String> future = currentFuture.get();
             while (true) {
               try {
-                String result = Uninterruptibles.getUninterruptibly(future, 0, TimeUnit.SECONDS);
+                String result = Uninterruptibles.getUninterruptibly(future, 0, SECONDS);
                 finalResults.add(result);
                 break;
               } catch (ExecutionException e) {
@@ -665,7 +666,7 @@ public void run() {
             Future<String> future = currentFuture.get();
             while (true) {
               try {
-                String result = Uninterruptibles.getUninterruptibly(future, 0, TimeUnit.SECONDS);
+                String result = Uninterruptibles.getUninterruptibly(future, 0, SECONDS);
                 finalResults.add(result);
                 break;
               } catch (ExecutionException e) {
@@ -765,7 +766,7 @@ public void testSetFutureCancelBash_withDoneFuture() {
         };
     Callable<@Nullable Void> setFutureCompleteSuccessfullyRunnable =
         new Callable<@Nullable Void>() {
-          final ListenableFuture<String> future = Futures.immediateFuture("hello");
+          final ListenableFuture<String> future = immediateFuture("hello");
 
           @Override
           public @Nullable Void call() {
@@ -1014,7 +1015,7 @@ public void run() {
                     ranImmediately.set(true);
                   }
                 },
-                MoreExecutors.directExecutor());
+                directExecutor());
             assertThat(ranImmediately.get()).isTrue();
           }
         };
@@ -1030,7 +1031,7 @@ public void testListenersExecuteImmediately_afterWaiterWakesUp() throws Exceptio
           protected void afterDone() {
             // this simply delays executing listeners
             try {
-              Thread.sleep(TimeUnit.SECONDS.toMillis(10));
+              Thread.sleep(SECONDS.toMillis(10));
             } catch (InterruptedException ignored) {
               Thread.currentThread().interrupt(); // preserve status
             }
@@ -1053,7 +1054,7 @@ public void run() {
             ranImmediately.set(true);
           }
         },
-        MoreExecutors.directExecutor());
+        directExecutor());
     assertThat(ranImmediately.get()).isTrue();
     t.interrupt();
     t.join();
@@ -1307,7 +1308,7 @@ private PollingThread(AbstractFuture<?> future) {
     public void run() {
       while (true) {
         try {
-          future.get(0, TimeUnit.SECONDS);
+          future.get(0, SECONDS);
           return;
         } catch (InterruptedException | ExecutionException e) {
           return;

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

@@ -18,12 +18,12 @@
 
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.util.concurrent.MoreExecutors.directExecutor;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static org.junit.Assert.assertThrows;
 
 import com.google.common.collect.Lists;
 import java.util.List;
 import java.util.concurrent.Executor;
-import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import junit.framework.TestCase;
 
@@ -137,8 +137,7 @@ protected String serviceName() {
         };
     TimeoutException e =
         assertThrows(
-            TimeoutException.class,
-            () -> service.startAsync().awaitRunning(1, TimeUnit.MILLISECONDS));
+            TimeoutException.class, () -> service.startAsync().awaitRunning(1, MILLISECONDS));
     assertThat(e)
         .hasMessageThat()
         .isEqualTo("Timed out waiting for Foo [STARTING] to reach the RUNNING state.");