Automatic code cleanup.

PiperOrigin-RevId: 830233723
Change-Id: I30730172e8eb0751dcb2a88894f65d71ea5eab90

Author: cushon

src/main/java/com/google/devtools/build/lib/pkgcache/PathPackageLocator.java

@@ -95,9 +95,11 @@ public Path getPackageBuildFileNullable(
         }
       }
     } else {
-      Verify.verify(outputBase != null, String.format(
+      Verify.verify(
+          outputBase != null,
           "External package '%s' needs to be loaded but this PathPackageLocator instance does not "
-              + "support external packages", packageIdentifier));
+              + "support external packages",
+          packageIdentifier);
       // This works only to some degree, because it relies on the presence of the repository under
       // $OUTPUT_BASE/external, which is created by the appropriate RepositoryDirectoryValue. This
       // is true for the invocation in GlobCache, but not for the locator.getBuildFileForPackage()

src/test/java/com/google/devtools/build/lib/actions/ExecutableSymlinkActionTest.java

@@ -136,9 +136,7 @@ public void testFailIfInputIsNotExecutable() throws Exception {
             () -> action.execute(createContext(inputMetadataProvider)));
     String want = "'in/some-file' is not executable";
       String got = e.getMessage();
-    assertWithMessage(String.format("got %s, want %s", got, want))
-        .that(got.contains(want))
-        .isTrue();
+    assertWithMessage("got %s, want %s", got, want).that(got.contains(want)).isTrue();
   }
 
   @Test

src/test/java/com/google/devtools/build/lib/analysis/AspectCollectionTest.java

@@ -287,7 +287,7 @@ private static void validateAspectPaths(AspectCollection collection,
   private static void collectAndValidateAspectDeps(AspectDeps aspectDeps,
       HashMap<AspectDescriptor, AspectDeps> allDeps) {
     if (allDeps.containsKey(aspectDeps.aspect())) {
-      assertWithMessage(String.format("Two different deps for aspect %s", aspectDeps.aspect()))
+      assertWithMessage("Two different deps for aspect %s", aspectDeps.aspect())
           .that(allDeps.get(aspectDeps.aspect()))
           .isSameInstanceAs(aspectDeps);
       return;

src/test/java/com/google/devtools/build/lib/analysis/MacroVisibilityTest.java

@@ -81,11 +81,10 @@ private void assertVisibilityPermits(String consumer, String dependency) throws
     // visibility error event in a traceback.
     assertDoesNotContainEvent(visibilityErrorMessage(consumer, dependency));
     assertWithMessage(
-            String.format(
-                "%s had an error (other than a visibility violation on %s)", consumer, dependency))
+            "%s had an error (other than a visibility violation on %s)", consumer, dependency)
         .that(consumerTarget)
         .isNotNull();
-    assertWithMessage(String.format("%s does not have a dependency on %s", consumer, dependency))
+    assertWithMessage("%s does not have a dependency on %s", consumer, dependency)
         .that(getDirectPrerequisite(consumerTarget, dependency))
         .isNotNull();
   }
@@ -102,9 +101,8 @@ private void assertVisibilityDisallows(
     reporter.removeHandler(failFastHandler);
     ConfiguredTarget consumerTarget = getConfiguredTarget(consumer);
     assertWithMessage(
-            String.format(
-                "%s unexpectedly did not have an error (no visibility violation due to %s)",
-                consumer, dependency))
+            "%s unexpectedly did not have an error (no visibility violation due to %s)",
+            consumer, dependency)
         .that(consumerTarget)
         .isNull();
     assertContainsEvent(visibilityErrorMessage(consumer, dependency, dependencyIsAlias));

src/test/java/com/google/devtools/build/lib/rules/python/PyExecutableConfiguredTargetTestBase.java

@@ -105,7 +105,7 @@ protected void assertPythonVersionIs_UnderNewConfigs(
       String targetName, PythonVersion version, String[]... configs) throws Exception {
     for (String[] config : configs) {
       useConfiguration(config);
-      assertWithMessage(String.format("Under config '%s'", Joiner.on(" ").join(config)))
+      assertWithMessage("Under config '%s'", Joiner.on(" ").join(config))
           .that(getPythonVersion(getOkPyTarget(targetName)))
           .isEqualTo(version);
     }

src/test/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcherRcoptionsTest.java

@@ -286,9 +286,9 @@ public void testInheritedOptionsWithSpecificOverride() throws Exception {
 
       dispatch.exec(cmdLine, "test", outErr);
       String out = outErr.outAsLatin1();
-      assertWithMessage(String.format(
+      assertWithMessage(
               "The more specific option should override, irrespective of source file or order. %s",
-              orderedOpts))
+              orderedOpts)
           .that(out)
           .isEqualTo("42 reportallinherited");
     }

src/test/java/com/google/devtools/build/lib/starlark/StarlarkRuleImplementationFunctionsTest.java

@@ -855,8 +855,7 @@ private void runExpansion(String command, String expectedPattern) throws Excepti
   private static void assertMatches(
       String description, String expectedPattern, String computedValue) {
     assertWithMessage(
-            String.format(
-                "%s '%s' did not match pattern '%s'", description, computedValue, expectedPattern))
+            "%s '%s' did not match pattern '%s'", description, computedValue, expectedPattern)
         .that(Pattern.matches(expectedPattern, computedValue))
         .isTrue();
   }