Add a ServerBuilder, and use that in the module API.

This change is similar to a previous change that introduced WorkspaceBuilder.

--
MOS_MIGRATED_REVID=126799657

2 files changed, 12 insertions, 15 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/DocumentationTestUtil.java b/src/test/java/com/google/devtools/build/lib/packages/util/DocumentationTestUtil.java
index 0836b5fdfd..2654b45917 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/util/DocumentationTestUtil.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/util/DocumentationTestUtil.java
@@ -16,18 +16,17 @@ package com.google.devtools.build.lib.packages.util;
 
 import static com.google.common.truth.Truth.assertWithMessage;
 
-import com.google.common.collect.Iterables;
 import com.google.devtools.build.docgen.DocCheckerUtils;
 import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider;
 import com.google.devtools.build.lib.runtime.BlazeCommand;
 import com.google.devtools.build.lib.runtime.BlazeCommandUtils;
 import com.google.devtools.build.lib.runtime.BlazeModule;
 import com.google.devtools.build.lib.runtime.BlazeRuntime;
+import com.google.devtools.build.lib.runtime.BuiltinCommandModule;
+import com.google.devtools.build.lib.runtime.ServerBuilder;
 import com.google.devtools.common.options.Options;
 import com.google.devtools.common.options.OptionsBase;
 
-import java.io.IOException;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -47,13 +46,13 @@ public abstract class DocumentationTestUtil {
           Pattern.CASE_INSENSITIVE);
 
   /**
-   * Validates that a user manual {@code documentationSource} contains only
-   * the flags actually provided by a given set of modules.
+   * Validates that a user manual {@code documentationSource} contains only the flags actually
+   * provided by a given set of modules.
    */
   public static void validateUserManual(
       List<Class<? extends BlazeModule>> modules,
-      ConfiguredRuleClassProvider ruleClassProvider, String documentationSource)
-      throws IOException {
+      ConfiguredRuleClassProvider ruleClassProvider,
+      String documentationSource) {
     // if there is a class missing, one can find it using
     //   find . -name "*.java" -exec grep -Hn "@Option(name = " {} \; | grep "xxx"
     // where 'xxx' is a flag name.
@@ -68,11 +67,12 @@ public abstract class DocumentationTestUtil {
     }
 
     // collect all command options
-    List<BlazeCommand> blazeCommands = new ArrayList<>();
-    blazeCommands.addAll(BlazeRuntime.getBuiltinCommandList());
+    ServerBuilder serverBuilder = new ServerBuilder();
+    new BuiltinCommandModule().serverInit(null, serverBuilder);
     for (BlazeModule module : blazeModules) {
-      Iterables.addAll(blazeCommands, module.getCommands());
+      module.serverInit(null, serverBuilder);
     }
+    List<BlazeCommand> blazeCommands = serverBuilder.getCommands();
 
     for (BlazeCommand command : blazeCommands) {
       for (Class<? extends OptionsBase> optionClass :
diff --git a/src/test/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcherRcoptionsTest.java b/src/test/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcherRcoptionsTest.java
index 8bd8bff189..dad3d2de0e 100644
--- a/src/test/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcherRcoptionsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcherRcoptionsTest.java
@@ -25,12 +25,10 @@ import com.google.devtools.build.lib.analysis.BlazeDirectories;
 import com.google.devtools.build.lib.analysis.ConfigurationCollectionFactory;
 import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider;
 import com.google.devtools.build.lib.analysis.config.BuildConfiguration;
-import com.google.devtools.build.lib.analysis.config.ConfigurationFactory;
 import com.google.devtools.build.lib.analysis.config.FragmentOptions;
 import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.runtime.BlazeCommandDispatcher.LockingMode;
 import com.google.devtools.build.lib.runtime.BlazeCommandDispatcher.ShutdownBlazeServerException;
-import com.google.devtools.build.lib.runtime.proto.InvocationPolicyOuterClass;
 import com.google.devtools.build.lib.testutil.Scratch;
 import com.google.devtools.build.lib.testutil.TestConstants;
 import com.google.devtools.build.lib.util.ExitCode;
@@ -140,8 +138,6 @@ public class BlazeCommandDispatcherRcoptionsTest {
             .setDirectories(directories)
             .setStartupOptionsProvider(
                 OptionsParser.newOptionsParser(BlazeServerStartupOptions.class))
-            .setConfigurationFactory(
-                new ConfigurationFactory(Mockito.mock(ConfigurationCollectionFactory.class)))
             .addBlazeModule(
                 new BlazeModule() {
                   @Override
@@ -152,9 +148,10 @@ public class BlazeCommandDispatcherRcoptionsTest {
                     builder.addConfigurationOptions(MockFragmentOptions.class);
                     // The tools repository is needed for createGlobals
                     builder.setToolsRepository(TestConstants.TOOLS_REPOSITORY);
+                    builder.setConfigurationCollectionFactory(
+                        Mockito.mock(ConfigurationCollectionFactory.class));
                   }
                 })
-            .setInvocationPolicy(InvocationPolicyOuterClass.InvocationPolicy.getDefaultInstance())
             .build();
   }