From da9f17b484fe7500c1a35cc46628e583fcbb276b Mon Sep 17 00:00:00 2001 From: Googler Date: Tue, 9 May 2023 10:23:28 -0700 Subject: [PATCH] Remove unused Java references. Part of a Bazel dead code cleanup. PiperOrigin-RevId: 530646985 Change-Id: Icb967b82a84a368bbf94e4e2dafaf1443cbf3248 --- .../devtools/build/lib/exec/AbstractSpawnStrategy.java | 9 +-------- .../com/google/devtools/build/lib/exec/SpawnRunner.java | 7 ------- .../build/lib/exec/local/LocalSpawnRunnerTest.java | 6 ------ .../devtools/build/lib/remote/RemoteSpawnCacheTest.java | 7 ------- .../build/lib/remote/util/FakeSpawnExecutionContext.java | 7 ------- .../devtools/build/lib/sandbox/SpawnRunnerTestUtil.java | 6 ------ 6 files changed, 1 insertion(+), 41 deletions(-) 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 911c8a837743ca..907039fd857481 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 @@ -42,7 +42,6 @@ import com.google.devtools.build.lib.actions.SpawnResult.Status; import com.google.devtools.build.lib.actions.Spawns; import com.google.devtools.build.lib.actions.UserExecException; -import com.google.devtools.build.lib.actions.cache.OutputMetadataStore; import com.google.devtools.build.lib.events.Event; import com.google.devtools.build.lib.events.ExtendedEventHandler; import com.google.devtools.build.lib.exec.SpawnCache.CacheHandle; @@ -90,7 +89,7 @@ protected AbstractSpawnStrategy( } /** - * Get's the {@link SpawnRunner} that this {@link AbstractSpawnStrategy} uses to actually run + * Gets the {@link SpawnRunner} that this {@link AbstractSpawnStrategy} uses to actually run * spawns. * *

This is considered a stop-gap until we refactor the entire SpawnStrategy / SpawnRunner @@ -285,12 +284,6 @@ public ListenableFuture prefetchInputs() public InputMetadataProvider getInputMetadataProvider() { return actionExecutionContext.getInputMetadataProvider(); } - - @Override - public OutputMetadataStore getMetadataInjector() { - return actionExecutionContext.getOutputMetadataStore(); - } - @Override public T getContext(Class identifyingType) { return actionExecutionContext.getContext(identifyingType); diff --git a/src/main/java/com/google/devtools/build/lib/exec/SpawnRunner.java b/src/main/java/com/google/devtools/build/lib/exec/SpawnRunner.java index cc1155d87558f5..c87016ac85a1de 100644 --- a/src/main/java/com/google/devtools/build/lib/exec/SpawnRunner.java +++ b/src/main/java/com/google/devtools/build/lib/exec/SpawnRunner.java @@ -27,7 +27,6 @@ import com.google.devtools.build.lib.actions.LostInputsExecException; import com.google.devtools.build.lib.actions.Spawn; import com.google.devtools.build.lib.actions.SpawnResult; -import com.google.devtools.build.lib.actions.cache.MetadataInjector; import com.google.devtools.build.lib.events.ExtendedEventHandler; import com.google.devtools.build.lib.profiler.Profiler; import com.google.devtools.build.lib.profiler.ProfilerTask; @@ -258,12 +257,6 @@ SortedMap getInputMapping( /** Reports a progress update to the Spawn strategy. */ void report(ProgressStatus progress); - /** - * Returns a {@link MetadataInjector} that allows a caller to inject metadata about spawn - * outputs that are stored remotely. - */ - MetadataInjector getMetadataInjector(); - /** * Returns the context registered for the given identifying type or {@code null} if none was * registered. diff --git a/src/test/java/com/google/devtools/build/lib/exec/local/LocalSpawnRunnerTest.java b/src/test/java/com/google/devtools/build/lib/exec/local/LocalSpawnRunnerTest.java index 1a673621cbd601..8bf65e4238043c 100644 --- a/src/test/java/com/google/devtools/build/lib/exec/local/LocalSpawnRunnerTest.java +++ b/src/test/java/com/google/devtools/build/lib/exec/local/LocalSpawnRunnerTest.java @@ -44,7 +44,6 @@ import com.google.devtools.build.lib.actions.Spawn; import com.google.devtools.build.lib.actions.SpawnResult; import com.google.devtools.build.lib.actions.SpawnResult.Status; -import com.google.devtools.build.lib.actions.cache.MetadataInjector; import com.google.devtools.build.lib.actions.cache.VirtualActionInput; import com.google.devtools.build.lib.actions.util.ActionsTestUtil; import com.google.devtools.build.lib.exec.BinTools; @@ -293,11 +292,6 @@ public void report(ProgressStatus progress) { reportedStatus.add(progress); } - @Override - public MetadataInjector getMetadataInjector() { - throw new UnsupportedOperationException(); - } - @Override public boolean isRewindingEnabled() { return false; diff --git a/src/test/java/com/google/devtools/build/lib/remote/RemoteSpawnCacheTest.java b/src/test/java/com/google/devtools/build/lib/remote/RemoteSpawnCacheTest.java index 22c5ff7bb04a7b..1065238473c15f 100644 --- a/src/test/java/com/google/devtools/build/lib/remote/RemoteSpawnCacheTest.java +++ b/src/test/java/com/google/devtools/build/lib/remote/RemoteSpawnCacheTest.java @@ -49,8 +49,6 @@ import com.google.devtools.build.lib.actions.SimpleSpawn; import com.google.devtools.build.lib.actions.SpawnResult; import com.google.devtools.build.lib.actions.SpawnResult.Status; -import com.google.devtools.build.lib.actions.cache.MetadataInjector; -import com.google.devtools.build.lib.actions.util.ActionsTestUtil; import com.google.devtools.build.lib.clock.JavaClock; import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder; import com.google.devtools.build.lib.collect.nestedset.Order; @@ -191,11 +189,6 @@ public void report(ProgressStatus progress) { progressUpdates.add(progress); } - @Override - public MetadataInjector getMetadataInjector() { - return ActionsTestUtil.THROWING_METADATA_HANDLER; - } - @Override public boolean isRewindingEnabled() { return false; diff --git a/src/test/java/com/google/devtools/build/lib/remote/util/FakeSpawnExecutionContext.java b/src/test/java/com/google/devtools/build/lib/remote/util/FakeSpawnExecutionContext.java index b136254b5d8025..3ca016aa5fca63 100644 --- a/src/test/java/com/google/devtools/build/lib/remote/util/FakeSpawnExecutionContext.java +++ b/src/test/java/com/google/devtools/build/lib/remote/util/FakeSpawnExecutionContext.java @@ -24,8 +24,6 @@ import com.google.devtools.build.lib.actions.ForbiddenActionInputException; import com.google.devtools.build.lib.actions.InputMetadataProvider; import com.google.devtools.build.lib.actions.Spawn; -import com.google.devtools.build.lib.actions.cache.MetadataInjector; -import com.google.devtools.build.lib.actions.util.ActionsTestUtil; import com.google.devtools.build.lib.exec.SpawnInputExpander; import com.google.devtools.build.lib.exec.SpawnRunner.ProgressStatus; import com.google.devtools.build.lib.exec.SpawnRunner.SpawnExecutionContext; @@ -151,11 +149,6 @@ public void report(ProgressStatus progress) { // Intentionally left empty. } - @Override - public MetadataInjector getMetadataInjector() { - return ActionsTestUtil.THROWING_METADATA_HANDLER; - } - @Override public T getContext(Class identifyingType) { return actionContextRegistry.getInstance(identifyingType); diff --git a/src/test/java/com/google/devtools/build/lib/sandbox/SpawnRunnerTestUtil.java b/src/test/java/com/google/devtools/build/lib/sandbox/SpawnRunnerTestUtil.java index 7451bf9b3440b7..03e64980237adc 100644 --- a/src/test/java/com/google/devtools/build/lib/sandbox/SpawnRunnerTestUtil.java +++ b/src/test/java/com/google/devtools/build/lib/sandbox/SpawnRunnerTestUtil.java @@ -25,7 +25,6 @@ import com.google.devtools.build.lib.actions.Artifact.ArtifactExpander; import com.google.devtools.build.lib.actions.InputMetadataProvider; import com.google.devtools.build.lib.actions.Spawn; -import com.google.devtools.build.lib.actions.cache.MetadataInjector; import com.google.devtools.build.lib.exec.SpawnInputExpander; import com.google.devtools.build.lib.exec.SpawnRunner.ProgressStatus; import com.google.devtools.build.lib.exec.SpawnRunner.SpawnExecutionContext; @@ -145,11 +144,6 @@ public void report(ProgressStatus progress) { reportedStatus.add(progress); } - @Override - public MetadataInjector getMetadataInjector() { - return mock(MetadataInjector.class); - } - @Override public T getContext(Class identifyingType) { throw new UnsupportedOperationException();