Merge branch 'master' into fix-7855-concurrentmap-spliterators

Author: holly-agyei

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

@@ -14,14 +14,14 @@
 
 package com.google.common.collect.testing.google;
 
+import static com.google.common.collect.Lists.newArrayList;
 import static com.google.common.collect.testing.Helpers.mapEntry;
 import static com.google.common.collect.testing.features.CollectionSize.SEVERAL;
 import static com.google.common.collect.testing.features.MapFeature.SUPPORTS_REMOVE;
 import static java.util.Collections.singletonList;
 import static java.util.Collections.singletonMap;
 
 import com.google.common.annotations.GwtCompatible;
-import com.google.common.collect.Lists;
 import com.google.common.collect.testing.features.CollectionSize;
 import com.google.common.collect.testing.features.MapFeature;
 import com.google.common.testing.EqualsTester;
@@ -76,17 +76,17 @@ public void testAsMapRemoveImplementsList() {
   public void testEquals() {
     resetContainer(mapEntry(k0(), v0()), mapEntry(k1(), v0()), mapEntry(k0(), v3()));
     Map<K, Collection<V>> expected = new HashMap<>();
-    expected.put(k0(), Lists.newArrayList(v0(), v3()));
-    expected.put(k1(), Lists.newArrayList(v0()));
+    expected.put(k0(), newArrayList(v0(), v3()));
+    expected.put(k1(), newArrayList(v0()));
     new EqualsTester().addEqualityGroup(expected, multimap().asMap()).testEquals();
   }
 
   @CollectionSize.Require(SEVERAL)
   public void testEntrySetEquals() {
     resetContainer(mapEntry(k0(), v0()), mapEntry(k1(), v0()), mapEntry(k0(), v3()));
     Set<Entry<K, Collection<V>>> expected = new HashSet<>();
-    expected.add(mapEntry(k0(), (Collection<V>) Lists.newArrayList(v0(), v3())));
-    expected.add(mapEntry(k1(), (Collection<V>) Lists.newArrayList(v0())));
+    expected.add(mapEntry(k0(), (Collection<V>) newArrayList(v0(), v3())));
+    expected.add(mapEntry(k1(), (Collection<V>) newArrayList(v0())));
     new EqualsTester().addEqualityGroup(expected, multimap().asMap().entrySet()).testEquals();
   }
 
@@ -102,6 +102,6 @@ public void testValuesRemove() {
     resetContainer(mapEntry(k0(), v0()), mapEntry(k1(), v0()), mapEntry(k0(), v3()));
     assertTrue(multimap().asMap().values().remove(singletonList(v0())));
     assertEquals(2, multimap().size());
-    assertEquals(singletonMap(k0(), Lists.newArrayList(v0(), v3())), multimap().asMap());
+    assertEquals(singletonMap(k0(), newArrayList(v0(), v3())), multimap().asMap());
   }
 }

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

@@ -16,6 +16,7 @@
 
 package com.google.common.collect.testing.google;
 
+import static com.google.common.collect.Lists.newArrayList;
 import static com.google.common.collect.testing.Helpers.assertContains;
 import static com.google.common.collect.testing.Helpers.assertEmpty;
 import static com.google.common.collect.testing.Helpers.assertEqualIgnoringOrder;
@@ -29,7 +30,6 @@
 
 import com.google.common.annotations.GwtCompatible;
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
 import com.google.common.collect.Multimap;
 import com.google.common.collect.testing.features.CollectionSize;
 import com.google.common.collect.testing.features.MapFeature;
@@ -105,7 +105,7 @@ public void testPutNullValue_supported() {
 
     multimap().put(k3(), null);
 
-    assertGet(k3(), Lists.newArrayList((V) null)); // ImmutableList.of can't take null.
+    assertGet(k3(), newArrayList((V) null)); // ImmutableList.of can't take null.
     assertEquals(size + 1, multimap().size());
   }
 

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

@@ -16,6 +16,7 @@
 
 import static com.google.common.collect.BoundType.CLOSED;
 import static com.google.common.collect.BoundType.OPEN;
+import static com.google.common.collect.Lists.newArrayList;
 import static com.google.common.collect.testing.Helpers.copyToList;
 import static com.google.common.collect.testing.features.CollectionFeature.SUPPORTS_ADD;
 import static com.google.common.collect.testing.features.CollectionFeature.SUPPORTS_REMOVE;
@@ -30,7 +31,6 @@
 
 import com.google.common.annotations.GwtCompatible;
 import com.google.common.collect.BoundType;
-import com.google.common.collect.Iterators;
 import com.google.common.collect.Multiset.Entry;
 import com.google.common.collect.Multisets;
 import com.google.common.collect.SortedMultiset;
@@ -224,10 +224,9 @@ public void testPollLastUnsupported() {
 
   @CollectionSize.Require(SEVERAL)
   public void testDescendingNavigation() {
-    List<Entry<E>> ascending = new ArrayList<>();
-    Iterators.addAll(ascending, sortedMultiset.entrySet().iterator());
-    List<Entry<E>> descending = new ArrayList<>();
-    Iterators.addAll(descending, sortedMultiset.descendingMultiset().entrySet().iterator());
+    List<Entry<E>> ascending = newArrayList(sortedMultiset.entrySet().iterator());
+    List<Entry<E>> descending =
+        newArrayList(sortedMultiset.descendingMultiset().entrySet().iterator());
     Collections.reverse(descending);
     assertEquals(ascending, descending);
   }

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

@@ -17,6 +17,7 @@
 package com.google.common.collect.testing.google;
 
 import static com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.collect.Lists.newArrayList;
 import static com.google.common.collect.Sets.newHashSet;
 import static com.google.common.collect.Sets.newTreeSet;
 import static com.google.common.collect.testing.SampleElements.Strings.AFTER_LAST;
@@ -34,7 +35,6 @@
 import com.google.common.collect.DiscreteDomain;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ImmutableSortedSet;
-import com.google.common.collect.Lists;
 import com.google.common.collect.Ordering;
 import com.google.common.collect.Range;
 import com.google.common.collect.testing.TestCollidingSetGenerator;
@@ -144,7 +144,7 @@ protected SortedSet<String> create(String[] elements) {
   public static class ImmutableSortedSetHeadsetGenerator extends TestStringSortedSetGenerator {
     @Override
     protected SortedSet<String> create(String[] elements) {
-      List<String> list = Lists.newArrayList(elements);
+      List<String> list = newArrayList(elements);
       list.add("zzz");
       return ImmutableSortedSet.copyOf(list).headSet("zzy");
     }
@@ -153,7 +153,7 @@ protected SortedSet<String> create(String[] elements) {
   public static class ImmutableSortedSetTailsetGenerator extends TestStringSortedSetGenerator {
     @Override
     protected SortedSet<String> create(String[] elements) {
-      List<String> list = Lists.newArrayList(elements);
+      List<String> list = newArrayList(elements);
       list.add("\0");
       return ImmutableSortedSet.copyOf(list).tailSet("\0\0");
     }
@@ -162,7 +162,7 @@ protected SortedSet<String> create(String[] elements) {
   public static class ImmutableSortedSetSubsetGenerator extends TestStringSortedSetGenerator {
     @Override
     protected SortedSet<String> create(String[] elements) {
-      List<String> list = Lists.newArrayList(elements);
+      List<String> list = newArrayList(elements);
       list.add("\0");
       list.add("zzz");
       return ImmutableSortedSet.copyOf(list).subSet("\0\0", "zzy");

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

@@ -19,6 +19,7 @@
 import static com.google.common.base.Predicates.and;
 import static com.google.common.base.Predicates.not;
 import static com.google.common.collect.Iterables.filter;
+import static com.google.common.collect.Maps.newTreeMap;
 import static com.google.common.testing.AbstractPackageSanityTests.Chopper.suffix;
 import static com.google.common.testing.SerializableTester.reserialize;
 import static com.google.common.testing.SerializableTester.reserializeAndAssert;
@@ -29,7 +30,6 @@
 import com.google.common.base.Predicate;
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Maps;
 import com.google.common.collect.Multimap;
 import com.google.common.reflect.ClassPath;
 import com.google.common.testing.NullPointerTester.Visibility;
@@ -340,7 +340,7 @@ private static AssertionError sanityError(
   List<Class<?>> findClassesToTest(
       Iterable<? extends Class<?>> classes, Iterable<String> explicitTestNames) {
     // "a.b.Foo" -> a.b.Foo.class
-    TreeMap<String, Class<?>> classMap = Maps.newTreeMap();
+    TreeMap<String, Class<?>> classMap = newTreeMap();
     for (Class<?> cls : classes) {
       classMap.put(cls.getName(), cls);
     }

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

@@ -17,7 +17,11 @@
 package com.google.common.testing;
 
 import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Predicates.alwaysTrue;
 import static com.google.common.collect.Iterators.peekingIterator;
+import static com.google.common.collect.Maps.difference;
+import static com.google.common.collect.Maps.newConcurrentMap;
+import static com.google.common.collect.Maps.newTreeMap;
 import static com.google.common.collect.Maps.unmodifiableNavigableMap;
 import static com.google.common.collect.Sets.newTreeSet;
 import static com.google.common.collect.Sets.unmodifiableNavigableSet;
@@ -34,7 +38,6 @@
 import com.google.common.base.Equivalence;
 import com.google.common.base.Joiner;
 import com.google.common.base.Predicate;
-import com.google.common.base.Predicates;
 import com.google.common.base.Splitter;
 import com.google.common.base.Stopwatch;
 import com.google.common.base.Ticker;
@@ -56,7 +59,6 @@
 import com.google.common.collect.ImmutableTable;
 import com.google.common.collect.ListMultimap;
 import com.google.common.collect.MapDifference;
-import com.google.common.collect.Maps;
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Multimaps;
 import com.google.common.collect.Multiset;
@@ -219,7 +221,7 @@ private static MatchResult createMatchResult() {
           .put(Joiner.class, Joiner.on(','))
           .put(Splitter.class, Splitter.on(','))
           .put(com.google.common.base.Optional.class, com.google.common.base.Optional.absent())
-          .put(Predicate.class, Predicates.alwaysTrue())
+          .put(Predicate.class, alwaysTrue())
           .put(Equivalence.class, Equivalence.equals())
           .put(Ticker.class, Ticker.systemTicker())
           .put(Stopwatch.class, Stopwatch.createUnstarted())
@@ -260,7 +262,7 @@ private static MatchResult createMatchResult() {
           .put(ImmutableMap.class, ImmutableMap.of())
           .put(SortedMap.class, ImmutableSortedMap.of())
           .put(ImmutableSortedMap.class, ImmutableSortedMap.of())
-          .put(NavigableMap.class, unmodifiableNavigableMap(Maps.newTreeMap()))
+          .put(NavigableMap.class, unmodifiableNavigableMap(newTreeMap()))
           .put(Multimap.class, ImmutableMultimap.of())
           .put(ImmutableMultimap.class, ImmutableMultimap.of())
           .put(ListMultimap.class, ImmutableListMultimap.of())
@@ -285,10 +287,10 @@ private static MatchResult createMatchResult() {
           .put(Comparator.class, AlwaysEqual.INSTANCE)
           .put(Ordering.class, AlwaysEqual.INSTANCE)
           .put(Range.class, Range.all())
-          .put(MapDifference.class, Maps.difference(ImmutableMap.of(), ImmutableMap.of()))
+          .put(MapDifference.class, difference(ImmutableMap.of(), ImmutableMap.of()))
           .put(
               SortedMapDifference.class,
-              Maps.difference(ImmutableSortedMap.of(), ImmutableSortedMap.of()))
+              difference(ImmutableSortedMap.of(), ImmutableSortedMap.of()))
           // reflect
           .put(AnnotatedElement.class, Object.class)
           .put(GenericDeclaration.class, Object.class)
@@ -299,7 +301,7 @@ private static MatchResult createMatchResult() {
    * type → implementation. Inherently mutable interfaces and abstract classes are mapped to their
    * default implementations and are "new"d upon get().
    */
-  private static final ConcurrentMap<Class<?>, Class<?>> implementations = Maps.newConcurrentMap();
+  private static final ConcurrentMap<Class<?>, Class<?>> implementations = newConcurrentMap();
 
   private static <T> void setImplementation(Class<T> type, Class<? extends T> implementation) {
     checkArgument(type != implementation, "Don't register %s to itself!", type);

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

@@ -20,6 +20,7 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Throwables.throwIfUnchecked;
 import static com.google.common.collect.Lists.newArrayListWithCapacity;
+import static com.google.common.collect.Lists.reverse;
 import static com.google.common.testing.NullPointerTester.isNullable;
 import static com.google.common.testing.SerializableTester.reserialize;
 import static com.google.common.testing.SerializableTester.reserializeAndAssert;
@@ -31,7 +32,6 @@
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ListMultimap;
-import com.google.common.collect.Lists;
 import com.google.common.collect.MutableClassToInstanceMap;
 import com.google.common.collect.Ordering;
 import com.google.common.reflect.Invokable;
@@ -307,7 +307,7 @@ void doTestEquals(Class<?> cls)
     if (cls.isEnum()) {
       return;
     }
-    List<? extends Invokable<?, ?>> factories = Lists.reverse(getFactories(TypeToken.of(cls)));
+    List<? extends Invokable<?, ?>> factories = reverse(getFactories(TypeToken.of(cls)));
     if (factories.isEmpty()) {
       return;
     }

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

@@ -17,13 +17,13 @@
 package com.google.common.testing;
 
 import static com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.collect.Lists.asList;
 import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertTrue;
 
 import com.google.common.annotations.GwtCompatible;
 import com.google.common.base.Equivalence;
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
 import com.google.common.testing.RelationshipTester.Item;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import java.util.ArrayList;
@@ -77,7 +77,7 @@ public static <T> EquivalenceTester<T> of(Equivalence<? super T> equivalence) {
    */
   @CanIgnoreReturnValue
   public EquivalenceTester<T> addEquivalenceGroup(T first, T... rest) {
-    addEquivalenceGroup(Lists.asList(first, rest));
+    addEquivalenceGroup(asList(first, rest));
     return this;
   }
 

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

@@ -19,6 +19,8 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Throwables.throwIfUnchecked;
 import static com.google.common.collect.Lists.newArrayListWithCapacity;
+import static com.google.common.collect.Maps.newConcurrentMap;
+import static com.google.common.collect.Maps.newTreeMap;
 import static com.google.common.collect.Sets.newTreeSet;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.Arrays.asList;
@@ -54,7 +56,6 @@
 import com.google.common.collect.LinkedHashMultimap;
 import com.google.common.collect.LinkedHashMultiset;
 import com.google.common.collect.ListMultimap;
-import com.google.common.collect.Maps;
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Multiset;
 import com.google.common.collect.Ordering;
@@ -780,12 +781,12 @@ static <K, V> ImmutableMap<K, V> generateImmutableMap(K key, V value) {
 
   @Empty
   static <K, V> ConcurrentMap<K, V> generateConcurrentMap() {
-    return Maps.newConcurrentMap();
+    return newConcurrentMap();
   }
 
   @Generates
   static <K, V> ConcurrentMap<K, V> generateConcurrentMap(K key, V value) {
-    ConcurrentMap<K, V> map = Maps.newConcurrentMap();
+    ConcurrentMap<K, V> map = newConcurrentMap();
     map.put(key, value);
     return map;
   }
@@ -805,7 +806,7 @@ static <K extends Comparable<? super K>, V> NavigableMap<K, V> generateNavigable
   @Generates
   static <K extends Comparable<? super K>, V> TreeMap<K, V> generateTreeMap(
       K key, @Nullable V value) {
-    TreeMap<K, V> map = Maps.newTreeMap();
+    TreeMap<K, V> map = newTreeMap();
     map.put(key, value);
     return map;
   }

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

@@ -18,6 +18,7 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.collect.Maps.newConcurrentMap;
 import static java.util.Arrays.stream;
 import static java.util.Objects.requireNonNull;
 import static java.util.stream.Stream.concat;
@@ -28,7 +29,6 @@
 import com.google.common.collect.ClassToInstanceMap;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Maps;
 import com.google.common.collect.MutableClassToInstanceMap;
 import com.google.common.reflect.Invokable;
 import com.google.common.reflect.Parameter;
@@ -314,7 +314,7 @@ final ImmutableList<Method> getStaticMethods(Class<?> cls) {
     }
 
     final Iterable<Method> getInstanceMethods(Class<?> cls) {
-      ConcurrentMap<Signature, Method> map = Maps.newConcurrentMap();
+      ConcurrentMap<Signature, Method> map = newConcurrentMap();
       for (Method method : getVisibleMethods(cls)) {
         if (!Invokable.from(method).isStatic()) {
           map.putIfAbsent(new Signature(method), method);