diff options
Diffstat (limited to 'src/main/java/com/google/devtools/build')
12 files changed, 31 insertions, 21 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/actions/cache/PersistentStringIndexer.java b/src/main/java/com/google/devtools/build/lib/actions/cache/PersistentStringIndexer.java index b0c3064f2d..c1619717bd 100644 --- a/src/main/java/com/google/devtools/build/lib/actions/cache/PersistentStringIndexer.java +++ b/src/main/java/com/google/devtools/build/lib/actions/cache/PersistentStringIndexer.java @@ -58,7 +58,7 @@ final class PersistentStringIndexer extends CanonicalStringIndexer { mapFile, journalFile); this.clock = clock; nextUpdate = clock.nanoTime(); - load(/*throwOnLoadFailure=*/true); + load(/* failFast= */ true); } @Override diff --git a/src/main/java/com/google/devtools/build/lib/buildtool/SkyframeBuilder.java b/src/main/java/com/google/devtools/build/lib/buildtool/SkyframeBuilder.java index 5c32a9e1fe..f80da14e7a 100644 --- a/src/main/java/com/google/devtools/build/lib/buildtool/SkyframeBuilder.java +++ b/src/main/java/com/google/devtools/build/lib/buildtool/SkyframeBuilder.java @@ -284,7 +284,7 @@ public class SkyframeBuilder implements Builder { // during evaluation (otherwise, it wouldn't have bothered to find a cycle). So the best // we can do is throw a generic build failure exception, since we've already reported the // cycles above. - throw new BuildFailedException(null, /*hasCatastrophe=*/ false); + throw new BuildFailedException(null, /* catastrophic= */ false); } else { rethrow(exception); } 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() { diff --git a/src/main/java/com/google/devtools/build/lib/runtime/TerminalTestResultNotifier.java b/src/main/java/com/google/devtools/build/lib/runtime/TerminalTestResultNotifier.java index fcb2010b28..de0f371fdb 100644 --- a/src/main/java/com/google/devtools/build/lib/runtime/TerminalTestResultNotifier.java +++ b/src/main/java/com/google/devtools/build/lib/runtime/TerminalTestResultNotifier.java @@ -188,11 +188,11 @@ public class TerminalTestResultNotifier implements TestResultNotifier { break; case SHORT: - printShortSummary(summaries, /*printSuccess=*/true); + printShortSummary(summaries, /* showPassingTests= */ true); break; case TERSE: - printShortSummary(summaries, /*printSuccess=*/false); + printShortSummary(summaries, /* showPassingTests= */ false); break; case NONE: diff --git a/src/main/java/com/google/devtools/build/lib/shell/Command.java b/src/main/java/com/google/devtools/build/lib/shell/Command.java index 291dd32ce9..0e8c5a0247 100644 --- a/src/main/java/com/google/devtools/build/lib/shell/Command.java +++ b/src/main/java/com/google/devtools/build/lib/shell/Command.java @@ -362,7 +362,7 @@ public final class Command { outErrConsumers.logConsumptionStrategy(); outErrConsumers.registerInputs( - process.getInputStream(), process.getErrorStream(), /*closeOutputStreams=*/false); + process.getInputStream(), process.getErrorStream(), /* closeStreams= */ false); // TODO(ulfjack): This call blocks until all input is written. If stdinInput is large (or // unbounded), then the async calls can block for a long time, and the timeout is not properly diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/packages/AbstractPackageLoader.java b/src/main/java/com/google/devtools/build/lib/skyframe/packages/AbstractPackageLoader.java index 5824c4d118..2a937bb235 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/packages/AbstractPackageLoader.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/packages/AbstractPackageLoader.java @@ -349,7 +349,7 @@ public abstract class AbstractPackageLoader implements PackageLoader { .put( SkyFunctions.PACKAGE_LOOKUP, new PackageLookupFunction( - /*deletedPackagesRef=*/ new AtomicReference<>(ImmutableSet.<PackageIdentifier>of()), + /* deletedPackages= */ new AtomicReference<>(ImmutableSet.<PackageIdentifier>of()), getCrossRepositoryLabelViolationStrategy(), getBuildFilesByPriority())) .put(SkyFunctions.BLACKLISTED_PACKAGE_PREFIXES, new BlacklistedPackagePrefixesFunction()) diff --git a/src/main/java/com/google/devtools/build/lib/util/PersistentMap.java b/src/main/java/com/google/devtools/build/lib/util/PersistentMap.java index f1979ad65c..04cd488320 100644 --- a/src/main/java/com/google/devtools/build/lib/util/PersistentMap.java +++ b/src/main/java/com/google/devtools/build/lib/util/PersistentMap.java @@ -251,7 +251,7 @@ public abstract class PersistentMap<K, V> extends ForwardingMap<K, V> { * @throws IOException */ public void load() throws IOException { - load(/*throwOnLoadFailure=*/ false); + load(/* failFast= */ false); } @Override diff --git a/src/main/java/com/google/devtools/build/skyframe/ErrorInfo.java b/src/main/java/com/google/devtools/build/skyframe/ErrorInfo.java index bd90d8afa0..af48c30e64 100644 --- a/src/main/java/com/google/devtools/build/skyframe/ErrorInfo.java +++ b/src/main/java/com/google/devtools/build/skyframe/ErrorInfo.java @@ -20,9 +20,7 @@ import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder; import com.google.devtools.build.lib.collect.nestedset.Order; import com.google.devtools.build.lib.util.Preconditions; import com.google.devtools.build.skyframe.SkyFunctionException.ReifiedSkyFunctionException; - import java.util.Collection; - import javax.annotation.Nullable; /** @@ -56,7 +54,7 @@ public class ErrorInfo { ImmutableList.of(cycleInfo), /*isDirectlyTransient=*/ false, /*isTransitivelyTransient=*/ false, - /*isCatastrophic=*/ false); + /* isCatostrophic= */ false); } /** Create an ErrorInfo from a collection of existing errors. */ |