Fix various linter errors

RELNOTES: None.
PiperOrigin-RevId: 170418147

6 files changed, 21 insertions, 16 deletions

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 8d46ef1791..8bebf4eb99 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 @@ public final class FailAction extends AbstractAction {
   }
 
   @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 17ed755306..4070e5a73a 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 @@ public final class ExecutableSymlinkAction extends SymlinkAction {
   }
 
   @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 82c25314ef..25da294619 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 @@ public final class SymlinkTreeAction extends AbstractAction {
   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 @@ public final class SymlinkTreeAction extends AbstractAction {
     this.inputManifest = inputManifest;
     this.outputManifest = outputManifest;
     this.filesetTree = filesetTree;
-    this.shellEnviroment = shellEnvironment;
+    this.shellEnvironment = shellEnvironment;
     this.enableRunfiles = enableRunfiles;
   }
 
@@ -117,6 +117,6 @@ public final class SymlinkTreeAction extends AbstractAction {
       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 f7d2fc184e..49a56222e7 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 @@ public class TestRunnerAction extends AbstractAction implements NotifyOnActionCa
     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 bf27cae80c..48d5f945e7 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 @@ public final class CppLinkAction extends AbstractAction
 
       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 @@ public final class CppLinkAction extends AbstractAction
         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 @@ public final class CppLinkAction extends AbstractAction
     }
     
     /**
-     * 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 9d564d551d..98b3f2fa54 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 @@ public final class SolibSymlinkAction extends AbstractAction {
   }
 
   @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