Use some static imports.

RELNOTES=n/a
PiperOrigin-RevId: 687471414

Author: cpovirk

android/guava-testlib/src/com/google/common/testing/ArbitraryInstances.java

@@ -19,6 +19,7 @@
 import static com.google.common.base.Preconditions.checkArgument;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.Objects.requireNonNull;
+import static java.util.concurrent.TimeUnit.SECONDS;
 
 import com.google.common.annotations.GwtIncompatible;
 import com.google.common.annotations.J2ktIncompatible;
@@ -205,7 +206,7 @@ private static MatchResult createMatchResult() {
           .put(String.class, "")
           .put(Pattern.class, Pattern.compile(""))
           .put(MatchResult.class, createMatchResult())
-          .put(TimeUnit.class, TimeUnit.SECONDS)
+          .put(TimeUnit.class, SECONDS)
           .put(Charset.class, UTF_8)
           .put(Currency.class, Currency.getInstance(Locale.US))
           .put(Locale.class, Locale.US)

android/guava-testlib/src/com/google/common/testing/FakeTicker.java

@@ -17,6 +17,7 @@
 package com.google.common.testing;
 
 import static com.google.common.base.Preconditions.checkArgument;
+import static java.util.concurrent.TimeUnit.NANOSECONDS;
 
 import com.google.common.annotations.Beta;
 import com.google.common.annotations.GwtCompatible;
@@ -107,7 +108,7 @@ public FakeTicker setAutoIncrementStep(long autoIncrementStep, TimeUnit timeUnit
   @IgnoreJRERequirement // TODO: b/288085449 - Remove this once we use library-desugaring scents.
   @Beta // TODO: b/288085449 - Remove @Beta after we're sure that Java 8 APIs are safe for Android
   public FakeTicker setAutoIncrementStep(Duration autoIncrementStep) {
-    return setAutoIncrementStep(autoIncrementStep.toNanos(), TimeUnit.NANOSECONDS);
+    return setAutoIncrementStep(autoIncrementStep.toNanos(), NANOSECONDS);
   }
 
   @Override

android/guava-testlib/src/com/google/common/testing/GcFinalization.java

@@ -16,6 +16,7 @@
 
 package com.google.common.testing;
 
+import static java.lang.Math.max;
 import static java.util.concurrent.TimeUnit.SECONDS;
 
 import com.google.common.annotations.GwtIncompatible;
@@ -126,7 +127,7 @@ private static long timeoutSeconds() {
     //
     // TODO(user): Consider scaling by number of mutator threads,
     // e.g. using Thread#activeCount()
-    return Math.max(10L, Runtime.getRuntime().totalMemory() / (32L * 1024L * 1024L));
+    return max(10L, Runtime.getRuntime().totalMemory() / (32L * 1024L * 1024L));
   }
 
   /**

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

@@ -18,6 +18,7 @@
 
 import static com.google.common.truth.Truth.assertThat;
 import static java.nio.charset.StandardCharsets.UTF_8;
+import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.junit.Assert.assertThrows;
 
 import com.google.common.base.CharMatcher;
@@ -162,7 +163,7 @@ public void testGet_primitives() {
     assertEquals(0, ArbitraryInstances.get(BigInteger.class).intValue());
     assertEquals("", ArbitraryInstances.get(String.class));
     assertEquals("", ArbitraryInstances.get(CharSequence.class));
-    assertEquals(TimeUnit.SECONDS, ArbitraryInstances.get(TimeUnit.class));
+    assertEquals(SECONDS, ArbitraryInstances.get(TimeUnit.class));
     assertNotNull(ArbitraryInstances.get(Object.class));
     assertEquals(0, ArbitraryInstances.get(Number.class));
     assertEquals(UTF_8, ArbitraryInstances.get(Charset.class));

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

@@ -17,6 +17,9 @@
 package com.google.common.testing;
 
 import static com.google.common.testing.ReflectionFreeAssertThrows.assertThrows;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static java.util.concurrent.TimeUnit.NANOSECONDS;
+import static java.util.concurrent.TimeUnit.SECONDS;
 
 import com.google.common.annotations.GwtCompatible;
 import com.google.common.annotations.GwtIncompatible;
@@ -54,33 +57,33 @@ public void testAdvance() {
     assertEquals(0, ticker.read());
     assertSame(ticker, ticker.advance(10));
     assertEquals(10, ticker.read());
-    ticker.advance(1, TimeUnit.MILLISECONDS);
+    ticker.advance(1, MILLISECONDS);
     assertEquals(1000010L, ticker.read());
     ticker.advance(Duration.ofMillis(1));
     assertEquals(2000010L, ticker.read());
   }
 
   public void testAutoIncrementStep_returnsSameInstance() {
     FakeTicker ticker = new FakeTicker();
-    assertSame(ticker, ticker.setAutoIncrementStep(10, TimeUnit.NANOSECONDS));
+    assertSame(ticker, ticker.setAutoIncrementStep(10, NANOSECONDS));
   }
 
   public void testAutoIncrementStep_nanos() {
-    FakeTicker ticker = new FakeTicker().setAutoIncrementStep(10, TimeUnit.NANOSECONDS);
+    FakeTicker ticker = new FakeTicker().setAutoIncrementStep(10, NANOSECONDS);
     assertEquals(0, ticker.read());
     assertEquals(10, ticker.read());
     assertEquals(20, ticker.read());
   }
 
   public void testAutoIncrementStep_millis() {
-    FakeTicker ticker = new FakeTicker().setAutoIncrementStep(1, TimeUnit.MILLISECONDS);
+    FakeTicker ticker = new FakeTicker().setAutoIncrementStep(1, MILLISECONDS);
     assertEquals(0, ticker.read());
     assertEquals(1000000, ticker.read());
     assertEquals(2000000, ticker.read());
   }
 
   public void testAutoIncrementStep_seconds() {
-    FakeTicker ticker = new FakeTicker().setAutoIncrementStep(3, TimeUnit.SECONDS);
+    FakeTicker ticker = new FakeTicker().setAutoIncrementStep(3, SECONDS);
     assertEquals(0, ticker.read());
     assertEquals(3000000000L, ticker.read());
     assertEquals(6000000000L, ticker.read());
@@ -96,7 +99,7 @@ public void testAutoIncrementStep_duration() {
   }
 
   public void testAutoIncrementStep_resetToZero() {
-    FakeTicker ticker = new FakeTicker().setAutoIncrementStep(10, TimeUnit.NANOSECONDS);
+    FakeTicker ticker = new FakeTicker().setAutoIncrementStep(10, NANOSECONDS);
     assertEquals(0, ticker.read());
     assertEquals(10, ticker.read());
     assertEquals(20, ticker.read());
@@ -113,8 +116,7 @@ public void testAutoIncrementStep_resetToZero() {
   public void testAutoIncrement_negative() {
     FakeTicker ticker = new FakeTicker();
     assertThrows(
-        IllegalArgumentException.class,
-        () -> ticker.setAutoIncrementStep(-1, TimeUnit.NANOSECONDS));
+        IllegalArgumentException.class, () -> ticker.setAutoIncrementStep(-1, NANOSECONDS));
   }
 
   @GwtIncompatible // concurrency
@@ -143,8 +145,7 @@ public void testConcurrentAdvance() throws Exception {
 
   public void testConcurrentAutoIncrementStep() throws Exception {
     int incrementByNanos = 3;
-    final FakeTicker ticker =
-        new FakeTicker().setAutoIncrementStep(incrementByNanos, TimeUnit.NANOSECONDS);
+    final FakeTicker ticker = new FakeTicker().setAutoIncrementStep(incrementByNanos, NANOSECONDS);
 
     int numberOfThreads = 64;
     runConcurrentTest(

android/guava-tests/benchmark/com/google/common/base/StopwatchBenchmark.java

@@ -16,8 +16,9 @@
 
 package com.google.common.base;
 
+import static java.util.concurrent.TimeUnit.NANOSECONDS;
+
 import com.google.caliper.Benchmark;
-import java.util.concurrent.TimeUnit;
 
 /**
  * Simple benchmark: create, start, read. This does not currently report the most useful result
@@ -32,7 +33,7 @@ long stopwatch(int reps) {
     for (int i = 0; i < reps; i++) {
       Stopwatch s = Stopwatch.createStarted();
       // here is where you would do something
-      total += s.elapsed(TimeUnit.NANOSECONDS);
+      total += s.elapsed(NANOSECONDS);
     }
     return total;
   }

android/guava-tests/benchmark/com/google/common/hash/HashStringBenchmark.java

@@ -16,10 +16,11 @@
 
 package com.google.common.hash;
 
+import static java.nio.charset.StandardCharsets.UTF_8;
+
 import com.google.caliper.BeforeExperiment;
 import com.google.caliper.Benchmark;
 import com.google.caliper.Param;
-import java.nio.charset.StandardCharsets;
 import java.util.Random;
 
 /** Benchmarks for the hashing of UTF-8 strings. */
@@ -118,9 +119,7 @@ int hashUtf8(int reps) {
     for (int i = 0; i < reps; i++) {
       res +=
           System.identityHashCode(
-              hashFunctionEnum
-                  .getHashFunction()
-                  .hashString(strings[i & SAMPLE_MASK], StandardCharsets.UTF_8));
+              hashFunctionEnum.getHashFunction().hashString(strings[i & SAMPLE_MASK], UTF_8));
     }
     return res;
   }
@@ -134,7 +133,7 @@ int hashUtf8Hasher(int reps) {
               hashFunctionEnum
                   .getHashFunction()
                   .newHasher()
-                  .putString(strings[i & SAMPLE_MASK], StandardCharsets.UTF_8)
+                  .putString(strings[i & SAMPLE_MASK], UTF_8)
                   .hash());
     }
     return res;
@@ -148,7 +147,7 @@ int hashUtf8GetBytes(int reps) {
           System.identityHashCode(
               hashFunctionEnum
                   .getHashFunction()
-                  .hashBytes(strings[i & SAMPLE_MASK].getBytes(StandardCharsets.UTF_8)));
+                  .hashBytes(strings[i & SAMPLE_MASK].getBytes(UTF_8)));
     }
     return res;
   }
@@ -162,7 +161,7 @@ int hashUtf8GetBytesHasher(int reps) {
               hashFunctionEnum
                   .getHashFunction()
                   .newHasher()
-                  .putBytes(strings[i & SAMPLE_MASK].getBytes(StandardCharsets.UTF_8))
+                  .putBytes(strings[i & SAMPLE_MASK].getBytes(UTF_8))
                   .hash());
     }
     return res;

android/guava-tests/test/com/google/common/base/FinalizableReferenceQueueClassLoaderUnloadingTest.java

@@ -19,6 +19,7 @@
 import static com.google.common.base.StandardSystemProperty.JAVA_CLASS_PATH;
 import static com.google.common.base.StandardSystemProperty.JAVA_SPECIFICATION_VERSION;
 import static com.google.common.base.StandardSystemProperty.PATH_SEPARATOR;
+import static java.util.concurrent.TimeUnit.SECONDS;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.testing.GcFinalization;
@@ -35,7 +36,6 @@
 import java.security.ProtectionDomain;
 import java.util.concurrent.Callable;
 import java.util.concurrent.Semaphore;
-import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 import junit.framework.TestCase;
 
@@ -249,7 +249,7 @@ private WeakReference<ClassLoader> doTestUnloadableInStaticFieldIfClosed() throw
 
     Field sepFrqUserFinalizedF = sepFrqUserC.getField("finalized");
     Semaphore finalizeCount = (Semaphore) sepFrqUserFinalizedF.get(null);
-    boolean finalized = finalizeCount.tryAcquire(5, TimeUnit.SECONDS);
+    boolean finalized = finalizeCount.tryAcquire(5, SECONDS);
     assertTrue(finalized);
 
     Field sepFrqUserFrqF = sepFrqUserC.getField("frq");

android/guava-tests/test/com/google/common/base/SuppliersTest.java

@@ -19,6 +19,9 @@
 import static com.google.common.base.ReflectionFreeAssertThrows.assertThrows;
 import static com.google.common.testing.SerializableTester.reserialize;
 import static com.google.common.truth.Truth.assertThat;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static java.util.concurrent.TimeUnit.NANOSECONDS;
+import static java.util.concurrent.TimeUnit.SECONDS;
 
 import com.google.common.annotations.GwtCompatible;
 import com.google.common.annotations.GwtIncompatible;
@@ -31,7 +34,6 @@
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
@@ -224,7 +226,7 @@ public void testMemoizeWithExpiration_longTimeUnit() throws InterruptedException
     CountingSupplier countingSupplier = new CountingSupplier();
 
     Supplier<Integer> memoizedSupplier =
-        Suppliers.memoizeWithExpiration(countingSupplier, 75, TimeUnit.MILLISECONDS);
+        Suppliers.memoizeWithExpiration(countingSupplier, 75, MILLISECONDS);
 
     checkExpiration(countingSupplier, memoizedSupplier);
   }
@@ -244,11 +246,11 @@ public void testMemoizeWithExpiration_duration() throws InterruptedException {
   public void testMemoizeWithExpiration_longTimeUnitNegative() throws InterruptedException {
     assertThrows(
         IllegalArgumentException.class,
-        () -> Suppliers.memoizeWithExpiration(() -> "", 0, TimeUnit.MILLISECONDS));
+        () -> Suppliers.memoizeWithExpiration(() -> "", 0, MILLISECONDS));
 
     assertThrows(
         IllegalArgumentException.class,
-        () -> Suppliers.memoizeWithExpiration(() -> "", -1, TimeUnit.MILLISECONDS));
+        () -> Suppliers.memoizeWithExpiration(() -> "", -1, MILLISECONDS));
   }
 
   @J2ktIncompatible // Duration
@@ -270,7 +272,7 @@ public void testMemoizeWithExpirationSerialized() throws InterruptedException {
     SerializableCountingSupplier countingSupplier = new SerializableCountingSupplier();
 
     Supplier<Integer> memoizedSupplier =
-        Suppliers.memoizeWithExpiration(countingSupplier, 75, TimeUnit.MILLISECONDS);
+        Suppliers.memoizeWithExpiration(countingSupplier, 75, MILLISECONDS);
     // Calls to the original memoized supplier shouldn't affect its copy.
     Object unused = memoizedSupplier.get();
 
@@ -329,7 +331,7 @@ public void testExpiringMemoizedSupplierThreadSafe() throws Throwable {
         new Function<Supplier<Boolean>, Supplier<Boolean>>() {
           @Override
           public Supplier<Boolean> apply(Supplier<Boolean> supplier) {
-            return Suppliers.memoizeWithExpiration(supplier, Long.MAX_VALUE, TimeUnit.NANOSECONDS);
+            return Suppliers.memoizeWithExpiration(supplier, Long.MAX_VALUE, NANOSECONDS);
           }
         };
     testSupplierThreadSafe(memoizer);
@@ -356,7 +358,7 @@ private void testSupplierThreadSafe(Function<Supplier<Boolean>, Supplier<Boolean
     final AtomicReference<Throwable> thrown = new AtomicReference<>(null);
     final int numThreads = 3;
     final Thread[] threads = new Thread[numThreads];
-    final long timeout = TimeUnit.SECONDS.toNanos(60);
+    final long timeout = SECONDS.toNanos(60);
 
     final Supplier<Boolean> supplier =
         new Supplier<Boolean>() {
@@ -485,8 +487,7 @@ public void testSerialization() {
     assertEquals(Integer.valueOf(5), reserialize(Suppliers.memoize(Suppliers.ofInstance(5))).get());
     assertEquals(
         Integer.valueOf(5),
-        reserialize(Suppliers.memoizeWithExpiration(Suppliers.ofInstance(5), 30, TimeUnit.SECONDS))
-            .get());
+        reserialize(Suppliers.memoizeWithExpiration(Suppliers.ofInstance(5), 30, SECONDS)).get());
     assertEquals(
         Integer.valueOf(5),
         reserialize(Suppliers.synchronizedSupplier(Suppliers.ofInstance(5))).get());

android/guava-tests/test/com/google/common/hash/BloomFilterTest.java

@@ -18,6 +18,7 @@
 
 import static com.google.common.truth.Truth.assertThat;
 import static java.nio.charset.StandardCharsets.UTF_8;
+import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.junit.Assert.assertThrows;
 
 import com.google.common.base.Stopwatch;
@@ -36,7 +37,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
-import java.util.concurrent.TimeUnit;
 import junit.framework.TestCase;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
@@ -557,7 +557,7 @@ public void run() {
               // Don't forget, the bloom filter slowly saturates over time and the
               // expected false positive probability goes up!
               assertThat(bloomFilter.expectedFpp()).isLessThan(safetyFalsePositiveRate);
-            } while (stopwatch.elapsed(TimeUnit.SECONDS) < 1);
+            } while (stopwatch.elapsed(SECONDS) < 1);
           }
         };