Fix various linter errors
RELNOTES: None.
PiperOrigin-RevId: 170418147
diff --git a/src/main/java/com/google/devtools/build/lib/actions/FailAction.java b/src/main/java/com/google/devtools/build/lib/actions/FailAction.java
index 8d46ef1..8bebf4e 100644
--- a/src/main/java/com/google/devtools/build/lib/actions/FailAction.java
+++ b/src/main/java/com/google/devtools/build/lib/actions/FailAction.java
@@ -39,9 +39,8 @@
}
@Override
- public void execute(
- ActionExecutionContext actionExecutionContext)
- throws ActionExecutionException {
+ public void execute(ActionExecutionContext actionExecutionContext)
+ throws ActionExecutionException {
throw new ActionExecutionException(errorMessage, this, false);
}
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/actions/ExecutableSymlinkAction.java b/src/main/java/com/google/devtools/build/lib/analysis/actions/ExecutableSymlinkAction.java
index 17ed755..4070e5a 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/actions/ExecutableSymlinkAction.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/actions/ExecutableSymlinkAction.java
@@ -60,5 +60,7 @@
}
@Override
- public String getMnemonic() { return "ExecutableSymlink"; }
+ public String getMnemonic() {
+ return "ExecutableSymlink";
+ }
}
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/actions/SymlinkTreeAction.java b/src/main/java/com/google/devtools/build/lib/analysis/actions/SymlinkTreeAction.java
index 82c2531..25da294 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/actions/SymlinkTreeAction.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/actions/SymlinkTreeAction.java
@@ -37,7 +37,7 @@
private final Artifact inputManifest;
private final Artifact outputManifest;
private final boolean filesetTree;
- private final ImmutableMap<String, String> shellEnviroment;
+ private final ImmutableMap<String, String> shellEnvironment;
private final boolean enableRunfiles;
/**
@@ -66,7 +66,7 @@
this.inputManifest = inputManifest;
this.outputManifest = outputManifest;
this.filesetTree = filesetTree;
- this.shellEnviroment = shellEnvironment;
+ this.shellEnvironment = shellEnvironment;
this.enableRunfiles = enableRunfiles;
}
@@ -117,6 +117,6 @@
throws ActionExecutionException, InterruptedException {
actionExecutionContext
.getContext(SymlinkTreeActionContext.class)
- .createSymlinks(this, actionExecutionContext, shellEnviroment, enableRunfiles);
+ .createSymlinks(this, actionExecutionContext, shellEnvironment, enableRunfiles);
}
}
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/test/TestRunnerAction.java b/src/main/java/com/google/devtools/build/lib/analysis/test/TestRunnerAction.java
index f7d2fc1..49a5622 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/test/TestRunnerAction.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/test/TestRunnerAction.java
@@ -163,8 +163,8 @@
this.baseDir = cacheStatus.getExecPath().getParentDirectory();
int totalShards = executionSettings.getTotalShards();
- Preconditions.checkState((totalShards == 0 && shardNum == 0) ||
- (totalShards > 0 && 0 <= shardNum && shardNum < totalShards));
+ Preconditions.checkState((totalShards == 0 && shardNum == 0)
+ || (totalShards > 0 && 0 <= shardNum && shardNum < totalShards));
this.testExitSafe = baseDir.getChild("test.exited_prematurely");
// testShard Path should be set only if sharding is enabled.
this.testShard = totalShards > 1
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkAction.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkAction.java
index bf27cae..48d5f94 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkAction.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkAction.java
@@ -360,8 +360,8 @@
s.append(getOutputFile().getBaseName()).append(": ");
for (Artifact linkstamp : linkstampOutputs) {
- s.append("mkdir -p " + outputPrefix +
- linkstamp.getExecPath().getParentDirectory() + " && ");
+ s.append("mkdir -p " + outputPrefix
+ + linkstamp.getExecPath().getParentDirectory() + " && ");
}
Joiner.on(' ').appendTo(s,
ShellEscaper.escapeAll(linkCommandLine.finalizeAlreadyEscapedWithLinkstampCommands(
@@ -376,8 +376,8 @@
FileSystemUtils.touchFile(linkstamp.getPath());
}
} catch (IOException e) {
- throw new ActionExecutionException("failed to create fake link command for rule '" +
- getOwner().getLabel() + ": " + e.getMessage(),
+ throw new ActionExecutionException("failed to create fake link command for rule '"
+ + getOwner().getLabel() + ": " + e.getMessage(),
this, false);
}
}
@@ -670,7 +670,7 @@
}
/**
- * Returns true if the linking of this target is used for a native dependecy library.
+ * Returns true if the linking of this target is used for a native dependency library.
*/
public boolean isNativeDeps() {
return this.isNativeDeps;
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/SolibSymlinkAction.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/SolibSymlinkAction.java
index 9d564d5..98b3f2f 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/SolibSymlinkAction.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/SolibSymlinkAction.java
@@ -75,10 +75,14 @@
}
@Override
- public String getMnemonic() { return "SolibSymlink"; }
+ public String getMnemonic() {
+ return "SolibSymlink";
+ }
@Override
- protected String getRawProgressMessage() { return null; }
+ protected String getRawProgressMessage() {
+ return null;
+ }
/**
* Replaces shared library artifact with mangled symlink and creates related
diff --git a/src/test/java/com/google/devtools/build/lib/actions/util/ActionsTestUtil.java b/src/test/java/com/google/devtools/build/lib/actions/util/ActionsTestUtil.java
index 2fc80f5..0b35f98 100644
--- a/src/test/java/com/google/devtools/build/lib/actions/util/ActionsTestUtil.java
+++ b/src/test/java/com/google/devtools/build/lib/actions/util/ActionsTestUtil.java
@@ -235,8 +235,9 @@
public Label getLabel() {
return NULL_LABEL;
}
- };
+ };
+ /** An unchecked exception class for action conflicts. */
public static class UncheckedActionConflictException extends RuntimeException {
public UncheckedActionConflictException(ActionConflictException e) {
super(e);
@@ -266,9 +267,12 @@
@Override
public void execute(ActionExecutionContext actionExecutionContext) {
+
}
- @Override protected String computeKey() { return "action"; }
+ @Override protected String computeKey() {
+ return "action";
+ }
@Override
public String getMnemonic() {
diff --git a/src/test/java/com/google/devtools/build/lib/actions/util/TestAction.java b/src/test/java/com/google/devtools/build/lib/actions/util/TestAction.java
index 9c39d84..f5c1a96 100644
--- a/src/test/java/com/google/devtools/build/lib/actions/util/TestAction.java
+++ b/src/test/java/com/google/devtools/build/lib/actions/util/TestAction.java
@@ -97,8 +97,8 @@
// used by tests to specify artifacts that may or may not be missing.
// This is used, e.g., to test Blaze behavior when action has missing
// input artifacts but still is successfully executed.
- if (!artifact.getPath().exists() &&
- !artifact.getExecPath().getBaseName().endsWith(".optional")) {
+ if (!artifact.getPath().exists()
+ && !artifact.getExecPath().getBaseName().endsWith(".optional")) {
throw new IllegalStateException("action's input file does not exist: "
+ artifact.getPath());
}
@@ -114,7 +114,7 @@
}
try {
- for (Artifact artifact: getOutputs()) {
+ for (Artifact artifact : getOutputs()) {
FileSystemUtils.touchFile(artifact.getPath());
}
} catch (IOException e) {
@@ -131,7 +131,9 @@
}
@Override
- public String getMnemonic() { return "Test"; }
+ public String getMnemonic() {
+ return "Test";
+ }
/** No-op action that has exactly one output, and can be a middleman action. */
public static class DummyAction extends TestAction {
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestUtil.java b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestUtil.java
index 7e2400d..bae2bef 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestUtil.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestUtil.java
@@ -190,6 +190,7 @@
}
}
+ /** A dummy WorkspaceStatusAction. */
@Immutable
public static final class DummyWorkspaceStatusAction extends WorkspaceStatusAction {
private final String key;
@@ -254,6 +255,7 @@
}
}
+ /** A WorkspaceStatusAction.Context that has no stable keys and no volatile keys. */
@ExecutionStrategy(contextType = WorkspaceStatusAction.Context.class)
public static class DummyWorkspaceStatusActionContext implements WorkspaceStatusAction.Context {
@Override
@@ -304,6 +306,7 @@
public static final AnalysisEnvironment STUB_ANALYSIS_ENVIRONMENT = new StubAnalysisEnvironment();
+ /** An AnalysisEnvironment with stubbed-out methods. */
public static class StubAnalysisEnvironment implements AnalysisEnvironment {
@Override
public void registerAction(ActionAnalysisMetadata... action) {
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java b/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java
index 15d0b04..d39d857 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java
@@ -422,6 +422,7 @@
}
}
+ /** In-memory {@link ActionCache} backed by a HashMap */
protected static class InMemoryActionCache implements ActionCache {
private final Map<String, Entry> actionCache = new HashMap<>();
