diff options
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib')
21 files changed, 43 insertions, 61 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/r15/AndroidNdkCrosstoolsR15.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/r15/AndroidNdkCrosstoolsR15.java index e46315e4d7..91dd384c28 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/r15/AndroidNdkCrosstoolsR15.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/r15/AndroidNdkCrosstoolsR15.java @@ -23,7 +23,7 @@ import com.google.devtools.build.lib.view.config.crosstool.CrosstoolConfig.Cross import com.google.devtools.build.lib.view.config.crosstool.CrosstoolConfig.DefaultCpuToolchain; import java.util.ArrayList; import java.util.List; -import java.util.Map.Entry; +import java.util.Map; /** Generates a CrosstoolRelease proto for the Android NDK. */ final class AndroidNdkCrosstoolsR15 { @@ -104,7 +104,7 @@ final class AndroidNdkCrosstoolsR15 { .build(); ImmutableList.Builder<DefaultCpuToolchain> defaultCpuToolchains = ImmutableList.builder(); - for (Entry<String, String> defaultCpu : defaultCpus.entrySet()) { + for (Map.Entry<String, String> defaultCpu : defaultCpus.entrySet()) { defaultCpuToolchains.add( DefaultCpuToolchain.newBuilder() .setCpu(defaultCpu.getKey()) diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/r15/ArmCrosstools.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/r15/ArmCrosstools.java index 699b167639..cf69457ae0 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/r15/ArmCrosstools.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/r15/ArmCrosstools.java @@ -18,7 +18,6 @@ import com.google.common.collect.ImmutableList; import com.google.devtools.build.lib.bazel.rules.android.ndkcrosstools.NdkPaths; import com.google.devtools.build.lib.bazel.rules.android.ndkcrosstools.StlImpl; import com.google.devtools.build.lib.view.config.crosstool.CrosstoolConfig.CToolchain; -import com.google.devtools.build.lib.view.config.crosstool.CrosstoolConfig.CToolchain.Builder; import com.google.devtools.build.lib.view.config.crosstool.CrosstoolConfig.CompilationMode; import com.google.devtools.build.lib.view.config.crosstool.CrosstoolConfig.CompilationModeFlags; import java.util.List; @@ -38,7 +37,7 @@ final class ArmCrosstools { this.clangVersion = clangVersion; } - ImmutableList<Builder> createCrosstools() { + ImmutableList<CToolchain.Builder> createCrosstools() { return ImmutableList.<CToolchain.Builder>builder() .add(createAarch64ClangToolchain()) .addAll(createArmeabiClangToolchain()) @@ -106,8 +105,8 @@ final class ArmCrosstools { return toolchain; } - private List<Builder> createArmeabiClangToolchain() { - ImmutableList<Builder> toolchains = + private List<CToolchain.Builder> createArmeabiClangToolchain() { + ImmutableList<CToolchain.Builder> toolchains = ImmutableList.of( createBaseArmeabiClangToolchain() .setToolchainIdentifier("arm-linux-androideabi-clang" + clangVersion) diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/r15/MipsCrosstools.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/r15/MipsCrosstools.java index 66523f52e0..469c2b08e6 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/r15/MipsCrosstools.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/r15/MipsCrosstools.java @@ -19,7 +19,6 @@ import com.google.devtools.build.lib.bazel.rules.android.ndkcrosstools.NdkPaths; import com.google.devtools.build.lib.bazel.rules.android.ndkcrosstools.StlImpl; import com.google.devtools.build.lib.rules.cpp.CppConfiguration; import com.google.devtools.build.lib.view.config.crosstool.CrosstoolConfig.CToolchain; -import com.google.devtools.build.lib.view.config.crosstool.CrosstoolConfig.CToolchain.Builder; import com.google.devtools.build.lib.view.config.crosstool.CrosstoolConfig.CompilationMode; import com.google.devtools.build.lib.view.config.crosstool.CrosstoolConfig.CompilationModeFlags; @@ -38,7 +37,7 @@ final class MipsCrosstools { this.clangVersion = clangVersion; } - ImmutableList<Builder> createCrosstools() { + ImmutableList<CToolchain.Builder> createCrosstools() { return ImmutableList.of(createMips64Toolchain(), createMipsToolchain()); } diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/r15/X86Crosstools.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/r15/X86Crosstools.java index 1183b4f40f..eb953278a6 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/r15/X86Crosstools.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/r15/X86Crosstools.java @@ -18,7 +18,6 @@ import com.google.common.collect.ImmutableList; import com.google.devtools.build.lib.bazel.rules.android.ndkcrosstools.NdkPaths; import com.google.devtools.build.lib.bazel.rules.android.ndkcrosstools.StlImpl; import com.google.devtools.build.lib.view.config.crosstool.CrosstoolConfig.CToolchain; -import com.google.devtools.build.lib.view.config.crosstool.CrosstoolConfig.CToolchain.Builder; import com.google.devtools.build.lib.view.config.crosstool.CrosstoolConfig.CompilationMode; import com.google.devtools.build.lib.view.config.crosstool.CrosstoolConfig.CompilationModeFlags; @@ -37,7 +36,7 @@ final class X86Crosstools { this.clangVersion = clangVersion; } - ImmutableList<Builder> createCrosstools() { + ImmutableList<CToolchain.Builder> createCrosstools() { /** x86 */ // clang CToolchain.Builder x86Clang = diff --git a/src/main/java/com/google/devtools/build/lib/query2/ConfiguredTargetQueryEnvironment.java b/src/main/java/com/google/devtools/build/lib/query2/ConfiguredTargetQueryEnvironment.java index b1251c6169..345a4bbca8 100644 --- a/src/main/java/com/google/devtools/build/lib/query2/ConfiguredTargetQueryEnvironment.java +++ b/src/main/java/com/google/devtools/build/lib/query2/ConfiguredTargetQueryEnvironment.java @@ -26,7 +26,6 @@ import com.google.devtools.build.lib.analysis.configuredtargets.RuleConfiguredTa import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.cmdline.TargetParsingException; import com.google.devtools.build.lib.cmdline.TargetPattern; -import com.google.devtools.build.lib.cmdline.TargetPattern.Type; import com.google.devtools.build.lib.collect.compacthashset.CompactHashSet; import com.google.devtools.build.lib.concurrent.MultisetSemaphore; import com.google.devtools.build.lib.events.Event; @@ -80,7 +79,6 @@ import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import java.util.function.Function; import java.util.function.Supplier; @@ -450,7 +448,7 @@ public class ConfiguredTargetQueryEnvironment eventHandler.handle(Event.warn("Targets were missing from graph: " + missingTargets)); } ThreadSafeMutableSet<ConfiguredTarget> result = createThreadSafeMutableSet(); - for (Entry<SkyKey, Collection<ConfiguredTarget>> entry : directDeps.entrySet()) { + for (Map.Entry<SkyKey, Collection<ConfiguredTarget>> entry : directDeps.entrySet()) { result.addAll(filterFwdDeps(targetsByKey.get(entry.getKey()), entry.getValue())); } return result; @@ -636,7 +634,7 @@ public class ConfiguredTargetQueryEnvironment if (TargetPattern.defaultParser() .parse(pattern) .getType() - .equals(Type.TARGETS_BELOW_DIRECTORY)) { + .equals(TargetPattern.Type.TARGETS_BELOW_DIRECTORY)) { // TODO(bazel-team): allow recursive patterns if the pattern is present in the graph? We // could do a mini-eval here to update the graph to contain the necessary nodes for // GraphBackedRecursivePackageProvider, since all the package loading and directory diff --git a/src/main/java/com/google/devtools/build/lib/query2/LabelVisitor.java b/src/main/java/com/google/devtools/build/lib/query2/LabelVisitor.java index 6f18da7e7d..ab1f1eaaa3 100644 --- a/src/main/java/com/google/devtools/build/lib/query2/LabelVisitor.java +++ b/src/main/java/com/google/devtools/build/lib/query2/LabelVisitor.java @@ -39,7 +39,7 @@ import com.google.devtools.build.lib.packages.Target; import com.google.devtools.build.lib.pkgcache.TargetEdgeObserver; import com.google.devtools.build.lib.pkgcache.TargetProvider; import java.util.Collection; -import java.util.Map.Entry; +import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.TimeUnit; @@ -401,7 +401,7 @@ final class LabelVisitor { ImmutableMultimap<Attribute, Label> labelsFromAspects = AspectDefinition.visitAspectsIfRequired(from, attribute, to, edgeFilter); // Create an edge from target to the attribute value. - for (Entry<Attribute, Label> entry : labelsFromAspects.entries()) { + for (Map.Entry<Attribute, Label> entry : labelsFromAspects.entries()) { enqueueTarget(from, entry.getKey(), entry.getValue(), depth, count); } } diff --git a/src/main/java/com/google/devtools/build/lib/query2/ProtoOutputFormatterCallback.java b/src/main/java/com/google/devtools/build/lib/query2/ProtoOutputFormatterCallback.java index 337ba34c53..ecf64be8f8 100644 --- a/src/main/java/com/google/devtools/build/lib/query2/ProtoOutputFormatterCallback.java +++ b/src/main/java/com/google/devtools/build/lib/query2/ProtoOutputFormatterCallback.java @@ -31,7 +31,7 @@ import com.google.devtools.build.lib.query2.output.AspectResolver; import com.google.devtools.build.lib.query2.output.CqueryOptions; import com.google.devtools.build.lib.query2.output.ProtoOutputFormatter; import com.google.devtools.build.lib.query2.proto.proto2api.Build; -import com.google.devtools.build.lib.query2.proto.proto2api.Build.QueryResult.Builder; +import com.google.devtools.build.lib.query2.proto.proto2api.Build.QueryResult; import com.google.devtools.build.lib.skyframe.SkyframeExecutor; import java.io.IOException; import java.io.OutputStream; @@ -71,7 +71,7 @@ public class ProtoOutputFormatterCallback extends CqueryThreadsafeCallback { // Documentation promises that setting this flag to false means we convert directly // to the build.proto format. This is hard to test in integration testing due to the way // proto output is turned readable (codex). So change the following code with caution. - Builder queryResult = Build.QueryResult.newBuilder(); + QueryResult.Builder queryResult = Build.QueryResult.newBuilder(); protoResult.getResultsList().forEach(ct -> queryResult.addTarget(ct.getTarget())); queryResult.build().writeTo(printStream); } diff --git a/src/main/java/com/google/devtools/build/lib/query2/SkyQueryEnvironment.java b/src/main/java/com/google/devtools/build/lib/query2/SkyQueryEnvironment.java index 9a3370a724..aaf4166f78 100644 --- a/src/main/java/com/google/devtools/build/lib/query2/SkyQueryEnvironment.java +++ b/src/main/java/com/google/devtools/build/lib/query2/SkyQueryEnvironment.java @@ -112,7 +112,6 @@ import java.util.Collection; import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import java.util.concurrent.Callable; import java.util.concurrent.RejectedExecutionException; @@ -868,10 +867,10 @@ public class SkyQueryEnvironment extends AbstractBlazeQueryEnvironment<Target> // First, look for errors in the successfully evaluated TransitiveTraversalValues. They may // have encountered errors that they were able to recover from. - Set<Entry<SkyKey, SkyValue>> successfulEntries = + Set<Map.Entry<SkyKey, SkyValue>> successfulEntries = graph.getSuccessfulValues(transitiveTraversalKeys).entrySet(); ImmutableSet.Builder<SkyKey> successfulKeysBuilder = ImmutableSet.builder(); - for (Entry<SkyKey, SkyValue> successfulEntry : successfulEntries) { + for (Map.Entry<SkyKey, SkyValue> successfulEntry : successfulEntries) { successfulKeysBuilder.add(successfulEntry.getKey()); TransitiveTraversalValue value = (TransitiveTraversalValue) successfulEntry.getValue(); String firstErrorMessage = value.getFirstErrorMessage(); @@ -884,7 +883,7 @@ public class SkyQueryEnvironment extends AbstractBlazeQueryEnvironment<Target> // Next, look for errors from the unsuccessfully evaluated TransitiveTraversal skyfunctions. Iterable<SkyKey> unsuccessfulKeys = Iterables.filter(transitiveTraversalKeys, Predicates.not(Predicates.in(successfulKeys))); - Set<Entry<SkyKey, Exception>> errorEntries = + Set<Map.Entry<SkyKey, Exception>> errorEntries = graph.getMissingAndExceptions(unsuccessfulKeys).entrySet(); for (Map.Entry<SkyKey, Exception> entry : errorEntries) { if (entry.getValue() == null) { @@ -1026,7 +1025,7 @@ public class SkyQueryEnvironment extends AbstractBlazeQueryEnvironment<Target> while (!currentToOriginal.isEmpty()) { Multimap<SkyKey, PathFragment> packageLookupKeysToOriginal = ArrayListMultimap.create(); Multimap<SkyKey, PathFragment> packageLookupKeysToCurrent = ArrayListMultimap.create(); - for (Entry<PathFragment, PathFragment> entry : currentToOriginal.entries()) { + for (Map.Entry<PathFragment, PathFragment> entry : currentToOriginal.entries()) { PathFragment current = entry.getKey(); PathFragment original = entry.getValue(); for (SkyKey packageLookupKey : getPkgLookupKeysForFile(original, current)) { diff --git a/src/main/java/com/google/devtools/build/lib/rules/apple/AppleToolchain.java b/src/main/java/com/google/devtools/build/lib/rules/apple/AppleToolchain.java index c5e54c7976..d69da25ab8 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/apple/AppleToolchain.java +++ b/src/main/java/com/google/devtools/build/lib/rules/apple/AppleToolchain.java @@ -26,7 +26,6 @@ import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; import com.google.devtools.build.lib.packages.Attribute.LabelLateBoundDefault; import com.google.devtools.build.lib.packages.RuleClass; -import com.google.devtools.build.lib.packages.RuleClass.Builder; import com.google.devtools.build.lib.packages.RuleClass.Builder.RuleClassType; import com.google.devtools.build.lib.skylarkinterface.SkylarkCallable; import com.google.devtools.build.lib.skylarkinterface.SkylarkModule; @@ -168,7 +167,7 @@ public class AppleToolchain { } @Override - public RuleClass build(Builder builder, RuleDefinitionEnvironment env) { + public RuleClass build(RuleClass.Builder builder, RuleDefinitionEnvironment env) { return builder .add( attr(XcodeConfigRule.XCODE_CONFIG_ATTR_NAME, LABEL) diff --git a/src/main/java/com/google/devtools/build/lib/rules/apple/XcodeConfigRule.java b/src/main/java/com/google/devtools/build/lib/rules/apple/XcodeConfigRule.java index b22e1aa6a6..a1d18324bc 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/apple/XcodeConfigRule.java +++ b/src/main/java/com/google/devtools/build/lib/rules/apple/XcodeConfigRule.java @@ -23,7 +23,6 @@ import com.google.devtools.build.lib.analysis.BaseRuleClasses; import com.google.devtools.build.lib.analysis.RuleDefinition; import com.google.devtools.build.lib.analysis.RuleDefinitionEnvironment; import com.google.devtools.build.lib.packages.RuleClass; -import com.google.devtools.build.lib.packages.RuleClass.Builder; /** * Rule definition for {@code xcode_config} rule. @@ -36,7 +35,7 @@ public class XcodeConfigRule implements RuleDefinition { static final String REQUIRE_DEFINED_VERSIONS_ATTR_NAME = "require_defined_version"; @Override - public RuleClass build(Builder builder, RuleDefinitionEnvironment env) { + public RuleClass build(RuleClass.Builder builder, RuleDefinitionEnvironment env) { return builder .requiresConfigurationFragments(AppleConfiguration.class) .exemptFromConstraintChecking( diff --git a/src/main/java/com/google/devtools/build/lib/rules/apple/XcodeVersionRule.java b/src/main/java/com/google/devtools/build/lib/rules/apple/XcodeVersionRule.java index bdf5b1b77f..a4630826a1 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/apple/XcodeVersionRule.java +++ b/src/main/java/com/google/devtools/build/lib/rules/apple/XcodeVersionRule.java @@ -22,7 +22,6 @@ import com.google.devtools.build.lib.analysis.BaseRuleClasses; import com.google.devtools.build.lib.analysis.RuleDefinition; import com.google.devtools.build.lib.analysis.RuleDefinitionEnvironment; import com.google.devtools.build.lib.packages.RuleClass; -import com.google.devtools.build.lib.packages.RuleClass.Builder; /** * Rule definition for {@code xcode_version} rule. @@ -37,7 +36,7 @@ public class XcodeVersionRule implements RuleDefinition { static final String DEFAULT_MACOS_SDK_VERSION_ATTR_NAME = "default_macos_sdk_version"; @Override - public RuleClass build(Builder builder, RuleDefinitionEnvironment env) { + public RuleClass build(RuleClass.Builder builder, RuleDefinitionEnvironment env) { return builder .requiresConfigurationFragments(AppleConfiguration.class) .exemptFromConstraintChecking( diff --git a/src/main/java/com/google/devtools/build/lib/rules/repository/CoreWorkspaceRules.java b/src/main/java/com/google/devtools/build/lib/rules/repository/CoreWorkspaceRules.java index 386c64a52c..da2dd2cffe 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/repository/CoreWorkspaceRules.java +++ b/src/main/java/com/google/devtools/build/lib/rules/repository/CoreWorkspaceRules.java @@ -14,7 +14,7 @@ package com.google.devtools.build.lib.rules.repository; import com.google.common.collect.ImmutableList; -import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider.Builder; +import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider; import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider.RuleSet; import com.google.devtools.build.lib.rules.core.CoreRules; @@ -29,7 +29,7 @@ public final class CoreWorkspaceRules implements RuleSet { } @Override - public void init(Builder builder) { + public void init(ConfiguredRuleClassProvider.Builder builder) { builder.addRuleDefinition(new BindRule()); builder.addRuleDefinition(new WorkspaceBaseRule()); builder.addRuleDefinition(new LocalRepositoryRule()); diff --git a/src/main/java/com/google/devtools/build/lib/rules/repository/LocalRepositoryRule.java b/src/main/java/com/google/devtools/build/lib/rules/repository/LocalRepositoryRule.java index 6be2cf5c81..6713a83a6a 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/repository/LocalRepositoryRule.java +++ b/src/main/java/com/google/devtools/build/lib/rules/repository/LocalRepositoryRule.java @@ -20,7 +20,6 @@ import static com.google.devtools.build.lib.syntax.Type.STRING; import com.google.devtools.build.lib.analysis.RuleDefinition; import com.google.devtools.build.lib.analysis.RuleDefinitionEnvironment; import com.google.devtools.build.lib.packages.RuleClass; -import com.google.devtools.build.lib.packages.RuleClass.Builder; import com.google.devtools.build.lib.packages.RuleClass.Builder.RuleClassType; /** @@ -31,7 +30,7 @@ public class LocalRepositoryRule implements RuleDefinition { public static final String NAME = "local_repository"; @Override - public RuleClass build(Builder builder, RuleDefinitionEnvironment environment) { + public RuleClass build(RuleClass.Builder builder, RuleDefinitionEnvironment environment) { return builder /* <!-- #BLAZE_RULE(local_repository).ATTRIBUTE(path) --> The path to the local repository's directory. diff --git a/src/main/java/com/google/devtools/build/lib/rules/repository/NewLocalRepositoryRule.java b/src/main/java/com/google/devtools/build/lib/rules/repository/NewLocalRepositoryRule.java index bee4534272..bb83728f3d 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/repository/NewLocalRepositoryRule.java +++ b/src/main/java/com/google/devtools/build/lib/rules/repository/NewLocalRepositoryRule.java @@ -20,7 +20,6 @@ import static com.google.devtools.build.lib.syntax.Type.STRING; import com.google.devtools.build.lib.analysis.RuleDefinition; import com.google.devtools.build.lib.analysis.RuleDefinitionEnvironment; import com.google.devtools.build.lib.packages.RuleClass; -import com.google.devtools.build.lib.packages.RuleClass.Builder; import com.google.devtools.build.lib.packages.RuleClass.Builder.RuleClassType; /** @@ -30,7 +29,7 @@ public class NewLocalRepositoryRule implements RuleDefinition { public static final String NAME = "new_local_repository"; @Override - public RuleClass build(Builder builder, RuleDefinitionEnvironment environment) { + public RuleClass build(RuleClass.Builder builder, RuleDefinitionEnvironment environment) { return builder /* <!-- #BLAZE_RULE(new_local_repository).ATTRIBUTE(path) --> A path on the local filesystem. diff --git a/src/main/java/com/google/devtools/build/lib/rules/repository/WorkspaceBaseRule.java b/src/main/java/com/google/devtools/build/lib/rules/repository/WorkspaceBaseRule.java index 8a6e078e68..4d4d3a71e6 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/repository/WorkspaceBaseRule.java +++ b/src/main/java/com/google/devtools/build/lib/rules/repository/WorkspaceBaseRule.java @@ -21,7 +21,6 @@ import com.google.devtools.build.lib.analysis.BaseRuleClasses.RootRule; import com.google.devtools.build.lib.analysis.RuleDefinition; import com.google.devtools.build.lib.analysis.RuleDefinitionEnvironment; import com.google.devtools.build.lib.packages.RuleClass; -import com.google.devtools.build.lib.packages.RuleClass.Builder; import com.google.devtools.build.lib.packages.RuleClass.Builder.RuleClassType; /** @@ -29,7 +28,7 @@ import com.google.devtools.build.lib.packages.RuleClass.Builder.RuleClassType; */ public class WorkspaceBaseRule implements RuleDefinition { @Override - public RuleClass build(Builder builder, RuleDefinitionEnvironment environment) { + public RuleClass build(RuleClass.Builder builder, RuleDefinitionEnvironment environment) { return builder .exemptFromConstraintChecking("workspace rules aren't built for target environments") .add( diff --git a/src/main/java/com/google/devtools/build/lib/sandbox/AbstractContainerizingSandboxedSpawn.java b/src/main/java/com/google/devtools/build/lib/sandbox/AbstractContainerizingSandboxedSpawn.java index 6ee10f5b3e..234c018386 100644 --- a/src/main/java/com/google/devtools/build/lib/sandbox/AbstractContainerizingSandboxedSpawn.java +++ b/src/main/java/com/google/devtools/build/lib/sandbox/AbstractContainerizingSandboxedSpawn.java @@ -24,7 +24,6 @@ import java.util.Collection; import java.util.LinkedHashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; /** @@ -114,7 +113,7 @@ public abstract class AbstractContainerizingSandboxedSpawn implements SandboxedS protected void createInputs(Map<PathFragment, Path> inputs) throws IOException { // All input files are relative to the execroot. - for (Entry<PathFragment, Path> entry : inputs.entrySet()) { + for (Map.Entry<PathFragment, Path> entry : inputs.entrySet()) { Path key = sandboxExecRoot.getRelative(entry.getKey()); // A null value means that we're supposed to create an empty file as the input. if (entry.getValue() != null) { diff --git a/src/main/java/com/google/devtools/build/lib/sandbox/DockerCommandLineBuilder.java b/src/main/java/com/google/devtools/build/lib/sandbox/DockerCommandLineBuilder.java index caf7596c16..db8c5c8033 100644 --- a/src/main/java/com/google/devtools/build/lib/sandbox/DockerCommandLineBuilder.java +++ b/src/main/java/com/google/devtools/build/lib/sandbox/DockerCommandLineBuilder.java @@ -22,7 +22,6 @@ import com.google.devtools.build.lib.vfs.PathFragment; import java.time.Duration; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.UUID; final class DockerCommandLineBuilder { @@ -130,7 +129,7 @@ final class DockerCommandLineBuilder { if (privileged) { dockerCmdLine.add("--privileged"); } - for (Entry<String, String> env : environmentVariables.entrySet()) { + for (Map.Entry<String, String> env : environmentVariables.entrySet()) { dockerCmdLine.add("-e", env.getKey() + "=" + env.getValue()); } PathFragment execRootInsideDocker = diff --git a/src/main/java/com/google/devtools/build/lib/sandbox/SandboxfsSandboxedSpawn.java b/src/main/java/com/google/devtools/build/lib/sandbox/SandboxfsSandboxedSpawn.java index 1c6357ad28..603ad79704 100644 --- a/src/main/java/com/google/devtools/build/lib/sandbox/SandboxfsSandboxedSpawn.java +++ b/src/main/java/com/google/devtools/build/lib/sandbox/SandboxfsSandboxedSpawn.java @@ -26,7 +26,6 @@ import java.util.Collection; import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Logger; @@ -182,7 +181,7 @@ class SandboxfsSandboxedSpawn implements SandboxedSpawn { // FUSE file system (which sandboxfs is) requires root privileges. Path emptyFile = null; - for (Entry<PathFragment, Path> entry : inputs.entrySet()) { + for (Map.Entry<PathFragment, Path> entry : inputs.entrySet()) { PathFragment target; if (entry.getValue() == null) { if (emptyFile == null) { diff --git a/src/main/java/com/google/devtools/build/lib/worker/WorkerExecRoot.java b/src/main/java/com/google/devtools/build/lib/worker/WorkerExecRoot.java index 4cf02ac5b7..87c55d48db 100644 --- a/src/main/java/com/google/devtools/build/lib/worker/WorkerExecRoot.java +++ b/src/main/java/com/google/devtools/build/lib/worker/WorkerExecRoot.java @@ -25,7 +25,6 @@ import com.google.devtools.build.lib.vfs.Symlinks; import java.io.IOException; import java.util.Collection; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; /** Creates and manages the contents of a working directory of a persistent worker. */ @@ -77,7 +76,7 @@ final class WorkerExecRoot extends SymlinkedSandboxedSpawn { @Override protected void createInputs(Map<PathFragment, Path> inputs) throws IOException { // All input files are relative to the execroot. - for (Entry<PathFragment, Path> entry : inputs.entrySet()) { + for (Map.Entry<PathFragment, Path> entry : inputs.entrySet()) { Path key = workDir.getRelative(entry.getKey()); FileStatus keyStat = key.statNullable(Symlinks.NOFOLLOW); if (keyStat != null) { diff --git a/src/main/java/com/google/devtools/build/lib/worker/WorkerFilesHash.java b/src/main/java/com/google/devtools/build/lib/worker/WorkerFilesHash.java index a39e47f968..ddc7da791f 100644 --- a/src/main/java/com/google/devtools/build/lib/worker/WorkerFilesHash.java +++ b/src/main/java/com/google/devtools/build/lib/worker/WorkerFilesHash.java @@ -30,7 +30,6 @@ import java.io.IOException; import java.nio.charset.Charset; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.SortedMap; import java.util.TreeMap; @@ -42,7 +41,7 @@ class WorkerFilesHash { static HashCode getCombinedHash(SortedMap<PathFragment, HashCode> workerFilesMap) { Hasher hasher = Hashing.sha256().newHasher(); - for (Entry<PathFragment, HashCode> workerFile : workerFilesMap.entrySet()) { + for (Map.Entry<PathFragment, HashCode> workerFile : workerFilesMap.entrySet()) { hasher.putString(workerFile.getKey().getPathString(), Charset.defaultCharset()); hasher.putBytes(workerFile.getValue().asBytes()); } @@ -66,11 +65,11 @@ class WorkerFilesHash { HashCode.fromBytes(actionInputFileCache.getMetadata(tool).getDigest())); } - for (Entry<PathFragment, Map<PathFragment, Artifact>> rootAndMappings : + for (Map.Entry<PathFragment, Map<PathFragment, Artifact>> rootAndMappings : spawn.getRunfilesSupplier().getMappings().entrySet()) { PathFragment root = rootAndMappings.getKey(); Preconditions.checkState(!root.isAbsolute(), root); - for (Entry<PathFragment, Artifact> mapping : rootAndMappings.getValue().entrySet()) { + for (Map.Entry<PathFragment, Artifact> mapping : rootAndMappings.getValue().entrySet()) { Artifact localArtifact = mapping.getValue(); if (localArtifact != null) { Metadata metadata = actionInputFileCache.getMetadata(localArtifact); diff --git a/src/main/java/com/google/devtools/build/lib/worker/WorkerOptions.java b/src/main/java/com/google/devtools/build/lib/worker/WorkerOptions.java index d0bb6749e3..6055818680 100644 --- a/src/main/java/com/google/devtools/build/lib/worker/WorkerOptions.java +++ b/src/main/java/com/google/devtools/build/lib/worker/WorkerOptions.java @@ -20,7 +20,7 @@ import com.google.devtools.common.options.OptionEffectTag; import com.google.devtools.common.options.Options; import com.google.devtools.common.options.OptionsBase; import java.util.List; -import java.util.Map.Entry; +import java.util.Map; /** * Options related to worker processes. @@ -85,17 +85,16 @@ public class WorkerOptions extends OptionsBase { public boolean workerVerbose; @Option( - name = "worker_extra_flag", - converter = Converters.AssignmentConverter.class, - defaultValue = "", - documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, - effectTags = {OptionEffectTag.UNKNOWN}, - help = - "Extra command-flags that will be passed to worker processes in addition to " - + "--persistent_worker, keyed by mnemonic (e.g. --worker_extra_flag=Javac=--debug.", - allowMultiple = true - ) - public List<Entry<String, String>> workerExtraFlags; + name = "worker_extra_flag", + converter = Converters.AssignmentConverter.class, + defaultValue = "", + documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, + effectTags = {OptionEffectTag.UNKNOWN}, + help = + "Extra command-flags that will be passed to worker processes in addition to " + + "--persistent_worker, keyed by mnemonic (e.g. --worker_extra_flag=Javac=--debug.", + allowMultiple = true) + public List<Map.Entry<String, String>> workerExtraFlags; @Option( name = "worker_sandboxing", |