Qualify all uses of ActionContextRegistry.
Part of the rollforward of https://github.com/bazelbuild/bazel/commit/37aeabcd39fe326d1c4e55693d8d207f9f7ac6c4.
PiperOrigin-RevId: 294456734
diff --git a/src/main/java/com/google/devtools/build/lib/actions/DynamicStrategyRegistry.java b/src/main/java/com/google/devtools/build/lib/actions/DynamicStrategyRegistry.java
index edd69f1..07708af 100644
--- a/src/main/java/com/google/devtools/build/lib/actions/DynamicStrategyRegistry.java
+++ b/src/main/java/com/google/devtools/build/lib/actions/DynamicStrategyRegistry.java
@@ -37,5 +37,5 @@
*
* @param actionContextRegistry a complete registry containing all available action contexts
*/
- void notifyUsedDynamic(ActionContextRegistry actionContextRegistry);
+ void notifyUsedDynamic(ActionContext.ActionContextRegistry actionContextRegistry);
}
diff --git a/src/main/java/com/google/devtools/build/lib/actions/SpawnStrategy.java b/src/main/java/com/google/devtools/build/lib/actions/SpawnStrategy.java
index d0ef44c..254e75f 100644
--- a/src/main/java/com/google/devtools/build/lib/actions/SpawnStrategy.java
+++ b/src/main/java/com/google/devtools/build/lib/actions/SpawnStrategy.java
@@ -43,5 +43,5 @@
}
/** Returns whether this SpawnActionContext supports executing the given Spawn. */
- boolean canExec(Spawn spawn, ActionContextRegistry actionContextRegistry);
+ boolean canExec(Spawn spawn, ActionContext.ActionContextRegistry actionContextRegistry);
}
diff --git a/src/main/java/com/google/devtools/build/lib/dynamic/DynamicSpawnStrategy.java b/src/main/java/com/google/devtools/build/lib/dynamic/DynamicSpawnStrategy.java
index 6b9c3c9..8fa8b61 100644
--- a/src/main/java/com/google/devtools/build/lib/dynamic/DynamicSpawnStrategy.java
+++ b/src/main/java/com/google/devtools/build/lib/dynamic/DynamicSpawnStrategy.java
@@ -23,6 +23,7 @@
import com.google.common.util.concurrent.ListeningExecutorService;
import com.google.common.util.concurrent.MoreExecutors;
import com.google.common.util.concurrent.SettableFuture;
+import com.google.devtools.build.lib.actions.ActionContext;
import com.google.devtools.build.lib.actions.ActionExecutionContext;
import com.google.devtools.build.lib.actions.DynamicStrategyRegistry;
import com.google.devtools.build.lib.actions.ExecException;
@@ -327,7 +328,7 @@
}
@Override
- public boolean canExec(Spawn spawn, ActionContextRegistry actionContextRegistry) {
+ public boolean canExec(Spawn spawn, ActionContext.ActionContextRegistry actionContextRegistry) {
DynamicStrategyRegistry dynamicStrategyRegistry =
actionContextRegistry.getContext(DynamicStrategyRegistry.class);
for (SandboxedSpawnStrategy strategy :
@@ -348,10 +349,10 @@
}
@Override
- public void usedContext(ActionContextRegistry actionExecutionContext) {
- actionExecutionContext
+ public void usedContext(ActionContext.ActionContextRegistry actionExecutionRegistry) {
+ actionExecutionRegistry
.getContext(DynamicStrategyRegistry.class)
- .notifyUsedDynamic(actionExecutionContext);
+ .notifyUsedDynamic(actionExecutionRegistry);
}
private static FileOutErr getSuffixedFileOutErr(FileOutErr fileOutErr, String suffix) {
diff --git a/src/main/java/com/google/devtools/build/lib/dynamic/LegacyDynamicSpawnStrategy.java b/src/main/java/com/google/devtools/build/lib/dynamic/LegacyDynamicSpawnStrategy.java
index e459369..c4d395c 100644
--- a/src/main/java/com/google/devtools/build/lib/dynamic/LegacyDynamicSpawnStrategy.java
+++ b/src/main/java/com/google/devtools/build/lib/dynamic/LegacyDynamicSpawnStrategy.java
@@ -20,6 +20,7 @@
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import com.google.common.io.Files;
+import com.google.devtools.build.lib.actions.ActionContext;
import com.google.devtools.build.lib.actions.ActionExecutionContext;
import com.google.devtools.build.lib.actions.DynamicStrategyRegistry;
import com.google.devtools.build.lib.actions.EnvironmentalExecException;
@@ -303,7 +304,7 @@
}
@Override
- public boolean canExec(Spawn spawn, ActionContextRegistry actionContextRegistry) {
+ public boolean canExec(Spawn spawn, ActionContext.ActionContextRegistry actionContextRegistry) {
DynamicStrategyRegistry dynamicStrategyRegistry =
actionContextRegistry.getContext(DynamicStrategyRegistry.class);
diff --git a/src/main/java/com/google/devtools/build/lib/exec/AbstractSpawnStrategy.java b/src/main/java/com/google/devtools/build/lib/exec/AbstractSpawnStrategy.java
index c7ddf47..c29f00b 100644
--- a/src/main/java/com/google/devtools/build/lib/exec/AbstractSpawnStrategy.java
+++ b/src/main/java/com/google/devtools/build/lib/exec/AbstractSpawnStrategy.java
@@ -84,7 +84,7 @@
}
@Override
- public boolean canExec(Spawn spawn, ActionContextRegistry actionContextRegistry) {
+ public boolean canExec(Spawn spawn, ActionContext.ActionContextRegistry actionContextRegistry) {
return spawnRunner.canExec(spawn);
}
diff --git a/src/main/java/com/google/devtools/build/lib/exec/ProxySpawnActionContext.java b/src/main/java/com/google/devtools/build/lib/exec/ProxySpawnActionContext.java
index 8d2d9fc..ae0960a 100644
--- a/src/main/java/com/google/devtools/build/lib/exec/ProxySpawnActionContext.java
+++ b/src/main/java/com/google/devtools/build/lib/exec/ProxySpawnActionContext.java
@@ -15,6 +15,7 @@
import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.ImmutableList;
+import com.google.devtools.build.lib.actions.ActionContext;
import com.google.devtools.build.lib.actions.ActionExecutionContext;
import com.google.devtools.build.lib.actions.ExecException;
import com.google.devtools.build.lib.actions.Spawn;
@@ -102,7 +103,7 @@
}
@Override
- public boolean canExec(Spawn spawn, ActionContextRegistry actionContextRegistry) {
+ public boolean canExec(Spawn spawn, ActionContext.ActionContextRegistry actionContextRegistry) {
return spawnActionContextMaps.getSpawnActionContexts(spawn, NullEventHandler.INSTANCE).stream()
.anyMatch(spawnActionContext -> spawnActionContext.canExec(spawn, actionContextRegistry));
}
diff --git a/src/main/java/com/google/devtools/build/lib/exec/SpawnActionContextMaps.java b/src/main/java/com/google/devtools/build/lib/exec/SpawnActionContextMaps.java
index f28cdda..3904821 100644
--- a/src/main/java/com/google/devtools/build/lib/exec/SpawnActionContextMaps.java
+++ b/src/main/java/com/google/devtools/build/lib/exec/SpawnActionContextMaps.java
@@ -191,7 +191,7 @@
}
@Override
- public void notifyUsedDynamic(ActionContextRegistry actionContextRegistry) {
+ public void notifyUsedDynamic(ActionContext.ActionContextRegistry actionContextRegistry) {
for (SandboxedSpawnStrategy context : mnemonicToRemoteDynamicStrategies.values()) {
context.usedContext(actionContextRegistry);
}
diff --git a/src/main/java/com/google/devtools/build/lib/exec/SpawnStrategyRegistry.java b/src/main/java/com/google/devtools/build/lib/exec/SpawnStrategyRegistry.java
index 8b3a684..4c2e75f 100644
--- a/src/main/java/com/google/devtools/build/lib/exec/SpawnStrategyRegistry.java
+++ b/src/main/java/com/google/devtools/build/lib/exec/SpawnStrategyRegistry.java
@@ -108,7 +108,7 @@
}
@Override
- public void notifyUsedDynamic(ActionContextRegistry actionContextRegistry) {
+ public void notifyUsedDynamic(ActionContext.ActionContextRegistry actionContextRegistry) {
for (SandboxedSpawnStrategy strategy : mnemonicToLocalDynamicStrategies.values()) {
strategy.usedContext(actionContextRegistry);
}
@@ -140,7 +140,7 @@
* Notifies all (non-dynamic) strategies stored in this registry that they are {@linkplain
* SpawnStrategy#usedContext used}.
*/
- public void notifyUsed(ActionContextRegistry actionContextRegistry) {
+ public void notifyUsed(ActionContext.ActionContextRegistry actionContextRegistry) {
for (SpawnStrategy strategy : filterToStrategies.values()) {
strategy.usedContext(actionContextRegistry);
}
diff --git a/src/test/java/com/google/devtools/build/lib/dynamic/DynamicSpawnStrategyTest.java b/src/test/java/com/google/devtools/build/lib/dynamic/DynamicSpawnStrategyTest.java
index ef01393..1d56444 100644
--- a/src/test/java/com/google/devtools/build/lib/dynamic/DynamicSpawnStrategyTest.java
+++ b/src/test/java/com/google/devtools/build/lib/dynamic/DynamicSpawnStrategyTest.java
@@ -194,7 +194,7 @@
}
@Override
- public boolean canExec(Spawn spawn, ActionContextRegistry actionContextRegistry) {
+ public boolean canExec(Spawn spawn, ActionContext.ActionContextRegistry actionContextRegistry) {
return true;
}
diff --git a/src/test/java/com/google/devtools/build/lib/exec/BlazeExecutorTest.java b/src/test/java/com/google/devtools/build/lib/exec/BlazeExecutorTest.java
index aa88c4c..a42f915 100644
--- a/src/test/java/com/google/devtools/build/lib/exec/BlazeExecutorTest.java
+++ b/src/test/java/com/google/devtools/build/lib/exec/BlazeExecutorTest.java
@@ -19,6 +19,7 @@
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables;
import com.google.common.eventbus.EventBus;
+import com.google.devtools.build.lib.actions.ActionContext;
import com.google.devtools.build.lib.actions.ActionExecutionContext;
import com.google.devtools.build.lib.actions.Spawn;
import com.google.devtools.build.lib.actions.SpawnResult;
@@ -105,7 +106,7 @@
}
@Override
- public boolean canExec(Spawn spawn, ActionContextRegistry actionContextRegistry) {
+ public boolean canExec(Spawn spawn, ActionContext.ActionContextRegistry actionContextRegistry) {
return false;
}
}
diff --git a/src/test/java/com/google/devtools/build/lib/exec/ModuleActionContextRegistryTest.java b/src/test/java/com/google/devtools/build/lib/exec/ModuleActionContextRegistryTest.java
index f51b3bf..e26db24 100644
--- a/src/test/java/com/google/devtools/build/lib/exec/ModuleActionContextRegistryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/exec/ModuleActionContextRegistryTest.java
@@ -153,7 +153,7 @@
private int usedCalls = 0;
@Override
- public void usedContext(ActionContextRegistry actionContextRegistry) {
+ public void usedContext(ActionContext.ActionContextRegistry actionContextRegistry) {
usedCalls++;
}
}
diff --git a/src/test/java/com/google/devtools/build/lib/exec/SpawnActionContextMapsTest.java b/src/test/java/com/google/devtools/build/lib/exec/SpawnActionContextMapsTest.java
index 508ad07..67856b1 100644
--- a/src/test/java/com/google/devtools/build/lib/exec/SpawnActionContextMapsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/exec/SpawnActionContextMapsTest.java
@@ -18,6 +18,7 @@
import com.google.common.collect.ImmutableList;
import com.google.common.eventbus.EventBus;
+import com.google.devtools.build.lib.actions.ActionContext;
import com.google.devtools.build.lib.actions.ActionExecutionContext;
import com.google.devtools.build.lib.actions.ActionExecutionMetadata;
import com.google.devtools.build.lib.actions.ExecException;
@@ -124,7 +125,7 @@
}
@Override
- public boolean canExec(Spawn spawn, ActionContextRegistry actionContextRegistry) {
+ public boolean canExec(Spawn spawn, ActionContext.ActionContextRegistry actionContextRegistry) {
return true;
}
}
@@ -138,7 +139,7 @@
}
@Override
- public boolean canExec(Spawn spawn, ActionContextRegistry actionContextRegistry) {
+ public boolean canExec(Spawn spawn, ActionContext.ActionContextRegistry actionContextRegistry) {
return true;
}
}
