Automatic code cleanup.

PiperOrigin-RevId: 168802886

5 files changed, 23 insertions, 11 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaImport.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaImport.java
index 3157f31ea8..9b42dd7f28 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaImport.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaImport.java
@@ -65,8 +65,14 @@ public class JavaImport implements RuleConfiguredTargetFactory {
             .addAll(ruleContext.getPrerequisites("deps", Mode.TARGET))
             .addAll(ruleContext.getPrerequisites("exports", Mode.TARGET))
             .build();
-    final JavaCommon common = new JavaCommon(
-        ruleContext, semantics, /*srcs=*/ImmutableList.<Artifact>of(), targets, targets, targets);
+    final JavaCommon common =
+        new JavaCommon(
+            ruleContext,
+            semantics,
+            /* sources= */ ImmutableList.<Artifact>of(),
+            targets,
+            targets,
+            targets);
     semantics.checkRule(ruleContext, common);
 
     // No need for javac options - no compilation happening here.
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaPlugin.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaPlugin.java
index c780c91f0d..f593fd9167 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaPlugin.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaPlugin.java
@@ -31,10 +31,11 @@ public class JavaPlugin implements RuleConfiguredTargetFactory {
   @Override
   public final ConfiguredTarget create(RuleContext ruleContext)
       throws InterruptedException, RuleErrorException {
-    return new JavaLibrary(semantics).init(
-        ruleContext,
-        new JavaCommon(ruleContext, semantics),
-        /* includeGeneratedExtensionRegistry = */ true,
-        /* includeJavaPluginInfoProvider = */ true);
+    return new JavaLibrary(semantics)
+        .init(
+            ruleContext,
+            new JavaCommon(ruleContext, semantics),
+            /* includeGeneratedExtensionRegistry = */ true,
+            /* isJavaPluginRule= */ true);
   }
 }
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java b/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java
index 159821f0e5..e8e87eb2e7 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java
@@ -1288,7 +1288,7 @@ public abstract class CompilationSupport {
             ImmutableList.<PathFragment>of(),
             /*compiledModule=*/ true,
             /*moduleMapHomeIsCwd=*/ false,
-            /*generateSubModules=*/ false,
+            /* generateSubmodules= */ false,
             /*externDependencies=*/ true));
 
     return this;
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/LegacyCompilationSupport.java b/src/main/java/com/google/devtools/build/lib/rules/objc/LegacyCompilationSupport.java
index 8eee5e22fa..4bf8b0de4c 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/LegacyCompilationSupport.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/LegacyCompilationSupport.java
@@ -467,7 +467,7 @@ public class LegacyCompilationSupport extends CompilationSupport {
             getPchFile(),
             Optional.<Artifact>absent(),
             otherFlags,
-            /* runCodeCoverage=*/ false,
+            /* collectCodeCoverage= */ false,
             /* isCPlusPlusSource=*/ false);
 
     AppleConfiguration appleConfiguration = ruleContext.getFragment(AppleConfiguration.class);
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/TestSupport.java b/src/main/java/com/google/devtools/build/lib/rules/objc/TestSupport.java
index 9e69388bed..03a56fe1df 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/TestSupport.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/TestSupport.java
@@ -124,8 +124,13 @@ public class TestSupport {
       template = testTemplateForLabDevice();
     }
 
-    ruleContext.registerAction(new TemplateExpansionAction(ruleContext.getActionOwner(),
-        template, generatedTestScript(), substitutions.build(), /*executable=*/true));
+    ruleContext.registerAction(
+        new TemplateExpansionAction(
+            ruleContext.getActionOwner(),
+            template,
+            generatedTestScript(),
+            substitutions.build(),
+            /* makeExecutable= */ true));
   }
 
   private boolean runWithLabDevice() {