diff options
author | jcater <jcater@google.com> | 2018-05-02 09:05:38 -0700 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-05-02 09:08:49 -0700 |
commit | bb4ffd680cf102d6dc2b32895b7bedde8e0cd695 (patch) | |
tree | bb7f04e967a093cc1eb557ce5c382e1a6f37666e /src/main/java | |
parent | 7b94972e84915a8892dcbe792c7e3a648ba55d35 (diff) |
Clean up code that directly imports nested classes like Builder, Entry, etc.
PiperOrigin-RevId: 195100125
Diffstat (limited to 'src/main/java')
11 files changed, 13 insertions, 24 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AarImportBaseRule.java b/src/main/java/com/google/devtools/build/lib/rules/android/AarImportBaseRule.java index 1b7f7706c1..8f4143b0d4 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AarImportBaseRule.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AarImportBaseRule.java @@ -22,7 +22,6 @@ import com.google.devtools.build.lib.analysis.RuleDefinition; import com.google.devtools.build.lib.analysis.RuleDefinitionEnvironment; import com.google.devtools.build.lib.analysis.config.HostTransition; 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.SkylarkProviderIdentifier; import com.google.devtools.build.lib.rules.android.AndroidRuleClasses.AndroidBaseRule; @@ -39,7 +38,7 @@ public class AarImportBaseRule implements RuleDefinition { static final String ZIPPER = "$zipper"; @Override - public RuleClass build(Builder builder, RuleDefinitionEnvironment env) { + public RuleClass build(RuleClass.Builder builder, RuleDefinitionEnvironment env) { return builder /* <!-- #BLAZE_RULE($aar_import_base).ATTRIBUTE(aar) --> The <code>.aar</code> file to provide to the Android targets that depend on this target. diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java index 672130407e..eed11af544 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java @@ -48,7 +48,6 @@ import com.google.devtools.build.lib.analysis.actions.CustomCommandLine; import com.google.devtools.build.lib.analysis.actions.CustomCommandLine.VectorArg; import com.google.devtools.build.lib.analysis.actions.ParameterFileWriteAction; import com.google.devtools.build.lib.analysis.actions.SpawnAction; -import com.google.devtools.build.lib.analysis.actions.SpawnAction.Builder; import com.google.devtools.build.lib.analysis.actions.SpawnActionTemplate; import com.google.devtools.build.lib.analysis.configuredtargets.RuleConfiguredTarget.Mode; import com.google.devtools.build.lib.collect.nestedset.NestedSet; @@ -539,7 +538,7 @@ public abstract class AndroidBinary implements RuleConfiguredTargetFactory { AndroidRuleClasses.INSTRUMENTATION_TEST_CHECK_RESULTS); SpawnAction.Builder checkAction = - new Builder() + new SpawnAction.Builder() .setExecutable(checker) .addInput(targetManifest) .addInput(instrumentationManifest) diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidDeviceScriptFixtureRule.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidDeviceScriptFixtureRule.java index 9904978c4c..7ce97cb833 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidDeviceScriptFixtureRule.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidDeviceScriptFixtureRule.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; import com.google.devtools.build.lib.util.FileType; /** Rule definition for the {@code android_device_script_fixture} rule. */ @@ -32,7 +31,7 @@ public class AndroidDeviceScriptFixtureRule implements RuleDefinition { static final FileType DEVICE_SCRIPT_FIXTURE = FileType.of(".sh"); @Override - public RuleClass build(Builder builder, RuleDefinitionEnvironment environment) { + public RuleClass build(RuleClass.Builder builder, RuleDefinitionEnvironment environment) { return builder .setUndocumented() .add( diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidHostServiceFixtureRule.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidHostServiceFixtureRule.java index 9338cd0c96..04de0b7cbe 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidHostServiceFixtureRule.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidHostServiceFixtureRule.java @@ -24,12 +24,11 @@ import com.google.devtools.build.lib.analysis.RuleDefinition; import com.google.devtools.build.lib.analysis.RuleDefinitionEnvironment; import com.google.devtools.build.lib.analysis.config.HostTransition; import com.google.devtools.build.lib.packages.RuleClass; -import com.google.devtools.build.lib.packages.RuleClass.Builder; /** Rule definition for the {@code android_host_service_fixture} rule. */ public class AndroidHostServiceFixtureRule implements RuleDefinition { @Override - public RuleClass build(Builder builder, RuleDefinitionEnvironment env) { + public RuleClass build(RuleClass.Builder builder, RuleDefinitionEnvironment env) { return builder .setUndocumented() .add(attr("executable", LABEL) diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidIdlHelper.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidIdlHelper.java index 2cf5aa1478..41cb498ec5 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidIdlHelper.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidIdlHelper.java @@ -39,7 +39,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 javax.annotation.Nullable; @@ -299,7 +298,7 @@ public class AndroidIdlHelper { preprocessedArgs.add("-p" + idlPreprocessed.getExecPathString()); } - for (Entry<Artifact, Artifact> entry : translatedIdlSources.entrySet()) { + for (Map.Entry<Artifact, Artifact> entry : translatedIdlSources.entrySet()) { createAndroidIdlAction( ruleContext, entry.getKey(), diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidInstrumentationTestRule.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidInstrumentationTestRule.java index 4ee64896aa..a9f6fe4826 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidInstrumentationTestRule.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidInstrumentationTestRule.java @@ -22,7 +22,6 @@ import com.google.devtools.build.lib.analysis.RuleDefinition; import com.google.devtools.build.lib.analysis.RuleDefinitionEnvironment; import com.google.devtools.build.lib.analysis.config.HostTransition; 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; @@ -30,7 +29,7 @@ import com.google.devtools.build.lib.util.FileTypeSet; public class AndroidInstrumentationTestRule implements RuleDefinition { @Override - public RuleClass build(Builder builder, RuleDefinitionEnvironment environment) { + public RuleClass build(RuleClass.Builder builder, RuleDefinitionEnvironment environment) { return builder /* <!-- #BLAZE_RULE(android_instrumentation_test).ATTRIBUTE(test_app) --> The <a href="${link android_binary}">android_binary</a> target containing the test classes. diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLocalTestBaseRule.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLocalTestBaseRule.java index fa6074ea33..9d06625b0e 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLocalTestBaseRule.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLocalTestBaseRule.java @@ -25,7 +25,6 @@ import com.google.devtools.build.lib.analysis.RuleDefinition; import com.google.devtools.build.lib.analysis.RuleDefinitionEnvironment; import com.google.devtools.build.lib.analysis.config.HostTransition; 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.config.ConfigFeatureFlagProvider; import com.google.devtools.build.lib.rules.java.JavaConfiguration; @@ -35,7 +34,7 @@ import com.google.devtools.build.lib.util.FileTypeSet; public class AndroidLocalTestBaseRule implements RuleDefinition { @Override - public RuleClass build(Builder builder, RuleDefinitionEnvironment environment) { + public RuleClass build(RuleClass.Builder builder, RuleDefinitionEnvironment environment) { return builder .requiresConfigurationFragments( JavaConfiguration.class, AndroidLocalTestConfiguration.class) diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourcesProcessorBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourcesProcessorBuilder.java index 0b664d1385..93a20a2b55 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourcesProcessorBuilder.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourcesProcessorBuilder.java @@ -20,7 +20,6 @@ import com.google.devtools.build.lib.actions.ParamFileInfo; import com.google.devtools.build.lib.actions.ParameterFile.ParameterFileType; import com.google.devtools.build.lib.analysis.RuleContext; import com.google.devtools.build.lib.analysis.actions.CustomCommandLine; -import com.google.devtools.build.lib.analysis.actions.CustomCommandLine.Builder; import com.google.devtools.build.lib.analysis.actions.CustomCommandLine.VectorArg; import com.google.devtools.build.lib.analysis.actions.SpawnAction; import com.google.devtools.build.lib.analysis.configuredtargets.RuleConfiguredTarget.Mode; @@ -504,7 +503,7 @@ public class AndroidResourcesProcessorBuilder { StampedAndroidManifest primaryManifest, List<Artifact> outs, NestedSetBuilder<Artifact> inputs, - Builder builder) { + CustomCommandLine.Builder builder) { // Add data builder.add( diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java index b40413e116..2035a7908f 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java @@ -45,7 +45,6 @@ import com.google.devtools.build.lib.packages.Attribute.LabelLateBoundDefault; import com.google.devtools.build.lib.packages.AttributeMap; 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.SkylarkProviderIdentifier; import com.google.devtools.build.lib.packages.TriState; @@ -367,7 +366,7 @@ public final class AndroidRuleClasses { /** Definition of the {@code android_sdk} rule. */ public static final class AndroidSdkRule implements RuleDefinition { @Override - public RuleClass build(Builder builder, RuleDefinitionEnvironment environment) { + public RuleClass build(RuleClass.Builder builder, RuleDefinitionEnvironment environment) { return builder .requiresConfigurationFragments(JavaConfiguration.class, AndroidConfiguration.class) .setUndocumented() @@ -1071,7 +1070,7 @@ public final class AndroidRuleClasses { } @Override - public RuleClass build(Builder builder, RuleDefinitionEnvironment environment) { + public RuleClass build(RuleClass.Builder builder, RuleDefinitionEnvironment environment) { builder .setUndocumented() .add( diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/DexArchiveAspect.java b/src/main/java/com/google/devtools/build/lib/rules/android/DexArchiveAspect.java index bf09dc9165..6b8514b0a2 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/DexArchiveAspect.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/DexArchiveAspect.java @@ -41,7 +41,6 @@ import com.google.devtools.build.lib.analysis.RuleContext; import com.google.devtools.build.lib.analysis.TransitiveInfoProvider; import com.google.devtools.build.lib.analysis.WrappingProvider; import com.google.devtools.build.lib.analysis.actions.CustomCommandLine; -import com.google.devtools.build.lib.analysis.actions.CustomCommandLine.Builder; import com.google.devtools.build.lib.analysis.actions.CustomCommandLine.VectorArg; import com.google.devtools.build.lib.analysis.actions.SpawnAction; import com.google.devtools.build.lib.analysis.config.HostTransition; @@ -437,7 +436,7 @@ public final class DexArchiveAspect extends NativeAspectClass implements Configu Set<String> incrementalDexopts, Artifact dexArchive) { CustomCommandLine args = - new Builder() + new CustomCommandLine.Builder() .addExecPath("--input_jar", jar) .addExecPath("--output_zip", dexArchive) .addAll(ImmutableList.copyOf(incrementalDexopts)) diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/ManifestMergerActionBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/android/ManifestMergerActionBuilder.java index 41d27443a2..860b129487 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/ManifestMergerActionBuilder.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/ManifestMergerActionBuilder.java @@ -30,7 +30,6 @@ import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder; import com.google.devtools.build.lib.util.OS; import java.util.Iterator; import java.util.Map; -import java.util.Map.Entry; /** Builder for creating manifest merger actions. */ public class ManifestMergerActionBuilder { @@ -175,9 +174,9 @@ public class ManifestMergerActionBuilder { } StringBuilder sb = new StringBuilder(); - Iterator<Entry<K, V>> iter = map.entrySet().iterator(); + Iterator<Map.Entry<K, V>> iter = map.entrySet().iterator(); while (iter.hasNext()) { - Entry<K, V> entry = iter.next(); + Map.Entry<K, V> entry = iter.next(); sb.append(Functions.compose(ESCAPER, keyConverter).apply(entry.getKey())); sb.append(':'); sb.append(Functions.compose(ESCAPER, valueConverter).apply(entry.getValue())); |