commit 54eeac5033fdca1b8b12a7191603e658929c5cda
author Ulf Adams <ulfjack@google.com> Mon Aug 29 09:07:35 2016 +0000
committer Klaus Aehlig <aehlig@google.com> Mon Aug 29 09:42:55 2016 +0000
tree ceabb8a46285ff28d5ae8da2902e855f797c998f
parent 15c09dd1b5dbd7e76fe42d193a79dab8bfc24abc

Move the query output formatters to ServerBuilder.

--
MOS_MIGRATED_REVID=131569674

src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java

diff --git a/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java b/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java
index d8a07d2..597d4d0 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java
@@ -129,6 +129,7 @@
   // For bazel query.
   private final QueryEnvironmentFactory queryEnvironmentFactory;
   private final ImmutableList<QueryFunction> queryFunctions;
+  private final ImmutableList<OutputFormatter> queryOutputFormatters;
 
   private final AtomicInteger storedExitCode = new AtomicInteger();
 
@@ -148,6 +149,7 @@
   private BlazeRuntime(
       QueryEnvironmentFactory queryEnvironmentFactory,
       ImmutableList<QueryFunction> queryFunctions,
+      ImmutableList<OutputFormatter> queryOutputFormatters,
       PackageFactory pkgFactory,
       ConfiguredRuleClassProvider ruleClassProvider,
       ConfigurationFactory configurationFactory,
@@ -175,6 +177,7 @@
     this.startupOptionsProvider = startupOptionsProvider;
     this.queryEnvironmentFactory = queryEnvironmentFactory;
     this.queryFunctions = queryFunctions;
+    this.queryOutputFormatters = queryOutputFormatters;
     this.eventBusExceptionHandler = eventBusExceptionHandler;
 
     this.defaultsPackageContent =
@@ -299,6 +302,10 @@
     return queryFunctions;
   }
 
+  public ImmutableList<OutputFormatter> getQueryOutputFormatters() {
+    return queryOutputFormatters;
+  }
+
   /**
    * Returns the package factory.
    */
@@ -306,16 +313,6 @@
     return packageFactory;
   }
 
-  public ImmutableList<OutputFormatter> getQueryOutputFormatters() {
-    ImmutableList.Builder<OutputFormatter> result = ImmutableList.builder();
-    result.addAll(OutputFormatter.getDefaultFormatters());
-    for (BlazeModule module : blazeModules) {
-      result.addAll(module.getQueryOutputFormatters());
-    }
-
-    return result.build();
-  }
-
   /**
    * Returns the rule class provider.
    */
@@ -1066,6 +1063,7 @@
             BlazeVersionInfo.instance(), instanceId, serverDirectories, clock);
       }
       ServerBuilder serverBuilder = new ServerBuilder();
+      serverBuilder.addQueryOutputFormatters(OutputFormatter.getDefaultFormatters());
       for (BlazeModule module : blazeModules) {
         module.serverInit(startupOptionsProvider, serverBuilder);
       }
@@ -1124,6 +1122,7 @@
       return new BlazeRuntime(
           serverBuilder.getQueryEnvironmentFactory(),
           serverBuilder.getQueryFunctions(),
+          serverBuilder.getQueryOutputFormatters(),
           packageFactory,
           ruleClassProvider,
           configurationFactory,