diff --git a/src/main/java/com/google/devtools/build/lib/analysis/AspectCompleteEvent.java b/src/main/java/com/google/devtools/build/lib/analysis/AspectCompleteEvent.java index 03774ce7e386a2..222bdf693c349e 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/AspectCompleteEvent.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/AspectCompleteEvent.java @@ -132,10 +132,6 @@ public ArtifactsInOutputGroup getArtifacts(String outputGroup) { return artifactOutputGroups.get(outputGroup); } - public ImmutableMap getOutputGroups() { - return artifactOutputGroups; - } - public CompletionContext getCompletionContext() { return completionContext; } diff --git a/src/main/java/com/google/devtools/build/lib/analysis/ExecGroupCollection.java b/src/main/java/com/google/devtools/build/lib/analysis/ExecGroupCollection.java index 7d9a37fa957d1f..9eeaeef713a25d 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/ExecGroupCollection.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/ExecGroupCollection.java @@ -101,14 +101,6 @@ public static ImmutableMap process( public abstract static class Builder { public abstract ImmutableMap execGroups(); - public ImmutableSet getExecGroupNames() { - return execGroups().keySet(); - } - - public ExecGroup getExecGroup(String name) { - return execGroups().get(name); - } - public ExecGroupCollection build( @Nullable ToolchainCollection toolchainContexts, ImmutableMap rawExecProperties) diff --git a/src/main/java/com/google/devtools/build/lib/analysis/TargetCompleteEvent.java b/src/main/java/com/google/devtools/build/lib/analysis/TargetCompleteEvent.java index c39c2e288a98f5..833364e7f496d9 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/TargetCompleteEvent.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/TargetCompleteEvent.java @@ -100,14 +100,6 @@ public Path getRunfilesDirectory() { return null; } - @Nullable - public Runfiles getRunfiles() { - if (runfilesSupport != null) { - return runfilesSupport.getRunfiles(); - } - return null; - } - @Nullable public Artifact getExecutable() { return executable; @@ -305,10 +297,6 @@ public ArtifactsInOutputGroup getOutputGroup(String outputGroup) { return outputs.get(outputGroup); } - public ImmutableMap getOutputs() { - return outputs; - } - // TODO(aehlig): remove as soon as we managed to get rid of the deprecated "important_output" // field. diff --git a/src/main/java/com/google/devtools/build/lib/query2/engine/QueryEnvironment.java b/src/main/java/com/google/devtools/build/lib/query2/engine/QueryEnvironment.java index adbad78af5cb2d..cf92d7edfd54d5 100644 --- a/src/main/java/com/google/devtools/build/lib/query2/engine/QueryEnvironment.java +++ b/src/main/java/com/google/devtools/build/lib/query2/engine/QueryEnvironment.java @@ -537,26 +537,6 @@ interface ThreadSafeMutableSet extends Set {} /** Returns a fresh {@link ThreadSafeMutableSet} instance for the type {@code T}. */ ThreadSafeMutableSet createThreadSafeMutableSet(); - /** - * A simple map-like interface that uses proper equality semantics for the key type. {@link - * QueryExpression}/{@link QueryFunction} implementations should use {@code - * ThreadSafeMutableSet} they need a map-like data structure for {@code T}. - */ - interface MutableMap { - /** - * Returns the value {@code value} associated with the given key by the most recent call to - * {@code put(key, value)}, or {@code null} if there was no such call. - */ - @Nullable - V get(K key); - - /** - * Associates the given key with the given value and returns the previous value associated with - * the key, or {@code null} if there wasn't one. - */ - V put(K key, V value); - } - /** * Creates a Uniquifier for use in a {@code QueryExpression}. Note that the usage of this * uniquifier should not be used for returning unique results to the parent callback. It should diff --git a/src/main/java/com/google/devtools/build/lib/remote/AbstractActionInputPrefetcher.java b/src/main/java/com/google/devtools/build/lib/remote/AbstractActionInputPrefetcher.java index 20d8a331cfda5d..ff394660907b4f 100644 --- a/src/main/java/com/google/devtools/build/lib/remote/AbstractActionInputPrefetcher.java +++ b/src/main/java/com/google/devtools/build/lib/remote/AbstractActionInputPrefetcher.java @@ -39,7 +39,6 @@ import com.google.devtools.build.lib.actions.cache.OutputMetadataStore; import com.google.devtools.build.lib.actions.cache.VirtualActionInput; import com.google.devtools.build.lib.events.Event; -import com.google.devtools.build.lib.events.ExtendedEventHandler.Postable; import com.google.devtools.build.lib.events.Reporter; import com.google.devtools.build.lib.remote.common.CacheNotFoundException; import com.google.devtools.build.lib.remote.util.AsyncTaskCache; @@ -573,19 +572,6 @@ public void shutdown() { } } - /** Event which is fired when inputs for local action are eagerly prefetched. */ - public static class InputsEagerlyPrefetched implements Postable { - private final List artifacts; - - public InputsEagerlyPrefetched(List artifacts) { - this.artifacts = artifacts; - } - - public List getArtifacts() { - return artifacts; - } - } - public void finalizeAction(Action action, OutputMetadataStore outputMetadataStore) throws IOException, InterruptedException { List outputsToDownload = new ArrayList<>(); diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcAspect.java b/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcAspect.java index 8a65312f5fe269..1e0cfac3d7e3ba 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcAspect.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcAspect.java @@ -131,11 +131,6 @@ public J2ObjcAspect(RuleDefinitionEnvironment env, CppSemantics cppSemantics) { this.javaToolchainTypeRequirement = JavaRuleClasses.javaToolchainTypeRequirement(env); } - /** Returns whether this aspect allows proto services to be generated from this proto rule */ - protected boolean shouldAllowProtoServices(RuleContext ruleContext) { - return true; - } - @Override public AspectDefinition getDefinition(AspectParameters aspectParameters) { return ConfigAwareAspectBuilder.of(new AspectDefinition.Builder(this)) diff --git a/src/main/java/com/google/devtools/build/lib/rules/python/PyRuntimeInfo.java b/src/main/java/com/google/devtools/build/lib/rules/python/PyRuntimeInfo.java index b4a973aa968a90..007254e720749e 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/python/PyRuntimeInfo.java +++ b/src/main/java/com/google/devtools/build/lib/rules/python/PyRuntimeInfo.java @@ -89,17 +89,6 @@ public NestedSet getFiles() throws EvalException { } } - @Nullable - public Artifact getCoverageTool() throws EvalException { - return info.getValue("coverage_tool", Artifact.class); - } - - @Nullable - public NestedSet getCoverageToolFiles() throws EvalException { - Object value = info.getValue("coverage_files"); - return Depset.cast(value, Artifact.class, "coverage_files"); - } - public PythonVersion getPythonVersion() throws EvalException { return PythonVersion.parseTargetValue(info.getValue("python_version", String.class)); } diff --git a/src/test/java/com/google/devtools/build/lib/query2/engine/GraphlessQueryTest.java b/src/test/java/com/google/devtools/build/lib/query2/engine/GraphlessQueryTest.java index d190409b918f97..a8d0d32d95c091 100644 --- a/src/test/java/com/google/devtools/build/lib/query2/engine/GraphlessQueryTest.java +++ b/src/test/java/com/google/devtools/build/lib/query2/engine/GraphlessQueryTest.java @@ -17,8 +17,6 @@ import com.google.common.base.Predicate; import com.google.common.collect.ImmutableList; -import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider; -import com.google.devtools.build.lib.analysis.config.BuildOptions; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.cmdline.TargetPattern; import com.google.devtools.build.lib.events.ExtendedEventHandler; @@ -152,12 +150,6 @@ public AbstractBlazeQueryEnvironment create( protected Iterable getExtraQueryFunctions() { return ImmutableList.of(); } - - @Override - protected BuildOptions getDefaultBuildOptions(ConfiguredRuleClassProvider ruleClassProvider) { - return BuildOptions.getDefaultBuildOptionsForFragments( - ruleClassProvider.getFragmentRegistry().getOptionsClasses()); - } }; } } diff --git a/src/test/java/com/google/devtools/build/lib/query2/testutil/SkyframeQueryHelper.java b/src/test/java/com/google/devtools/build/lib/query2/testutil/SkyframeQueryHelper.java index 7bdeec19e8e45f..08d819a4fd384c 100644 --- a/src/test/java/com/google/devtools/build/lib/query2/testutil/SkyframeQueryHelper.java +++ b/src/test/java/com/google/devtools/build/lib/query2/testutil/SkyframeQueryHelper.java @@ -23,7 +23,6 @@ import com.google.devtools.build.lib.analysis.BlazeDirectories; import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider; import com.google.devtools.build.lib.analysis.ServerDirectories; -import com.google.devtools.build.lib.analysis.config.BuildOptions; import com.google.devtools.build.lib.analysis.util.AnalysisMock; import com.google.devtools.build.lib.bazel.bzlmod.BazelLockFileFunction; import com.google.devtools.build.lib.bazel.bzlmod.BazelModuleResolutionFunction; @@ -428,9 +427,6 @@ protected SkyframeExecutor createSkyframeExecutor(ConfiguredRuleClassProvider ru return skyframeExecutor; } - protected abstract BuildOptions getDefaultBuildOptions( - ConfiguredRuleClassProvider ruleClassProvider); - @Override public void assertPackageNotLoaded(String packageName) throws Exception { MemoizingEvaluator evaluator = skyframeExecutor.getEvaluator();