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
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
index bee10809..4ff32f1 100644
--- 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 @@
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/src/test/java/com/google/devtools/build/lib/buildeventservice/BazelBuildEventServiceModuleTest.java b/src/test/java/com/google/devtools/build/lib/buildeventservice/BazelBuildEventServiceModuleTest.java
index e365f8c..2b3afda 100644
--- a/src/test/java/com/google/devtools/build/lib/buildeventservice/BazelBuildEventServiceModuleTest.java
+++ b/src/test/java/com/google/devtools/build/lib/buildeventservice/BazelBuildEventServiceModuleTest.java
@@ -122,7 +122,7 @@
@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(
