Global cleanup change.

--
PiperOrigin-RevId: 141307853
MOS_MIGRATED_REVID=141307853

6 files changed, 18 insertions, 15 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/packages/AspectDefinition.java b/src/main/java/com/google/devtools/build/lib/packages/AspectDefinition.java
index 0878b2c762..24d28ae5b4 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/AspectDefinition.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/AspectDefinition.java
@@ -22,6 +22,7 @@ import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ImmutableSetMultimap;
 import com.google.common.collect.LinkedHashMultimap;
 import com.google.common.collect.Multimap;
+import com.google.common.collect.SetMultimap;
 import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
 import com.google.devtools.build.lib.packages.ConfigurationFragmentPolicy.MissingFragmentPolicy;
@@ -170,7 +171,7 @@ public final class AspectDefinition {
   public static ImmutableMultimap<Attribute, Label> visitAspectsIfRequired(
       Rule from, Attribute attribute, boolean canHaveAnyProvider, Set<String> advertisedProviders,
       DependencyFilter dependencyFilter) {
-    LinkedHashMultimap<Attribute, Label> result = LinkedHashMultimap.create();
+    SetMultimap<Attribute, Label> result = LinkedHashMultimap.create();
     for (Aspect candidateClass : attribute.getAspects(from)) {
       // Check if target satisfies condition for this aspect (has to provide all required
       // TransitiveInfoProviders)
diff --git a/src/main/java/com/google/devtools/build/lib/packages/Rule.java b/src/main/java/com/google/devtools/build/lib/packages/Rule.java
index 5d233f0817..34b6ab5fb6 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/Rule.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/Rule.java
@@ -26,6 +26,7 @@ import com.google.common.collect.LinkedListMultimap;
 import com.google.common.collect.ListMultimap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Multimap;
+import com.google.common.collect.SetMultimap;
 import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.cmdline.LabelSyntaxException;
 import com.google.devtools.build.lib.cmdline.RepositoryName;
@@ -695,7 +696,7 @@ public final class Rule implements Target, DependencyFilter.AttributeInfoProvide
    * can require from its direct dependencies.
    */
   public Collection<? extends Label> getAspectLabelsSuperset(DependencyFilter predicate) {
-    LinkedHashMultimap<Attribute, Label> labels = LinkedHashMultimap.create();
+    SetMultimap<Attribute, Label> labels = LinkedHashMultimap.create();
     for (Attribute attribute : this.getAttributes()) {
       for (Aspect candidateClass : attribute.getAspects(this)) {
         AspectDefinition.addAllAttributesOfAspect(Rule.this, labels, candidateClass, predicate);
diff --git a/src/main/java/com/google/devtools/build/lib/query2/ParallelSkyQueryUtils.java b/src/main/java/com/google/devtools/build/lib/query2/ParallelSkyQueryUtils.java
index 086ecfc1b8..30a27f8e63 100644
--- a/src/main/java/com/google/devtools/build/lib/query2/ParallelSkyQueryUtils.java
+++ b/src/main/java/com/google/devtools/build/lib/query2/ParallelSkyQueryUtils.java
@@ -21,6 +21,7 @@ import com.google.common.collect.Collections2;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
+import com.google.common.collect.ListMultimap;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Multimap;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
@@ -314,7 +315,7 @@ class ParallelSkyQueryUtils {
     @Override
     protected Iterable<Task> getVisitTasks(Collection<Pair<SkyKey, SkyKey>> pendingKeysToVisit) {
       // Group pending visits by package.
-      ArrayListMultimap<PackageIdentifier, Pair<SkyKey, SkyKey>> visitsByPackage =
+      ListMultimap<PackageIdentifier, Pair<SkyKey, SkyKey>> visitsByPackage =
           ArrayListMultimap.create();
       for (Pair<SkyKey, SkyKey> visit : pendingKeysToVisit) {
         Label label = SkyQueryEnvironment.SKYKEY_TO_LABEL.apply(visit.second);
diff --git a/src/main/java/com/google/devtools/build/lib/util/OrderedSetMultimap.java b/src/main/java/com/google/devtools/build/lib/util/OrderedSetMultimap.java
index a64ddf6602..79be3d6bb5 100644
--- a/src/main/java/com/google/devtools/build/lib/util/OrderedSetMultimap.java
+++ b/src/main/java/com/google/devtools/build/lib/util/OrderedSetMultimap.java
@@ -26,7 +26,7 @@ import com.google.common.collect.SetMultimap;
  * {@link Multimap} documentation for information common to all multimaps.
  */
 public final class OrderedSetMultimap<K, V> extends ForwardingSetMultimap<K, V> {
-  private final LinkedHashMultimap<K, V> delegate = LinkedHashMultimap.<K, V>create();
+  private final SetMultimap<K, V> delegate = LinkedHashMultimap.<K, V>create();
 
   @Override
   protected SetMultimap delegate() {
diff --git a/src/main/java/com/google/devtools/build/skyframe/CycleDeduper.java b/src/main/java/com/google/devtools/build/skyframe/CycleDeduper.java
index f5ac95482f..d32f559778 100644
--- a/src/main/java/com/google/devtools/build/skyframe/CycleDeduper.java
+++ b/src/main/java/com/google/devtools/build/skyframe/CycleDeduper.java
@@ -16,6 +16,7 @@ package com.google.devtools.build.skyframe;
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.SetMultimap;
 import com.google.devtools.build.lib.util.Preconditions;
 
 /**
@@ -27,7 +28,7 @@ import com.google.devtools.build.lib.util.Preconditions;
  */
 class CycleDeduper<T> {
 
-  private HashMultimap<ImmutableSet<T>, ImmutableList<T>> knownCyclesByMembers =
+  private SetMultimap<ImmutableSet<T>, ImmutableList<T>> knownCyclesByMembers =
       HashMultimap.create();
 
   /**
diff --git a/src/test/java/com/google/devtools/build/lib/collect/ImmutableSortedKeyListMultimapTest.java b/src/test/java/com/google/devtools/build/lib/collect/ImmutableSortedKeyListMultimapTest.java
index 8c26deffa2..7b3f8e7f7a 100644
--- a/src/test/java/com/google/devtools/build/lib/collect/ImmutableSortedKeyListMultimapTest.java
+++ b/src/test/java/com/google/devtools/build/lib/collect/ImmutableSortedKeyListMultimapTest.java
@@ -23,20 +23,19 @@ import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.HashMultiset;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.LinkedListMultimap;
+import com.google.common.collect.ListMultimap;
 import com.google.common.collect.Multimap;
 import com.google.common.collect.testing.google.UnmodifiableCollectionTests;
 import com.google.common.testing.EqualsTester;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
 import java.util.AbstractMap.SimpleImmutableEntry;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Map;
 import java.util.Set;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 /**
  * A test for {@link ImmutableSortedKeyListMultimap}. Started out as a copy of
@@ -191,7 +190,7 @@ public class ImmutableSortedKeyListMultimapTest {
 
   @Test
   public void copyOf() {
-    ArrayListMultimap<String, Integer> input = ArrayListMultimap.create();
+    ListMultimap<String, Integer> input = ArrayListMultimap.create();
     input.put("foo", 1);
     input.put("bar", 2);
     input.put("foo", 3);
@@ -202,7 +201,7 @@ public class ImmutableSortedKeyListMultimapTest {
 
   @Test
   public void copyOfWithDuplicates() {
-    ArrayListMultimap<String, Integer> input = ArrayListMultimap.create();
+    ListMultimap<String, Integer> input = ArrayListMultimap.create();
     input.put("foo", 1);
     input.put("bar", 2);
     input.put("foo", 3);
@@ -214,7 +213,7 @@ public class ImmutableSortedKeyListMultimapTest {
 
   @Test
   public void copyOfEmpty() {
-    ArrayListMultimap<String, Integer> input = ArrayListMultimap.create();
+    ListMultimap<String, Integer> input = ArrayListMultimap.create();
     Multimap<String, Integer> multimap = ImmutableSortedKeyListMultimap.copyOf(input);
     assertEquals(multimap, input);
     assertEquals(input, multimap);
@@ -228,7 +227,7 @@ public class ImmutableSortedKeyListMultimapTest {
 
   @Test
   public void copyOfNullKey() {
-    ArrayListMultimap<String, Integer> input = ArrayListMultimap.create();
+    ListMultimap<String, Integer> input = ArrayListMultimap.create();
     input.put(null, 1);
     try {
       ImmutableSortedKeyListMultimap.copyOf(input);
@@ -238,7 +237,7 @@ public class ImmutableSortedKeyListMultimapTest {
 
   @Test
   public void copyOfNullValue() {
-    ArrayListMultimap<String, Integer> input = ArrayListMultimap.create();
+    ListMultimap<String, Integer> input = ArrayListMultimap.create();
     input.putAll("foo", Arrays.asList(1, null, 3));
     try {
       ImmutableSortedKeyListMultimap.copyOf(input);