Deduplicate annotation processor classes

Also rename the build method from add* to set*.

--
MOS_MIGRATED_REVID=118746866

3 files changed, 11 insertions, 10 deletions

diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/java/turbine/TurbineOptions.java b/src/java_tools/buildjar/java/com/google/devtools/build/java/turbine/TurbineOptions.java
index e7434c0e2d..dfe78002a7 100644
--- a/src/java_tools/buildjar/java/com/google/devtools/build/java/turbine/TurbineOptions.java
+++ b/src/java_tools/buildjar/java/com/google/devtools/build/java/turbine/TurbineOptions.java
@@ -19,6 +19,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
 import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
 
 import javax.annotation.Nullable;
 
@@ -30,7 +31,7 @@ public class TurbineOptions {
   private final ImmutableList<String> bootClassPath;
   private final ImmutableList<String> sources;
   private final ImmutableList<String> processorPath;
-  private final ImmutableList<String> processors;
+  private final ImmutableSet<String> processors;
   private final String tempDir;
   private final ImmutableList<String> sourceJars;
   private final Optional<String> outputDeps;
@@ -48,7 +49,7 @@ public class TurbineOptions {
       ImmutableList<String> bootClassPath,
       ImmutableList<String> sources,
       ImmutableList<String> processorPath,
-      ImmutableList<String> processors,
+      ImmutableSet<String> processors,
       String tempDir,
       ImmutableList<String> sourceJars,
       @Nullable String outputDeps,
@@ -110,7 +111,7 @@ public class TurbineOptions {
   }
 
   /** Annotation processor class names. */
-  public ImmutableList<String> processors() {
+  public ImmutableSet<String> processors() {
     return processors;
   }
 
@@ -174,7 +175,7 @@ public class TurbineOptions {
     private final ImmutableList.Builder<String> classPath = ImmutableList.builder();
     private final ImmutableList.Builder<String> sources = ImmutableList.builder();
     private final ImmutableList.Builder<String> processorPath = ImmutableList.builder();
-    private final ImmutableList.Builder<String> processors = ImmutableList.builder();
+    private final ImmutableSet.Builder<String> processors = ImmutableSet.builder();
     private String tempDir;
     private final ImmutableList.Builder<String> sourceJars = ImmutableList.builder();
     private final ImmutableList.Builder<String> bootClassPath = ImmutableList.builder();
@@ -238,7 +239,7 @@ public class TurbineOptions {
       return this;
     }
 
-    public Builder setProcessors(Iterable<String> processors) {
+    public Builder addProcessors(Iterable<String> processors) {
       this.processors.addAll(processors);
       return this;
     }
diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/java/turbine/TurbineOptionsParser.java b/src/java_tools/buildjar/java/com/google/devtools/build/java/turbine/TurbineOptionsParser.java
index e839ba8768..2c8d87ea1c 100644
--- a/src/java_tools/buildjar/java/com/google/devtools/build/java/turbine/TurbineOptionsParser.java
+++ b/src/java_tools/buildjar/java/com/google/devtools/build/java/turbine/TurbineOptionsParser.java
@@ -82,7 +82,7 @@ public class TurbineOptionsParser {
           builder.setTempDir(readOne(argumentDeque));
           break;
         case "--processors":
-          builder.setProcessors(readList(argumentDeque));
+          builder.addProcessors(readList(argumentDeque));
           break;
         case "--processorpath":
           builder.addProcessorPathEntries(splitClasspath(readOne(argumentDeque)));
diff --git a/src/java_tools/buildjar/javatests/com/google/devtools/build/java/turbine/javac/JavacTurbineTest.java b/src/java_tools/buildjar/javatests/com/google/devtools/build/java/turbine/javac/JavacTurbineTest.java
index 7588d647ec..52cf79ef52 100644
--- a/src/java_tools/buildjar/javatests/com/google/devtools/build/java/turbine/javac/JavacTurbineTest.java
+++ b/src/java_tools/buildjar/javatests/com/google/devtools/build/java/turbine/javac/JavacTurbineTest.java
@@ -263,7 +263,7 @@ public class JavacTurbineTest {
         "  }",
         "}");
 
-    optionsBuilder.setProcessors(ImmutableList.of(MyProcessor.class.getName()));
+    optionsBuilder.addProcessors(ImmutableList.of(MyProcessor.class.getName()));
     optionsBuilder.addProcessorPathEntries(
         ImmutableList.copyOf(Splitter.on(':').split(System.getProperty("java.class.path"))));
     optionsBuilder.addClassPathEntries(
@@ -819,7 +819,7 @@ public class JavacTurbineTest {
         "  }",
         "}");
 
-    optionsBuilder.setProcessors(ImmutableList.of(MyBadEncodingProcessor.class.getName()));
+    optionsBuilder.addProcessors(ImmutableList.of(MyBadEncodingProcessor.class.getName()));
     optionsBuilder.addProcessorPathEntries(
         ImmutableList.copyOf(Splitter.on(':').split(System.getProperty("java.class.path"))));
     optionsBuilder.addClassPathEntries(
@@ -961,7 +961,7 @@ public class JavacTurbineTest {
       }
     }
 
-    optionsBuilder.setProcessors(ImmutableList.of(HostClasspathProcessor.class.getName()));
+    optionsBuilder.addProcessors(ImmutableList.of(HostClasspathProcessor.class.getName()));
     optionsBuilder.addProcessorPathEntries(ImmutableList.of(processorJar.toString()));
     optionsBuilder.addClassPathEntries(ImmutableList.<String>of());
 
@@ -1069,7 +1069,7 @@ public class JavacTurbineTest {
   @Test
   public void processorReadsNonexistantFile() throws Exception {
     addSourceLines("Hello.java", "@Deprecated class Hello {}");
-    optionsBuilder.setProcessors(ImmutableList.of(NoSuchFileProcessor.class.getName()));
+    optionsBuilder.addProcessors(ImmutableList.of(NoSuchFileProcessor.class.getName()));
     optionsBuilder.addProcessorPathEntries(
         ImmutableList.copyOf(Splitter.on(':').split(System.getProperty("java.class.path"))));
     optionsBuilder.addSources(ImmutableList.copyOf(Iterables.transform(sources, TO_STRING)));