Use _more_ static imports.

(followup to cl/687404334)

RELNOTES=n/a
PiperOrigin-RevId: 687466612

Author: cpovirk

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

@@ -16,11 +16,12 @@
 
 package com.google.common.collect.testing;
 
+import static java.util.Arrays.asList;
+
 import com.google.common.annotations.GwtCompatible;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import com.google.errorprone.annotations.OverridingMethodsMustInvokeSuper;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
@@ -91,7 +92,7 @@ protected C resetContainer(C newValue) {
    * @param elements expected contents of {@link #container}
    */
   protected final void expectContents(E... elements) {
-    expectContents(Arrays.asList(elements));
+    expectContents(asList(elements));
   }
 
   /**
@@ -139,12 +140,12 @@ protected void expectUnchanged() {
    */
   protected final void expectAdded(E... elements) {
     List<E> expected = Helpers.copyToList(getSampleElements());
-    expected.addAll(Arrays.asList(elements));
+    expected.addAll(asList(elements));
     expectContents(expected);
   }
 
   protected final void expectAdded(int index, E... elements) {
-    expectAdded(index, Arrays.asList(elements));
+    expectAdded(index, asList(elements));
   }
 
   protected final void expectAdded(int index, Collection<E> elements) {

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

@@ -16,6 +16,7 @@
 
 package com.google.common.collect.testing;
 
+import static java.util.Arrays.asList;
 import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.fail;
 
@@ -340,7 +341,7 @@ private void recurse(int level) {
   }
 
   private void compareResultsForThisListOfStimuli() {
-    int removes = Collections.frequency(Arrays.asList(stimuli), remove);
+    int removes = Collections.frequency(asList(stimuli), remove);
     if ((!features.contains(IteratorFeature.SUPPORTS_REMOVE) && removes > 1)
         || (stimuli.length >= 5 && removes > 2)) {
       // removes are the most expensive thing to test, since they often throw exceptions with stack
@@ -363,7 +364,7 @@ private void compareResultsForThisListOfStimuli() {
   private static List<Object> subListCopy(Object[] source, int size) {
     final Object[] copy = new Object[size];
     System.arraycopy(source, 0, copy, 0, size);
-    return Arrays.asList(copy);
+    return asList(copy);
   }
 
   private interface IteratorOperation {
@@ -539,7 +540,7 @@ void executeAndCompare(ListIterator<E> reference, Iterator<E> target) {
       };
 
   List<Stimulus<E, Iterator<E>>> iteratorStimuli() {
-    return Arrays.asList(hasNext, next, remove);
+    return asList(hasNext, next, remove);
   }
 
   Stimulus<E, ListIterator<E>> hasPrevious =
@@ -586,6 +587,6 @@ void executeAndCompare(ListIterator<E> reference, ListIterator<E> target) {
       };
 
   List<Stimulus<E, ListIterator<E>>> listIteratorStimuli() {
-    return Arrays.asList(hasPrevious, nextIndex, previousIndex, previous, add, set);
+    return asList(hasPrevious, nextIndex, previousIndex, previous, add, set);
   }
 }

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

@@ -14,12 +14,13 @@
 
 package com.google.common.collect.testing;
 
+import static java.util.Arrays.asList;
+
 import com.google.common.annotations.GwtIncompatible;
 import com.google.common.collect.testing.testers.ConcurrentMapPutIfAbsentTester;
 import com.google.common.collect.testing.testers.ConcurrentMapRemoveTester;
 import com.google.common.collect.testing.testers.ConcurrentMapReplaceEntryTester;
 import com.google.common.collect.testing.testers.ConcurrentMapReplaceTester;
-import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -38,7 +39,7 @@ public static <K, V> ConcurrentMapTestSuiteBuilder<K, V> using(TestMapGenerator<
 
   @SuppressWarnings("rawtypes") // class literals
   static final List<? extends Class<? extends AbstractTester>> TESTERS =
-      Arrays.asList(
+      asList(
           ConcurrentMapPutIfAbsentTester.class,
           ConcurrentMapRemoveTester.class,
           ConcurrentMapReplaceTester.class,

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

@@ -19,11 +19,11 @@
 import static com.google.common.collect.testing.Helpers.castOrCopyToList;
 import static com.google.common.collect.testing.Helpers.equal;
 import static com.google.common.collect.testing.Helpers.mapEntry;
+import static java.util.Arrays.asList;
 import static java.util.Collections.sort;
 
 import com.google.common.annotations.GwtCompatible;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
@@ -382,7 +382,7 @@ public Iterable<E> order(List<E> insertionOrder) {
 
     @Override
     public SortedSet<E> create(Object... elements) {
-      List<?> normalValues = (List<?>) Arrays.asList(elements);
+      List<?> normalValues = (List<?>) asList(elements);
       List<E> extremeValues = new ArrayList<>();
 
       // nulls are usually out of bounds for a subset, so ban them altogether
@@ -472,7 +472,7 @@ public SortedMapSubmapTestMapGenerator(
       // derive values for inclusive filtering from the input samples
       SampleElements<Entry<K, V>> samples = delegate.samples();
       List<Entry<K, V>> samplesList =
-          Arrays.asList(samples.e0(), samples.e1(), samples.e2(), samples.e3(), samples.e4());
+          asList(samples.e0(), samples.e1(), samples.e2(), samples.e3(), samples.e4());
       Collections.sort(samplesList, entryComparator);
       this.firstInclusive = samplesList.get(0).getKey();
       this.lastInclusive = samplesList.get(samplesList.size() - 1).getKey();

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

@@ -16,6 +16,7 @@
 
 package com.google.common.collect.testing;
 
+import static java.util.Arrays.asList;
 import static java.util.Collections.disjoint;
 import static java.util.logging.Level.FINER;
 
@@ -27,7 +28,6 @@
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Enumeration;
@@ -109,7 +109,7 @@ public Runnable getTearDown() {
    */
   @CanIgnoreReturnValue
   public B withFeatures(Feature<?>... features) {
-    return withFeatures(Arrays.asList(features));
+    return withFeatures(asList(features));
   }
 
   @CanIgnoreReturnValue
@@ -157,7 +157,7 @@ public String getName() {
    */
   @CanIgnoreReturnValue
   public B suppressing(Method... methods) {
-    return suppressing(Arrays.asList(methods));
+    return suppressing(asList(methods));
   }
 
   @CanIgnoreReturnValue

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

@@ -17,6 +17,7 @@
 package com.google.common.collect.testing;
 
 import static java.lang.Math.max;
+import static java.util.Arrays.asList;
 import static java.util.Collections.sort;
 import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertFalse;
@@ -31,7 +32,6 @@
 import java.lang.reflect.Method;
 import java.util.AbstractList;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
@@ -60,7 +60,7 @@ static boolean equal(@Nullable Object a, @Nullable Object b) {
   }
 
   public static <E extends @Nullable Object> List<E> copyToList(E[] elements) {
-    return copyToList(Arrays.asList(elements));
+    return copyToList(asList(elements));
   }
 
   // Clone of Sets.newLinkedHashSet
@@ -71,7 +71,7 @@ static boolean equal(@Nullable Object a, @Nullable Object b) {
   }
 
   public static <E extends @Nullable Object> Set<E> copyToSet(E[] elements) {
-    return copyToSet(Arrays.asList(elements));
+    return copyToSet(asList(elements));
   }
 
   // Would use Maps.immutableEntry
@@ -125,7 +125,7 @@ public static void assertEqualInOrder(Iterable<?> expected, Iterable<?> actual)
   }
 
   public static void assertContentsInOrder(Iterable<?> actual, Object... expected) {
-    assertEqualInOrder(Arrays.asList(expected), actual);
+    assertEqualInOrder(asList(expected), actual);
   }
 
   public static void assertEqualIgnoringOrder(Iterable<?> expected, Iterable<?> actual) {
@@ -153,7 +153,7 @@ public static void assertEqualIgnoringOrder(Iterable<?> expected, Iterable<?> ac
   }
 
   public static void assertContentsAnyOrder(Iterable<?> actual, Object... expected) {
-    assertEqualIgnoringOrder(Arrays.asList(expected), actual);
+    assertEqualIgnoringOrder(asList(expected), actual);
   }
 
   public static void assertContains(Iterable<?> actual, Object expected) {
@@ -175,14 +175,14 @@ public static void assertContains(Iterable<?> actual, Object expected) {
   }
 
   public static void assertContainsAllOf(Iterable<?> actual, Object... expected) {
-    List<Object> expectedList = new ArrayList<>(Arrays.asList(expected));
+    List<Object> expectedList = new ArrayList<>(asList(expected));
 
     for (Object o : actual) {
       expectedList.remove(o);
     }
 
     if (!expectedList.isEmpty()) {
-      fail("Not true that " + actual + " contains all of " + Arrays.asList(expected));
+      fail("Not true that " + actual + " contains all of " + asList(expected));
     }
   }
 
@@ -283,7 +283,7 @@ Comparator<Entry<K, V>> entryComparator(@Nullable Comparator<? super K> keyCompa
    */
   public static <T extends @Nullable Object> void testComparator(
       Comparator<? super T> comparator, T... valuesInExpectedOrder) {
-    testComparator(comparator, Arrays.asList(valuesInExpectedOrder));
+    testComparator(comparator, asList(valuesInExpectedOrder));
   }
 
   /**

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

@@ -17,11 +17,11 @@
 package com.google.common.collect.testing;
 
 import static com.google.common.collect.testing.ReflectionFreeAssertThrows.assertThrows;
+import static java.util.Arrays.asList;
 import static java.util.Collections.singleton;
 
 import com.google.common.annotations.GwtCompatible;
 import com.google.common.annotations.J2ktIncompatible;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
@@ -226,23 +226,23 @@ protected final void assertInvariants(Map<K, V> map) {
 
     Object[] entrySetToArray1 = entrySet.toArray();
     assertEquals(map.size(), entrySetToArray1.length);
-    assertTrue(Arrays.asList(entrySetToArray1).containsAll(entrySet));
+    assertTrue(asList(entrySetToArray1).containsAll(entrySet));
 
     Entry<?, ?>[] entrySetToArray2 = new Entry<?, ?>[map.size() + 2];
     entrySetToArray2[map.size()] = mapEntry("foo", 1);
     assertSame(entrySetToArray2, entrySet.toArray(entrySetToArray2));
     assertNull(entrySetToArray2[map.size()]);
-    assertTrue(Arrays.asList(entrySetToArray2).containsAll(entrySet));
+    assertTrue(asList(entrySetToArray2).containsAll(entrySet));
 
     Object[] valuesToArray1 = valueCollection.toArray();
     assertEquals(map.size(), valuesToArray1.length);
-    assertTrue(Arrays.asList(valuesToArray1).containsAll(valueCollection));
+    assertTrue(asList(valuesToArray1).containsAll(valueCollection));
 
     Object[] valuesToArray2 = new Object[map.size() + 2];
     valuesToArray2[map.size()] = "foo";
     assertSame(valuesToArray2, valueCollection.toArray(valuesToArray2));
     assertNull(valuesToArray2[map.size()]);
-    assertTrue(Arrays.asList(valuesToArray2).containsAll(valueCollection));
+    assertTrue(asList(valuesToArray2).containsAll(valueCollection));
 
     if (supportsValuesHashCode) {
       int expectedHash = 0;

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

@@ -16,9 +16,10 @@
 
 package com.google.common.collect.testing;
 
+import static java.util.Arrays.asList;
+
 import com.google.common.annotations.GwtCompatible;
 import java.util.AbstractCollection;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Iterator;
 import org.checkerframework.checker.nullness.qual.NonNull;
@@ -79,7 +80,7 @@ public boolean contains(@Nullable Object object) {
       }
     }
     Platform.checkCast(type, object); // behave badly
-    return Arrays.asList(contents).contains(object);
+    return asList(contents).contains(object);
   }
 
   @Override
@@ -97,7 +98,7 @@ public boolean containsAll(Collection<?> collection) {
 
   @Override
   public Iterator<E> iterator() {
-    return Arrays.asList(contents).iterator();
+    return asList(contents).iterator();
   }
 
   @Override

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

@@ -16,8 +16,9 @@
 
 package com.google.common.collect.testing;
 
+import static java.util.Arrays.asList;
+
 import com.google.common.annotations.GwtCompatible;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Iterator;
 import org.checkerframework.checker.nullness.qual.Nullable;
@@ -52,7 +53,7 @@ public final class MinimalIterable<E extends @Nullable Object> implements Iterab
   /** Returns an iterable whose iterator returns the given elements in order. */
   public static <E extends @Nullable Object> MinimalIterable<E> of(E... elements) {
     // Make sure to get an unmodifiable iterator
-    return new MinimalIterable<>(Arrays.asList(elements).iterator());
+    return new MinimalIterable<>(asList(elements).iterator());
   }
 
   /**

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

@@ -16,9 +16,10 @@
 
 package com.google.common.collect.testing;
 
+import static java.util.Arrays.asList;
+
 import com.google.common.annotations.GwtCompatible;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 import java.util.Set;
@@ -38,7 +39,7 @@ public class MinimalSet<E extends @Nullable Object> extends MinimalCollection<E>
 
   @SuppressWarnings("unchecked") // empty Object[] as E[]
   public static <E extends @Nullable Object> MinimalSet<E> of(E... contents) {
-    return ofClassAndContents(Object.class, (E[]) new Object[0], Arrays.asList(contents));
+    return ofClassAndContents(Object.class, (E[]) new Object[0], asList(contents));
   }
 
   @SuppressWarnings("unchecked") // empty Object[] as E[]