Fix modules returning command options

Nobody reads the documentation, apparently. It also clearly states that getCommonCommandOptions should be used to add options to all commands. PiperOrigin-RevId: 196965665
werkt · May 17, 2018 · 4ca4b8d · 4ca4b8d
1 parent 64a461d
commit 4ca4b8d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/buildeventservice/BuildEventServiceModule.java b/src/main/java/com/google/devtools/build/lib/buildeventservice/BuildEventServiceModule.java
@@ -35,7 +35,6 @@
 import com.google.devtools.build.lib.events.Reporter;
 import com.google.devtools.build.lib.runtime.BlazeModule;
 import com.google.devtools.build.lib.runtime.BuildEventStreamer;
-import com.google.devtools.build.lib.runtime.Command;
 import com.google.devtools.build.lib.runtime.CommandEnvironment;
 import com.google.devtools.build.lib.runtime.SynchronizedOutputStream;
 import com.google.devtools.build.lib.util.AbruptExitException;
@@ -63,7 +62,7 @@ public abstract class BuildEventServiceModule<T extends BuildEventServiceOptions
  private Set<BuildEventTransport> transports = ImmutableSet.of();
 
  @Override
- public Iterable<Class<? extends OptionsBase>> getCommandOptions(Command command) {
+ public Iterable<Class<? extends OptionsBase>> getCommonCommandOptions() {
  return ImmutableList.of(optionsClass(), AuthAndTLSOptions.class, BuildEventStreamOptions.class);
  }
 

diff --git a/...ava/com/google/devtools/build/lib/buildeventservice/BazelBuildEventServiceModuleTest.java b/...ava/com/google/devtools/build/lib/buildeventservice/BazelBuildEventServiceModuleTest.java
@@ -122,7 +122,7 @@ public void validateMocks() {
  @Test
  public void testReturnsBuildEventStreamerOptions() throws Exception {
  BazelBuildEventServiceModule module = new BazelBuildEventServiceModule();
- Iterable<Class<? extends OptionsBase>> commandOptions = module.getCommandOptions(command);
+ Iterable<Class<? extends OptionsBase>> commandOptions = module.getCommonCommandOptions();
  assertThat(commandOptions).isNotEmpty();
  OptionsParser optionsParser = OptionsParser.newOptionsParser(commandOptions);
  optionsParser.parse(