Convert ActionContextProvider to an abstract class. This gets rid of a lot of empty, unused methods in child classes.

--
MOS_MIGRATED_REVID=96299366

5 files changed, 12 insertions, 73 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/actions/ActionContextProvider.java b/src/main/java/com/google/devtools/build/lib/actions/ActionContextProvider.java
index 6e52a4a404..ac33b01d3f 100644
--- a/src/main/java/com/google/devtools/build/lib/actions/ActionContextProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/actions/ActionContextProvider.java
@@ -20,32 +20,32 @@ import com.google.devtools.build.lib.actions.Executor.ActionContext;
  *
  * <p>For more information, see {@link ActionContextConsumer}.
  */
-public interface ActionContextProvider {
+public abstract class ActionContextProvider {
   /**
    * Returns the execution strategies that are provided by this object.
    *
    * <p>These may or may not actually end up in the executor depending on the command line options
    * and other factors influencing how the executor is set up.
    */
-  Iterable<ActionContext> getActionContexts();
+  public abstract Iterable<ActionContext> getActionContexts();
 
   /**
    * Called when the executor is constructed. The parameter contains all the contexts that were
    * selected for this execution phase.
    */
-  void executorCreated(Iterable<ActionContext> usedContexts) throws ExecutorInitException;
+  public void executorCreated(Iterable<ActionContext> usedContexts) throws ExecutorInitException {}
 
   /**
    * Called when the execution phase is started.
    */
-  void executionPhaseStarting(
+  public void executionPhaseStarting(
       ActionInputFileCache actionInputFileCache,
       ActionGraph actionGraph,
       Iterable<Artifact> topLevelArtifacts)
-          throws ExecutorInitException, InterruptedException;
+      throws ExecutorInitException, InterruptedException {}
 
   /**
    * Called when the execution phase is finished.
    */
-  void executionPhaseEnding();
+  public void executionPhaseEnding() {}
 }
diff --git a/src/main/java/com/google/devtools/build/lib/actions/SimpleActionContextProvider.java b/src/main/java/com/google/devtools/build/lib/actions/SimpleActionContextProvider.java
index f289c3e1fe..ab49fd3e7f 100644
--- a/src/main/java/com/google/devtools/build/lib/actions/SimpleActionContextProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/actions/SimpleActionContextProvider.java
@@ -21,7 +21,7 @@ import java.util.List;
 /**
  * An {@link ActionContextProvider} that just provides the {@link ActionContext}s it's given.
  */
-public class SimpleActionContextProvider implements ActionContextProvider {
+public class SimpleActionContextProvider extends ActionContextProvider {
 
   /**
    * Creates an immutable list containing a single SimpleActionContextProvider with the given
@@ -41,15 +41,4 @@ public class SimpleActionContextProvider implements ActionContextProvider {
   public Iterable<ActionContext> getActionContexts() {
     return actionContexts;
   }
-
-  @Override
-  public void executorCreated(Iterable<ActionContext> usedContexts) {}
-
-  @Override
-  public void executionPhaseStarting(ActionInputFileCache actionInputFileCache,
-      ActionGraph actionGraph, Iterable<Artifact> topLevelArtifacts) {}
-
-  @Override
-  public void executionPhaseEnding() {}
-
 }
diff --git a/src/main/java/com/google/devtools/build/lib/rules/fileset/FilesetActionContextImpl.java b/src/main/java/com/google/devtools/build/lib/rules/fileset/FilesetActionContextImpl.java
index 9c03129758..b002d56c4f 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/fileset/FilesetActionContextImpl.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/fileset/FilesetActionContextImpl.java
@@ -16,9 +16,6 @@ package com.google.devtools.build.lib.rules.fileset;
 import com.google.common.collect.ImmutableList;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.google.devtools.build.lib.actions.ActionContextProvider;
-import com.google.devtools.build.lib.actions.ActionGraph;
-import com.google.devtools.build.lib.actions.ActionInputFileCache;
-import com.google.devtools.build.lib.actions.Artifact;
 import com.google.devtools.build.lib.actions.BlazeExecutor;
 import com.google.devtools.build.lib.actions.ExecutionStrategy;
 import com.google.devtools.build.lib.actions.Executor.ActionContext;
@@ -41,7 +38,7 @@ public final class FilesetActionContextImpl implements FilesetActionContext {
   /**
    * Factory class.
    */
-  public static class Provider implements ActionContextProvider {
+  public static class Provider extends ActionContextProvider {
     private FilesetActionContextImpl impl;
     private final Reporter reporter;
     private final ThreadPoolExecutor filesetPool;
@@ -67,15 +64,6 @@ public final class FilesetActionContextImpl implements FilesetActionContext {
     }
 
     @Override
-    public void executorCreated(Iterable<ActionContext> usedStrategies) {}
-
-    @Override
-    public void executionPhaseStarting(
-        ActionInputFileCache actionInputFileCache,
-        ActionGraph actionGraph,
-        Iterable<Artifact> topLevelArtifacts) {}
-
-    @Override
     public void executionPhaseEnding() {
       BlazeExecutor.shutdownHelperPool(reporter, filesetPool, "Fileset");
     }
diff --git a/src/main/java/com/google/devtools/build/lib/standalone/StandaloneContextProvider.java b/src/main/java/com/google/devtools/build/lib/standalone/StandaloneContextProvider.java
index 3fe423d18b..76c2655f06 100644
--- a/src/main/java/com/google/devtools/build/lib/standalone/StandaloneContextProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/standalone/StandaloneContextProvider.java
@@ -17,14 +17,11 @@ import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableList.Builder;
 import com.google.devtools.build.lib.actions.ActionContextProvider;
 import com.google.devtools.build.lib.actions.ActionExecutionContext;
-import com.google.devtools.build.lib.actions.ActionGraph;
-import com.google.devtools.build.lib.actions.ActionInputFileCache;
 import com.google.devtools.build.lib.actions.ActionMetadata;
 import com.google.devtools.build.lib.actions.Artifact;
 import com.google.devtools.build.lib.actions.ArtifactResolver;
 import com.google.devtools.build.lib.actions.ExecutionStrategy;
 import com.google.devtools.build.lib.actions.Executor.ActionContext;
-import com.google.devtools.build.lib.actions.ExecutorInitException;
 import com.google.devtools.build.lib.buildtool.BuildRequest;
 import com.google.devtools.build.lib.exec.ExecutionOptions;
 import com.google.devtools.build.lib.exec.FileWriteStrategy;
@@ -43,7 +40,7 @@ import java.io.IOException;
 /**
  * Provide a standalone, local execution context.
  */
-public class StandaloneContextProvider implements ActionContextProvider {
+public class StandaloneContextProvider extends ActionContextProvider {
 
   /**
    * a IncludeScanningContext that does nothing. Since local execution does not need to
@@ -107,21 +104,4 @@ public class StandaloneContextProvider implements ActionContextProvider {
   public Iterable<ActionContext> getActionContexts() {
     return strategies;
   }
-
-  @Override
-  public void executorCreated(Iterable<ActionContext> usedContexts) throws ExecutorInitException {
-  }
-
-  @Override
-  public void executionPhaseStarting(
-      ActionInputFileCache actionInputFileCache,
-      ActionGraph actionGraph,
-      Iterable<Artifact> topLevelArtifacts) throws ExecutorInitException {
-  }
-
-  @Override
-  public void executionPhaseEnding() {
-  }
 }
-
-
diff --git a/src/main/java/com/google/devtools/build/lib/worker/WorkerActionContextProvider.java b/src/main/java/com/google/devtools/build/lib/worker/WorkerActionContextProvider.java
index 74b0c5302e..6d4e419391 100644
--- a/src/main/java/com/google/devtools/build/lib/worker/WorkerActionContextProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/worker/WorkerActionContextProvider.java
@@ -15,40 +15,22 @@ package com.google.devtools.build.lib.worker;
 
 import com.google.common.collect.ImmutableList;
 import com.google.devtools.build.lib.actions.ActionContextProvider;
-import com.google.devtools.build.lib.actions.ActionGraph;
-import com.google.devtools.build.lib.actions.ActionInputFileCache;
-import com.google.devtools.build.lib.actions.Artifact;
 import com.google.devtools.build.lib.actions.Executor.ActionContext;
-import com.google.devtools.build.lib.actions.ExecutorInitException;
 import com.google.devtools.build.lib.buildtool.BuildRequest;
 
 /**
  * Factory for the Worker-based execution strategy.
  */
-final class WorkerActionContextProvider implements ActionContextProvider {
+final class WorkerActionContextProvider extends ActionContextProvider {
   private final ImmutableList<ActionContext> strategies;
 
   public WorkerActionContextProvider(BuildRequest buildRequest, WorkerPool workers) {
-    this.strategies = ImmutableList.<ActionContext>of(new WorkerSpawnStrategy(buildRequest,
-        workers));
+    this.strategies =
+        ImmutableList.<ActionContext>of(new WorkerSpawnStrategy(buildRequest, workers));
   }
 
   @Override
   public Iterable<ActionContext> getActionContexts() {
     return strategies;
   }
-
-  @Override
-  public void executorCreated(Iterable<ActionContext> usedContexts) throws ExecutorInitException {
-  }
-
-  @Override
-  public void executionPhaseStarting(ActionInputFileCache actionInputFileCache,
-      ActionGraph actionGraph, Iterable<Artifact> topLevelArtifacts)
-      throws ExecutorInitException, InterruptedException {
-  }
-
-  @Override
-  public void executionPhaseEnding() {
-  }
 }