From 83aac1f20905601101896de87be3d9bfe9db1a16 Mon Sep 17 00:00:00 2001 From: svc-excavator-bot Date: Thu, 17 Jul 2025 10:51:05 +0000 Subject: [PATCH] Excavator: Upgrades Baseline to the latest version --- build.gradle | 2 +- .../com/palantir/javaformat/gradle/ExecutableTransform.java | 2 ++ .../com/palantir/javaformat/gradle/JavaFormatExtension.java | 1 + .../javaformat/gradle/spotless/PalantirJavaFormatStep.java | 2 +- .../com/palantir/javaformat/intellij/FormatterProvider.java | 1 + .../javaformat/intellij/PalantirJavaFormatSettings.java | 1 + .../intellij/PalantirJavaFormatFormattingServiceTest.java | 1 + .../jmh/java/com/palantir/javaformat/BenchmarkMultiFiles.java | 1 + .../javaformat/bootstrap/BootstrappingFormatterService.java | 3 +++ .../javaformat/bootstrap/NativeImageFormatterService.java | 3 +++ .../src/main/java/com/palantir/javaformat/BreakBehaviour.java | 1 + .../main/java/com/palantir/javaformat/java/DebugRenderer.java | 3 +++ .../java/com/palantir/javaformat/java/FormatFileCallable.java | 1 + .../src/main/java/com/palantir/javaformat/java/Formatter.java | 1 + .../src/main/java/com/palantir/javaformat/java/JavaInput.java | 3 ++- .../java/com/palantir/javaformat/java/JavaInputAstVisitor.java | 3 +-- .../src/main/java/com/palantir/javaformat/java/JsonSink.java | 1 + .../src/main/java/com/palantir/javaformat/java/Main.java | 1 + .../src/main/java/com/palantir/javaformat/java/Trees.java | 1 + .../test/java/com/palantir/javaformat/java/FileBasedTests.java | 1 + 20 files changed, 28 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 9b410cd31..926632798 100644 --- 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.42.0' + classpath 'com.palantir.baseline:gradle-baseline-java:6.43.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 index 2d61c98c2..94339036c 100644 --- 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 @@ -46,6 +46,7 @@ public abstract class ExecutableTransform implements TransformAction getInputArtifact(); + @SuppressWarnings("for-rollout:PreferUncheckedIoException") @Override public void transform(TransformOutputs outputs) { File inputFile = getInputArtifact().get().getAsFile(); @@ -58,6 +59,7 @@ public void transform(TransformOutputs outputs) { } } + @SuppressWarnings("for-rollout:PreferUncheckedIoException") private static void makeFileExecutable(Path pathToExe) { try { Set existingPermissions = Files.getPosixFilePermissions(pathToExe); 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 index 13e2dd00b..b8791d832 100644 --- 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 @@ -41,6 +41,7 @@ public FormatterService serviceLoad() { @SuppressWarnings("for-rollout:NullAway") private FormatterService serviceLoadInternal() { + @SuppressWarnings("for-rollout:PreferUncheckedIoException") URL[] jarUris = configuration.getFiles().stream() .map(file -> { try { 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 index fe7f607f6..dd8d62b20 100644 --- 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 @@ -79,7 +79,7 @@ static final class State implements Serializable { this.memoizedFormatter = memoizedFormatter; } - @SuppressWarnings("NullableProblems") + @SuppressWarnings({"NullableProblems", "for-rollout:PreferUncheckedIoException"}) FormatterFunc createFormat() { return input -> { try { 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 index e30306b13..cd38a6876 100644 --- a/idea-plugin/src/main/java/com/palantir/javaformat/intellij/FormatterProvider.java +++ b/idea-plugin/src/main/java/com/palantir/javaformat/intellij/FormatterProvider.java @@ -207,6 +207,7 @@ private static URL[] toUrlsUnchecked(List paths) { .toArray(URL[]::new); } + @SuppressWarnings("for-rollout:PreferUncheckedIoException") private static List listDirAsUrlsUnchecked(Path dir) { try (Stream list = Files.list(dir)) { return list.collect(Collectors.toList()); 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 index 553faa51d..283f031ee 100644 --- a/idea-plugin/src/main/java/com/palantir/javaformat/intellij/PalantirJavaFormatSettings.java +++ b/idea-plugin/src/main/java/com/palantir/javaformat/intellij/PalantirJavaFormatSettings.java @@ -113,6 +113,7 @@ Optional getImplementationVersion() { return Optional.ofNullable(FormatterProvider.getPluginDescriptor().getVersion()); } + @SuppressWarnings("for-rollout:PreferUncheckedIoException") Optional computeFormatterVersion() { return getImplementationClassPath().map(classpath -> classpath.stream() .flatMap(uri -> { 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 index 7e617f36a..5ab1fd9c8 100644 --- a/idea-plugin/src/test/java/com/palantir/javaformat/intellij/PalantirJavaFormatFormattingServiceTest.java +++ b/idea-plugin/src/test/java/com/palantir/javaformat/intellij/PalantirJavaFormatFormattingServiceTest.java @@ -103,6 +103,7 @@ protected Project getProject() { @NotNull protected LightProjectDescriptor getProjectDescriptor() { return new DefaultLightProjectDescriptor() { + @SuppressWarnings("for-rollout:PreferUncheckedIoException") @Override public Sdk getSdk() { try { 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 index c27c38791..b1b006d46 100644 --- 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 @@ -47,6 +47,7 @@ public static class BenchmarkState { final List filesToFormat = getFilesToFormat(); + @SuppressWarnings("for-rollout:PreferUncheckedIoException") private static List getFilesToFormat() { Path srcJavaFormatFiles = Paths.get(".") .toAbsolutePath() 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 index 34c49721f..86ba95936 100644 --- 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 @@ -50,6 +50,7 @@ public BootstrappingFormatterService(Path jdkPath, Integer jdkMajorVersion, List this.implementationClassPath = implementationClassPath; } + @SuppressWarnings("for-rollout:PreferUncheckedIoException") @Override public ImmutableList getFormatReplacements(String input, Collection> ranges) { try { @@ -59,6 +60,7 @@ public ImmutableList getFormatReplacements(String input, Collection } } + @SuppressWarnings("for-rollout:PreferUncheckedIoException") @Override public String formatSourceReflowStringsAndFixImports(String input) { try { @@ -68,6 +70,7 @@ public String formatSourceReflowStringsAndFixImports(String input) { } } + @SuppressWarnings("for-rollout:PreferUncheckedIoException") @Override public String fixImports(String input) throws FormatterException { try { 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 index 54158d915..5a858b843 100644 --- 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 @@ -42,6 +42,7 @@ public NativeImageFormatterService(Path nativeImagePath) { this.nativeImagePath = nativeImagePath; } + @SuppressWarnings("for-rollout:PreferUncheckedIoException") @Override public ImmutableList getFormatReplacements(String input, Collection> ranges) { try { @@ -63,6 +64,7 @@ public ImmutableList getFormatReplacements(String input, Collection } } + @SuppressWarnings("for-rollout:PreferUncheckedIoException") @Override public String formatSourceReflowStringsAndFixImports(String input) { try { @@ -72,6 +74,7 @@ public String formatSourceReflowStringsAndFixImports(String input) { } } + @SuppressWarnings("for-rollout:PreferUncheckedIoException") @Override public String fixImports(String input) { try { 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 index 7ab0751b0..4a255c1b6 100644 --- a/palantir-java-format/src/main/java/com/palantir/javaformat/BreakBehaviour.java +++ b/palantir-java-format/src/main/java/com/palantir/javaformat/BreakBehaviour.java @@ -73,6 +73,7 @@ public interface Cases { */ static class Json extends JsonSerializer { + @SuppressWarnings("for-rollout:PreferUncheckedIoException") @Override public void serialize(BreakBehaviour value, JsonGenerator gen, SerializerProvider serializers) throws IOException { 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 index 95563036d..ba96a024b 100644 --- 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 @@ -51,6 +51,7 @@ static Path getOutputFile() { return publicDir.resolve("output.js"); } + @SuppressWarnings("for-rollout:PreferUncheckedIoException") static void render( JavaInput javaInput, OpsOutput opsOutput, @@ -84,6 +85,7 @@ private static String outputAsString(JavaOutput javaOutput) { return output.toString(); } + @SuppressWarnings("for-rollout:PreferUncheckedIoException") private static String opsJson(OpsOutput opsOutput) { ArrayNode arrayNode = OBJECT_MAPPER.createArrayNode(); @@ -145,6 +147,7 @@ private static String opsJson(OpsOutput opsOutput) { } } + @SuppressWarnings("for-rollout:PreferUncheckedIoException") private static String jsonEscapedString(String javaInput) { try { return OBJECT_MAPPER.writeValueAsString(javaInput); 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 index d73ad787c..385f9afc5 100644 --- 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 @@ -53,6 +53,7 @@ public String call() throws FormatterException { return formatFile(formatter); } + @SuppressWarnings("for-rollout:PreferUncheckedIoException") private String formatReplacements(Formatter formatter) throws FormatterException { ImmutableList replacements = formatter.getFormatReplacements(input, characterRanges(input).asRanges()); 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 index 561d74895..68a03cade 100644 --- 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 @@ -163,6 +163,7 @@ static JavaOutput format( return javaOutput; } + @SuppressWarnings("for-rollout:PreferUncheckedIoException") static JCCompilationUnit parseJcCompilationUnit(Context context, String sourceText) throws FormatterException { DiagnosticCollector diagnostics = new DiagnosticCollector<>(); context.put(DiagnosticListener.class, diagnostics); diff --git a/palantir-java-format/src/main/java/com/palantir/javaformat/java/JavaInput.java b/palantir-java-format/src/main/java/com/palantir/javaformat/java/JavaInput.java index e3745dd5e..efd1caaff 100644 --- a/palantir-java-format/src/main/java/com/palantir/javaformat/java/JavaInput.java +++ b/palantir-java-format/src/main/java/com/palantir/javaformat/java/JavaInput.java @@ -59,6 +59,7 @@ import javax.tools.SimpleJavaFileObject; /** {@code JavaInput} extends {@link Input} to represent a Java input document. */ +@SuppressWarnings("for-rollout:ThrowError") public final class JavaInput extends Input { /** * A {@code JavaInput} is a sequence of {@link Tok}s that cover the Java input. A {@link Tok} is either a token (if @@ -475,7 +476,7 @@ public CharSequence getCharContent(boolean ignoreEncodingErrors) throws IOExcept * @param handler the diagnostic handler * @return a collection of diagnostics */ - @SuppressWarnings("unchecked") + @SuppressWarnings({"unchecked", "for-rollout:ThrowError"}) private static Collection getDiagnostics(DeferredDiagnosticHandler handler) { try { return (Collection) GET_DIAGNOSTICS.invoke(handler); diff --git a/palantir-java-format/src/main/java/com/palantir/javaformat/java/JavaInputAstVisitor.java b/palantir-java-format/src/main/java/com/palantir/javaformat/java/JavaInputAstVisitor.java index 2d65e943b..5f0152870 100644 --- a/palantir-java-format/src/main/java/com/palantir/javaformat/java/JavaInputAstVisitor.java +++ b/palantir-java-format/src/main/java/com/palantir/javaformat/java/JavaInputAstVisitor.java @@ -3623,6 +3623,7 @@ private void declareMany(List fragments, Direction annotationDirec } /** Add a list of declarations. */ + @SuppressWarnings("for-rollout:NullAway") protected void addBodyDeclarations( List bodyDeclarations, BracesOrNot braces, FirstDeclarationsOrNot first0) { if (bodyDeclarations.isEmpty()) { @@ -3648,7 +3649,6 @@ protected void addBodyDeclarations( Tree bodyDeclaration = it.next(); dropEmptyDeclarations(); builder.forcedBreak(); - @SuppressWarnings("for-rollout:NullAway") boolean thisOneGetsBlankLineBefore = !(bodyDeclaration instanceof VariableTree) || hasJavaDoc(bodyDeclaration); if (first) { @@ -3715,7 +3715,6 @@ private void classDeclarationTypeList(String token, List types) * *

e.g. {@code int x, y;} is parsed as {@code int x; int y;}. */ - @SuppressWarnings("for-rollout:NullAway") private List variableFragments(PeekingIterator it, Tree first) { List fragments = new ArrayList<>(); if (first instanceof VariableTree) { 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 index 7ef3d7afc..23a86d157 100644 --- 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 @@ -86,6 +86,7 @@ public FinishLevelNode writeLevelNode(int levelNodeId, int parentExplorationId, return acceptedExplorationId -> json.put("acceptedExplorationId", acceptedExplorationId); } + @SuppressWarnings("for-rollout:PreferUncheckedIoException") @Override public String getOutput() { try { 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 index 169bb962d..fd21f52e2 100644 --- 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 @@ -183,6 +183,7 @@ private int formatFiles(CommandLineOptions parameters, JavaFormatterOptions opti return allOk ? 0 : 1; } + @SuppressWarnings("for-rollout:PreferUncheckedIoException") private int formatStdin(CommandLineOptions parameters, JavaFormatterOptions options) { String input; try { 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 index 8b3b5646a..d92d0a8fd 100644 --- 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 @@ -48,6 +48,7 @@ static int getEndPosition(Tree expression, TreePath path) { } /** Returns the source text for the node. */ + @SuppressWarnings("for-rollout:PreferUncheckedIoException") static String getSourceForNode(Tree node, TreePath path) { CharSequence source; try { 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 index 6c9e1e9de..736a5761d 100644 --- 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 @@ -142,6 +142,7 @@ private Path getOutputTestPath(String testName) { return fullTestPath.resolve(testName + ".output"); } + @SuppressWarnings("for-rollout:PreferUncheckedIoException") public void writeFormatterOutput(String testName, String output) { try (BufferedWriter writer = Files.newBufferedWriter(getOutputTestPath(testName))) { writer.append(output);