Excavator: Upgrades Baseline to the latest version (#1370)

svc-excavator-bot · web-flow · commit e921d785006d · 2025-07-17T14:48:16.000Z
diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
     dependencies {
         classpath 'com.palantir.jakartapackagealignment:jakarta-package-alignment:0.6.0'
         classpath 'com.gradle.publish:plugin-publish-plugin:1.3.1'
-        classpath 'com.palantir.baseline:gradle-baseline-java:6.43.0'
+        classpath 'com.palantir.baseline:gradle-baseline-java:6.44.0'
         classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:2.36.0'
         classpath 'com.palantir.gradle.externalpublish:gradle-external-publish-plugin:1.19.0'
         classpath 'com.palantir.gradle.failure-reports:gradle-failure-reports:1.14.0'
diff --git a/gradle-palantir-java-format/src/main/java/com/palantir/javaformat/gradle/ExecutableTransform.java b/gradle-palantir-java-format/src/main/java/com/palantir/javaformat/gradle/ExecutableTransform.java
@@ -18,6 +18,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
@@ -46,7 +47,6 @@ public abstract class ExecutableTransform implements TransformAction<TransformPa
     @InputArtifact
     public abstract Provider<FileSystemLocation> getInputArtifact();
 
-    @SuppressWarnings("for-rollout:PreferUncheckedIoException")
     @Override
     public void transform(TransformOutputs outputs) {
         File inputFile = getInputArtifact().get().getAsFile();
@@ -55,11 +55,11 @@ public void transform(TransformOutputs outputs) {
             Files.copy(inputFile.toPath(), outputFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
             makeFileExecutable(outputFile.toPath());
         } catch (IOException e) {
-            throw new RuntimeException(String.format("Failed to create executable file %s", outputFile.toPath()), e);
+            throw new UncheckedIOException(
+                    String.format("Failed to create executable file %s", outputFile.toPath()), e);
         }
     }
 
-    @SuppressWarnings("for-rollout:PreferUncheckedIoException")
     private static void makeFileExecutable(Path pathToExe) {
         try {
             Set<PosixFilePermission> existingPermissions = Files.getPosixFilePermissions(pathToExe);
@@ -73,7 +73,7 @@ private static void makeFileExecutable(Path pathToExe) {
                                             PosixFilePermission.OTHERS_EXECUTE))
                             .collect(Collectors.toSet()));
         } catch (IOException e) {
-            throw new RuntimeException("Failed to set execute permissions on native-image", e);
+            throw new UncheckedIOException("Failed to set execute permissions on native-image", e);
         }
     }
 }
diff --git a/gradle-palantir-java-format/src/main/java/com/palantir/javaformat/gradle/JavaFormatExtension.java b/gradle-palantir-java-format/src/main/java/com/palantir/javaformat/gradle/JavaFormatExtension.java
@@ -19,6 +19,7 @@
 import com.google.common.base.Suppliers;
 import com.google.common.collect.Iterables;
 import com.palantir.javaformat.java.FormatterService;
+import java.io.UncheckedIOException;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLClassLoader;
@@ -41,13 +42,12 @@ public FormatterService serviceLoad() {
 
     @SuppressWarnings("for-rollout:NullAway")
     private FormatterService serviceLoadInternal() {
-        @SuppressWarnings("for-rollout:PreferUncheckedIoException")
         URL[] jarUris = configuration.getFiles().stream()
                 .map(file -> {
                     try {
                         return file.toURI().toURL();
                     } catch (MalformedURLException e) {
-                        throw new RuntimeException("Unable to convert URI to URL: " + file, e);
+                        throw new UncheckedIOException("Unable to convert URI to URL: " + file, e);
                     }
                 })
                 .toArray(URL[]::new);
diff --git a/gradle-palantir-java-format/src/main/java/com/palantir/javaformat/gradle/spotless/PalantirJavaFormatStep.java b/gradle-palantir-java-format/src/main/java/com/palantir/javaformat/gradle/spotless/PalantirJavaFormatStep.java
@@ -22,6 +22,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.Serializable;
+import java.io.UncheckedIOException;
 import java.util.function.Supplier;
 import org.gradle.api.artifacts.Configuration;
 
@@ -79,7 +80,7 @@ static final class State implements Serializable {
             this.memoizedFormatter = memoizedFormatter;
         }
 
-        @SuppressWarnings({"NullableProblems", "for-rollout:PreferUncheckedIoException"})
+        @SuppressWarnings("NullableProblems")
         FormatterFunc createFormat() {
             return input -> {
                 try {
@@ -92,7 +93,7 @@ FormatterFunc createFormat() {
 
                     return memoizedFormatter.get().formatSourceReflowStringsAndFixImports(input);
                 } catch (IOException e) {
-                    throw new RuntimeException(e);
+                    throw new UncheckedIOException(e);
                 }
             };
         }
diff --git a/idea-plugin/src/main/java/com/palantir/javaformat/intellij/FormatterProvider.java b/idea-plugin/src/main/java/com/palantir/javaformat/intellij/FormatterProvider.java
@@ -34,6 +34,7 @@
 import com.palantir.javaformat.bootstrap.NativeImageFormatterService;
 import com.palantir.javaformat.java.FormatterService;
 import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URL;
@@ -207,12 +208,11 @@ private static URL[] toUrlsUnchecked(List<Path> paths) {
                 .toArray(URL[]::new);
     }
 
-    @SuppressWarnings("for-rollout:PreferUncheckedIoException")
     private static List<Path> listDirAsUrlsUnchecked(Path dir) {
         try (Stream<Path> list = Files.list(dir)) {
             return list.collect(Collectors.toList());
         } catch (IOException e) {
-            throw new RuntimeException("Couldn't list dir: " + dir, e);
+            throw new UncheckedIOException("Couldn't list dir: " + dir, e);
         }
     }
 
diff --git a/idea-plugin/src/main/java/com/palantir/javaformat/intellij/PalantirJavaFormatSettings.java b/idea-plugin/src/main/java/com/palantir/javaformat/intellij/PalantirJavaFormatSettings.java
@@ -24,6 +24,7 @@
 import com.palantir.javaformat.java.JavaFormatterOptions;
 import com.palantir.sls.versions.OrderableSlsVersion;
 import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.net.URI;
 import java.util.List;
 import java.util.Optional;
@@ -113,7 +114,6 @@ Optional<String> getImplementationVersion() {
         return Optional.ofNullable(FormatterProvider.getPluginDescriptor().getVersion());
     }
 
-    @SuppressWarnings("for-rollout:PreferUncheckedIoException")
     Optional<String> computeFormatterVersion() {
         return getImplementationClassPath().map(classpath -> classpath.stream()
                 .flatMap(uri -> {
@@ -127,7 +127,7 @@ Optional<String> computeFormatterVersion() {
                         }
                         return Stream.empty();
                     } catch (IOException e) {
-                        throw new RuntimeException(e);
+                        throw new UncheckedIOException(e);
                     }
                 })
                 .findFirst()
diff --git a/idea-plugin/src/test/java/com/palantir/javaformat/intellij/PalantirJavaFormatFormattingServiceTest.java b/idea-plugin/src/test/java/com/palantir/javaformat/intellij/PalantirJavaFormatFormattingServiceTest.java
@@ -41,6 +41,7 @@
 import com.palantir.javaformat.intellij.PalantirJavaFormatSettings.State;
 import java.io.File;
 import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -103,15 +104,14 @@ protected Project getProject() {
     @NotNull
     protected LightProjectDescriptor getProjectDescriptor() {
         return new DefaultLightProjectDescriptor() {
-            @SuppressWarnings("for-rollout:PreferUncheckedIoException")
             @Override
             public Sdk getSdk() {
                 try {
                     return JavaSdk.getInstance()
                             .createJdk(
                                     "java 1.11", new File(System.getProperty("java.home")).getCanonicalPath(), false);
                 } catch (IOException e) {
-                    throw new RuntimeException(e);
+                    throw new UncheckedIOException(e);
                 }
             }
         };
diff --git a/palantir-java-format-benchmarks/src/jmh/java/com/palantir/javaformat/BenchmarkMultiFiles.java b/palantir-java-format-benchmarks/src/jmh/java/com/palantir/javaformat/BenchmarkMultiFiles.java
@@ -19,6 +19,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -47,7 +48,6 @@ public static class BenchmarkState {
 
         final List<String> filesToFormat = getFilesToFormat();
 
-        @SuppressWarnings("for-rollout:PreferUncheckedIoException")
         private static List<String> getFilesToFormat() {
             Path srcJavaFormatFiles = Paths.get(".")
                     .toAbsolutePath()
@@ -57,7 +57,7 @@ private static List<String> getFilesToFormat() {
                     .map(path -> path.toAbsolutePath().toString())) {
                 return paths.collect(Collectors.toList());
             } catch (IOException e) {
-                throw new RuntimeException("Couldn't list src files: " + srcJavaFormatFiles, e);
+                throw new UncheckedIOException("Couldn't list src files: " + srcJavaFormatFiles, e);
             }
         }
     }
diff --git a/palantir-java-format-jdk-bootstrap/src/main/java/com/palantir/javaformat/bootstrap/BootstrappingFormatterService.java b/palantir-java-format-jdk-bootstrap/src/main/java/com/palantir/javaformat/bootstrap/BootstrappingFormatterService.java
@@ -27,6 +27,7 @@
 import com.palantir.javaformat.java.FormatterService;
 import com.palantir.javaformat.java.Replacement;
 import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.nio.file.Path;
 import java.util.Collection;
 import java.util.List;
@@ -50,33 +51,30 @@ public BootstrappingFormatterService(Path jdkPath, Integer jdkMajorVersion, List
         this.implementationClassPath = implementationClassPath;
     }
 
-    @SuppressWarnings("for-rollout:PreferUncheckedIoException")
     @Override
     public ImmutableList<Replacement> getFormatReplacements(String input, Collection<Range<Integer>> ranges) {
         try {
             return getFormatReplacementsInternal(input, ranges);
         } catch (IOException e) {
-            throw new RuntimeException("Error running formatter command", e);
+            throw new UncheckedIOException("Error running formatter command", e);
         }
     }
 
-    @SuppressWarnings("for-rollout:PreferUncheckedIoException")
     @Override
     public String formatSourceReflowStringsAndFixImports(String input) {
         try {
             return runFormatterCommand(input);
         } catch (IOException e) {
-            throw new RuntimeException("Error running formatter command", e);
+            throw new UncheckedIOException("Error running formatter command", e);
         }
     }
 
-    @SuppressWarnings("for-rollout:PreferUncheckedIoException")
     @Override
     public String fixImports(String input) throws FormatterException {
         try {
             return runFormatterCommand(input);
         } catch (IOException e) {
-            throw new RuntimeException("Error running formatter command", e);
+            throw new UncheckedIOException("Error running formatter command", e);
         }
     }
 
diff --git a/palantir-java-format-jdk-bootstrap/src/main/java/com/palantir/javaformat/bootstrap/NativeImageFormatterService.java b/palantir-java-format-jdk-bootstrap/src/main/java/com/palantir/javaformat/bootstrap/NativeImageFormatterService.java
@@ -26,6 +26,7 @@
 import com.palantir.javaformat.java.FormatterService;
 import com.palantir.javaformat.java.Replacement;
 import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.nio.file.Path;
 import java.util.Collection;
 import java.util.List;
@@ -42,7 +43,6 @@ public NativeImageFormatterService(Path nativeImagePath) {
         this.nativeImagePath = nativeImagePath;
     }
 
-    @SuppressWarnings("for-rollout:PreferUncheckedIoException")
     @Override
     public ImmutableList<Replacement> getFormatReplacements(String input, Collection<Range<Integer>> ranges) {
         try {
@@ -60,27 +60,25 @@ public ImmutableList<Replacement> getFormatReplacements(String input, Collection
             }
             return MAPPER.readValue(output.get(), new TypeReference<>() {});
         } catch (IOException e) {
-            throw new RuntimeException("Error running the native image command", e);
+            throw new UncheckedIOException("Error running the native image command", e);
         }
     }
 
-    @SuppressWarnings("for-rollout:PreferUncheckedIoException")
     @Override
     public String formatSourceReflowStringsAndFixImports(String input) {
         try {
             return runFormatterCommand(input);
         } catch (IOException e) {
-            throw new RuntimeException("Error running the native image command", e);
+            throw new UncheckedIOException("Error running the native image command", e);
         }
     }
 
-    @SuppressWarnings("for-rollout:PreferUncheckedIoException")
     @Override
     public String fixImports(String input) {
         try {
             return runFormatterCommand(input);
         } catch (IOException e) {
-            throw new RuntimeException("Error running the native image command", e);
+            throw new UncheckedIOException("Error running the native image command", e);
         }
     }
 
diff --git a/palantir-java-format/src/main/java/com/palantir/javaformat/BreakBehaviour.java b/palantir-java-format/src/main/java/com/palantir/javaformat/BreakBehaviour.java
@@ -23,6 +23,7 @@
 import com.palantir.javaformat.doc.Doc;
 import com.palantir.javaformat.doc.Level;
 import java.io.IOException;
+import java.io.UncheckedIOException;
 import org.derive4j.ArgOption;
 import org.derive4j.Data;
 
@@ -73,7 +74,6 @@ public interface Cases<R> {
      */
     static class Json extends JsonSerializer<BreakBehaviour> {
 
-        @SuppressWarnings("for-rollout:PreferUncheckedIoException")
         @Override
         public void serialize(BreakBehaviour value, JsonGenerator gen, SerializerProvider serializers)
                 throws IOException {
@@ -83,7 +83,7 @@ public void serialize(BreakBehaviour value, JsonGenerator gen, SerializerProvide
                         try {
                             gen.writeObjectField("type", "breakThisLevel");
                         } catch (IOException e) {
-                            throw new RuntimeException(e);
+                            throw new UncheckedIOException(e);
                         }
                         return null;
                     })
@@ -92,15 +92,15 @@ public void serialize(BreakBehaviour value, JsonGenerator gen, SerializerProvide
                             gen.writeObjectField("type", "preferBreakingLastInnerLevel");
                             gen.writeObjectField("keepIndentWhenInlined", keepIndentWhenInlined);
                         } catch (IOException e) {
-                            throw new RuntimeException(e);
+                            throw new UncheckedIOException(e);
                         }
                         return null;
                     })
                     .inlineSuffix(() -> {
                         try {
                             gen.writeObjectField("type", "inlineSuffix");
                         } catch (IOException e) {
-                            throw new RuntimeException(e);
+                            throw new UncheckedIOException(e);
                         }
                         return null;
                     })
@@ -109,7 +109,7 @@ public void serialize(BreakBehaviour value, JsonGenerator gen, SerializerProvide
                             gen.writeObjectField("type", "breakOnlyIfInnerLevelsThenFitOnOneLine");
                             gen.writeObjectField("keepIndentWhenInlined", keepIndentWhenInlined);
                         } catch (IOException e) {
-                            throw new RuntimeException(e);
+                            throw new UncheckedIOException(e);
                         }
                         return null;
                     });
diff --git a/palantir-java-format/src/main/java/com/palantir/javaformat/java/DebugRenderer.java b/palantir-java-format/src/main/java/com/palantir/javaformat/java/DebugRenderer.java
@@ -36,6 +36,7 @@
 import com.palantir.javaformat.doc.State;
 import com.palantir.javaformat.doc.Token;
 import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -51,7 +52,6 @@ static Path getOutputFile() {
         return publicDir.resolve("output.js");
     }
 
-    @SuppressWarnings("for-rollout:PreferUncheckedIoException")
     static void render(
             JavaInput javaInput,
             OpsOutput opsOutput,
@@ -72,7 +72,7 @@ static void render(
         try {
             Files.write(getOutputFile(), javascript.getBytes(StandardCharsets.UTF_8));
         } catch (IOException e) {
-            throw new RuntimeException(e);
+            throw new UncheckedIOException(e);
         }
     }
 
@@ -85,7 +85,6 @@ private static String outputAsString(JavaOutput javaOutput) {
         return output.toString();
     }
 
-    @SuppressWarnings("for-rollout:PreferUncheckedIoException")
     private static String opsJson(OpsOutput opsOutput) {
         ArrayNode arrayNode = OBJECT_MAPPER.createArrayNode();
 
@@ -143,16 +142,15 @@ private static String opsJson(OpsOutput opsOutput) {
         try {
             return OBJECT_MAPPER.writerWithDefaultPrettyPrinter().writeValueAsString(arrayNode);
         } catch (JsonProcessingException e) {
-            throw new RuntimeException(e);
+            throw new UncheckedIOException(e);
         }
     }
 
-    @SuppressWarnings("for-rollout:PreferUncheckedIoException")
     private static String jsonEscapedString(String javaInput) {
         try {
             return OBJECT_MAPPER.writeValueAsString(javaInput);
         } catch (JsonProcessingException e) {
-            throw new RuntimeException(e);
+            throw new UncheckedIOException(e);
         }
     }
 
diff --git a/palantir-java-format/src/main/java/com/palantir/javaformat/java/FormatFileCallable.java b/palantir-java-format/src/main/java/com/palantir/javaformat/java/FormatFileCallable.java
diff --git a/palantir-java-format/src/main/java/com/palantir/javaformat/java/Formatter.java b/palantir-java-format/src/main/java/com/palantir/javaformat/java/Formatter.java
diff --git a/palantir-java-format/src/main/java/com/palantir/javaformat/java/JsonSink.java b/palantir-java-format/src/main/java/com/palantir/javaformat/java/JsonSink.java
diff --git a/palantir-java-format/src/main/java/com/palantir/javaformat/java/Main.java b/palantir-java-format/src/main/java/com/palantir/javaformat/java/Main.java
diff --git a/palantir-java-format/src/main/java/com/palantir/javaformat/java/Trees.java b/palantir-java-format/src/main/java/com/palantir/javaformat/java/Trees.java
diff --git a/palantir-java-format/src/test/java/com/palantir/javaformat/java/FileBasedTests.java b/palantir-java-format/src/test/java/com/palantir/javaformat/java/FileBasedTests.java

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@`
`34`	`34`	`import com.palantir.javaformat.bootstrap.NativeImageFormatterService;`
`35`	`35`	`import com.palantir.javaformat.java.FormatterService;`
`36`	`36`	`import java.io.IOException;`
	`37`	`+import java.io.UncheckedIOException;`
`37`	`38`	`import java.net.MalformedURLException;`
`38`	`39`	`import java.net.URI;`
`39`	`40`	`import java.net.URL;`
`@@ -207,12 +208,11 @@ private static URL[] toUrlsUnchecked(List<Path> paths) {`
`207`	`208`	`.toArray(URL[]::new);`
`208`	`209`	`}`
`209`	`210`
`210`		`- @SuppressWarnings("for-rollout:PreferUncheckedIoException")`
`211`	`211`	`private static List<Path> listDirAsUrlsUnchecked(Path dir) {`
`212`	`212`	`try (Stream<Path> list = Files.list(dir)) {`
`213`	`213`	`return list.collect(Collectors.toList());`
`214`	`214`	`} catch (IOException e) {`
`215`		`- throw new RuntimeException("Couldn't list dir: " + dir, e);`
	`215`	`+ throw new UncheckedIOException("Couldn't list dir: " + dir, e);`
`216`	`216`	`}`
`217`	`217`	`}`
`218`	`218`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@`
`26`	`26`	`import com.palantir.javaformat.java.FormatterService;`
`27`	`27`	`import com.palantir.javaformat.java.Replacement;`
`28`	`28`	`import java.io.IOException;`
	`29`	`+import java.io.UncheckedIOException;`
`29`	`30`	`import java.nio.file.Path;`
`30`	`31`	`import java.util.Collection;`
`31`	`32`	`import java.util.List;`
`@@ -42,7 +43,6 @@ public NativeImageFormatterService(Path nativeImagePath) {`
`42`	`43`	`this.nativeImagePath = nativeImagePath;`
`43`	`44`	`}`
`44`	`45`
`45`		`- @SuppressWarnings("for-rollout:PreferUncheckedIoException")`
`46`	`46`	`@Override`
`47`	`47`	`public ImmutableList<Replacement> getFormatReplacements(String input, Collection<Range<Integer>> ranges) {`
`48`	`48`	`try {`
`@@ -60,27 +60,25 @@ public ImmutableList<Replacement> getFormatReplacements(String input, Collection`
`60`	`60`	`}`
`61`	`61`	`return MAPPER.readValue(output.get(), new TypeReference<>() {});`
`62`	`62`	`} catch (IOException e) {`
`63`		`- throw new RuntimeException("Error running the native image command", e);`
	`63`	`+ throw new UncheckedIOException("Error running the native image command", e);`
`64`	`64`	`}`
`65`	`65`	`}`
`66`	`66`
`67`		`- @SuppressWarnings("for-rollout:PreferUncheckedIoException")`
`68`	`67`	`@Override`
`69`	`68`	`public String formatSourceReflowStringsAndFixImports(String input) {`
`70`	`69`	`try {`
`71`	`70`	`return runFormatterCommand(input);`
`72`	`71`	`} catch (IOException e) {`
`73`		`- throw new RuntimeException("Error running the native image command", e);`
	`72`	`+ throw new UncheckedIOException("Error running the native image command", e);`
`74`	`73`	`}`
`75`	`74`	`}`
`76`	`75`
`77`		`- @SuppressWarnings("for-rollout:PreferUncheckedIoException")`
`78`	`76`	`@Override`
`79`	`77`	`public String fixImports(String input) {`
`80`	`78`	`try {`
`81`	`79`	`return runFormatterCommand(input);`
`82`	`80`	`} catch (IOException e) {`
`83`		`- throw new RuntimeException("Error running the native image command", e);`
	`81`	`+ throw new UncheckedIOException("Error running the native image command", e);`
`84`	`82`	`}`
`85`	`83`	`}`
`86`	`84`