Skip to content

Commit 6881739

Browse files
cpovirkGoogle Java Core Libraries
cpovirk
authored and
Google Java Core Libraries
committed
Use more static imports.
This CL covers APIs that we've already covered in the past (probably most but not all of them), but it covers more usages of them because it's produced after cl/897308244. I suspect that another run after this one will catch yet more occurrences, such as the qualified usage of `Sets.newLinkedHashSet` in `CacheBuilderFactory`, that may have been missed because they "overlapped" with other changes in this CL? But I won't know until I try. (Maybe I just haven't done `newLinkedHashSet` yet, or maybe I dropped it from my list somewhere along the way.) RELNOTES=n/a PiperOrigin-RevId: 900294868
1 parent ce39d2b commit 6881739

435 files changed

Lines changed: 2007 additions & 1772 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616

1717
package com.google.common.collect.testing;
1818

19+
import static java.util.Arrays.asList;
20+
1921
import com.google.common.annotations.GwtIncompatible;
2022
import com.google.common.collect.testing.testers.CollectionAddAllTester;
2123
import com.google.common.collect.testing.testers.CollectionAddTester;
@@ -33,7 +35,6 @@
3335
import com.google.common.collect.testing.testers.CollectionSizeTester;
3436
import com.google.common.collect.testing.testers.CollectionToArrayTester;
3537
import com.google.common.collect.testing.testers.CollectionToStringTester;
36-
import java.util.Arrays;
3738
import java.util.Collection;
3839
import java.util.List;
3940

@@ -49,7 +50,7 @@ public abstract class AbstractCollectionTestSuiteBuilder<
4950
@SuppressWarnings("rawtypes") // class literals
5051
@Override
5152
protected List<Class<? extends AbstractTester>> getTesters() {
52-
return Arrays.asList(
53+
return asList(
5354
CollectionAddAllTester.class,
5455
CollectionAddTester.class,
5556
CollectionClearTester.class,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818

1919
import static com.google.common.collect.testing.features.CollectionFeature.SERIALIZABLE;
2020
import static com.google.common.collect.testing.features.CollectionFeature.SERIALIZABLE_INCLUDING_VIEWS;
21+
import static com.google.common.testing.SerializableTester.reserialize;
2122

2223
import com.google.common.annotations.GwtIncompatible;
2324
import com.google.common.collect.testing.features.Feature;
24-
import com.google.common.testing.SerializableTester;
2525
import java.util.ArrayList;
2626
import java.util.Collection;
2727
import java.util.HashSet;
@@ -79,7 +79,7 @@ public SampleElements<E> samples() {
7979

8080
@Override
8181
public Collection<E> create(Object... elements) {
82-
return SerializableTester.reserialize(gen.create(elements));
82+
return reserialize(gen.create(elements));
8383
}
8484

8585
@Override

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@
1616

1717
package com.google.common.collect.testing;
1818

19+
import static java.util.Collections.singleton;
20+
1921
import com.google.common.annotations.GwtCompatible;
20-
import java.util.Collections;
2122
import java.util.Iterator;
2223
import org.jspecify.annotations.NullMarked;
2324
import org.jspecify.annotations.Nullable;
@@ -98,7 +99,7 @@ protected IteratorTester(
9899
Iterable<? extends IteratorFeature> features,
99100
Iterable<E> expectedElements,
100101
KnownOrder knownOrder) {
101-
super(steps, Collections.singleton(null), features, expectedElements, knownOrder, 0);
102+
super(steps, singleton(null), features, expectedElements, knownOrder, 0);
102103
}
103104

104105
@Override

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import static com.google.common.collect.testing.features.CollectionFeature.KNOWN_ORDER;
2121
import static com.google.common.collect.testing.features.CollectionFeature.SERIALIZABLE;
2222
import static com.google.common.collect.testing.features.CollectionFeature.SERIALIZABLE_INCLUDING_VIEWS;
23+
import static com.google.common.testing.SerializableTester.reserialize;
2324

2425
import com.google.common.annotations.GwtIncompatible;
2526
import com.google.common.collect.testing.features.CollectionFeature;
@@ -43,7 +44,6 @@
4344
import com.google.common.collect.testing.testers.ListSetTester;
4445
import com.google.common.collect.testing.testers.ListSubListTester;
4546
import com.google.common.collect.testing.testers.ListToArrayTester;
46-
import com.google.common.testing.SerializableTester;
4747
import java.util.ArrayList;
4848
import java.util.Collection;
4949
import java.util.HashSet;
@@ -135,7 +135,7 @@ public SampleElements<E> samples() {
135135

136136
@Override
137137
public List<E> create(Object... elements) {
138-
return (List<E>) SerializableTester.reserialize(gen.create(elements));
138+
return (List<E>) reserialize(gen.create(elements));
139139
}
140140

141141
@Override

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818

1919
import static com.google.common.collect.testing.DerivedCollectionGenerators.keySetGenerator;
2020
import static com.google.common.collect.testing.Helpers.copyToSet;
21+
import static com.google.common.testing.SerializableTester.reserialize;
22+
import static java.util.Arrays.asList;
2123

2224
import com.google.common.annotations.GwtIncompatible;
2325
import com.google.common.collect.testing.DerivedCollectionGenerators.MapEntrySetGenerator;
@@ -41,8 +43,6 @@
4143
import com.google.common.collect.testing.testers.MapSerializationTester;
4244
import com.google.common.collect.testing.testers.MapSizeTester;
4345
import com.google.common.collect.testing.testers.MapToStringTester;
44-
import com.google.common.testing.SerializableTester;
45-
import java.util.Arrays;
4646
import java.util.HashSet;
4747
import java.util.List;
4848
import java.util.Map;
@@ -66,7 +66,7 @@ public static <K, V> MapTestSuiteBuilder<K, V> using(TestMapGenerator<K, V> gene
6666
@SuppressWarnings("rawtypes") // class literals
6767
@Override
6868
protected List<Class<? extends AbstractTester>> getTesters() {
69-
return Arrays.asList(
69+
return asList(
7070
MapClearTester.class,
7171
MapContainsKeyTester.class,
7272
MapContainsValueTester.class,
@@ -251,7 +251,7 @@ public Iterable<Entry<K, V>> order(List<Entry<K, V>> insertionOrder) {
251251

252252
@Override
253253
public Map<K, V> create(Object... elements) {
254-
return SerializableTester.reserialize(mapGenerator.create(elements));
254+
return reserialize(mapGenerator.create(elements));
255255
}
256256

257257
@Override

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public TestSuite createTestSuite() {
6767
logger.fine(" Testing: " + name);
6868

6969
// Split out all the specified sizes.
70-
Set<Feature<?>> sizesToTest = Helpers.copyToSet(CollectionSize.values());
70+
Set<Feature<?>> sizesToTest = copyToSet(CollectionSize.values());
7171
sizesToTest.retainAll(features);
7272
features.removeAll(sizesToTest);
7373

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import static com.google.common.collect.testing.Helpers.copyToList;
2020
import static com.google.common.collect.testing.features.CollectionFeature.SERIALIZABLE;
2121
import static com.google.common.collect.testing.features.CollectionFeature.SERIALIZABLE_INCLUDING_VIEWS;
22+
import static com.google.common.testing.SerializableTester.reserialize;
2223

2324
import com.google.common.annotations.GwtIncompatible;
2425
import com.google.common.collect.testing.features.Feature;
@@ -29,7 +30,6 @@
2930
import com.google.common.collect.testing.testers.SetEqualsTester;
3031
import com.google.common.collect.testing.testers.SetHashCodeTester;
3132
import com.google.common.collect.testing.testers.SetRemoveTester;
32-
import com.google.common.testing.SerializableTester;
3333
import java.util.ArrayList;
3434
import java.util.Collection;
3535
import java.util.HashSet;
@@ -101,7 +101,7 @@ public SampleElements<E> samples() {
101101

102102
@Override
103103
public Set<E> create(Object... elements) {
104-
return (Set<E>) SerializableTester.reserialize(gen.create(elements));
104+
return (Set<E>) reserialize(gen.create(elements));
105105
}
106106

107107
@Override

‎android/guava-testlib/src/com/google/common/collect/testing/features/TesterRequirements.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
package com.google.common.collect.testing.features;
1818

1919
import static com.google.common.collect.testing.Helpers.copyToSet;
20+
import static java.util.Collections.emptySet;
2021

2122
import com.google.common.annotations.GwtCompatible;
2223
import com.google.common.annotations.GwtIncompatible;
2324
import com.google.common.annotations.J2ktIncompatible;
24-
import java.util.Collections;
2525
import java.util.Set;
2626
import org.jspecify.annotations.Nullable;
2727

@@ -46,7 +46,7 @@ public TesterRequirements(TesterRequirements tr) {
4646
}
4747

4848
public TesterRequirements() {
49-
this(Collections.emptySet(), Collections.emptySet());
49+
this(emptySet(), emptySet());
5050
}
5151

5252
public final Set<Feature<?>> getPresentFeatures() {

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,17 @@
1717
package com.google.common.collect.testing.google;
1818

1919
import static com.google.common.collect.testing.features.CollectionFeature.SERIALIZABLE;
20+
import static com.google.common.testing.SerializableTester.reserialize;
21+
import static java.util.Collections.singletonList;
2022

2123
import com.google.common.annotations.GwtCompatible;
2224
import com.google.common.annotations.GwtIncompatible;
2325
import com.google.common.annotations.J2ktIncompatible;
2426
import com.google.common.collect.BiMap;
2527
import com.google.common.collect.testing.Helpers;
2628
import com.google.common.collect.testing.features.CollectionFeature;
27-
import com.google.common.testing.SerializableTester;
2829
import java.io.Serializable;
2930
import java.lang.reflect.Method;
30-
import java.util.Collections;
3131
import java.util.List;
3232
import org.junit.Ignore;
3333

@@ -52,7 +52,7 @@ public void testInverseSame() {
5252
@CollectionFeature.Require(SERIALIZABLE)
5353
public void testInverseSerialization() {
5454
BiMapPair<K, V> pair = new BiMapPair<>(getMap());
55-
BiMapPair<K, V> copy = SerializableTester.reserialize(pair);
55+
BiMapPair<K, V> copy = reserialize(pair);
5656
assertEquals(pair.forward, copy.forward);
5757
assertEquals(pair.backward, copy.backward);
5858
assertSame(copy.backward, copy.forward.inverse());
@@ -78,7 +78,7 @@ private static final class BiMapPair<K, V> implements Serializable {
7878
@J2ktIncompatible
7979
@GwtIncompatible // reflection
8080
public static List<Method> getInverseSameAfterSerializingMethods() {
81-
return Collections.singletonList(getMethod("testInverseSerialization"));
81+
return singletonList(getMethod("testInverseSerialization"));
8282
}
8383

8484
@J2ktIncompatible

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import static com.google.common.collect.testing.features.MapFeature.ALLOWS_NULL_KEYS;
2323
import static com.google.common.collect.testing.features.MapFeature.ALLOWS_NULL_VALUES;
2424
import static com.google.common.collect.testing.features.MapFeature.SUPPORTS_PUT;
25+
import static java.util.Collections.emptyList;
2526
import static java.util.Collections.singletonList;
2627
import static org.junit.Assert.assertThrows;
2728

@@ -148,7 +149,7 @@ public void testPutAllNullForbidden() {
148149
@SuppressWarnings("EmptyList") // ImmutableList doesn't support nullable element types
149150
@MapFeature.Require(SUPPORTS_PUT)
150151
public void testPutAllEmptyCollectionOnAbsentKey() {
151-
assertFalse(multimap().putAll(k3(), Collections.emptyList()));
152+
assertFalse(multimap().putAll(k3(), emptyList()));
152153
expectUnchanged();
153154
}
154155

@@ -162,7 +163,7 @@ public void testPutAllEmptyIterableOnAbsentKey() {
162163
@CollectionSize.Require(absent = ZERO)
163164
@MapFeature.Require(SUPPORTS_PUT)
164165
public void testPutAllEmptyIterableOnPresentKey() {
165-
multimap().putAll(k0(), Collections.emptyList());
166+
multimap().putAll(k0(), emptyList());
166167
expectUnchanged();
167168
}
168169

0 commit comments

Comments
 (0)