Use some static imports.

RELNOTES=n/a
PiperOrigin-RevId: 687404334

Author: cpovirk

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

@@ -16,6 +16,7 @@
 
 package com.google.common.collect.testing;
 
+import static java.lang.Math.max;
 import static java.util.Collections.sort;
 import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertFalse;
@@ -365,7 +366,7 @@ public static <T extends Comparable<? super T>> void testCompareToAndEquals(
 
       @Override
       public int size() {
-        return Math.max(0, data.size() + delta);
+        return max(0, data.size() + delta);
       }
 
       @Override

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

@@ -21,6 +21,7 @@
 import static com.google.common.collect.testing.features.MapFeature.ALLOWS_NULL_KEYS;
 import static com.google.common.collect.testing.features.MapFeature.ALLOWS_NULL_KEY_QUERIES;
 import static com.google.common.collect.testing.features.MapFeature.SUPPORTS_REMOVE;
+import static java.lang.Math.max;
 
 import com.google.common.annotations.GwtCompatible;
 import com.google.common.collect.Multimap;
@@ -83,7 +84,7 @@ public void testKeysElementSet() {
   @MapFeature.Require(SUPPORTS_REMOVE)
   public void testKeysRemove() {
     int original = multimap().keys().remove(k0(), 1);
-    assertEquals(Math.max(original - 1, 0), multimap().get(k0()).size());
+    assertEquals(max(original - 1, 0), multimap().get(k0()).size());
   }
 
   @CollectionSize.Require(ONE)

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

@@ -23,6 +23,7 @@
 import static com.google.common.collect.testing.SampleElements.Strings.AFTER_LAST_2;
 import static com.google.common.collect.testing.SampleElements.Strings.BEFORE_FIRST;
 import static com.google.common.collect.testing.SampleElements.Strings.BEFORE_FIRST_2;
+import static java.lang.Math.max;
 import static junit.framework.Assert.assertEquals;
 
 import com.google.common.annotations.GwtCompatible;
@@ -108,7 +109,7 @@ public static class ImmutableSetTooSmallBuilderGenerator extends TestStringSetGe
     @Override
     protected Set<String> create(String[] elements) {
       ImmutableSet.Builder<String> builder =
-          ImmutableSet.builderWithExpectedSize(Math.max(0, Sets.newHashSet(elements).size() - 1));
+          ImmutableSet.builderWithExpectedSize(max(0, Sets.newHashSet(elements).size() - 1));
       for (String e : elements) {
         builder.add(e);
       }

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

@@ -16,6 +16,8 @@
 
 package com.google.common.collect;
 
+import static java.lang.Math.min;
+
 import com.google.caliper.BeforeExperiment;
 import com.google.caliper.Benchmark;
 import com.google.caliper.Param;
@@ -51,7 +53,7 @@ void setUp() {
     while (sizeRemaining > 0) {
       // The JVM will return interned values for small ints.
       Integer value = random.nextInt(1000) + 128;
-      int count = Math.min(random.nextInt(10) + 1, sizeRemaining);
+      int count = min(random.nextInt(10) + 1, sizeRemaining);
       sizeRemaining -= count;
       hashMultiset.add(value, count);
       linkedHashMultiset.add(value, count);

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

@@ -18,6 +18,7 @@
 
 import static com.google.common.collect.Iterables.getOnlyElement;
 import static com.google.common.truth.Truth.assertThat;
+import static java.lang.Math.max;
 
 import com.google.common.collect.testing.MapTestSuiteBuilder;
 import com.google.common.collect.testing.TestStringMapGenerator;
@@ -111,7 +112,7 @@ public void testAllocArraysExpectedSize() {
 
       map.put(1, "1");
       assertThat(map.needsAllocArrays()).isFalse();
-      int expectedSize = Math.max(1, i);
+      int expectedSize = max(1, i);
       assertThat(map.entries).hasLength(expectedSize);
       assertThat(map.keys).hasLength(expectedSize);
       assertThat(map.values).hasLength(expectedSize);

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

@@ -17,7 +17,7 @@
 package com.google.common.collect;
 
 import static com.google.common.truth.Truth.assertThat;
-import static java.util.stream.Collectors.*;
+import static java.lang.Math.max;
 
 import com.google.common.annotations.GwtIncompatible;
 import com.google.common.collect.testing.SetTestSuiteBuilder;
@@ -104,7 +104,7 @@ public void testAllocArraysExpectedSize() {
 
       set.add(1);
       assertThat(set.needsAllocArrays()).isFalse();
-      int expectedSize = Math.max(1, i);
+      int expectedSize = max(1, i);
       assertThat(set.elements).hasLength(expectedSize);
     }
   }

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

@@ -15,6 +15,7 @@
 package com.google.common.collect;
 
 import static com.google.common.truth.Truth.assertThat;
+import static java.lang.Math.max;
 
 import com.google.common.collect.testing.MapTestSuiteBuilder;
 import com.google.common.collect.testing.TestStringMapGenerator;
@@ -170,7 +171,7 @@ public void testAllocArraysExpectedSize() {
 
       map.put(1, Integer.toString(1));
       assertThat(map.needsAllocArrays()).isFalse();
-      int expectedSize = Math.max(1, i);
+      int expectedSize = max(1, i);
       assertThat(map.entries).hasLength(expectedSize);
       assertThat(map.keys).hasLength(expectedSize);
       assertThat(map.values).hasLength(expectedSize);

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

@@ -17,6 +17,7 @@
 package com.google.common.collect;
 
 import static com.google.common.truth.Truth.assertThat;
+import static java.lang.Math.max;
 
 import com.google.common.annotations.GwtIncompatible;
 import com.google.common.collect.testing.SetTestSuiteBuilder;
@@ -85,7 +86,7 @@ public void testAllocArraysExpectedSize() {
 
       set.add(1);
       assertThat(set.needsAllocArrays()).isFalse();
-      int expectedSize = Math.max(1, i);
+      int expectedSize = max(1, i);
       assertThat(set.elements).hasLength(expectedSize);
     }
   }

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

@@ -16,6 +16,8 @@
 
 package com.google.common.collect;
 
+import static com.google.common.collect.Comparators.max;
+import static com.google.common.collect.Comparators.min;
 import static com.google.common.truth.Truth.assertThat;
 import static java.util.Arrays.asList;
 
@@ -75,26 +77,26 @@ public void testIsInStrictOrder() {
   }
 
   public void testMinMaxNatural() {
-    assertThat(Comparators.min(1, 2)).isEqualTo(1);
-    assertThat(Comparators.min(2, 1)).isEqualTo(1);
-    assertThat(Comparators.max(1, 2)).isEqualTo(2);
-    assertThat(Comparators.max(2, 1)).isEqualTo(2);
+    assertThat(min(1, 2)).isEqualTo(1);
+    assertThat(min(2, 1)).isEqualTo(1);
+    assertThat(max(1, 2)).isEqualTo(2);
+    assertThat(max(2, 1)).isEqualTo(2);
   }
 
   public void testMinMaxNatural_equalInstances() {
     Foo a = new Foo(1);
     Foo b = new Foo(1);
-    assertThat(Comparators.min(a, b)).isSameInstanceAs(a);
-    assertThat(Comparators.max(a, b)).isSameInstanceAs(a);
+    assertThat(min(a, b)).isSameInstanceAs(a);
+    assertThat(max(a, b)).isSameInstanceAs(a);
   }
 
   public void testMinMaxComparator() {
     Comparator<Integer> natural = Ordering.natural();
     Comparator<Integer> reverse = Collections.reverseOrder(natural);
-    assertThat(Comparators.min(1, 2, reverse)).isEqualTo(2);
-    assertThat(Comparators.min(2, 1, reverse)).isEqualTo(2);
-    assertThat(Comparators.max(1, 2, reverse)).isEqualTo(1);
-    assertThat(Comparators.max(2, 1, reverse)).isEqualTo(1);
+    assertThat(min(1, 2, reverse)).isEqualTo(2);
+    assertThat(min(2, 1, reverse)).isEqualTo(2);
+    assertThat(max(1, 2, reverse)).isEqualTo(1);
+    assertThat(max(2, 1, reverse)).isEqualTo(1);
   }
 
   /**
@@ -113,8 +115,8 @@ public int compare(Number a, Number b) {
     Integer comparand1 = 1;
     Integer comparand2 = 2;
 
-    Integer min = Comparators.min(comparand1, comparand2, numberComparator);
-    Integer max = Comparators.max(comparand1, comparand2, numberComparator);
+    Integer min = min(comparand1, comparand2, numberComparator);
+    Integer max = max(comparand1, comparand2, numberComparator);
 
     assertThat(min).isEqualTo(1);
     assertThat(max).isEqualTo(2);
@@ -125,8 +127,8 @@ public void testMinMaxComparator_equalInstances() {
     Comparator<Foo> reverse = Collections.reverseOrder(natural);
     Foo a = new Foo(1);
     Foo b = new Foo(1);
-    assertThat(Comparators.min(a, b, reverse)).isSameInstanceAs(a);
-    assertThat(Comparators.max(a, b, reverse)).isSameInstanceAs(a);
+    assertThat(min(a, b, reverse)).isSameInstanceAs(a);
+    assertThat(max(a, b, reverse)).isSameInstanceAs(a);
   }
 
   private static class Foo implements Comparable<Foo> {

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

@@ -16,6 +16,8 @@
 
 package com.google.common.collect;
 
+import static java.lang.Math.min;
+
 import com.google.common.base.Function;
 import com.google.common.primitives.Ints;
 import java.util.List;
@@ -148,7 +150,7 @@ public int[] call() throws Exception {
             {
               int delta = random.nextInt(6); // [0, 5]
               int oldValue = multiset.remove(key, delta);
-              deltas[keyIndex] -= Math.min(delta, oldValue);
+              deltas[keyIndex] -= min(delta, oldValue);
               break;
             }
           case REMOVE_EXACTLY: