Skip to content

Commit 0bd361f

Browse files
gregestrencopybara-github
authored andcommitted
Remove unused Java references.
Part of a Bazel dead code cleanup. PiperOrigin-RevId: 530646985 Change-Id: Icb967b82a84a368bbf94e4e2dafaf1443cbf3248
1 parent 6b7f1ef commit 0bd361f

File tree

6 files changed

+1
-41
lines changed

6 files changed

+1
-41
lines changed

src/main/java/com/google/devtools/build/lib/exec/AbstractSpawnStrategy.java

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
import com.google.devtools.build.lib.actions.SpawnResult.Status;
4343
import com.google.devtools.build.lib.actions.Spawns;
4444
import com.google.devtools.build.lib.actions.UserExecException;
45-
import com.google.devtools.build.lib.actions.cache.OutputMetadataStore;
4645
import com.google.devtools.build.lib.events.Event;
4746
import com.google.devtools.build.lib.events.ExtendedEventHandler;
4847
import com.google.devtools.build.lib.exec.SpawnCache.CacheHandle;
@@ -90,7 +89,7 @@ protected AbstractSpawnStrategy(
9089
}
9190

9291
/**
93-
* Get's the {@link SpawnRunner} that this {@link AbstractSpawnStrategy} uses to actually run
92+
* Gets the {@link SpawnRunner} that this {@link AbstractSpawnStrategy} uses to actually run
9493
* spawns.
9594
*
9695
* <p>This is considered a stop-gap until we refactor the entire SpawnStrategy / SpawnRunner
@@ -285,12 +284,6 @@ public ListenableFuture<Void> prefetchInputs()
285284
public InputMetadataProvider getInputMetadataProvider() {
286285
return actionExecutionContext.getInputMetadataProvider();
287286
}
288-
289-
@Override
290-
public OutputMetadataStore getMetadataInjector() {
291-
return actionExecutionContext.getOutputMetadataStore();
292-
}
293-
294287
@Override
295288
public <T extends ActionContext> T getContext(Class<T> identifyingType) {
296289
return actionExecutionContext.getContext(identifyingType);

src/main/java/com/google/devtools/build/lib/exec/SpawnRunner.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import com.google.devtools.build.lib.actions.LostInputsExecException;
2828
import com.google.devtools.build.lib.actions.Spawn;
2929
import com.google.devtools.build.lib.actions.SpawnResult;
30-
import com.google.devtools.build.lib.actions.cache.MetadataInjector;
3130
import com.google.devtools.build.lib.events.ExtendedEventHandler;
3231
import com.google.devtools.build.lib.profiler.Profiler;
3332
import com.google.devtools.build.lib.profiler.ProfilerTask;
@@ -258,12 +257,6 @@ SortedMap<PathFragment, ActionInput> getInputMapping(
258257
/** Reports a progress update to the Spawn strategy. */
259258
void report(ProgressStatus progress);
260259

261-
/**
262-
* Returns a {@link MetadataInjector} that allows a caller to inject metadata about spawn
263-
* outputs that are stored remotely.
264-
*/
265-
MetadataInjector getMetadataInjector();
266-
267260
/**
268261
* Returns the context registered for the given identifying type or {@code null} if none was
269262
* registered.

src/test/java/com/google/devtools/build/lib/exec/local/LocalSpawnRunnerTest.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
import com.google.devtools.build.lib.actions.Spawn;
4545
import com.google.devtools.build.lib.actions.SpawnResult;
4646
import com.google.devtools.build.lib.actions.SpawnResult.Status;
47-
import com.google.devtools.build.lib.actions.cache.MetadataInjector;
4847
import com.google.devtools.build.lib.actions.cache.VirtualActionInput;
4948
import com.google.devtools.build.lib.actions.util.ActionsTestUtil;
5049
import com.google.devtools.build.lib.exec.BinTools;
@@ -293,11 +292,6 @@ public void report(ProgressStatus progress) {
293292
reportedStatus.add(progress);
294293
}
295294

296-
@Override
297-
public MetadataInjector getMetadataInjector() {
298-
throw new UnsupportedOperationException();
299-
}
300-
301295
@Override
302296
public boolean isRewindingEnabled() {
303297
return false;

src/test/java/com/google/devtools/build/lib/remote/RemoteSpawnCacheTest.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,6 @@
4949
import com.google.devtools.build.lib.actions.SimpleSpawn;
5050
import com.google.devtools.build.lib.actions.SpawnResult;
5151
import com.google.devtools.build.lib.actions.SpawnResult.Status;
52-
import com.google.devtools.build.lib.actions.cache.MetadataInjector;
53-
import com.google.devtools.build.lib.actions.util.ActionsTestUtil;
5452
import com.google.devtools.build.lib.clock.JavaClock;
5553
import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
5654
import com.google.devtools.build.lib.collect.nestedset.Order;
@@ -191,11 +189,6 @@ public void report(ProgressStatus progress) {
191189
progressUpdates.add(progress);
192190
}
193191

194-
@Override
195-
public MetadataInjector getMetadataInjector() {
196-
return ActionsTestUtil.THROWING_METADATA_HANDLER;
197-
}
198-
199192
@Override
200193
public boolean isRewindingEnabled() {
201194
return false;

src/test/java/com/google/devtools/build/lib/remote/util/FakeSpawnExecutionContext.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@
2424
import com.google.devtools.build.lib.actions.ForbiddenActionInputException;
2525
import com.google.devtools.build.lib.actions.InputMetadataProvider;
2626
import com.google.devtools.build.lib.actions.Spawn;
27-
import com.google.devtools.build.lib.actions.cache.MetadataInjector;
28-
import com.google.devtools.build.lib.actions.util.ActionsTestUtil;
2927
import com.google.devtools.build.lib.exec.SpawnInputExpander;
3028
import com.google.devtools.build.lib.exec.SpawnRunner.ProgressStatus;
3129
import com.google.devtools.build.lib.exec.SpawnRunner.SpawnExecutionContext;
@@ -151,11 +149,6 @@ public void report(ProgressStatus progress) {
151149
// Intentionally left empty.
152150
}
153151

154-
@Override
155-
public MetadataInjector getMetadataInjector() {
156-
return ActionsTestUtil.THROWING_METADATA_HANDLER;
157-
}
158-
159152
@Override
160153
public <T extends ActionContext> T getContext(Class<T> identifyingType) {
161154
return actionContextRegistry.getInstance(identifyingType);

src/test/java/com/google/devtools/build/lib/sandbox/SpawnRunnerTestUtil.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import com.google.devtools.build.lib.actions.Artifact.ArtifactExpander;
2626
import com.google.devtools.build.lib.actions.InputMetadataProvider;
2727
import com.google.devtools.build.lib.actions.Spawn;
28-
import com.google.devtools.build.lib.actions.cache.MetadataInjector;
2928
import com.google.devtools.build.lib.exec.SpawnInputExpander;
3029
import com.google.devtools.build.lib.exec.SpawnRunner.ProgressStatus;
3130
import com.google.devtools.build.lib.exec.SpawnRunner.SpawnExecutionContext;
@@ -145,11 +144,6 @@ public void report(ProgressStatus progress) {
145144
reportedStatus.add(progress);
146145
}
147146

148-
@Override
149-
public MetadataInjector getMetadataInjector() {
150-
return mock(MetadataInjector.class);
151-
}
152-
153147
@Override
154148
public <T extends ActionContext> T getContext(Class<T> identifyingType) {
155149
throw new UnsupportedOperationException();

0 commit comments

Comments
 (0)