diff options
Diffstat (limited to 'src/main/java/com')
30 files changed, 57 insertions, 83 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/AspectCollection.java b/src/main/java/com/google/devtools/build/lib/analysis/AspectCollection.java index 66b734fd4b..f95340c930 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/AspectCollection.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/AspectCollection.java @@ -23,7 +23,7 @@ import com.google.devtools.build.lib.packages.AspectDescriptor; import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedHashMap; -import java.util.Map.Entry; +import java.util.Map; import java.util.Set; /** @@ -254,7 +254,7 @@ public final class AspectCollection { // the original list in reverse). // // deps[aspect] contains all aspects that 'aspect' needs, in reverse order. - for (Entry<AspectDescriptor, Aspect> aspect : + for (Map.Entry<AspectDescriptor, Aspect> aspect : ImmutableList.copyOf(aspectMap.entrySet()).reverse()) { boolean needed = visibleAspects.contains(aspect.getKey()); for (AspectDescriptor depAspectDescriptor : deps.keySet()) { diff --git a/src/main/java/com/google/devtools/build/lib/analysis/BaseRuleClasses.java b/src/main/java/com/google/devtools/build/lib/analysis/BaseRuleClasses.java index ca48a59e4b..712be737a2 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/BaseRuleClasses.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/BaseRuleClasses.java @@ -38,7 +38,6 @@ import com.google.devtools.build.lib.packages.Attribute.LabelLateBoundDefault; import com.google.devtools.build.lib.packages.Attribute.LabelListLateBoundDefault; import com.google.devtools.build.lib.packages.AttributeMap; 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.packages.TestSize; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; @@ -99,7 +98,7 @@ public class BaseRuleClasses { */ public static final class TestBaseRule implements RuleDefinition { @Override - public RuleClass build(Builder builder, RuleDefinitionEnvironment env) { + public RuleClass build(RuleClass.Builder builder, RuleDefinitionEnvironment env) { return builder .requiresConfigurationFragments(TestConfiguration.class) .add( @@ -255,7 +254,7 @@ public class BaseRuleClasses { public static final class RootRule implements RuleDefinition { @Override - public RuleClass build(Builder builder, RuleDefinitionEnvironment environment) { + public RuleClass build(RuleClass.Builder builder, RuleDefinitionEnvironment environment) { return nameAttribute(builder).build(); } @@ -311,7 +310,7 @@ public class BaseRuleClasses { */ public static final class MakeVariableExpandingRule implements RuleDefinition { @Override - public RuleClass build(Builder builder, RuleDefinitionEnvironment env) { + public RuleClass build(RuleClass.Builder builder, RuleDefinitionEnvironment env) { return builder /* <!-- #BLAZE_RULE($make_variable_expanding_rule).ATTRIBUTE(toolchains) --> The set of toolchains that supply <a href="${link make-variables}">"Make variables"</a> @@ -338,7 +337,7 @@ public class BaseRuleClasses { */ public static final class RuleBase implements RuleDefinition { @Override - public RuleClass build(Builder builder, RuleDefinitionEnvironment env) { + public RuleClass build(RuleClass.Builder builder, RuleDefinitionEnvironment env) { return builder .add(attr("deps", LABEL_LIST).legacyAllowAnyFileType()) .add(attr("data", LABEL_LIST).cfg(env.getLipoDataTransition()) @@ -363,7 +362,7 @@ public class BaseRuleClasses { /** A base rule for all binary rules. */ public static final class BinaryBaseRule implements RuleDefinition { @Override - public RuleClass build(Builder builder, RuleDefinitionEnvironment env) { + public RuleClass build(RuleClass.Builder builder, RuleDefinitionEnvironment env) { return builder .add(attr("args", STRING_LIST)) .add(attr("output_licenses", LICENSE)) @@ -387,7 +386,7 @@ public class BaseRuleClasses { /** Rule class for rules in error. */ public static final class ErrorRule implements RuleDefinition { @Override - public RuleClass build(Builder builder, RuleDefinitionEnvironment env) { + public RuleClass build(RuleClass.Builder builder, RuleDefinitionEnvironment env) { return builder.publicByDefault().build(); } diff --git a/src/main/java/com/google/devtools/build/lib/analysis/CommandHelper.java b/src/main/java/com/google/devtools/build/lib/analysis/CommandHelper.java index 065d3074ad..24c6efd978 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/CommandHelper.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/CommandHelper.java @@ -34,7 +34,6 @@ import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import javax.annotation.Nullable; /** @@ -130,7 +129,7 @@ public final class CommandHelper { this.toolsRunfilesSuppliers = SkylarkList.createImmutable(toolsRunfilesBuilder.build()); ImmutableMap.Builder<Label, ImmutableCollection<Artifact>> labelMapBuilder = ImmutableMap.builder(); - for (Entry<Label, Collection<Artifact>> entry : tempLabelMap.entrySet()) { + for (Map.Entry<Label, Collection<Artifact>> entry : tempLabelMap.entrySet()) { labelMapBuilder.put(entry.getKey(), ImmutableList.copyOf(entry.getValue())); } this.labelMap = labelMapBuilder.build(); diff --git a/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredTargetFactory.java b/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredTargetFactory.java index 62fd1a7a0f..554ea6ae21 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredTargetFactory.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredTargetFactory.java @@ -77,7 +77,6 @@ import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import javax.annotation.Nullable; @@ -493,7 +492,7 @@ public final class ConfiguredTargetFactory { for (Aspect underlyingAspect : aspectPath) { ImmutableMap<String, Attribute> currentAttributes = underlyingAspect.getDefinition() .getAttributes(); - for (Entry<String, Attribute> kv : currentAttributes.entrySet()) { + for (Map.Entry<String, Attribute> kv : currentAttributes.entrySet()) { if (!aspectAttributes.containsKey(kv.getKey())) { aspectAttributes.put(kv.getKey(), kv.getValue()); } diff --git a/src/main/java/com/google/devtools/build/lib/analysis/OutputGroupInfo.java b/src/main/java/com/google/devtools/build/lib/analysis/OutputGroupInfo.java index adacb23db8..3a2d65a91d 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/OutputGroupInfo.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/OutputGroupInfo.java @@ -41,7 +41,6 @@ import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import javax.annotation.Nullable; @@ -274,7 +273,7 @@ public final class OutputGroupInfo extends NativeInfo Map<String, Object> kwargs = (Map<String, Object>) args[0]; ImmutableMap.Builder<String, NestedSet<Artifact>> builder = ImmutableMap.builder(); - for (Entry<String, Object> entry : kwargs.entrySet()) { + for (Map.Entry<String, Object> entry : kwargs.entrySet()) { builder.put( entry.getKey(), SkylarkRuleConfiguredTargetUtil.convertToOutputGroupValue( diff --git a/src/main/java/com/google/devtools/build/lib/analysis/Runfiles.java b/src/main/java/com/google/devtools/build/lib/analysis/Runfiles.java index 40d6f497bc..2a332d64d5 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/Runfiles.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/Runfiles.java @@ -45,7 +45,6 @@ import java.util.HashMap; import java.util.Iterator; import java.util.LinkedHashMap; import java.util.Map; -import java.util.Map.Entry; import java.util.Objects; import java.util.Set; import java.util.TreeSet; @@ -391,9 +390,9 @@ public final class Runfiles implements RunfilesApi { Map<PathFragment, Artifact> newManifest = new HashMap<>(); outer: - for (Iterator<Entry<PathFragment, Artifact>> i = workingManifest.entrySet().iterator(); - i.hasNext(); ) { - Entry<PathFragment, Artifact> entry = i.next(); + for (Iterator<Map.Entry<PathFragment, Artifact>> i = workingManifest.entrySet().iterator(); + i.hasNext(); ) { + Map.Entry<PathFragment, Artifact> entry = i.next(); PathFragment source = entry.getKey(); Artifact symlink = entry.getValue(); // drop nested entries; warn if this changes anything diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCcBinaryRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCcBinaryRule.java index ecb7c4fb31..23b090a43a 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCcBinaryRule.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCcBinaryRule.java @@ -22,14 +22,13 @@ import com.google.devtools.build.lib.analysis.RuleDefinition; import com.google.devtools.build.lib.analysis.RuleDefinitionEnvironment; import com.google.devtools.build.lib.bazel.rules.cpp.BazelCppRuleClasses.CcBinaryBaseRule; import com.google.devtools.build.lib.packages.RuleClass; -import com.google.devtools.build.lib.packages.RuleClass.Builder; import com.google.devtools.build.lib.rules.cpp.CppConfiguration; import com.google.devtools.build.lib.rules.cpp.CppRuleClasses; /** Rule definition for cc_binary rules. */ public final class BazelCcBinaryRule implements RuleDefinition { @Override - public RuleClass build(Builder builder, RuleDefinitionEnvironment env) { + public RuleClass build(RuleClass.Builder builder, RuleDefinitionEnvironment env) { return builder .requiresConfigurationFragments(CppConfiguration.class) /*<!-- #BLAZE_RULE(cc_binary).IMPLICIT_OUTPUTS --> diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCcImportRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCcImportRule.java index ac479685ca..98ba63374f 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCcImportRule.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCcImportRule.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; import com.google.devtools.build.lib.rules.cpp.CcImportRule; import com.google.devtools.build.lib.rules.cpp.CcToolchain; import com.google.devtools.build.lib.rules.cpp.CppConfiguration; @@ -31,7 +30,7 @@ import com.google.devtools.build.lib.rules.cpp.CppRuleClasses; /** Rule definition for the cc_import rule. */ public final class BazelCcImportRule implements RuleDefinition { @Override - public RuleClass build(Builder builder, RuleDefinitionEnvironment env) { + public RuleClass build(RuleClass.Builder builder, RuleDefinitionEnvironment env) { return builder .requiresConfigurationFragments(CppConfiguration.class) .add( diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCcLibraryRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCcLibraryRule.java index d28f15dd7e..b3c01a02e6 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCcLibraryRule.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCcLibraryRule.java @@ -22,13 +22,12 @@ import com.google.devtools.build.lib.analysis.RuleDefinition; import com.google.devtools.build.lib.analysis.RuleDefinitionEnvironment; import com.google.devtools.build.lib.bazel.rules.cpp.BazelCppRuleClasses.CcLibraryBaseRule; import com.google.devtools.build.lib.packages.RuleClass; -import com.google.devtools.build.lib.packages.RuleClass.Builder; import com.google.devtools.build.lib.rules.cpp.CppConfiguration; /** Rule definition for the cc_library rule. */ public final class BazelCcLibraryRule implements RuleDefinition { @Override - public RuleClass build(Builder builder, RuleDefinitionEnvironment env) { + public RuleClass build(RuleClass.Builder builder, RuleDefinitionEnvironment env) { return builder // TODO: Google cc_library overrides documentation for: // deps, data, linkopts, defines, srcs; override here too? diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCcTestRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCcTestRule.java index 292bd9c38b..d893a657cc 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCcTestRule.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCcTestRule.java @@ -24,7 +24,6 @@ import com.google.devtools.build.lib.analysis.RuleDefinition; import com.google.devtools.build.lib.analysis.RuleDefinitionEnvironment; import com.google.devtools.build.lib.bazel.rules.cpp.BazelCppRuleClasses.CcBinaryBaseRule; 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.packages.TriState; import com.google.devtools.build.lib.rules.cpp.CppConfiguration; @@ -34,7 +33,7 @@ import com.google.devtools.build.lib.util.OS; /** Rule definition for cc_test rules. */ public final class BazelCcTestRule implements RuleDefinition { @Override - public RuleClass build(Builder builder, RuleDefinitionEnvironment env) { + public RuleClass build(RuleClass.Builder builder, RuleDefinitionEnvironment env) { return builder .requiresConfigurationFragments(CppConfiguration.class) .setImplicitOutputsFunction(CppRuleClasses.CC_BINARY_DEBUG_PACKAGE) diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCppRuleClasses.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCppRuleClasses.java index c674c880db..4cbfa065d8 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCppRuleClasses.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCppRuleClasses.java @@ -51,7 +51,6 @@ import com.google.devtools.build.lib.packages.AttributeMap; import com.google.devtools.build.lib.packages.BuildType; import com.google.devtools.build.lib.packages.ImplicitOutputsFunction.SafeImplicitOutputsFunction; 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.packages.TriState; import com.google.devtools.build.lib.rules.cpp.CcToolchain; @@ -126,7 +125,7 @@ public class BazelCppRuleClasses { public static final class CcLinkingRule implements RuleDefinition { @Override @SuppressWarnings("unchecked") - public RuleClass build(Builder builder, RuleDefinitionEnvironment env) { + public RuleClass build(RuleClass.Builder builder, RuleDefinitionEnvironment env) { return builder .add( attr(CcToolchain.CC_TOOLCHAIN_DEFAULT_ATTRIBUTE_NAME, LABEL) @@ -155,7 +154,7 @@ public class BazelCppRuleClasses { */ public static final class CcBaseRule implements RuleDefinition { @Override - public RuleClass build(Builder builder, RuleDefinitionEnvironment env) { + public RuleClass build(RuleClass.Builder builder, RuleDefinitionEnvironment env) { return builder /*<!-- #BLAZE_RULE($cc_base_rule).ATTRIBUTE(copts) --> Add these options to the C++ compilation command. @@ -194,7 +193,7 @@ public class BazelCppRuleClasses { */ public static final class CcDeclRule implements RuleDefinition { @Override - public RuleClass build(Builder builder, RuleDefinitionEnvironment env) { + public RuleClass build(RuleClass.Builder builder, RuleDefinitionEnvironment env) { return builder /*<!-- #BLAZE_RULE($cc_decl_rule).ATTRIBUTE(defines) --> List of defines to add to the compile line. @@ -266,7 +265,7 @@ public class BazelCppRuleClasses { } @Override - public RuleClass build(Builder builder, final RuleDefinitionEnvironment env) { + public RuleClass build(RuleClass.Builder builder, final RuleDefinitionEnvironment env) { if (defParserLabel != null) { builder.add( attr("$def_parser", LABEL) @@ -480,7 +479,7 @@ public class BazelCppRuleClasses { */ public static final class CcLibraryBaseRule implements RuleDefinition { @Override - public RuleClass build(Builder builder, RuleDefinitionEnvironment env) { + public RuleClass build(RuleClass.Builder builder, RuleDefinitionEnvironment env) { return builder /*<!-- #BLAZE_RULE($cc_library).ATTRIBUTE(hdrs) --> The list of header files published by @@ -551,7 +550,7 @@ public class BazelCppRuleClasses { /** Helper rule class. */ public static final class CcBinaryBaseRule implements RuleDefinition { @Override - public RuleClass build(Builder builder, RuleDefinitionEnvironment env) { + public RuleClass build(RuleClass.Builder builder, RuleDefinitionEnvironment env) { return builder /*<!-- #BLAZE_RULE($cc_binary_base).ATTRIBUTE(malloc) --> Override the default dependency on malloc. diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCppSemantics.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCppSemantics.java index 7cbb0dda83..ca1842fb72 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCppSemantics.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCppSemantics.java @@ -20,7 +20,7 @@ import com.google.devtools.build.lib.collect.nestedset.NestedSet; import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder; import com.google.devtools.build.lib.collect.nestedset.Order; import com.google.devtools.build.lib.rules.cpp.AspectLegalCppSemantics; -import com.google.devtools.build.lib.rules.cpp.CcCompilationContextInfo.Builder; +import com.google.devtools.build.lib.rules.cpp.CcCompilationContextInfo; import com.google.devtools.build.lib.rules.cpp.CppCompileActionBuilder; import com.google.devtools.build.lib.rules.cpp.CppConfiguration; import com.google.devtools.build.lib.rules.cpp.CppConfiguration.HeadersCheckingMode; @@ -51,7 +51,7 @@ public class BazelCppSemantics implements AspectLegalCppSemantics { @Override public void setupCcCompilationContextInfo( - RuleContext ruleContext, Builder ccCompilationContextInfoBuilder) {} + RuleContext ruleContext, CcCompilationContextInfo.Builder ccCompilationContextInfoBuilder) {} @Override public NestedSet<Artifact> getAdditionalPrunableIncludes() { diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/sh/BazelShBinaryRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/sh/BazelShBinaryRule.java index 0a0b4e0205..5cf4b8cf88 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/sh/BazelShBinaryRule.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/sh/BazelShBinaryRule.java @@ -23,14 +23,13 @@ import com.google.devtools.build.lib.analysis.config.HostTransition; import com.google.devtools.build.lib.bazel.rules.sh.BazelShRuleClasses.ShRule; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.packages.RuleClass; -import com.google.devtools.build.lib.packages.RuleClass.Builder; /** * Rule definition for the sh_binary rule. */ public final class BazelShBinaryRule implements RuleDefinition { @Override - public RuleClass build(Builder builder, RuleDefinitionEnvironment environment) { + public RuleClass build(RuleClass.Builder builder, RuleDefinitionEnvironment environment) { Label launcher = environment.getLauncherLabel(); if (launcher != null) { builder.add(attr("$launcher", LABEL).cfg(HostTransition.INSTANCE).value(launcher)); diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/sh/BazelShLibraryRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/sh/BazelShLibraryRule.java index ad95e47546..ae0c1a0420 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/sh/BazelShLibraryRule.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/sh/BazelShLibraryRule.java @@ -20,7 +20,6 @@ import com.google.devtools.build.lib.analysis.RuleDefinition; import com.google.devtools.build.lib.analysis.RuleDefinitionEnvironment; import com.google.devtools.build.lib.bazel.rules.sh.BazelShRuleClasses.ShRule; import com.google.devtools.build.lib.packages.RuleClass; -import com.google.devtools.build.lib.packages.RuleClass.Builder; import com.google.devtools.build.lib.util.FileTypeSet; /** @@ -28,7 +27,7 @@ import com.google.devtools.build.lib.util.FileTypeSet; */ public final class BazelShLibraryRule implements RuleDefinition { @Override - public RuleClass build(Builder builder, RuleDefinitionEnvironment environment) { + public RuleClass build(RuleClass.Builder builder, RuleDefinitionEnvironment environment) { return builder /* <!-- #BLAZE_RULE(sh_library).ATTRIBUTE(srcs) --> The list of input files. diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/sh/BazelShRuleClasses.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/sh/BazelShRuleClasses.java index f71e160c79..955830d244 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/sh/BazelShRuleClasses.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/sh/BazelShRuleClasses.java @@ -25,7 +25,6 @@ import com.google.devtools.build.lib.analysis.RuleDefinitionEnvironment; import com.google.devtools.build.lib.packages.Attribute.AllowedValueSet; import com.google.devtools.build.lib.packages.PredicateWithMessage; 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.util.FileTypeSet; import javax.annotation.Nullable; @@ -43,7 +42,7 @@ public final class BazelShRuleClasses { */ public static final class ShRule implements RuleDefinition { @Override - public RuleClass build(Builder builder, RuleDefinitionEnvironment environment) { + public RuleClass build(RuleClass.Builder builder, RuleDefinitionEnvironment environment) { return builder /* <!-- #BLAZE_RULE($sh_target).ATTRIBUTE(srcs) --> The file containing the shell script. diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/sh/BazelShTestRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/sh/BazelShTestRule.java index fdd142ea03..d46cf2882a 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/sh/BazelShTestRule.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/sh/BazelShTestRule.java @@ -23,7 +23,6 @@ import com.google.devtools.build.lib.analysis.config.HostTransition; import com.google.devtools.build.lib.bazel.rules.sh.BazelShRuleClasses.ShRule; import com.google.devtools.build.lib.cmdline.Label; 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 @@ import com.google.devtools.build.lib.packages.RuleClass.Builder.RuleClassType; */ public final class BazelShTestRule implements RuleDefinition { @Override - public RuleClass build(Builder builder, RuleDefinitionEnvironment environment) { + public RuleClass build(RuleClass.Builder builder, RuleDefinitionEnvironment environment) { Label launcher = environment.getLauncherLabel(); if (launcher != null) { builder.add(attr("$launcher", LABEL).cfg(HostTransition.INSTANCE).value(launcher)); diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/workspace/HttpArchiveRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/workspace/HttpArchiveRule.java index ac3cfd6b89..b953d9fb23 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/workspace/HttpArchiveRule.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/workspace/HttpArchiveRule.java @@ -21,7 +21,6 @@ import static com.google.devtools.build.lib.syntax.Type.STRING_LIST; 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; import com.google.devtools.build.lib.rules.repository.WorkspaceBaseRule; import com.google.devtools.build.lib.rules.repository.WorkspaceConfiguredTargetFactory; @@ -34,7 +33,7 @@ public class HttpArchiveRule implements RuleDefinition { public static final String NAME = "http_archive"; @Override - public RuleClass build(Builder builder, RuleDefinitionEnvironment environment) { + public RuleClass build(RuleClass.Builder builder, RuleDefinitionEnvironment environment) { return builder /* <!-- #BLAZE_RULE(http_archive).ATTRIBUTE(url) --> (Deprecated) A URL referencing an archive file containing a Bazel repository. diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/workspace/HttpFileRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/workspace/HttpFileRule.java index 9ef7b0d3fe..4f13114982 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/workspace/HttpFileRule.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/workspace/HttpFileRule.java @@ -22,7 +22,6 @@ import static com.google.devtools.build.lib.syntax.Type.STRING_LIST; 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; import com.google.devtools.build.lib.rules.repository.WorkspaceBaseRule; import com.google.devtools.build.lib.rules.repository.WorkspaceConfiguredTargetFactory; @@ -35,7 +34,7 @@ public class HttpFileRule implements RuleDefinition { public static final String NAME = "http_file"; @Override - public RuleClass build(Builder builder, RuleDefinitionEnvironment environment) { + public RuleClass build(RuleClass.Builder builder, RuleDefinitionEnvironment environment) { return builder /* <!-- #BLAZE_RULE(http_file).ATTRIBUTE(url) --> (Deprecated) A URL to a file that will be made available to Bazel. diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/workspace/HttpJarRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/workspace/HttpJarRule.java index 14c3b16177..b8dab31339 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/workspace/HttpJarRule.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/workspace/HttpJarRule.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; import com.google.devtools.build.lib.rules.repository.WorkspaceBaseRule; import com.google.devtools.build.lib.rules.repository.WorkspaceConfiguredTargetFactory; @@ -33,7 +32,7 @@ public class HttpJarRule implements RuleDefinition { public static final String NAME = "http_jar"; @Override - public RuleClass build(Builder builder, RuleDefinitionEnvironment environment) { + public RuleClass build(RuleClass.Builder builder, RuleDefinitionEnvironment environment) { return builder /* <!-- #BLAZE_RULE(http_jar).ATTRIBUTE(url) --> A URL to an archive file containing a Bazel repository. diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/workspace/MavenJarRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/workspace/MavenJarRule.java index 63c0e95b0d..5afb93429f 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/workspace/MavenJarRule.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/workspace/MavenJarRule.java @@ -19,7 +19,6 @@ import static com.google.devtools.build.lib.packages.Attribute.attr; 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; import com.google.devtools.build.lib.rules.repository.WorkspaceBaseRule; import com.google.devtools.build.lib.rules.repository.WorkspaceConfiguredTargetFactory; @@ -33,7 +32,7 @@ public class MavenJarRule implements RuleDefinition { public static final String NAME = "maven_jar"; @Override - public RuleClass build(Builder builder, RuleDefinitionEnvironment environment) { + public RuleClass build(RuleClass.Builder builder, RuleDefinitionEnvironment environment) { return builder /* <!-- #BLAZE_RULE(maven_jar).ATTRIBUTE(artifact) --> A description of a Maven artifact using diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/workspace/MavenServerRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/workspace/MavenServerRule.java index dfa59dbb14..965a392223 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/workspace/MavenServerRule.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/workspace/MavenServerRule.java @@ -19,7 +19,6 @@ import static com.google.devtools.build.lib.packages.Attribute.attr; 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; import com.google.devtools.build.lib.rules.repository.WorkspaceBaseRule; import com.google.devtools.build.lib.rules.repository.WorkspaceConfiguredTargetFactory; @@ -33,7 +32,7 @@ public class MavenServerRule implements RuleDefinition { public static final String NAME = "maven_server"; @Override - public RuleClass build(Builder builder, RuleDefinitionEnvironment environment) { + public RuleClass build(RuleClass.Builder builder, RuleDefinitionEnvironment environment) { return builder /* <!-- #BLAZE_RULE(maven_server).ATTRIBUTE(url) --> A URL for accessing the server. 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 fc179ba957..20adb6040f 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 @@ -44,7 +44,6 @@ import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import java.util.TreeMap; @@ -138,7 +137,7 @@ public final class SpawnActionContextMaps { * <p>Prints out debug information about the mappings. */ public void debugPrintSpawnActionContextMaps(Reporter reporter) { - for (Entry<String, SpawnActionContext> entry : spawnStrategyMnemonicMap.entrySet()) { + for (Map.Entry<String, SpawnActionContext> entry : spawnStrategyMnemonicMap.entrySet()) { reporter.handle( Event.info( String.format( @@ -148,11 +147,11 @@ public final class SpawnActionContextMaps { ImmutableMap<Class<? extends ActionContext>, ActionContext> contextMap = contextMap(); TreeMap<String, String> sortedContextMapWithSimpleNames = new TreeMap<>(); - for (Entry<Class<? extends ActionContext>, ActionContext> entry : contextMap.entrySet()) { + for (Map.Entry<Class<? extends ActionContext>, ActionContext> entry : contextMap.entrySet()) { sortedContextMapWithSimpleNames.put( entry.getKey().getSimpleName(), entry.getValue().getClass().getSimpleName()); } - for (Entry<String, String> entry : sortedContextMapWithSimpleNames.entrySet()) { + for (Map.Entry<String, String> entry : sortedContextMapWithSimpleNames.entrySet()) { // Skip uninteresting identity mappings of contexts. if (!entry.getKey().equals(entry.getValue())) { reporter.handle( diff --git a/src/main/java/com/google/devtools/build/lib/exec/SpawnInputExpander.java b/src/main/java/com/google/devtools/build/lib/exec/SpawnInputExpander.java index 9197e870ca..f57968984d 100644 --- a/src/main/java/com/google/devtools/build/lib/exec/SpawnInputExpander.java +++ b/src/main/java/com/google/devtools/build/lib/exec/SpawnInputExpander.java @@ -32,7 +32,6 @@ import com.google.devtools.build.lib.vfs.PathFragment; import java.io.IOException; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.SortedMap; import java.util.TreeMap; @@ -87,11 +86,11 @@ public class SpawnInputExpander { Map<PathFragment, Map<PathFragment, Artifact>> rootsAndMappings = null; rootsAndMappings = runfilesSupplier.getMappings(); - for (Entry<PathFragment, Map<PathFragment, Artifact>> rootAndMappings : + for (Map.Entry<PathFragment, Map<PathFragment, Artifact>> rootAndMappings : rootsAndMappings.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()) { PathFragment location = root.getRelative(mapping.getKey()); Artifact localArtifact = mapping.getValue(); if (localArtifact != null) { diff --git a/src/main/java/com/google/devtools/build/lib/exec/StandaloneTestStrategy.java b/src/main/java/com/google/devtools/build/lib/exec/StandaloneTestStrategy.java index 279fea4cfa..c1f04356cc 100644 --- a/src/main/java/com/google/devtools/build/lib/exec/StandaloneTestStrategy.java +++ b/src/main/java/com/google/devtools/build/lib/exec/StandaloneTestStrategy.java @@ -47,7 +47,6 @@ import com.google.devtools.build.lib.vfs.PathFragment; import com.google.devtools.build.lib.view.test.TestStatus.BlazeTestStatus; import com.google.devtools.build.lib.view.test.TestStatus.TestCase; import com.google.devtools.build.lib.view.test.TestStatus.TestResultData; -import com.google.devtools.build.lib.view.test.TestStatus.TestResultData.Builder; import java.io.Closeable; import java.io.IOException; import java.time.Duration; @@ -191,7 +190,7 @@ public class StandaloneTestStrategy extends TestStrategy { int attempt, ActionExecutionContext actionExecutionContext, TestRunnerAction action, - Builder dataBuilder, + TestResultData.Builder dataBuilder, StandaloneTestResult result) throws IOException { ImmutableList.Builder<Pair<String, Path>> testOutputsBuilder = new ImmutableList.Builder<>(); @@ -256,7 +255,8 @@ public class StandaloneTestStrategy extends TestStrategy { processTestOutput(actionExecutionContext, new TestResult(action, data, false), testLog); } - private void processLastTestAttempt(int attempt, Builder dataBuilder, TestResultData data) { + private void processLastTestAttempt( + int attempt, TestResultData.Builder dataBuilder, TestResultData data) { dataBuilder.setHasCoverage(data.getHasCoverage()); dataBuilder.setRemotelyCached(data.getRemotelyCached()); dataBuilder.setIsRemoteStrategy(data.getIsRemoteStrategy()); diff --git a/src/main/java/com/google/devtools/build/lib/exec/TestXmlOutputParser.java b/src/main/java/com/google/devtools/build/lib/exec/TestXmlOutputParser.java index e10db69c3c..e449bf9749 100644 --- a/src/main/java/com/google/devtools/build/lib/exec/TestXmlOutputParser.java +++ b/src/main/java/com/google/devtools/build/lib/exec/TestXmlOutputParser.java @@ -17,7 +17,6 @@ package com.google.devtools.build.lib.exec; import com.google.common.collect.ImmutableCollection; import com.google.common.collect.ImmutableSet; import com.google.devtools.build.lib.view.test.TestStatus.TestCase; -import com.google.devtools.build.lib.view.test.TestStatus.TestCase.Type; import com.google.protobuf.UninitializedMessageException; import java.io.InputStream; import javax.xml.stream.XMLInputFactory; @@ -140,7 +139,7 @@ final class TestXmlOutputParser { private TestCase parseTestSuite(XMLStreamReader parser, String elementName) throws XMLStreamException, TestXmlOutputParserException { TestCase.Builder builder = TestCase.newBuilder(); - builder.setType(Type.TEST_SUITE); + builder.setType(TestCase.Type.TEST_SUITE); for (int i = 0; i < parser.getAttributeCount(); i++) { String name = parser.getAttributeLocalName(i).intern(); String value = parser.getAttributeValue(i); @@ -184,7 +183,7 @@ final class TestXmlOutputParser { private TestCase parseTestDecorator(XMLStreamReader parser) throws XMLStreamException, TestXmlOutputParserException { TestCase.Builder builder = TestCase.newBuilder(); - builder.setType(Type.TEST_DECORATOR); + builder.setType(TestCase.Type.TEST_DECORATOR); for (int i = 0; i < parser.getAttributeCount(); i++) { String name = parser.getAttributeLocalName(i); String value = parser.getAttributeValue(i); @@ -291,7 +290,7 @@ final class TestXmlOutputParser { private TestCase parseTestCase(XMLStreamReader parser) throws XMLStreamException, TestXmlOutputParserException { TestCase.Builder builder = TestCase.newBuilder(); - builder.setType(Type.TEST_CASE); + builder.setType(TestCase.Type.TEST_CASE); for (int i = 0; i < parser.getAttributeCount(); i++) { String name = parser.getAttributeLocalName(i).intern(); String value = parser.getAttributeValue(i); diff --git a/src/main/java/com/google/devtools/build/lib/packages/AspectDescriptor.java b/src/main/java/com/google/devtools/build/lib/packages/AspectDescriptor.java index 0c2a9dfa59..d74c05575c 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/AspectDescriptor.java +++ b/src/main/java/com/google/devtools/build/lib/packages/AspectDescriptor.java @@ -18,7 +18,7 @@ import com.google.common.collect.ImmutableMultimap; import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import com.google.protobuf.TextFormat; -import java.util.Map.Entry; +import java.util.Map; import java.util.Objects; /** @@ -91,7 +91,7 @@ public final class AspectDescriptor { builder.append('['); ImmutableMultimap<String, String> attributes = aspectParameters.getAttributes(); boolean first = true; - for (Entry<String, String> attribute : attributes.entries()) { + for (Map.Entry<String, String> attribute : attributes.entries()) { if (!first) { builder.append(','); } else { diff --git a/src/main/java/com/google/devtools/build/lib/packages/AttributeFormatter.java b/src/main/java/com/google/devtools/build/lib/packages/AttributeFormatter.java index 5b4468a67a..e48dbb4138 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/AttributeFormatter.java +++ b/src/main/java/com/google/devtools/build/lib/packages/AttributeFormatter.java @@ -41,7 +41,6 @@ import com.google.devtools.build.lib.packages.BuildType.SelectorList; import com.google.devtools.build.lib.query2.proto.proto2api.Build; import com.google.devtools.build.lib.query2.proto.proto2api.Build.Attribute.Discriminator; import com.google.devtools.build.lib.query2.proto.proto2api.Build.Attribute.SelectorEntry; -import com.google.devtools.build.lib.query2.proto.proto2api.Build.Attribute.SelectorEntry.Builder; import com.google.devtools.build.lib.query2.proto.proto2api.Build.Attribute.Tristate; import com.google.devtools.build.lib.query2.proto.proto2api.Build.LabelDictUnaryEntry; import com.google.devtools.build.lib.query2.proto.proto2api.Build.LabelKeyedStringDictEntry; @@ -52,7 +51,6 @@ import com.google.devtools.build.lib.syntax.Type; import java.util.Collection; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import javax.annotation.Nullable; /** Common utilities for serializing {@link Attribute}s as protocol buffers. */ @@ -146,11 +144,12 @@ public class AttributeFormatter { // Note that the order of entries returned by selector.getEntries is stable. The map's // entries' order is preserved from the fact that Skylark dictionary entry order is stable // (it's determined by insertion order). - for (Entry<Label, ?> entry : selector.getEntries().entrySet()) { + for (Map.Entry<Label, ?> entry : selector.getEntries().entrySet()) { Label condition = entry.getKey(); - Builder selectorEntryBuilder = SelectorEntry.newBuilder() - .setLabel(condition.toString()) - .setIsDefaultValue(!selector.isValueSet(condition)); + SelectorEntry.Builder selectorEntryBuilder = + SelectorEntry.newBuilder() + .setLabel(condition.toString()) + .setIsDefaultValue(!selector.isValueSet(condition)); Object conditionValue = entry.getValue(); if (conditionValue != null) { @@ -470,7 +469,7 @@ public class AttributeFormatter { private static class SelectorEntryBuilderAdapter implements AttributeValueBuilderAdapter { private final SelectorEntry.Builder selectorEntryBuilder; - private SelectorEntryBuilderAdapter(Builder selectorEntryBuilder) { + private SelectorEntryBuilderAdapter(SelectorEntry.Builder selectorEntryBuilder) { this.selectorEntryBuilder = Preconditions.checkNotNull(selectorEntryBuilder); } diff --git a/src/main/java/com/google/devtools/build/lib/packages/BuildType.java b/src/main/java/com/google/devtools/build/lib/packages/BuildType.java index 2ce2c10de1..7f8d0d8e70 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/BuildType.java +++ b/src/main/java/com/google/devtools/build/lib/packages/BuildType.java @@ -42,7 +42,6 @@ import java.util.Collections; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import javax.annotation.Nullable; @@ -568,7 +567,7 @@ public final class BuildType { LinkedHashMap<Label, T> result = Maps.newLinkedHashMapWithExpectedSize(x.size()); ImmutableSet.Builder<Label> defaultValuesBuilder = ImmutableSet.builder(); boolean foundDefaultCondition = false; - for (Entry<?, ?> entry : x.entrySet()) { + for (Map.Entry<?, ?> entry : x.entrySet()) { Label key = LABEL.convert(entry.getKey(), what, context); if (key.equals(DEFAULT_CONDITION_LABEL)) { foundDefaultCondition = true; diff --git a/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java b/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java index ac66963090..ff021167ba 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java +++ b/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java @@ -70,7 +70,6 @@ import java.util.Collection; import java.util.Collections; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import java.util.TreeMap; import java.util.concurrent.Future; @@ -1556,7 +1555,7 @@ public final class PackageFactory { .setup("repository_name", repositoryNameFunction) .setup("environment_group", newEnvironmentGroupFunction.apply(context)); - for (Entry<String, BuiltinRuleFunction> entry : ruleFunctions.entrySet()) { + for (Map.Entry<String, BuiltinRuleFunction> entry : ruleFunctions.entrySet()) { pkgEnv.setup(entry.getKey(), entry.getValue()); } diff --git a/src/main/java/com/google/devtools/build/lib/packages/WorkspaceFactoryHelper.java b/src/main/java/com/google/devtools/build/lib/packages/WorkspaceFactoryHelper.java index 42239f6506..ff95dc8c2c 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/WorkspaceFactoryHelper.java +++ b/src/main/java/com/google/devtools/build/lib/packages/WorkspaceFactoryHelper.java @@ -21,7 +21,6 @@ import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.cmdline.LabelSyntaxException; import com.google.devtools.build.lib.events.Location; import com.google.devtools.build.lib.events.StoredEventHandler; -import com.google.devtools.build.lib.packages.Package.Builder; import com.google.devtools.build.lib.packages.RuleFactory.BuildLangTypedAttributeValuesMap; import com.google.devtools.build.lib.syntax.FuncallExpression; import java.util.Map; @@ -68,7 +67,7 @@ public class WorkspaceFactoryHelper { } static void addBindRule( - Builder pkg, + Package.Builder pkg, RuleClass bindRuleClass, Label virtual, Label actual, |