Rename SpawnActionContext#isRemotable() to more appropriate willExecuteRemotely(). Remove unused parameter "mnemonic".

--
MOS_MIGRATED_REVID=115666410

7 files changed, 13 insertions, 22 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/actions/SpawnActionContext.java b/src/main/java/com/google/devtools/build/lib/actions/SpawnActionContext.java
index 80ef4a505b..5e20f85684 100644
--- a/src/main/java/com/google/devtools/build/lib/actions/SpawnActionContext.java
+++ b/src/main/java/com/google/devtools/build/lib/actions/SpawnActionContext.java
@@ -13,7 +13,6 @@
 // limitations under the License.
 package com.google.devtools.build.lib.actions;
 
-
 /**
  * A context that allows execution of {@link Spawn} instances.
  */
@@ -25,13 +24,13 @@ public interface SpawnActionContext extends Executor.ActionContext {
       throws ExecException, InterruptedException;
 
   /**
-   * This implements a tri-state mode. There are three possible cases: (1) implementations of this
-   * class can unconditionally execute spawns locally, (2) they can follow whatever is set for the
-   * corresponding spawn (see {@link Spawn#isRemotable}), or (3) they can unconditionally execute
-   * spawns remotely, i.e., force remote execution.
-   *
-   * <p>Passing the spawns remotable flag to this method returns whether the spawn will actually be
+   * Passing a spawns remotable flag to this method returns whether the spawn will actually be
    * executed remotely.
+   *
+   * <p>This implements a tri-state mode. There are three possible cases: (1) implementations of
+   * this class can unconditionally execute spawns locally, (2) they can follow whatever is set for
+   * the corresponding spawn (see {@link Spawn#isRemotable}), or (3) they can unconditionally
+   * execute spawns remotely, i.e., force remote execution.
    */
-  boolean isRemotable(String mnemonic, boolean remotable);
+  boolean willExecuteRemotely(boolean remotable);
 }
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java b/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java
index 4260597360..7b19b454c0 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java
@@ -375,21 +375,13 @@ public class SpawnAction extends AbstractAction {
   @Override
   public ResourceSet estimateResourceConsumption(Executor executor) {
     SpawnActionContext context = getContext(executor);
-    if (context.isRemotable(getMnemonic(), isRemotable())) {
+    if (context.willExecuteRemotely(!executionInfo.containsKey("local"))) {
       return ResourceSet.ZERO;
     }
     return resourceSet;
   }
 
   /**
-   * Returns true if this can be run remotely.
-   */
-  public final boolean isRemotable() {
-    // TODO(bazel-team): get rid of this method.
-    return !executionInfo.containsKey("local");
-  }
-
-  /**
    * The Spawn which this SpawnAction will execute.
    */
   private class ActionSpawn extends BaseSpawn {
diff --git a/src/main/java/com/google/devtools/build/lib/remote/RemoteSpawnStrategy.java b/src/main/java/com/google/devtools/build/lib/remote/RemoteSpawnStrategy.java
index 2001f759bb..b5f4326ba2 100644
--- a/src/main/java/com/google/devtools/build/lib/remote/RemoteSpawnStrategy.java
+++ b/src/main/java/com/google/devtools/build/lib/remote/RemoteSpawnStrategy.java
@@ -255,7 +255,7 @@ final class RemoteSpawnStrategy implements SpawnActionContext {
   }
 
   @Override
-  public boolean isRemotable(String mnemonic, boolean remotable) {
+  public boolean willExecuteRemotely(boolean remotable) {
     // Returning true here just helps to estimate the cost of this computation is zero.
     return remotable;
   }
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompileAction.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompileAction.java
index 0d5c6cd35d..81fc5732d0 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompileAction.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompileAction.java
@@ -424,7 +424,7 @@ public class JavaCompileAction extends AbstractAction {
 
   @Override
   public ResourceSet estimateResourceConsumption(Executor executor) {
-    if (getContext(executor).isRemotable(getMnemonic(), true)) {
+    if (getContext(executor).willExecuteRemotely(true)) {
       return ResourceSet.ZERO;
     }
     return LOCAL_RESOURCES;
diff --git a/src/main/java/com/google/devtools/build/lib/sandbox/LinuxSandboxedStrategy.java b/src/main/java/com/google/devtools/build/lib/sandbox/LinuxSandboxedStrategy.java
index d67a6757dc..76e18e7e09 100644
--- a/src/main/java/com/google/devtools/build/lib/sandbox/LinuxSandboxedStrategy.java
+++ b/src/main/java/com/google/devtools/build/lib/sandbox/LinuxSandboxedStrategy.java
@@ -499,7 +499,7 @@ public class LinuxSandboxedStrategy implements SpawnActionContext {
   }
 
   @Override
-  public boolean isRemotable(String mnemonic, boolean remotable) {
+  public boolean willExecuteRemotely(boolean remotable) {
     return false;
   }
 
diff --git a/src/main/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategy.java b/src/main/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategy.java
index 7299f3555f..9c269633c9 100644
--- a/src/main/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategy.java
+++ b/src/main/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategy.java
@@ -137,7 +137,7 @@ public class StandaloneSpawnStrategy implements SpawnActionContext {
   }
 
   @Override
-  public boolean isRemotable(String mnemonic, boolean remotable) {
+  public boolean willExecuteRemotely(boolean remotable) {
     return false;
   }
 
diff --git a/src/main/java/com/google/devtools/build/lib/worker/WorkerSpawnStrategy.java b/src/main/java/com/google/devtools/build/lib/worker/WorkerSpawnStrategy.java
index edee914438..e2b99beee3 100644
--- a/src/main/java/com/google/devtools/build/lib/worker/WorkerSpawnStrategy.java
+++ b/src/main/java/com/google/devtools/build/lib/worker/WorkerSpawnStrategy.java
@@ -282,7 +282,7 @@ final class WorkerSpawnStrategy implements SpawnActionContext {
   }
 
   @Override
-  public boolean isRemotable(String mnemonic, boolean remotable) {
+  public boolean willExecuteRemotely(boolean remotable) {
     return false;
   }