Remove use of bare Immutable{List,Map,Set} Builder classes.

Always use the more-qualified class name for clarity at the site of use. There are too many classes named Builder.

PiperOrigin-RevId: 193649193

3 files changed, 6 insertions, 9 deletions

diff --git a/src/test/java/com/google/devtools/build/android/DensitySpecificResourceFilterTest.java b/src/test/java/com/google/devtools/build/android/DensitySpecificResourceFilterTest.java
index 03f38e93e9..580cea3f85 100644
--- a/src/test/java/com/google/devtools/build/android/DensitySpecificResourceFilterTest.java
+++ b/src/test/java/com/google/devtools/build/android/DensitySpecificResourceFilterTest.java
@@ -17,7 +17,6 @@ import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.fail;
 
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableList.Builder;
 import com.google.common.collect.Lists;
 import com.google.devtools.build.android.AndroidResourceMerger.MergingException;
 import java.io.IOException;
@@ -254,7 +253,7 @@ public class DensitySpecificResourceFilterTest {
   }
 
   private ImmutableList <Path> createFiles(String... pathStrings) throws IOException {
-    Builder<Path> paths = ImmutableList.builder();
+    ImmutableList.Builder<Path> paths = ImmutableList.builder();
     for (String pathString : pathStrings) {
       final Path path = tmp.resolve(pathString);
       Files.createDirectories(path.getParent());
diff --git a/src/test/java/com/google/devtools/build/lib/collect/ImmutableSortedKeyMapTest.java b/src/test/java/com/google/devtools/build/lib/collect/ImmutableSortedKeyMapTest.java
index 24282d453f..61c8acd120 100644
--- a/src/test/java/com/google/devtools/build/lib/collect/ImmutableSortedKeyMapTest.java
+++ b/src/test/java/com/google/devtools/build/lib/collect/ImmutableSortedKeyMapTest.java
@@ -18,7 +18,6 @@ import static org.junit.Assert.fail;
 
 import com.google.common.collect.Maps;
 import com.google.common.testing.NullPointerTester;
-import com.google.devtools.build.lib.collect.ImmutableSortedKeyMap.Builder;
 import java.io.Serializable;
 import java.util.Collections;
 import java.util.LinkedHashMap;
@@ -108,7 +107,7 @@ public class ImmutableSortedKeyMapTest {
 
   @Test
   public void builderPutNullKey() {
-    Builder<String, Integer> builder = new Builder<>();
+    ImmutableSortedKeyMap.Builder<String, Integer> builder = new ImmutableSortedKeyMap.Builder<>();
     try {
       builder.put(null, 1);
       fail();
@@ -118,7 +117,7 @@ public class ImmutableSortedKeyMapTest {
 
   @Test
   public void builderPutNullValue() {
-    Builder<String, Integer> builder = new Builder<>();
+    ImmutableSortedKeyMap.Builder<String, Integer> builder = new ImmutableSortedKeyMap.Builder<>();
     try {
       builder.put("one", null);
       fail();
@@ -128,7 +127,7 @@ public class ImmutableSortedKeyMapTest {
 
   @Test
   public void builderPutNullKeyViaPutAll() {
-    Builder<String, Integer> builder = new Builder<>();
+    ImmutableSortedKeyMap.Builder<String, Integer> builder = new ImmutableSortedKeyMap.Builder<>();
     try {
       builder.putAll(Collections.<String, Integer>singletonMap(null, 1));
       fail();
@@ -138,7 +137,7 @@ public class ImmutableSortedKeyMapTest {
 
   @Test
   public void builderPutNullValueViaPutAll() {
-    Builder<String, Integer> builder = new Builder<>();
+    ImmutableSortedKeyMap.Builder<String, Integer> builder = new ImmutableSortedKeyMap.Builder<>();
     try {
       builder.putAll(Collections.<String, Integer>singletonMap("one", null));
       fail();
diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/MockObjcSupport.java b/src/test/java/com/google/devtools/build/lib/packages/util/MockObjcSupport.java
index 227bb30b8f..3b10f41561 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/util/MockObjcSupport.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/util/MockObjcSupport.java
@@ -16,7 +16,6 @@ package com.google.devtools.build.lib.packages.util;
 
 import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableList.Builder;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.io.ByteStreams;
 import com.google.devtools.build.lib.testutil.TestConstants;
@@ -227,7 +226,7 @@ public final class MockObjcSupport {
       }
 
       // Create the test BUILD file.
-      Builder<String> crosstoolBuild =
+      ImmutableList.Builder<String> crosstoolBuild =
           ImmutableList.<String>builder()
               .add(
                   "package(default_visibility=['//visibility:public'])",