palantir · bulldozer-bot · Mar 11, 2025 · Oct 19, 2024 · Apr 20, 2023 · Dec 7, 2023
diff --git a/build.gradle b/build.gradle
@@ -29,6 +29,7 @@ apply plugin: 'com.palantir.git-version'
 apply plugin: 'com.palantir.jdks'
 apply plugin: 'com.palantir.jdks.latest'
 apply plugin: 'com.palantir.baseline'
+apply plugin: 'com.palantir.baseline-java-versions'
 apply plugin: 'com.palantir.consistent-versions'
 apply plugin: 'com.palantir.baseline-java-versions'
 
@@ -68,6 +69,7 @@ subprojects {
 
 javaVersions {
     libraryTarget = 17
+    runtime = 21
 }
 
 jdks {

diff --git a/changelog/@unreleased/pr-1211.v2.yml b/changelog/@unreleased/pr-1211.v2.yml
@@ -0,0 +1,5 @@
+type: improvement
+improvement:
+  description: Java 21 with Graal support
+  links:
+  - https://github.com/palantir/palantir-java-format/pull/1211
diff --git a/gradle-palantir-java-format/build.gradle b/gradle-palantir-java-format/build.gradle
@@ -21,11 +21,12 @@ dependencies {
     implementation project(':palantir-java-format-jdk-bootstrap')
     implementation 'com.palantir.gradle.utils:platform'
 
+    testImplementation project(':palantir-java-format')
     testImplementation 'com.netflix.nebula:nebula-test'
     testImplementation 'org.junit.jupiter:junit-jupiter'
-    testImplementation 'org.junit.vintage:junit-vintage-engine'
     testImplementation 'org.assertj:assertj-core'
-    testImplementation project(':palantir-java-format')
+
+    testRuntimeOnly 'org.junit.vintage:junit-vintage-engine'
 
     pluginClasspath 'com.diffplug.spotless:spotless-plugin-gradle'
 }
@@ -90,7 +91,6 @@ dependencies {
             attribute(LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE, project.objects.named(LibraryElements, 'nativeImage'))
         }
     }
-
 }
 
 tasks.register("copyNativeImage", Copy.class) {

diff --git a/...-format/src/main/java/com/palantir/javaformat/gradle/spotless/PalantirJavaFormatStep.java b/...-format/src/main/java/com/palantir/javaformat/gradle/spotless/PalantirJavaFormatStep.java
@@ -60,7 +60,7 @@ static final class State implements Serializable {
          * Build a cacheable state for spotless from the given jars, that uses the given {@link FormatterService}.
          *
          * @param jars The jars that contain the palantir-java-format implementation. This is only used for caching and
-         *     up-to-dateness purposes.
+         * up-to-dateness purposes.
          */
         State(Iterable<File> jars, Supplier<FormatterService> memoizedFormatter) throws IOException {
             this.jarsSignature = FileSignature.signAsSet(jars);

diff --git a/...tir/javaformat/gradle/FormatDiffTest.java → ...r/javaformat/gradle/FormatDiffTest.groovy b/...tir/javaformat/gradle/FormatDiffTest.java → ...r/javaformat/gradle/FormatDiffTest.groovy
@@ -1,5 +1,5 @@
 /*
- * (c) Copyright 2019 Palantir Technologies Inc. All rights reserved.
+ * (c) Copyright 2025 Palantir Technologies Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,27 +16,36 @@
 
 package com.palantir.javaformat.gradle;
 
+import com.google.common.base.Splitter
+import com.palantir.javaformat.bootstrap.BootstrappingFormatterService
+import com.palantir.javaformat.java.FormatterService
+import org.junit.jupiter.params.ParameterizedTest
+import org.junit.jupiter.params.provider.MethodSource
+
+import java.util.stream.Stream
+
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import com.google.common.io.ByteStreams;
-import com.palantir.javaformat.java.FormatterServiceImpl;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
+import com.palantir.javaformat.bootstrap.NativeImageFormatterService;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.List;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
 class FormatDiffTest {
+
+    private static final CLASSPATH_FILE = new File("build/impl.classpath")
+    private static final NATIVE_IMAGE_FILE = new File("build/nativeImage.path")
+
     @TempDir
     Path repo;
 
@@ -58,8 +67,9 @@ void parsing_git_diff_output_works() throws IOException {
                 strings);
     }
 
-    @Test
-    void reformat_a_subpath_of_a_git_directory_for_only_changed_lines() throws IOException, InterruptedException {
+    @ParameterizedTest
+    @MethodSource("getFormatters")
+    void reformat_a_subpath_of_a_git_directory_for_only_changed_lines(FormatterService formatterService) throws IOException, InterruptedException {
         runCommandInRepo("git", "init");
         runCommandInRepo("git", "config", "user.name", "Test User");
         runCommandInRepo("git", "config", "user.email", "[email protected]");
@@ -77,7 +87,7 @@ void reformat_a_subpath_of_a_git_directory_for_only_changed_lines() throws IOExc
 
         runCommandInRepo("git", "add", "-N", ".");
 
-        FormatDiff.formatDiff(subdir, new FormatterServiceImpl());
+        FormatDiff.formatDiff(subdir, formatterService);
 
         assertThat(reformatMe).hasContent("class ReformatMe {}");
         assertThat(dontTouchMe).hasContent("                                 class DontTouchMe {}");
@@ -95,4 +105,27 @@ private void runCommandInRepo(String... args) throws IOException, InterruptedExc
 
         Preconditions.checkState(process.exitValue() == 0, "Expected return code of 0: " + stderr);
     }
+
+    private static Stream<FormatterService> getFormatters() {
+        return Stream.of(
+                new BootstrappingFormatterService(
+                        javaBinPath(), Runtime.version().feature(), getClasspath()),
+                new NativeImageFormatterService(
+                        Path.of(NATIVE_IMAGE_FILE.text)));
+    }
+
+    private static getClasspath() {
+        return Splitter.on(':')
+                .trimResults()
+                .omitEmptyStrings()
+                .splitToStream(CLASSPATH_FILE.text)
+                .map(Path::of)
+                .collect(Collectors.toList());
+    }
+
+    private static Path javaBinPath() {
+        String javaHome = Preconditions.checkNotNull(System.getProperty("java.home"), "java.home property not set");
+        return Path.of(javaHome).resolve("bin").resolve("java");
+    }
+
 }
diff --git a/idea-plugin/build.gradle b/idea-plugin/build.gradle
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+apply plugin: 'java'
 apply plugin: 'com.palantir.external-publish-intellij'
 
 def name = "palantir-java-format"

diff --git a/palantir-java-format-benchmarks/build.gradle b/palantir-java-format-benchmarks/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     jmhImplementation 'org.openjdk.jmh:jmh-core'
     jmhImplementation 'org.openjdk.jmh:jmh-generator-annprocess'
     formatterNativeJars project(':palantir-java-format')
-    formatterNativeImage(project(':palantir-java-format')) {
+    formatterNativeImage(project(':palantir-java-format-native')) {
         attributes {
             attribute(LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE, project.objects.named(LibraryElements, 'nativeImage'))
         }

diff --git a/palantir-java-format-jdk-bootstrap/build.gradle b/palantir-java-format-jdk-bootstrap/build.gradle
@@ -31,4 +31,3 @@ tasks.named('test', Test.class) {
     inputs.files(configurations.named('formatterNativeImage'))
     environment.put('NATIVE_IMAGE_CLASSPATH', configurations.formatterNativeImage.asPath)
 }
-
diff --git a/palantir-java-format-native/build.gradle b/palantir-java-format-native/build.gradle
@@ -54,7 +54,7 @@ graalvmNative {
             sharedLibrary = false
             classpath.setFrom(configurations.named('runtimeClasspath'))
             configurationFileDirectories.from(file('src/main/resources/META-INF/native-image'))
-            buildArgs.addAll("-H:ConfigurationFileDirectories=${projectDir}/src/main/resources/META-INF/native-image",
+            buildArgs.addAll(
                     '-H:+UnlockExperimentalVMOptions',
                     '-H:IncludeResourceBundles=com.sun.tools.javac.resources.compiler',
                     '-H:IncludeResourceBundles=com.sun.tools.javac.resources.javac',

diff --git a/...ir-java-format-native/src/main/resources/META-INF/native-image/reachability-metadata.json b/...ir-java-format-native/src/main/resources/META-INF/native-image/reachability-metadata.json
@@ -83,6 +83,18 @@
         }
       ]
     },
+    {
+      "type": "com.palantir.javaformat.java.java21.Java21InputAstVisitor",
+      "methods": [
+        {
+          "name": "<init>",
+          "parameterTypes": [
+            "com.palantir.javaformat.OpsBuilder",
+            "int"
+          ]
+        }
+      ]
+    },
     {
       "type": "com.sun.source.tree.BindingPatternTree"
     },

diff --git a/palantir-java-format-spi/build.gradle b/palantir-java-format-spi/build.gradle
@@ -16,3 +16,7 @@ tasks.withType(JavaCompile).named('compileJava') {
     sourceCompatibility = JavaVersion.VERSION_11
     targetCompatibility = JavaVersion.VERSION_11
 }
+
+javaVersion {
+    target = 21
+}
diff --git a/palantir-java-format/build.gradle b/palantir-java-format/build.gradle
@@ -60,3 +60,7 @@ tasks.named("test") {
     // https://junit.org/junit5/docs/current/user-guide/#writing-tests-parallel-execution
     systemProperty 'junit.jupiter.execution.parallel.mode.default', 'concurrent'
 }
+
+javaVersion {
+    target = 21
+}
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
@@ -131,15 +131,10 @@ static JavaOutput format(
         OpsBuilder opsBuilder = new OpsBuilder(javaInput);
 
         JavaInputAstVisitor visitor;
-        if (getRuntimeVersion() >= 14) {
-            try {
-                visitor = Class.forName("com.palantir.javaformat.java.java14.Java14InputAstVisitor")
-                        .asSubclass(JavaInputAstVisitor.class)
-                        .getConstructor(OpsBuilder.class, int.class)
-                        .newInstance(opsBuilder, options.indentationMultiplier());
-            } catch (ReflectiveOperationException e) {
-                throw new RuntimeException(e.getMessage(), e);
-            }
+        if (getRuntimeVersion() >= 21) {
+            visitor = createVisitor("com.palantir.javaformat.java.java21.Java21InputAstVisitor", opsBuilder, options);
+        } else if (getRuntimeVersion() >= 14) {
+            visitor = createVisitor("com.palantir.javaformat.java.java14.Java14InputAstVisitor", opsBuilder, options);
         } else {
             visitor = new JavaInputAstVisitor(opsBuilder, options.indentationMultiplier());
         }
@@ -206,6 +201,18 @@ static int getRuntimeVersion() {
         return Runtime.version().feature();
     }
 
+    private static JavaInputAstVisitor createVisitor(
+            final String className, final OpsBuilder builder, final JavaFormatterOptions options) {
+        try {
+            return Class.forName(className)
+                    .asSubclass(JavaInputAstVisitor.class)
+                    .getConstructor(OpsBuilder.class, int.class)
+                    .newInstance(builder, options.indentationMultiplier());
+        } catch (ReflectiveOperationException e) {
+            throw new LinkageError(e.getMessage());
+        }
+    }
+
     static boolean errorDiagnostic(Diagnostic<?> input) {
         if (input.getKind() != Diagnostic.Kind.ERROR) {
             return false;
@@ -254,7 +261,7 @@ public String formatSource(String input) throws FormatterException {
      * @return the output string
      * @throws FormatterException if the input string cannot be parsed
      * @see <a href="https://google.github.io/styleguide/javaguide.html#s3.3.3-import-ordering-and-spacing">Google Java
-     *     Style Guide - 3.3.3 Import ordering and spacing</a>
+     * Style Guide - 3.3.3 Import ordering and spacing</a>
      */
     public String formatSourceAndFixImports(String input) throws FormatterException {
         input = ImportOrderer.reorderImports(input, options.style());
@@ -271,7 +278,7 @@ public String formatSourceAndFixImports(String input) throws FormatterException
      * @return the output string
      * @throws FormatterException if the input string cannot be parsed
      * @see <a href="https://google.github.io/styleguide/javaguide.html#s3.3.3-import-ordering-and-spacing">Google Java
-     *     Style Guide - 3.3.3 Import ordering and spacing</a>
+     * Style Guide - 3.3.3 Import ordering and spacing</a>
      */
     public String fixImports(String input) throws FormatterException {
         return ImportOrderer.reorderImports(RemoveUnusedImports.removeUnusedImports(input), options.style());

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
@@ -1869,13 +1869,13 @@ protected void visitSwitch(ExpressionTree expression, List<? extends CaseTree> c
         tokenBreakTrailingComment("{", plusTwo);
         builder.blankLineWanted(BlankLineWanted.NO);
         builder.open(plusTwo);
-        boolean first = true;
+        boolean afterFirstToken = false;
         for (CaseTree caseTree : cases) {
-            if (!first) {
+            if (afterFirstToken) {
                 builder.blankLineWanted(BlankLineWanted.PRESERVE);
             }
             scan(caseTree, null);
-            first = false;
+            afterFirstToken = true;
         }
         builder.close();
         builder.forcedBreak();
@@ -2928,7 +2928,7 @@ private void visitDotWithPrefix(
      *   <li>{@code foo().bar()[0]}
      *   <li>{@code foo().bar()[0][0]}
      * </ul>
-     *
+     * <p>
      * Whereas an expression like a name {@code com.palantir.foo.bar.Baz} would not.
      */
     private boolean shouldHaveColumnLimit(ExpressionTree expr) {
@@ -3523,7 +3523,7 @@ private void maybeAddDims(Deque<List<? extends AnnotationTree>> annotations) {
      *
      * @param dimExpressions an ordered list of dimension expressions (e.g. the {@code 0} in {@code new int[0]}
      * @param annotations an ordered list of type annotations grouped by dimension (e.g. {@code [[@A, @B], [@C]]} for
-     *     {@code int @A [] @B @C []}
+     * {@code int @A [] @B @C []}
      */
     private void maybeAddDims(Deque<ExpressionTree> dimExpressions, Deque<List<? extends AnnotationTree>> annotations) {
         boolean lastWasAnnotation = false;
@@ -3679,6 +3679,7 @@ protected void addBodyDeclarations(
             }
         }
     }
+
     /** Gets the permits clause for the given node. This is only available in Java 15 and later. */
     protected List<? extends Tree> getPermitsClause(ClassTree node) {
         return ImmutableList.of();
Original file line number	Diff line number	Diff line change
Expand Up		@@ -31,4 +31,3 @@ tasks.named('test', Test.class) {
		inputs.files(configurations.named('formatterNativeImage'))
		environment.put('NATIVE_IMAGE_CLASSPATH', configurations.formatterNativeImage.asPath)
		}