Move BlazeRuntime.getView() to CommandEnvironment. Update all callers.

--
MOS_MIGRATED_REVID=103376668

4 files changed, 10 insertions, 15 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/buildtool/BuildTool.java b/src/main/java/com/google/devtools/build/lib/buildtool/BuildTool.java
index 85955fcdc1..c9f528a3cc 100644
--- a/src/main/java/com/google/devtools/build/lib/buildtool/BuildTool.java
+++ b/src/main/java/com/google/devtools/build/lib/buildtool/BuildTool.java
@@ -441,7 +441,7 @@ public final class BuildTool {
     Profiler.instance().markPhase(ProfilePhase.ANALYZE);
 
     AnalysisResult analysisResult =
-        runtime.getView()
+        env.getView()
             .update(
                 loadingResult,
                 configurations,
@@ -454,7 +454,7 @@ public final class BuildTool {
 
     // TODO(bazel-team): Merge these into one event.
     env.getEventBus().post(new AnalysisPhaseCompleteEvent(analysisResult.getTargetsToBuild(),
-        runtime.getView().getTargetsVisited(), timer.stop().elapsed(TimeUnit.MILLISECONDS)));
+        env.getView().getTargetsVisited(), timer.stop().elapsed(TimeUnit.MILLISECONDS)));
     env.getEventBus().post(new TestFilteringCompleteEvent(analysisResult.getTargetsToBuild(),
         analysisResult.getTargetsToTest()));
 
diff --git a/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java b/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java
index f6d9715e17..61045304e4 100644
--- a/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java
+++ b/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java
@@ -427,7 +427,7 @@ public class ExecutionTool {
         // Free memory by removing cache entries that aren't going to be needed. Note that in
         // skyframe full, this destroys the action graph as well, so we can only do it after the
         // action graph is no longer needed.
-        getView().clearAnalysisCache(analysisResult.getTargetsToBuild());
+        env.getView().clearAnalysisCache(analysisResult.getTargetsToBuild());
         actionGraph = null;
       }
 
@@ -716,7 +716,7 @@ public class ExecutionTool {
         // files), OR when a user explicitly requests an output file but not
         // its rule.
         TransitiveInfoCollection generatingRule =
-            getView().getGeneratingRule((OutputFileConfiguredTarget) target);
+            env.getView().getGeneratingRule((OutputFileConfiguredTarget) target);
         if (CollectionUtils.containsAll(
             generatingRule.getProvider(FileProvider.class).getFilesToBuild(),
             target.getProvider(FileProvider.class).getFilesToBuild()) &&
@@ -840,7 +840,7 @@ public class ExecutionTool {
     fileCache = createBuildSingleFileCache(executor.getExecRoot());
     skyframeExecutor.setActionOutputRoot(actionOutputRoot);
     return new SkyframeBuilder(skyframeExecutor,
-        new ActionCacheChecker(actionCache, getView().getArtifactFactory(), executionFilter,
+        new ActionCacheChecker(actionCache, env.getView().getArtifactFactory(), executionFilter,
             verboseExplanations),
         keepGoing, actualJobs, options.checkOutputFiles, fileCache,
         request.getBuildOptions().progressReportInterval);
@@ -910,10 +910,6 @@ public class ExecutionTool {
     return env.getReporter();
   }
 
-  private BuildView getView() {
-    return runtime.getView();
-  }
-
   private Path getWorkspace() {
     return runtime.getWorkspace();
   }
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 7d2cfae097..368812f671 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
@@ -549,7 +549,7 @@ public final class BlazeRuntime {
   /**
    * Returns the build view.
    */
-  public BuildView getView() {
+  BuildView getView() {
     return view;
   }
 
diff --git a/src/main/java/com/google/devtools/build/lib/standalone/StandaloneActionContextProvider.java b/src/main/java/com/google/devtools/build/lib/standalone/StandaloneActionContextProvider.java
index 5639363e4a..086d7f6c19 100644
--- a/src/main/java/com/google/devtools/build/lib/standalone/StandaloneActionContextProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/standalone/StandaloneActionContextProvider.java
@@ -57,18 +57,18 @@ public class StandaloneActionContextProvider extends ActionContextProvider {
 
     @Override
     public ArtifactResolver getArtifactResolver() {
-      return runtime.getView().getArtifactFactory();
+      return env.getView().getArtifactFactory();
     }
   }
 
+  private final CommandEnvironment env;
   private final ImmutableList<ActionContext> strategies;
-  private final BlazeRuntime runtime;
 
   public StandaloneActionContextProvider(CommandEnvironment env, BuildRequest buildRequest) {
+    this.env = env;
+    BlazeRuntime runtime = env.getRuntime();
     boolean verboseFailures = buildRequest.getOptions(ExecutionOptions.class).verboseFailures;
 
-    this.runtime = env.getRuntime();
-
     TestActionContext testStrategy = new StandaloneTestStrategy(buildRequest,
         runtime.getStartupOptionsProvider(), runtime.getBinTools(), env.getClientEnv(),
         runtime.getWorkspace());
@@ -94,5 +94,4 @@ public class StandaloneActionContextProvider extends ActionContextProvider {
   public Iterable<ActionContext> getActionContexts() {
     return strategies;
   }
-
 }