diff options
46 files changed, 157 insertions, 153 deletions
diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/BlazeJavacMain.java b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/BlazeJavacMain.java index d422cd39ea..f4bb407975 100644 --- a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/BlazeJavacMain.java +++ b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/BlazeJavacMain.java @@ -98,7 +98,7 @@ public class BlazeJavacMain { fileManager, diagnostics, javacArguments, - ImmutableList.of() /*classes*/, + /* classes= */ ImmutableList.of(), fileManager.getJavaFileObjectsFromPaths(arguments.sourceFiles()), context); if (arguments.processors() != null) { diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/java/turbine/javac/JavacTurbineCompiler.java b/src/java_tools/buildjar/java/com/google/devtools/build/java/turbine/javac/JavacTurbineCompiler.java index 3ee4d204c0..1a3b32f669 100644 --- a/src/java_tools/buildjar/java/com/google/devtools/build/java/turbine/javac/JavacTurbineCompiler.java +++ b/src/java_tools/buildjar/java/com/google/devtools/build/java/turbine/javac/JavacTurbineCompiler.java @@ -74,7 +74,7 @@ public class JavacTurbineCompiler { fm, diagnostic -> diagnostics.add(formatDiagnostic(diagnostic)), request.javacOptions(), - ImmutableList.of() /*classes*/, + /* classes= */ ImmutableList.of(), fm.getJavaFileObjectsFromPaths(request.sources()), context); diff --git a/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredAspect.java b/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredAspect.java index c373257370..a33e6fefd5 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredAspect.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredAspect.java @@ -247,7 +247,7 @@ public final class ConfiguredAspect { addProvider( createExtraActionProvider( - ImmutableSet.<ActionAnalysisMetadata>of() /* actionsWithoutExtraAction */, + /* actionsWithoutExtraAction= */ ImmutableSet.<ActionAnalysisMetadata>of(), ruleContext)); return new ConfiguredAspect(descriptor, providers.build()); diff --git a/src/main/java/com/google/devtools/build/lib/analysis/actions/CustomCommandLine.java b/src/main/java/com/google/devtools/build/lib/analysis/actions/CustomCommandLine.java index 6f04a0eb6f..770d16aef7 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/actions/CustomCommandLine.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/actions/CustomCommandLine.java @@ -174,7 +174,7 @@ public final class CustomCommandLine extends CommandLine { private SimpleVectorArg(Builder builder, @Nullable Collection<T> values) { this( - false /* isNestedSet */, + /* isNestedSet= */ false, values == null || values.isEmpty(), values != null ? values.size() : 0, builder.formatEach, @@ -185,9 +185,9 @@ public final class CustomCommandLine extends CommandLine { private SimpleVectorArg(Builder builder, @Nullable NestedSet<T> values) { this( - true /* isNestedSet */, + /* isNestedSet= */ true, values == null || values.isEmpty(), - -1 /* count */, + /* count= */ -1, builder.formatEach, builder.beforeEach, builder.joinWith, diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkActionFactory.java b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkActionFactory.java index 0985afb108..731ccf1cbe 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkActionFactory.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkActionFactory.java @@ -1134,16 +1134,16 @@ public class SkylarkActionFactory implements SkylarkValue { } addVectorArg( value, - null /* argName */, + /* argName= */ null, mapFn != Runtime.NONE ? (BaseFunction) mapFn : null, - null /* mapEach */, + /* mapEach= */ null, format != Runtime.NONE ? (String) format : null, beforeEach != Runtime.NONE ? (String) beforeEach : null, joinWith != Runtime.NONE ? (String) joinWith : null, - null /* formatJoined */, - false /* omitIfEmpty */, - false /* uniquify */, - null /* terminateWith */, + /* formatJoined= */ null, + /* omitIfEmpty= */ false, + /* uniquify= */ false, + /* terminateWith= */ null, loc); } else { @@ -1337,12 +1337,12 @@ public class SkylarkActionFactory implements SkylarkValue { addVectorArg( values, argName, - null /* mapAll */, + /* mapAll= */ null, mapEach != Runtime.NONE ? (BaseFunction) mapEach : null, formatEach != Runtime.NONE ? (String) formatEach : null, beforeEach != Runtime.NONE ? (String) beforeEach : null, - null /* joinWith */, - null /* formatJoined */, + /* joinWith= */ null, + /* formatJoined= */ null, omitIfEmpty, uniquify, terminateWith != Runtime.NONE ? (String) terminateWith : null, @@ -1481,15 +1481,15 @@ public class SkylarkActionFactory implements SkylarkValue { addVectorArg( values, argName, - null /* mapAll */, + /* mapAll= */ null, mapEach != Runtime.NONE ? (BaseFunction) mapEach : null, formatEach != Runtime.NONE ? (String) formatEach : null, - null /* beforeEach */, + /* beforeEach= */ null, joinWith, formatJoined != Runtime.NONE ? (String) formatJoined : null, omitIfEmpty, uniquify, - null /* terminateWith */, + /* terminateWith= */ null, loc); return Runtime.NONE; } diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/NdkRelease.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/NdkRelease.java index 7b393ce166..9c475d13aa 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/NdkRelease.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/NdkRelease.java @@ -59,7 +59,7 @@ public class NdkRelease { } else { return new NdkRelease( revision, // raw revision - true, // isValid + /* isValid= */ true, Integer.parseInt(revisionParsed[0]), // major revision revisionParsed[1], // minor revision null, // release candidate @@ -90,8 +90,8 @@ public class NdkRelease { isValid, Integer.parseInt(matcher.group("Mrev")), /* major revision */ matcher.group("mrev"), /* minor revision */ - matcher.group("rc"), /* releaseCandidate */ - matcher.group("s4") != null /* is64Bit */); + /* releaseCandidate= */ matcher.group("rc"), + /* is64Bit= */ matcher.group("s4") != null); } else { return new NdkRelease( revisionString, diff --git a/src/main/java/com/google/devtools/build/lib/packages/Rule.java b/src/main/java/com/google/devtools/build/lib/packages/Rule.java index 6615fe633f..027d292b41 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/Rule.java +++ b/src/main/java/com/google/devtools/build/lib/packages/Rule.java @@ -353,7 +353,7 @@ public final class Rule implements Target, DependencyFilter.AttributeInfoProvide * <p>This method ignores whether the present rule was created by a macro or not. */ public Location getAttributeLocationWithoutMacro(String attrName) { - return getAttributeLocation(attrName, false /* useBuildLocation */); + return getAttributeLocation(attrName, /* useBuildLocation= */ false); } /** @@ -365,7 +365,7 @@ public final class Rule implements Target, DependencyFilter.AttributeInfoProvide * location of the macro invocation in the BUILD file instead. */ public Location getAttributeLocation(String attrName) { - return getAttributeLocation(attrName, true /* useBuildLocation */); + return getAttributeLocation(attrName, /* useBuildLocation= */ true); } private Location getAttributeLocation(String attrName, boolean useBuildLocation) { 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 650027ffd8..3f246766a0 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 @@ -257,10 +257,10 @@ public abstract class AndroidBinary implements RuleConfiguredTargetFactory { androidSemantics, resourceApk, ruleContext.getConfiguration().isCodeCoverageEnabled(), - true /* collectJavaCompilationArgs */, - true, /* isBinary */ + /* collectJavaCompilationArgs= */ true, + /* isBinary= */ true, excludedRuntimeArtifacts, - true /* generateExtensionRegistry */); + /* generateExtensionRegistry= */ true); ruleContext.assertNoErrors(); Function<Artifact, Artifact> derivedJarFunction = @@ -558,13 +558,12 @@ public abstract class AndroidBinary implements RuleConfiguredTargetFactory { androidCommon.addTransitiveInfoProviders( builder, - null /* aar */, + /* aar= */ null, resourceApk, zipAlignedApk, apksUnderTest, nativeLibs, - androidCommon.isNeverLink() - ); + androidCommon.isNeverLink()); if (dexPostprocessingOutput.proguardMap() != null) { builder.addProvider( diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java index f94a3811ae..fffda808d9 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java @@ -195,11 +195,11 @@ public abstract class AndroidLibrary implements RuleConfiguredTargetFactory { javaSemantics, androidSemantics, resourceApk, - false /* addCoverageSupport */, - true /* collectJavaCompilationArgs */, - false /* isBinary */, - null /* excludedRuntimeArtifacts */, - false /* generateExtensionRegistry */); + /* addCoverageSupport= */ false, + /* collectJavaCompilationArgs= */ true, + /* isBinary= */ false, + /* excludedRuntimeArtifacts= */ null, + /* generateExtensionRegistry= */ false); if (javaTargetAttributes == null) { return null; } diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLocalTestBase.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLocalTestBase.java index 76d5ff660e..f5527ba934 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLocalTestBase.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLocalTestBase.java @@ -102,7 +102,7 @@ public abstract class AndroidLocalTestBase implements RuleConfiguredTargetFactor } else { // Create the final merged manifest ResourceDependencies resourceDependencies = - ResourceDependencies.fromRuleDeps(ruleContext, false /* neverlink */); + ResourceDependencies.fromRuleDeps(ruleContext, /* neverlink= */ false); ApplicationManifest applicationManifest = getApplicationManifest(ruleContext, androidSemantics, resourceDependencies); @@ -119,8 +119,8 @@ public abstract class AndroidLocalTestBase implements RuleConfiguredTargetFactor ImmutableList.of(), /* list of uncompressed extensions */ false, /* crunch png */ ProguardHelper.getProguardConfigArtifact(ruleContext, ""), - null, /* mainDexProguardCfg */ - false, /* conditionalKeepRules */ + /* mainDexProguardCfg= */ null, + /* conditionalKeepRules= */ false, ruleContext.getImplicitOutputArtifact(AndroidRuleClasses.ANDROID_PROCESSED_MANIFEST), ruleContext.getImplicitOutputArtifact(AndroidRuleClasses.ANDROID_RESOURCES_ZIP), DataBinding.isEnabled(ruleContext) @@ -168,7 +168,7 @@ public abstract class AndroidLocalTestBase implements RuleConfiguredTargetFactor propertiesFile, template, substitutions, - false /* makeExecutable */)); + /* makeExecutable= */ false)); // Add the properties file to the test jar as a java resource attributesBuilder.addResource( PathFragment.create("com/android/tools/test_config.properties"), propertiesFile); 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 adff649444..41d27443a2 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 @@ -108,7 +108,7 @@ public class ManifestMergerActionBuilder { builder.add( "--mergeeManifests", mapToDictionaryString( - mergeeManifests, Artifact::getExecPathString, null /* valueConverter */)); + mergeeManifests, Artifact::getExecPathString, /* valueConverter= */ null)); inputs.addAll(mergeeManifests.keySet()); } diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionBuilder.java index 19bd3a7ddd..6662968cb3 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionBuilder.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionBuilder.java @@ -1065,7 +1065,8 @@ public class CppLinkActionBuilder { } else { List<String> opts = new ArrayList<>(linkopts); opts.addAll( - featureConfiguration.getCommandLine("lto-indexing", buildVariables, null /* expander */)); + featureConfiguration.getCommandLine( + "lto-indexing", buildVariables, /* expander= */ null)); opts.addAll(cppConfiguration.getLtoIndexOptions()); linkoptsForVariables = ImmutableList.copyOf(opts); } diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoAspect.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoAspect.java index 2abecee223..b1b466e2ec 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoAspect.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoAspect.java @@ -347,7 +347,7 @@ public abstract class CcProtoAspect extends NativeAspectClass implements Configu ruleContext.getLabel(), outputs, "C++", - true /* allowServices */); + /* allowServices= */ true); } private ProtoLangToolchainProvider getProtoToolchainProvider() { diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaBinary.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaBinary.java index b3b8ed1bf8..f50bc03944 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaBinary.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaBinary.java @@ -147,9 +147,15 @@ public class JavaBinary implements RuleConfiguredTargetFactory { Artifact unstrippedLauncher = null; if (stripAsDefault) { unstrippedDeployArchiveBuilder = new DeployArchiveBuilder(semantics, ruleContext); - unstrippedLauncher = semantics.getLauncher(ruleContext, common, - unstrippedDeployArchiveBuilder, runfilesBuilder, jvmFlags, attributesBuilder, - false /* shouldStrip */); + unstrippedLauncher = + semantics.getLauncher( + ruleContext, + common, + unstrippedDeployArchiveBuilder, + runfilesBuilder, + jvmFlags, + attributesBuilder, + /* shouldStrip= */ false); } JavaCompilationArtifacts.Builder javaArtifactsBuilder = new JavaCompilationArtifacts.Builder(); diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompileAction.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompileAction.java index b60cb2c30e..71c198d73c 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompileAction.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompileAction.java @@ -217,8 +217,8 @@ public final class JavaCompileAction extends SpawnAction { progressMessage, runfilesSupplier, "Javac", - false /*executeUnconditionally*/, - null /*extraActionInfoSupplier*/); + /* executeUnconditionally= */ false, + /* extraActionInfoSupplier= */ null); this.javaCompileCommandLine = javaCompileCommandLine; this.commandLine = commandLine; diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoAspect.java b/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoAspect.java index 31f7d9e84a..f531e0f700 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoAspect.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoAspect.java @@ -240,7 +240,8 @@ public class JavaLiteProtoAspect extends NativeAspectClass implements Configured ruleContext, ImmutableList.of( new ProtoCompileActionBuilder.ToolchainInvocation( - "javalite", aspectCommon.getProtoToolchainProvider(), + "javalite", + aspectCommon.getProtoToolchainProvider(), sourceJar.getExecPathString())), supportData.getDirectProtoSources(), supportData.getTransitiveImports(), @@ -249,7 +250,7 @@ public class JavaLiteProtoAspect extends NativeAspectClass implements Configured ruleContext.getLabel(), ImmutableList.of(sourceJar), "JavaLite", - true /* allowServices */); + /* allowServices= */ true); } } } diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaProtoSkylarkCommon.java b/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaProtoSkylarkCommon.java index e74d5a005f..6ec3fcfd0a 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaProtoSkylarkCommon.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaProtoSkylarkCommon.java @@ -88,7 +88,7 @@ public class JavaProtoSkylarkCommon { skylarkRuleContext.getLabel(), ImmutableList.of(sourceJar), "JavaLite", - true /* allowServices */); + /* allowServices= */ true); } @SkylarkCallable( diff --git a/src/main/java/com/google/devtools/build/lib/rules/proto/BazelProtoLibrary.java b/src/main/java/com/google/devtools/build/lib/rules/proto/BazelProtoLibrary.java index 384384250a..e3687be773 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/proto/BazelProtoLibrary.java +++ b/src/main/java/com/google/devtools/build/lib/rules/proto/BazelProtoLibrary.java @@ -51,7 +51,7 @@ public class BazelProtoLibrary implements RuleConfiguredTargetFactory { final SupportData supportData = SupportData.create( - Predicates.<TransitiveInfoCollection>alwaysTrue() /* nonWeakDepsPredicate */, + /* nonWeakDepsPredicate= */ Predicates.<TransitiveInfoCollection>alwaysTrue(), protoSources, protosInDirectDeps, transitiveImports, @@ -73,7 +73,7 @@ public class BazelProtoLibrary implements RuleConfiguredTargetFactory { transitiveImports, protosInDirectDeps, descriptorSetOutput, - true /* allowServices */, + /* allowServices= */ true, dependenciesDescriptorSets, protoPathFlags); diff --git a/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoCompileActionBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoCompileActionBuilder.java index 7eb1e2e324..808c2a309a 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoCompileActionBuilder.java +++ b/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoCompileActionBuilder.java @@ -369,9 +369,9 @@ public class ProtoCompileActionBuilder { // A rule that concatenates the artifacts from ctx.deps.proto.transitive_descriptor_sets // provides similar results. "--descriptor_set_out=$(OUT)", - null /* pluginExecutable */, - null /* runtime */, - NestedSetBuilder.<Artifact>emptySet(STABLE_ORDER) /* blacklistedProtos */), + /* pluginExecutable= */ null, + /* runtime= */ null, + /* blacklistedProtos= */ NestedSetBuilder.<Artifact>emptySet(STABLE_ORDER)), outReplacement); } diff --git a/src/main/java/com/google/devtools/build/lib/vfs/PathFragment.java b/src/main/java/com/google/devtools/build/lib/vfs/PathFragment.java index fcb857bf20..8c9009fab4 100644 --- a/src/main/java/com/google/devtools/build/lib/vfs/PathFragment.java +++ b/src/main/java/com/google/devtools/build/lib/vfs/PathFragment.java @@ -620,7 +620,7 @@ public final class PathFragment * these are always normalized and will throw uplevel references away. */ public static boolean isNormalized(String path) { - return isNormalizedImpl(path, true /* lookForSameLevelReferences */); + return isNormalizedImpl(path, /* lookForSameLevelReferences= */ true); } /** @@ -630,7 +630,7 @@ public final class PathFragment * these are always normalized and will throw uplevel references away. */ public static boolean containsUplevelReferences(String path) { - return !isNormalizedImpl(path, false /* lookForSameLevelReferences */); + return !isNormalizedImpl(path, /* lookForSameLevelReferences= */ false); } private enum NormalizedImplState { diff --git a/src/test/java/com/google/devtools/build/android/ManifestMergerActionTest.java b/src/test/java/com/google/devtools/build/android/ManifestMergerActionTest.java index b39f34c835..160978b98e 100644 --- a/src/test/java/com/google/devtools/build/android/ManifestMergerActionTest.java +++ b/src/test/java/com/google/devtools/build/android/ManifestMergerActionTest.java @@ -224,15 +224,16 @@ public class ManifestMergerActionTest { + " </manifest>"); // binary manifest merging - args = generateArgs( - binaryManifest, - ImmutableMap.of(libFooOutput, "libFoo", libBarOutput, "libBar"), - false, /* library */ - ImmutableMap.of( - "applicationId", "com.google.android.app", - "foo", "this \\\\: is \"a, \"bad string"), - "", /* customPackage */ - binaryOutput); + args = + generateArgs( + binaryManifest, + ImmutableMap.of(libFooOutput, "libFoo", libBarOutput, "libBar"), + /* library= */ false, + ImmutableMap.of( + "applicationId", "com.google.android.app", + "foo", "this \\\\: is \"a, \"bad string"), + /* customPackage= */ "", + binaryOutput); ManifestMergerAction.main(args.toArray(new String[0])); assertThat(Joiner.on(" ") .join(Files.readAllLines(binaryOutput, UTF_8)) diff --git a/src/test/java/com/google/devtools/build/android/ParsedAndroidDataTest.java b/src/test/java/com/google/devtools/build/android/ParsedAndroidDataTest.java index e7a55bc9a4..0ab2fbd987 100644 --- a/src/test/java/com/google/devtools/build/android/ParsedAndroidDataTest.java +++ b/src/test/java/com/google/devtools/build/android/ParsedAndroidDataTest.java @@ -374,8 +374,7 @@ public class ParsedAndroidDataTest { DataResourceXml.createWithNoNamespace( otherRootValuesPath.overwrite(rootValuesPath), SimpleXmlResourceValue.createWithValue( - SimpleXmlResourceValue.Type.STRING, "way out")) // value - ), + SimpleXmlResourceValue.Type.STRING, /* value= */ "way out"))), ImmutableMap.<DataKey, DataResource>of( idSomeId, // key DataResourceXml.createWithNoNamespace( diff --git a/src/test/java/com/google/devtools/build/lib/analysis/DeprecationValidatorTest.java b/src/test/java/com/google/devtools/build/lib/analysis/DeprecationValidatorTest.java index 053af1ec6c..7cc175a810 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/DeprecationValidatorTest.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/DeprecationValidatorTest.java @@ -94,7 +94,7 @@ public final class DeprecationValidatorTest extends BuildViewTestCase { @Test public void deprecationWarningForSamePackageInDifferentRepository() throws Exception { - try (OutputStream output = scratch.resolve("WORKSPACE").getOutputStream(true /* append */)) { + try (OutputStream output = scratch.resolve("WORKSPACE").getOutputStream(/* append= */ true)) { output.write( "\nlocal_repository(name = 'r', path = '/r')\n".getBytes(StandardCharsets.UTF_8)); } @@ -111,7 +111,7 @@ public final class DeprecationValidatorTest extends BuildViewTestCase { @Test public void deprecationWarningForJavatestsCompanionOfJavaPackageInDifferentRepository() throws Exception { - try (OutputStream output = scratch.resolve("WORKSPACE").getOutputStream(true /* append */)) { + try (OutputStream output = scratch.resolve("WORKSPACE").getOutputStream(/* append= */ true)) { output.write( "\nlocal_repository(name = 'r', path = '/r')\n".getBytes(StandardCharsets.UTF_8)); } diff --git a/src/test/java/com/google/devtools/build/lib/analysis/actions/SpawnActionTest.java b/src/test/java/com/google/devtools/build/lib/analysis/actions/SpawnActionTest.java index 8c359ff939..48428ecbe4 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/actions/SpawnActionTest.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/actions/SpawnActionTest.java @@ -643,9 +643,9 @@ public class SpawnActionTest extends BuildViewTestCase { update( ImmutableList.of("//a:a"), - false /* keepGoing */, - 1 /* loadingPhaseThreads */, - true /* doAnalysis */, + /* keepGoing= */ false, + /* loadingPhaseThreads= */ 1, + /* doAnalysis= */ true, new EventBus()); Artifact artifact = getOnlyElement(getFilesToBuild(getConfiguredTarget("//a:a"))); diff --git a/src/test/java/com/google/devtools/build/lib/bazel/repository/skylark/SkylarkRepositoryIntegrationTest.java b/src/test/java/com/google/devtools/build/lib/bazel/repository/skylark/SkylarkRepositoryIntegrationTest.java index 8f1a37384e..738d0be355 100644 --- a/src/test/java/com/google/devtools/build/lib/bazel/repository/skylark/SkylarkRepositoryIntegrationTest.java +++ b/src/test/java/com/google/devtools/build/lib/bazel/repository/skylark/SkylarkRepositoryIntegrationTest.java @@ -284,7 +284,7 @@ public class SkylarkRepositoryIntegrationTest extends BuildViewTestCase { @Test public void testCycleErrorInWorkspaceFileWithExternalRepo() throws Exception { - try (OutputStream output = scratch.resolve("WORKSPACE").getOutputStream(true /* append */)) { + try (OutputStream output = scratch.resolve("WORKSPACE").getOutputStream(/* append= */ true)) { output.write(( "\nload('//foo:bar.bzl', 'foobar')" + "\ngit_repository(name = 'git_repo')").getBytes(StandardCharsets.UTF_8)); diff --git a/src/test/java/com/google/devtools/build/lib/packages/AttributeTest.java b/src/test/java/com/google/devtools/build/lib/packages/AttributeTest.java index bffbec667c..2244ca55ba 100644 --- a/src/test/java/com/google/devtools/build/lib/packages/AttributeTest.java +++ b/src/test/java/com/google/devtools/build/lib/packages/AttributeTest.java @@ -223,7 +223,7 @@ public class AttributeTest { assertThat(childAttr1.getAllowedRuleClassesPredicate()).isEqualTo(Predicates.alwaysTrue()); assertThat(childAttr1.isMandatory()).isTrue(); assertThat(childAttr1.isNonEmpty()).isFalse(); - assertThat(childAttr1.getAspects(null /* rule */)).hasSize(1); + assertThat(childAttr1.getAspects(/* rule= */ null)).hasSize(1); } { @@ -240,7 +240,7 @@ public class AttributeTest { .isEqualTo(ruleClasses.asPredicateOfRuleClass()); assertThat(childAttr2.isMandatory()).isTrue(); assertThat(childAttr2.isNonEmpty()).isTrue(); - assertThat(childAttr2.getAspects(null /* rule */)).hasSize(2); + assertThat(childAttr2.getAspects(/* rule= */ null)).hasSize(2); } // Check if the parent attribute is unchanged diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/PackageLoadingTestCase.java b/src/test/java/com/google/devtools/build/lib/packages/util/PackageLoadingTestCase.java index 7902de2a18..5503935adf 100644 --- a/src/test/java/com/google/devtools/build/lib/packages/util/PackageLoadingTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/packages/util/PackageLoadingTestCase.java @@ -117,7 +117,7 @@ public abstract class PackageLoadingTestCase extends FoundationTestCase { fileSystem, directories, actionKeyContext, - null, /* workspaceStatusActionFactory */ + /* workspaceStatusActionFactory= */ null, ruleClassProvider.getBuildInfoFactories(), ImmutableList.<DiffAwareness.Factory>of(), ImmutableMap.<SkyFunctionName, SkyFunction>of(), diff --git a/src/test/java/com/google/devtools/build/lib/pkgcache/BuildFileModificationTest.java b/src/test/java/com/google/devtools/build/lib/pkgcache/BuildFileModificationTest.java index d8f19997f6..b199ffa2c5 100644 --- a/src/test/java/com/google/devtools/build/lib/pkgcache/BuildFileModificationTest.java +++ b/src/test/java/com/google/devtools/build/lib/pkgcache/BuildFileModificationTest.java @@ -81,13 +81,11 @@ public class BuildFileModificationTest extends FoundationTestCase { analysisMock.getProductName()); skyframeExecutor = SequencedSkyframeExecutor.create( - analysisMock - .getPackageFactoryBuilderForTesting(directories) - .build(ruleClassProvider), + analysisMock.getPackageFactoryBuilderForTesting(directories).build(ruleClassProvider), fileSystem, directories, actionKeyContext, - null, /* workspaceStatusActionFactory */ + /* workspaceStatusActionFactory= */ null, ruleClassProvider.getBuildInfoFactories(), ImmutableList.<DiffAwareness.Factory>of(), analysisMock.getSkyFunctions(directories), diff --git a/src/test/java/com/google/devtools/build/lib/pkgcache/IncrementalLoadingTest.java b/src/test/java/com/google/devtools/build/lib/pkgcache/IncrementalLoadingTest.java index d37d72a0d0..81da77283f 100644 --- a/src/test/java/com/google/devtools/build/lib/pkgcache/IncrementalLoadingTest.java +++ b/src/test/java/com/google/devtools/build/lib/pkgcache/IncrementalLoadingTest.java @@ -475,13 +475,11 @@ public class IncrementalLoadingTest { ConfiguredRuleClassProvider ruleClassProvider = loadingMock.createRuleClassProvider(); skyframeExecutor = SequencedSkyframeExecutor.create( - loadingMock - .getPackageFactoryBuilderForTesting(directories) - .build(ruleClassProvider), + loadingMock.getPackageFactoryBuilderForTesting(directories).build(ruleClassProvider), fs, directories, actionKeyContext, - null, /* workspaceStatusActionFactory */ + /* workspaceStatusActionFactory= */ null, loadingMock.createRuleClassProvider().getBuildInfoFactories(), ImmutableList.of(new ManualDiffAwarenessFactory()), ImmutableMap.<SkyFunctionName, SkyFunction>of(), diff --git a/src/test/java/com/google/devtools/build/lib/pkgcache/PackageCacheTest.java b/src/test/java/com/google/devtools/build/lib/pkgcache/PackageCacheTest.java index a48e9ec7ea..afdab94a68 100644 --- a/src/test/java/com/google/devtools/build/lib/pkgcache/PackageCacheTest.java +++ b/src/test/java/com/google/devtools/build/lib/pkgcache/PackageCacheTest.java @@ -104,7 +104,7 @@ public class PackageCacheTest extends FoundationTestCase { fileSystem, directories, actionKeyContext, - null, /* workspaceStatusActionFactory */ + /* workspaceStatusActionFactory= */ null, ruleClassProvider.getBuildInfoFactories(), ImmutableList.<DiffAwareness.Factory>of(), analysisMock.getSkyFunctions(directories), diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/ResourceTestBase.java b/src/test/java/com/google/devtools/build/lib/rules/android/ResourceTestBase.java index 21310bd344..d045a2cb95 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/android/ResourceTestBase.java +++ b/src/test/java/com/google/devtools/build/lib/rules/android/ResourceTestBase.java @@ -224,14 +224,14 @@ public abstract class ResourceTestBase extends AndroidBuildViewTestCase { return view.getRuleContextForTesting( eventHandler, dummyTarget, - new CachingAnalysisEnvironment( + /* env= */ new CachingAnalysisEnvironment( view.getArtifactFactory(), skyframeExecutor.getActionKeyContext(), ConfiguredTargetKey.of(dummyTarget.getLabel(), targetConfig), /*isSystemEnv=*/ false, targetConfig.extendedSanityChecks(), eventHandler, - /*env=*/ null, + null, targetConfig.isActionsEnabled()), new BuildConfigurationCollection( ImmutableList.of(dummy.getConfiguration()), dummy.getHostConfiguration())); diff --git a/src/test/java/com/google/devtools/build/lib/rules/java/proto/SkylarkJavaLiteProtoLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/java/proto/SkylarkJavaLiteProtoLibraryTest.java index df9e786da6..7d8f1fa1fd 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/java/proto/SkylarkJavaLiteProtoLibraryTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/java/proto/SkylarkJavaLiteProtoLibraryTest.java @@ -387,9 +387,9 @@ public class SkylarkJavaLiteProtoLibraryTest extends BuildViewTestCase { "custom_rule(name = 'custom', dep = ':lite_pb2')"); update( ImmutableList.of("//proto:custom"), - false /* keepGoing */, - 1 /* loadingPhaseThreads */, - true /* doAnalysis */, + /* keepGoing= */ false, + /* loadingPhaseThreads= */ 1, + /* doAnalysis= */ true, new EventBus()); // Implicitly check that `update()` above didn't throw an exception. This implicitly checks that // ctx.attr.dep.java.{transitive_deps, outputs}, above, is defined. @@ -409,9 +409,9 @@ public class SkylarkJavaLiteProtoLibraryTest extends BuildViewTestCase { "java_lite_proto_library(name = 'lite_pb2', deps = [':proto'])"); update( ImmutableList.of("//proto:lite_pb2"), - false /* keepGoing */, - 1 /* loadingPhaseThreads */, - true /* doAnalysis */, + /* keepGoing= */ false, + /* loadingPhaseThreads= */ 1, + /* doAnalysis= */ true, new EventBus()); } diff --git a/src/test/java/com/google/devtools/build/lib/rules/proto/ProtoCompileActionBuilderTest.java b/src/test/java/com/google/devtools/build/lib/rules/proto/ProtoCompileActionBuilderTest.java index 9881b194b3..e33ed9a47e 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/proto/ProtoCompileActionBuilderTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/proto/ProtoCompileActionBuilderTest.java @@ -62,28 +62,28 @@ public class ProtoCompileActionBuilderTest { ProtoLangToolchainProvider toolchainNoPlugin = ProtoLangToolchainProvider.create( "--java_out=param1,param2:$(OUT)", - null /* pluginExecutable */, - mock(TransitiveInfoCollection.class) /* runtime */, - NestedSetBuilder.<Artifact>emptySet(STABLE_ORDER) /* blacklistedProtos */); + /* pluginExecutable= */ null, + /* runtime= */ mock(TransitiveInfoCollection.class), + /* blacklistedProtos= */ NestedSetBuilder.<Artifact>emptySet(STABLE_ORDER)); ProtoLangToolchainProvider toolchainWithPlugin = ProtoLangToolchainProvider.create( "--$(PLUGIN_OUT)=param3,param4:$(OUT)", plugin, - mock(TransitiveInfoCollection.class) /* runtime */, - NestedSetBuilder.<Artifact>emptySet(STABLE_ORDER) /* blacklistedProtos */); + /* runtime= */ mock(TransitiveInfoCollection.class), + /* blacklistedProtos= */ NestedSetBuilder.<Artifact>emptySet(STABLE_ORDER)); SupportData supportData = SupportData.create( Predicates.<TransitiveInfoCollection>alwaysFalse(), ImmutableList.of(artifact("//:dont-care", "source_file.proto")), - NestedSetBuilder.<Artifact>emptySet(STABLE_ORDER) /* protosInDirectDeps */, + /* protosInDirectDeps= */ NestedSetBuilder.<Artifact>emptySet(STABLE_ORDER), NestedSetBuilder.create( STABLE_ORDER, artifact("//:dont-care", "import1.proto"), artifact("//:dont-care", "import2.proto")), /*transitiveProtoPathFlags=*/ NestedSetBuilder.<String>emptySet(STABLE_ORDER), - true /* hasProtoSources */); + /* hasProtoSources= */ true); CustomCommandLine cmdLine = createCommandLineFromToolchains( @@ -117,10 +117,10 @@ public class ProtoCompileActionBuilderTest { SupportData.create( Predicates.<TransitiveInfoCollection>alwaysFalse(), ImmutableList.of(derivedArtifact("//:dont-care", "source_file.proto")), - NestedSetBuilder.<Artifact>emptySet(STABLE_ORDER) /* protosInDirectDeps */, - NestedSetBuilder.<Artifact>emptySet(STABLE_ORDER) /* transitiveImports */, + /* protosInDirectDeps= */ NestedSetBuilder.<Artifact>emptySet(STABLE_ORDER), + /* transitiveImports= */ NestedSetBuilder.<Artifact>emptySet(STABLE_ORDER), /*transitiveProtoPathFlags=*/ NestedSetBuilder.<String>emptySet(STABLE_ORDER), - true /* hasProtoSources */); + /* hasProtoSources= */ true); CustomCommandLine cmdLine = createCommandLineFromToolchains( @@ -141,9 +141,9 @@ public class ProtoCompileActionBuilderTest { ProtoLangToolchainProvider toolchain = ProtoLangToolchainProvider.create( "--java_out=param1,param2:$(OUT)", - null /* pluginExecutable */, - mock(TransitiveInfoCollection.class) /* runtime */, - NestedSetBuilder.<Artifact>emptySet(STABLE_ORDER) /* blacklistedProtos */); + /* pluginExecutable= */ null, + /* runtime= */ mock(TransitiveInfoCollection.class), + /* blacklistedProtos= */ NestedSetBuilder.<Artifact>emptySet(STABLE_ORDER)); SupportData supportData = SupportData.create( @@ -155,7 +155,7 @@ public class ProtoCompileActionBuilderTest { artifact("//:dont-care", "import1.proto"), artifact("//:dont-care", "import2.proto")), /*transitiveProtoPathFlags=*/ NestedSetBuilder.<String>emptySet(STABLE_ORDER), - true /* hasProtoSources */); + /* hasProtoSources= */ true); CustomCommandLine cmdLine = createCommandLineFromToolchains( @@ -186,10 +186,10 @@ public class ProtoCompileActionBuilderTest { SupportData.create( Predicates.<TransitiveInfoCollection>alwaysFalse(), ImmutableList.<Artifact>of(), - NestedSetBuilder.<Artifact>emptySet(STABLE_ORDER) /* protosInDirectDeps */, + /* protosInDirectDeps= */ NestedSetBuilder.<Artifact>emptySet(STABLE_ORDER), NestedSetBuilder.<Artifact>emptySet(STABLE_ORDER), /*transitiveProtoPathFlags=*/ NestedSetBuilder.<String>emptySet(STABLE_ORDER), - true /* hasProtoSources */); + /* hasProtoSources= */ true); CustomCommandLine cmdLine = createCommandLineFromToolchains( @@ -222,18 +222,18 @@ public class ProtoCompileActionBuilderTest { ProtoLangToolchainProvider toolchain = ProtoLangToolchainProvider.create( "--java_out=param1,param2:$(OUT)", - null /* pluginExecutable */, - mock(TransitiveInfoCollection.class) /* runtime */, - NestedSetBuilder.<Artifact>emptySet(STABLE_ORDER) /* blacklistedProtos */); + /* pluginExecutable= */ null, + /* runtime= */ mock(TransitiveInfoCollection.class), + /* blacklistedProtos= */ NestedSetBuilder.<Artifact>emptySet(STABLE_ORDER)); SupportData supportData = SupportData.create( Predicates.<TransitiveInfoCollection>alwaysFalse(), ImmutableList.<Artifact>of(), - NestedSetBuilder.<Artifact>emptySet(STABLE_ORDER) /* protosInDirectDeps */, + /* protosInDirectDeps= */ NestedSetBuilder.<Artifact>emptySet(STABLE_ORDER), NestedSetBuilder.<Artifact>emptySet(STABLE_ORDER), /*transitiveProtoPathFlags=*/ NestedSetBuilder.<String>emptySet(STABLE_ORDER), - true /* hasProtoSources */); + /* hasProtoSources= */ true); CustomCommandLine cmdLine = createCommandLineFromToolchains( @@ -261,24 +261,24 @@ public class ProtoCompileActionBuilderTest { SupportData.create( Predicates.<TransitiveInfoCollection>alwaysFalse(), ImmutableList.<Artifact>of(), - NestedSetBuilder.<Artifact>emptySet(STABLE_ORDER) /* protosInDirectDeps */, + /* protosInDirectDeps= */ NestedSetBuilder.<Artifact>emptySet(STABLE_ORDER), NestedSetBuilder.<Artifact>emptySet(STABLE_ORDER), /*transitiveProtoPathFlags=*/ NestedSetBuilder.<String>emptySet(STABLE_ORDER), - true /* hasProtoSources */); + /* hasProtoSources= */ true); ProtoLangToolchainProvider toolchain1 = ProtoLangToolchainProvider.create( "dontcare", - null /* pluginExecutable */, - mock(TransitiveInfoCollection.class) /* runtime */, - NestedSetBuilder.<Artifact>emptySet(STABLE_ORDER) /* blacklistedProtos */); + /* pluginExecutable= */ null, + /* runtime= */ mock(TransitiveInfoCollection.class), + /* blacklistedProtos= */ NestedSetBuilder.<Artifact>emptySet(STABLE_ORDER)); ProtoLangToolchainProvider toolchain2 = ProtoLangToolchainProvider.create( "dontcare", - null /* pluginExecutable */, - mock(TransitiveInfoCollection.class) /* runtime */, - NestedSetBuilder.<Artifact>emptySet(STABLE_ORDER) /* blacklistedProtos */); + /* pluginExecutable= */ null, + /* runtime= */ mock(TransitiveInfoCollection.class), + /* blacklistedProtos= */ NestedSetBuilder.<Artifact>emptySet(STABLE_ORDER)); try { createCommandLineFromToolchains( diff --git a/src/tools/android/java/com/google/devtools/build/android/Aapt2ResourcePackagingAction.java b/src/tools/android/java/com/google/devtools/build/android/Aapt2ResourcePackagingAction.java index 3ec965067b..025533ee6a 100644 --- a/src/tools/android/java/com/google/devtools/build/android/Aapt2ResourcePackagingAction.java +++ b/src/tools/android/java/com/google/devtools/build/android/Aapt2ResourcePackagingAction.java @@ -104,7 +104,7 @@ public class Aapt2ResourcePackagingAction { null /* cruncher. Aapt2 automatically chooses to crunch or not. */, options.packageType, options.symbolsOut, - null /* rclassWriter */, + /* rclassWriter= */ null, dataDeserializer, options.throwOnResourceConflict, executorService) @@ -185,13 +185,13 @@ public class Aapt2ResourcePackagingAction { profiler.recordEndOf("link"); if (options.resourcesOutput != null) { profiler.startTask("package"); - // The compiled resources and the merged resources should be the same. - // TODO(corysmith): Decompile or otherwise provide the exact resources in the apk. - ResourcesZip.fromApk( - mergedAndroidData.getResourceDir(), - packagedResources.getApk(), - packagedResources.getResourceIds()) - .writeTo(options.resourcesOutput, false /* compress */); + // The compiled resources and the merged resources should be the same. + // TODO(corysmith): Decompile or otherwise provide the exact resources in the apk. + ResourcesZip.fromApk( + mergedAndroidData.getResourceDir(), + packagedResources.getApk(), + packagedResources.getResourceIds()) + .writeTo(options.resourcesOutput, /* compress= */ false); profiler.recordEndOf("package"); } } diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidAssetMergingAction.java b/src/tools/android/java/com/google/devtools/build/android/AndroidAssetMergingAction.java index 98081c72b0..aa74a7405a 100644 --- a/src/tools/android/java/com/google/devtools/build/android/AndroidAssetMergingAction.java +++ b/src/tools/android/java/com/google/devtools/build/android/AndroidAssetMergingAction.java @@ -148,7 +148,7 @@ public class AndroidAssetMergingAction extends AbstractBusyBoxAction { "The asset merging action should not produce non-asset merge results!"); ResourcesZip.from(ignored, mergedData.getAssetDir()) - .writeTo(options.assetsOutput, true /* compress */); + .writeTo(options.assetsOutput, /* compress= */ true); logCompletion("Create assets zip"); } diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidManifestProcessor.java b/src/tools/android/java/com/google/devtools/build/android/AndroidManifestProcessor.java index f870d6c7df..c65bc98880 100644 --- a/src/tools/android/java/com/google/devtools/build/android/AndroidManifestProcessor.java +++ b/src/tools/android/java/com/google/devtools/build/android/AndroidManifestProcessor.java @@ -271,8 +271,8 @@ public class AndroidManifestProcessor { if (newManifestPackage != null) { processManifest( - -1 /* versionCode */, - null /* versionName */, + /* versionCode= */ -1, + /* versionName= */ null, manifest, processedManifest, MergeType.LIBRARY, diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceClassWriter.java b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceClassWriter.java index b9458fb05b..f5ba7dc9b7 100644 --- a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceClassWriter.java +++ b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceClassWriter.java @@ -101,10 +101,11 @@ public class AndroidResourceClassWriter implements Flushable, AndroidResourceSym } private void writeAsJava(FieldInitializers initializers) throws IOException { - RSourceGenerator.with(outputBasePath, initializers, false /* finalFields */).write(packageName); + RSourceGenerator.with(outputBasePath, initializers, /* finalFields= */ false) + .write(packageName); } private void writeAsClass(FieldInitializers initializers) throws IOException { - RClassGenerator.with(outputBasePath, initializers, false /* finalFields */).write(packageName); + RClassGenerator.with(outputBasePath, initializers, /* finalFields= */ false).write(packageName); } } diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceMerger.java b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceMerger.java index 2b63b5647b..f77c4e1b92 100644 --- a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceMerger.java +++ b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceMerger.java @@ -162,7 +162,7 @@ public class AndroidResourceMerger { cruncher, type, symbolsOut, - null /* rclassWriter */, + /* rclassWriter= */ null, AndroidParsedDataDeserializer.withFilteredResources(filteredResources), throwOnResourceConflict, executorService); diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceMergingAction.java b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceMergingAction.java index cbd53a512e..9b9b87f308 100644 --- a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceMergingAction.java +++ b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceMergingAction.java @@ -278,9 +278,9 @@ public class AndroidResourceMergingAction { .processManifest( packageType, options.packageForR, - null, /* applicationId */ - -1, /* versionCode */ - null, /* versionName */ + /* applicationId= */ null, + /* versionCode= */ -1, + /* versionName= */ null, mergedData, processedManifest); AndroidResourceOutputs.copyManifestToOutput(processedData, options.manifestOutput); @@ -311,7 +311,7 @@ public class AndroidResourceMergingAction { // For now, try compressing the library resources that we pass to the validator. This takes // extra CPU resources to pack and unpack (~2x), but can reduce the zip size (~4x). ResourcesZip.from(resourcesDir, mergedData.getAssetDir()) - .writeTo(options.resourcesOutput, true /* compress */); + .writeTo(options.resourcesOutput, /* compress= */ true); logger.fine( String.format( "Create resources.zip finished at %sms", timer.elapsed(TimeUnit.MILLISECONDS))); diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessingAction.java b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessingAction.java index 0a4a275de9..18dd20381c 100644 --- a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessingAction.java +++ b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessingAction.java @@ -535,7 +535,7 @@ public class AndroidResourceProcessingAction { } ResourcesZip.from(processedAndroidData.getResourceDir(), processedAndroidData.getAssetDir()) - .writeTo(options.resourcesOutput, false /* compress */); + .writeTo(options.resourcesOutput, /* compress= */ false); } logger.fine( String.format("Packaging finished at %sms", timer.elapsed(TimeUnit.MILLISECONDS))); diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessor.java b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessor.java index f995a7a370..ddbfa18a6c 100644 --- a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessor.java +++ b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessor.java @@ -299,7 +299,7 @@ public class AndroidResourceProcessor { variantType, customPackageForR, androidManifest, - true /* shouldZipDataBindingInfo */); + /* shouldZipDataBindingInfo= */ true); final Path assetsDir = primaryData.getAssetDir(); if (publicResourcesOut != null) { @@ -593,7 +593,7 @@ public class AndroidResourceProcessor { // Loop on all the package name, merge all the symbols to write, and write. for (String packageName : libSymbolMap.keySet()) { Collection<ResourceSymbols> symbols = libSymbolMap.get(packageName); - fullSymbolValues.writeSourcesTo(sourceOut, packageName, symbols, true /* finalFields */); + fullSymbolValues.writeSourcesTo(sourceOut, packageName, symbols, /* finalFields= */ true); } } } diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceValidatorAction.java b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceValidatorAction.java index 23f1671a07..b960c8c952 100644 --- a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceValidatorAction.java +++ b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceValidatorAction.java @@ -168,9 +168,9 @@ public class AndroidResourceValidatorAction { assets, generatedSources, options.packagePath, - null, /* proguardOut */ - null, /* mainDexProguardOut */ - null /* publicResourcesOut */); + /* proguardOut= */ null, + /* mainDexProguardOut= */ null, + /* publicResourcesOut= */ null); logger.fine(String.format("aapt finished at %sms", timer.elapsed(TimeUnit.MILLISECONDS))); AndroidResourceOutputs.copyRToOutput( diff --git a/src/tools/android/java/com/google/devtools/build/android/RClassGeneratorAction.java b/src/tools/android/java/com/google/devtools/build/android/RClassGeneratorAction.java index ff3256d6ae..2c1f96fa4d 100644 --- a/src/tools/android/java/com/google/devtools/build/android/RClassGeneratorAction.java +++ b/src/tools/android/java/com/google/devtools/build/android/RClassGeneratorAction.java @@ -169,7 +169,7 @@ public class RClassGeneratorAction { String.format("Load symbols finished at %sms", timer.elapsed(TimeUnit.MILLISECONDS))); // For now, assuming not used for libraries and setting final access for fields. fullSymbolValues.writeClassesTo( - libSymbolMap, appPackageName, classOutPath, true /* finalFields */); + libSymbolMap, appPackageName, classOutPath, /* finalFields= */ true); logger.fine( String.format("Finished R.class at %sms", timer.elapsed(TimeUnit.MILLISECONDS))); } else if (!options.libraries.isEmpty()) { @@ -179,7 +179,7 @@ public class RClassGeneratorAction { logger.fine( String.format("Load symbols finished at %sms", timer.elapsed(TimeUnit.MILLISECONDS))); // For now, assuming not used for libraries and setting final access for fields. - fullSymbolValues.writeClassesTo(libSymbolMap, null, classOutPath, true /* finalFields */); + fullSymbolValues.writeClassesTo(libSymbolMap, null, classOutPath, /* finalFields= */ true); logger.fine( String.format("Finished R.class at %sms", timer.elapsed(TimeUnit.MILLISECONDS))); } else { diff --git a/src/tools/android/java/com/google/devtools/build/android/ResourceShrinkerAction.java b/src/tools/android/java/com/google/devtools/build/android/ResourceShrinkerAction.java index 57193f0f7f..81bfb7349d 100644 --- a/src/tools/android/java/com/google/devtools/build/android/ResourceShrinkerAction.java +++ b/src/tools/android/java/com/google/devtools/build/android/ResourceShrinkerAction.java @@ -309,11 +309,11 @@ public class ResourceShrinkerAction { options.shrunkApk, null /* proguardOutput */, null /* mainDexProguardOutput */, - null /* publicResourcesOut */, - null /* dataBindingInfoOut */); + /* publicResourcesOut= */ null, + /* dataBindingInfoOut= */ null); if (options.shrunkResources != null) { ResourcesZip.from(shrunkResources, resourceFiles.resolve("assets")) - .writeTo(options.shrunkResources, false /* compress */); + .writeTo(options.shrunkResources, /* compress= */ false); } if (options.rTxtOutput != null) { AndroidResourceOutputs.copyRToOutput( diff --git a/src/tools/android/java/com/google/devtools/build/android/ResourcesZip.java b/src/tools/android/java/com/google/devtools/build/android/ResourcesZip.java index 3b6b160f54..3c599e4279 100644 --- a/src/tools/android/java/com/google/devtools/build/android/ResourcesZip.java +++ b/src/tools/android/java/com/google/devtools/build/android/ResourcesZip.java @@ -84,7 +84,7 @@ public class ResourcesZip { public static ResourcesZip fromApk(Path resourcesRoot, Path apkWithAssets, Path resourceIds) { return new ResourcesZip( resourcesRoot, - null /* assetsRoot */, + /* assetsRoot= */ null, Optional.of(resourceIds).filter(Files::exists), Optional.of(apkWithAssets)); } diff --git a/src/tools/android/java/com/google/devtools/build/android/aapt2/ResourceLinker.java b/src/tools/android/java/com/google/devtools/build/android/aapt2/ResourceLinker.java index c2bfc60abe..adaeabbe72 100644 --- a/src/tools/android/java/com/google/devtools/build/android/aapt2/ResourceLinker.java +++ b/src/tools/android/java/com/google/devtools/build/android/aapt2/ResourceLinker.java @@ -224,7 +224,7 @@ public class ResourceLinker { } profiler.startTask("sourcejar"); - AndroidResourceOutputs.createSrcJar(javaSourceDirectory, sourceJar, true /* staticIds */); + AndroidResourceOutputs.createSrcJar(javaSourceDirectory, sourceJar, /* staticIds= */ true); profiler.recordEndOf("sourcejar"); return StaticLibrary.from(outPath, rTxt, ImmutableList.of(), sourceJar); } catch (IOException e) { |