diff --git a/open-java-format/src/main/java/com/palantir/javaformat/doc/Level.java b/open-java-format/src/main/java/com/palantir/javaformat/doc/Level.java index 5b69d4507..98197c055 100644 --- a/open-java-format/src/main/java/com/palantir/javaformat/doc/Level.java +++ b/open-java-format/src/main/java/com/palantir/javaformat/doc/Level.java @@ -590,7 +590,7 @@ case BreakOnlyIfInnerLevelsThenFitOnOneLine(boolean keepIndentWhenInlined) -> { // levels that are meant to look good even if partially inlined, e.g. method // chains, which will catch things like builders, but not other kinds of levels like // constant expressions. - // See the palantir-expression-lambdas cases in test-cases/testdata for an example of + // See the palantir-expression-lambdas cases in test-cases-java21/testdata for an example of // what this is trying to avoid. // For this, need to actually check the last inner level of `lastLevel` (2 levels down). diff --git a/open-java-format/src/test/java/com/palantir/javaformat/java/FileBasedTests.java b/open-java-format/src/test/java/com/palantir/javaformat/java/FileBasedTests.java index 138b162cf..a9be8952f 100644 --- a/open-java-format/src/test/java/com/palantir/javaformat/java/FileBasedTests.java +++ b/open-java-format/src/test/java/com/palantir/javaformat/java/FileBasedTests.java @@ -43,12 +43,6 @@ @Execution(ExecutionMode.CONCURRENT) public final class FileBasedTests { - // Test files that are only used when run with a minimum Java version - private static final ImmutableMultimap VERSIONED_TESTS = - ImmutableMultimap.builder() - .putAll(23, "ModuleImport") - .build(); - private final Class testClass; /** The path prefix for all tests if loaded as resources. */ private final Path resourcePrefix; @@ -66,13 +60,6 @@ public FileBasedTests(Class testClass, String testDirName) { this.fullTestPath = Paths.get("src/test/resources").resolve(resourcePrefix); } - public static void assumeJavaVersionForTest(String testName) { - Optional maybeJavaVersion = - VERSIONED_TESTS.inverse().get(testName).stream().collect(toOptional()); - maybeJavaVersion.ifPresent(version -> Assumptions.assumeTrue( - Formatter.getRuntimeVersion() >= version, String.format("Not running on jdk %d or later", version))); - } - /** The names of the resources under {@link #resourcePrefix}, in every directory of the class path that has it. */ private List resourceNames(ClassLoader classLoader) throws IOException { var names = new ArrayList(); diff --git a/open-java-format/src/test/java/com/palantir/javaformat/java/FormatterCasesJava21Test.java b/open-java-format/src/test/java/com/palantir/javaformat/java/FormatterCasesJava21Test.java new file mode 100644 index 000000000..83439aa9a --- /dev/null +++ b/open-java-format/src/test/java/com/palantir/javaformat/java/FormatterCasesJava21Test.java @@ -0,0 +1,33 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.palantir.javaformat.java; + +import java.util.List; +import org.junit.jupiter.api.DynamicTest; +import org.junit.jupiter.api.TestFactory; +import org.junit.jupiter.api.condition.EnabledForJreRange; +import org.junit.jupiter.api.condition.JRE; +import org.junit.jupiter.api.parallel.Execution; +import org.junit.jupiter.api.parallel.ExecutionMode; + +/** The cases on JDK 21 and later: those for the syntax of JDK 21. */ +@EnabledForJreRange(min = JRE.JAVA_21) +@Execution(ExecutionMode.CONCURRENT) +final class FormatterCasesJava21Test { + @TestFactory + List cases() throws Exception { + return FormatterCasesTest.casesIn("test-cases-java21"); + } +} diff --git a/open-java-format/src/test/java/com/palantir/javaformat/java/FormatterCasesJava25Test.java b/open-java-format/src/test/java/com/palantir/javaformat/java/FormatterCasesJava25Test.java new file mode 100644 index 000000000..51118d7ae --- /dev/null +++ b/open-java-format/src/test/java/com/palantir/javaformat/java/FormatterCasesJava25Test.java @@ -0,0 +1,33 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.palantir.javaformat.java; + +import java.util.List; +import org.junit.jupiter.api.DynamicTest; +import org.junit.jupiter.api.TestFactory; +import org.junit.jupiter.api.condition.EnabledForJreRange; +import org.junit.jupiter.api.condition.JRE; +import org.junit.jupiter.api.parallel.Execution; +import org.junit.jupiter.api.parallel.ExecutionMode; + +/** The cases on JDK 25 and later: those of JDK 21, and those for the syntax of JDK 25. */ +@EnabledForJreRange(min = JRE.JAVA_25) +@Execution(ExecutionMode.CONCURRENT) +final class FormatterCasesJava25Test { + @TestFactory + List cases() throws Exception { + return FormatterCasesTest.casesIn("test-cases-java25", "test-cases-java21"); + } +} diff --git a/open-java-format/src/test/java/com/palantir/javaformat/java/FormatterCasesJava28Test.java b/open-java-format/src/test/java/com/palantir/javaformat/java/FormatterCasesJava28Test.java new file mode 100644 index 000000000..e38ec91ba --- /dev/null +++ b/open-java-format/src/test/java/com/palantir/javaformat/java/FormatterCasesJava28Test.java @@ -0,0 +1,33 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.palantir.javaformat.java; + +import java.util.List; +import org.junit.jupiter.api.DynamicTest; +import org.junit.jupiter.api.TestFactory; +import org.junit.jupiter.api.condition.EnabledForJreRange; +import org.junit.jupiter.api.condition.JRE; +import org.junit.jupiter.api.parallel.Execution; +import org.junit.jupiter.api.parallel.ExecutionMode; + +/** The cases on JDK 28 and later: those of JDK 21 and 25, and those for the syntax of JDK 28. */ +@EnabledForJreRange(min = JRE.JAVA_28) +@Execution(ExecutionMode.CONCURRENT) +final class FormatterCasesJava28Test { + @TestFactory + List cases() throws Exception { + return FormatterCasesTest.casesIn("test-cases-java28", "test-cases-java25", "test-cases-java21"); + } +} diff --git a/open-java-format/src/test/java/com/palantir/javaformat/java/FormatterCasesTest.java b/open-java-format/src/test/java/com/palantir/javaformat/java/FormatterCasesTest.java index 89b20e1c9..937e7743f 100644 --- a/open-java-format/src/test/java/com/palantir/javaformat/java/FormatterCasesTest.java +++ b/open-java-format/src/test/java/com/palantir/javaformat/java/FormatterCasesTest.java @@ -23,51 +23,49 @@ import java.util.ArrayList; import java.util.List; import org.junit.jupiter.api.DynamicTest; -import org.junit.jupiter.api.TestFactory; -import org.junit.jupiter.api.parallel.Execution; -import org.junit.jupiter.api.parallel.ExecutionMode; /** - * One test for each {@link CaseFile} under {@code test-cases} on the test classpath: formatting the before block gives - * the after block, and formatting that again changes nothing. Adding a case is adding a file. + * One test for each {@link CaseFile} in the given folders on the test classpath: formatting the before block gives the + * after block, and formatting that again changes nothing. Adding a case is adding a file. The cases are in a folder of + * the JDK they need, and each JDK has a class that runs the folders it can parse, such as + * {@link FormatterCasesJava21Test}. */ -@Execution(ExecutionMode.CONCURRENT) final class FormatterCasesTest { - private static final String CASES = "test-cases"; - private static final Formatter FORMATTER = Formatter.createFormatter( JavaFormatterOptions.builder().style(Style.OJF).build()); - @TestFactory - List cases() throws Exception { - var folder = requireNonNull( - FormatterCasesTest.class.getClassLoader().getResource(CASES), - "no " + CASES + " folder on the test classpath"); - var root = Path.of(folder.toURI()); - var paths = CaseFile.pathsIn(root); + /** The tests of the case files under {@code folders} on the test classpath. */ + static List casesIn(String... folders) throws Exception { + var tests = new ArrayList(); - // A wrong folder or a resource filter would otherwise pass with no tests at all. - assertThat(paths).as("the case files under %s", root).isNotEmpty(); + for (var folder : folders) { + var url = requireNonNull( + FormatterCasesTest.class.getClassLoader().getResource(folder), + "no " + folder + " folder on the test classpath"); + var root = Path.of(url.toURI()); + var paths = CaseFile.pathsIn(root); - var tests = new ArrayList(); + // A wrong folder or a resource filter would otherwise pass with no tests at all. + assertThat(paths).as("the case files under %s", root).isNotEmpty(); - for (var path : paths) { - var name = path.substring(0, path.length() - CaseFile.EXTENSION.length()); + for (var path : paths) { + var name = path.substring(0, path.length() - CaseFile.EXTENSION.length()); - tests.add(DynamicTest.dynamicTest(name, () -> { - var testCase = CaseFile.parse(path, Files.readString(root.resolve(path))); - var once = FORMATTER.formatSourceAndFixImports(testCase.before()); + tests.add(DynamicTest.dynamicTest(name, () -> { + var testCase = CaseFile.parse(path, Files.readString(root.resolve(path))); + var once = FORMATTER.formatSourceAndFixImports(testCase.before()); - assertThat(once) - .as(() -> CASES + "/" + path + ", first run, " + testCase.firstDifference(once)) - .isEqualTo(testCase.after()); + assertThat(once) + .as(() -> folder + "/" + path + ", first run, " + testCase.firstDifference(once)) + .isEqualTo(testCase.after()); - var twice = FORMATTER.formatSourceAndFixImports(once); + var twice = FORMATTER.formatSourceAndFixImports(once); - assertThat(twice) - .as(() -> CASES + "/" + path + ", second run, " + testCase.firstDifference(twice)) - .isEqualTo(once); - })); + assertThat(twice) + .as(() -> folder + "/" + path + ", second run, " + testCase.firstDifference(twice)) + .isEqualTo(once); + })); + } } return tests; diff --git a/open-java-format/src/test/java/com/palantir/javaformat/java/FormatterIntegrationTest.java b/open-java-format/src/test/java/com/palantir/javaformat/java/FormatterIntegrationTest.java index 6190d5174..629759bb7 100644 --- a/open-java-format/src/test/java/com/palantir/javaformat/java/FormatterIntegrationTest.java +++ b/open-java-format/src/test/java/com/palantir/javaformat/java/FormatterIntegrationTest.java @@ -15,7 +15,6 @@ package com.palantir.javaformat.java; import static com.google.common.base.Preconditions.checkNotNull; -import static com.palantir.javaformat.java.FileBasedTests.assumeJavaVersionForTest; import static com.palantir.javaformat.java.FileBasedTests.isRecreate; import static org.assertj.core.api.Assertions.assertThat; @@ -74,7 +73,6 @@ private static boolean isDebugMode() { @TestTemplate public void format() { - assumeJavaVersionForTest(name); try { Formatter formatter = createFormatter(); String output = formatter.formatSource(input); @@ -99,7 +97,6 @@ private static Formatter createFormatter() { @TestTemplate public void idempotentLF() { - assumeJavaVersionForTest(name); Assumptions.assumeFalse(isRecreate(), "Not running when recreating test outputs"); try { String mangled = expected.replace(separator(), "\n"); @@ -112,7 +109,6 @@ public void idempotentLF() { @TestTemplate public void idempotentCR() { - assumeJavaVersionForTest(name); Assumptions.assumeFalse(isRecreate(), "Not running when recreating test outputs"); try { String mangled = expected.replace(separator(), "\r"); @@ -125,7 +121,6 @@ public void idempotentCR() { @TestTemplate public void idempotentCRLF() { - assumeJavaVersionForTest(name); Assumptions.assumeFalse(isRecreate(), "Not running when recreating test outputs"); try { String mangled = expected.replace(separator(), "\r\n"); diff --git a/open-java-format/src/test/java/com/palantir/javaformat/java/FormatterTest.java b/open-java-format/src/test/java/com/palantir/javaformat/java/FormatterTest.java index 973a1a3f6..5ffb10a78 100644 --- a/open-java-format/src/test/java/com/palantir/javaformat/java/FormatterTest.java +++ b/open-java-format/src/test/java/com/palantir/javaformat/java/FormatterTest.java @@ -33,11 +33,8 @@ import java.nio.file.Files; import java.nio.file.Path; import java.time.Duration; -import java.util.Arrays; import java.util.List; -import javax.lang.model.element.Modifier; import org.jspecify.annotations.Nullable; -import org.junit.jupiter.api.Assumptions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; import org.junit.jupiter.api.parallel.Execution; @@ -352,44 +349,6 @@ void indentsCommentsThatShareALineLinearly() throws FormatterException { assertThat(formatter.formatSource(input.toString()).length()).isLessThan(10_000); } - @Test - void valueClassAndRecord() throws FormatterException { - Assumptions.assumeTrue( - Arrays.stream(Modifier.values()) - .anyMatch(modifier -> modifier.name().equals("VALUE")), - "`value` is a modifier only on a JDK with Project Valhalla's value classes"); - String input = """ - value final public class PointValueClass { - final int x; - final int y; - - PointValueClass(int x, int y) { - this.x = x; - this.y = y; - } - } - - value public record PointValueRecord(int x, int y) {} - """; - String expected = """ - public final value class PointValueClass { - final int x; - final int y; - - PointValueClass(int x, int y) { - this.x = x; - this.y = y; - } - } - - public value record PointValueRecord(int x, int y) {} - """; - Formatter formatter = Formatter.createFormatter( - JavaFormatterOptions.builder().style(Style.OJF).build()); - - assertThat(formatter.formatSource(input)).isEqualTo(expected); - } - @Test @SuppressWarnings("deprecation") void palantirStyleAliasMatchesOjfStyle() throws FormatterException { diff --git a/open-java-format/src/test/java/com/palantir/javaformat/java/ModifierOrdererJava28Test.java b/open-java-format/src/test/java/com/palantir/javaformat/java/ModifierOrdererJava28Test.java new file mode 100644 index 000000000..c2c762183 --- /dev/null +++ b/open-java-format/src/test/java/com/palantir/javaformat/java/ModifierOrdererJava28Test.java @@ -0,0 +1,34 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.palantir.javaformat.java; + +import static com.google.common.truth.Truth.assertThat; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.EnabledForJreRange; +import org.junit.jupiter.api.condition.JRE; +import org.junit.jupiter.api.parallel.Execution; +import org.junit.jupiter.api.parallel.ExecutionMode; + +/** {@link ModifierOrderer} on the {@code value} modifier of value classes, a preview of JDK 28. */ +@EnabledForJreRange(min = JRE.JAVA_28) +@Execution(ExecutionMode.CONCURRENT) +final class ModifierOrdererJava28Test { + @Test + void valueClass() throws FormatterException { + assertThat(ModifierOrderer.reorderModifiers("value final public").getText()) + .isEqualTo("public final value"); + } +} diff --git a/open-java-format/src/test/java/com/palantir/javaformat/java/ModifierOrdererTest.java b/open-java-format/src/test/java/com/palantir/javaformat/java/ModifierOrdererTest.java index d990b66f9..abfa5a684 100644 --- a/open-java-format/src/test/java/com/palantir/javaformat/java/ModifierOrdererTest.java +++ b/open-java-format/src/test/java/com/palantir/javaformat/java/ModifierOrdererTest.java @@ -21,8 +21,6 @@ import com.google.common.base.Joiner; import com.google.common.collect.Range; import java.util.Arrays; -import javax.lang.model.element.Modifier; -import org.junit.jupiter.api.Assumptions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.parallel.Execution; import org.junit.jupiter.api.parallel.ExecutionMode; @@ -115,16 +113,6 @@ void nonSealedBeforeAccessModifier() throws FormatterException { .isEqualTo("private non-sealed interface B extends I {}"); } - @Test - void valueClass() throws FormatterException { - Assumptions.assumeTrue( - Arrays.stream(Modifier.values()) - .anyMatch(modifier -> modifier.name().equals("VALUE")), - "`value` is a modifier only on a JDK with Project Valhalla's value classes"); - assertThat(ModifierOrderer.reorderModifiers("value final public").getText()) - .isEqualTo("public final value"); - } - @Test void nonMinusValueIsAnExpression() throws FormatterException { // `non - value` lexes like `non-sealed`, and there is no NON_VALUE modifier to look up for it diff --git a/open-java-format/src/test/java/com/palantir/javaformat/java/ModuleImportTest.java b/open-java-format/src/test/java/com/palantir/javaformat/java/ModuleImportTest.java index 96ebbede8..6aca760f3 100644 --- a/open-java-format/src/test/java/com/palantir/javaformat/java/ModuleImportTest.java +++ b/open-java-format/src/test/java/com/palantir/javaformat/java/ModuleImportTest.java @@ -22,23 +22,17 @@ import java.io.ByteArrayInputStream; import java.io.PrintWriter; import java.io.StringWriter; -import org.junit.jupiter.api.Assumptions; -import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.EnabledForJreRange; +import org.junit.jupiter.api.condition.JRE; /** * End-to-end tests for module import declarations (JEP 511) through the pipeline the Gradle plugin and Spotless use, - * which reorders imports before formatting. The {@code ModuleImport} golden only exercises {@code formatSource}. + * which reorders imports before formatting. Module imports are final from JDK 25 on, and the tests run there. */ +@EnabledForJreRange(min = JRE.JAVA_25) final class ModuleImportTest { - @BeforeAll - static void requiresAParserThatProducesModuleImports() { - // Module imports parse from JDK 23 on, as a preview feature there; the formatter enables preview. - Assumptions.assumeTrue( - Formatter.getRuntimeVersion() >= 23, "import module requires running on JDK 23 or later"); - } - /** Asserts both entry points that reorder imports, and that their output survives a second pass. */ private static void assertFormats(String input, String expected) throws FormatterException { assertThat(Formatter.create().formatSourceAndFixImports(input)).isEqualTo(expected); diff --git a/open-java-format/src/test/java/com/palantir/javaformat/java/RemoveUnusedImportsJava25Test.java b/open-java-format/src/test/java/com/palantir/javaformat/java/RemoveUnusedImportsJava25Test.java new file mode 100644 index 000000000..ff03aa9f2 --- /dev/null +++ b/open-java-format/src/test/java/com/palantir/javaformat/java/RemoveUnusedImportsJava25Test.java @@ -0,0 +1,48 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.palantir.javaformat.java; + +import static com.google.common.truth.Truth.assertThat; +import static com.palantir.javaformat.java.RemoveUnusedImports.removeUnusedImports; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.EnabledForJreRange; +import org.junit.jupiter.api.condition.JRE; +import org.junit.jupiter.api.parallel.Execution; +import org.junit.jupiter.api.parallel.ExecutionMode; + +/** {@link RemoveUnusedImports} on module imports, which are final from JDK 25 on. */ +@EnabledForJreRange(min = JRE.JAVA_25) +@Execution(ExecutionMode.CONCURRENT) +final class RemoveUnusedImportsJava25Test { + // Module imports (JEP 511, `import module foo.bar;`) parse to JCModuleImport, a sibling of JCImport rather than a + // subtype. They must never be reported as unused (see isUnused), and must not crash buildReplacements when mixed + // with ordinary imports, some used and some not. + @Test + void moduleImportStaysAmongOrdinaryImports() throws FormatterException { + var input = """ + import module java.base; + import java.util.List; + import java.util.Map; + class T { List xs; } + """; + + assertThat(removeUnusedImports(input)).isEqualTo(""" + import module java.base; + import java.util.List; + class T { List xs; } + """); + } +} diff --git a/open-java-format/src/test/java/com/palantir/javaformat/java/RemoveUnusedImportsTest.java b/open-java-format/src/test/java/com/palantir/javaformat/java/RemoveUnusedImportsTest.java index 16d12f887..02e48684f 100644 --- a/open-java-format/src/test/java/com/palantir/javaformat/java/RemoveUnusedImportsTest.java +++ b/open-java-format/src/test/java/com/palantir/javaformat/java/RemoveUnusedImportsTest.java @@ -17,15 +17,14 @@ import static com.google.common.truth.Truth.assertThat; import static com.palantir.javaformat.java.RemoveUnusedImports.removeUnusedImports; -import org.junit.jupiter.api.Assumptions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.parallel.Execution; import org.junit.jupiter.api.parallel.ExecutionMode; /** - * {@link RemoveUnusedImports} on its own, where a case under {@code test-cases/imports} cannot show it. A case fixes the - * imports before it formats, and formatting takes a doubled blank line away by itself, while the command line formats - * first. And the cases run on JDK 21, where a module import does not parse. + * {@link RemoveUnusedImports} on its own, where a case under {@code test-cases-java21/imports} cannot show it. A case + * fixes the imports before it formats, and formatting takes a doubled blank line away by itself, while the command line + * formats first. */ @Execution(ExecutionMode.CONCURRENT) final class RemoveUnusedImportsTest { @@ -84,27 +83,4 @@ public class TestBug {} public class TestBug {} """); } - - // Module imports (JEP 511, `import module foo.bar;`) parse to JCModuleImport, a sibling of JCImport rather than a - // subtype. They must never be reported as unused (see isUnused), and must not crash buildReplacements when mixed - // with ordinary imports, some used and some not. - @Test - void moduleImportStaysAmongOrdinaryImports() throws FormatterException { - // Module imports parse from JDK 23 on, as preview there; the formatter enables preview. - Assumptions.assumeTrue( - Formatter.getRuntimeVersion() >= 23, "import module requires running on JDK 23 or later"); - - var input = """ - import module java.base; - import java.util.List; - import java.util.Map; - class T { List xs; } - """; - - assertThat(removeUnusedImports(input)).isEqualTo(""" - import module java.base; - import java.util.List; - class T { List xs; } - """); - } } diff --git a/open-java-format/src/test/resources/com/palantir/javaformat/java/testdata/ModuleImport.input b/open-java-format/src/test/resources/com/palantir/javaformat/java/testdata/ModuleImport.input deleted file mode 100644 index 63d020f52..000000000 --- a/open-java-format/src/test/resources/com/palantir/javaformat/java/testdata/ModuleImport.input +++ /dev/null @@ -1,8 +0,0 @@ -import module java.base; -import module java.sql; - -import java.util.List; - -class ModuleImport { - List xs; -} diff --git a/open-java-format/src/test/resources/com/palantir/javaformat/java/testdata/ModuleImport.output b/open-java-format/src/test/resources/com/palantir/javaformat/java/testdata/ModuleImport.output deleted file mode 100644 index 72e62d733..000000000 --- a/open-java-format/src/test/resources/com/palantir/javaformat/java/testdata/ModuleImport.output +++ /dev/null @@ -1,8 +0,0 @@ -import module java.base; -import module java.sql; - -import java.util.List; - -class ModuleImport { - List xs; -} diff --git a/open-java-format/src/test/resources/test-cases/badConstructor.case b/open-java-format/src/test/resources/test-cases-java21/badConstructor.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/badConstructor.case rename to open-java-format/src/test/resources/test-cases-java21/badConstructor.case diff --git a/open-java-format/src/test/resources/test-cases/blankInClassBody.case b/open-java-format/src/test/resources/test-cases-java21/blankInClassBody.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/blankInClassBody.case rename to open-java-format/src/test/resources/test-cases-java21/blankInClassBody.case diff --git a/open-java-format/src/test/resources/test-cases/blockCommentInteriorTrailingBlank.case b/open-java-format/src/test/resources/test-cases-java21/blockCommentInteriorTrailingBlank.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/blockCommentInteriorTrailingBlank.case rename to open-java-format/src/test/resources/test-cases-java21/blockCommentInteriorTrailingBlank.case diff --git a/open-java-format/src/test/resources/test-cases/blockCommentTrailingBlank.case b/open-java-format/src/test/resources/test-cases-java21/blockCommentTrailingBlank.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/blockCommentTrailingBlank.case rename to open-java-format/src/test/resources/test-cases-java21/blockCommentTrailingBlank.case diff --git a/open-java-format/src/test/resources/test-cases/commentAfterOpeningDelimiter-assert.case b/open-java-format/src/test/resources/test-cases-java21/commentAfterOpeningDelimiter-assert.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/commentAfterOpeningDelimiter-assert.case rename to open-java-format/src/test/resources/test-cases-java21/commentAfterOpeningDelimiter-assert.case diff --git a/open-java-format/src/test/resources/test-cases/commentAfterOpeningDelimiter-enumSemicolon.case b/open-java-format/src/test/resources/test-cases-java21/commentAfterOpeningDelimiter-enumSemicolon.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/commentAfterOpeningDelimiter-enumSemicolon.case rename to open-java-format/src/test/resources/test-cases-java21/commentAfterOpeningDelimiter-enumSemicolon.case diff --git a/open-java-format/src/test/resources/test-cases/commentAfterOpeningDelimiter-forHeader.case b/open-java-format/src/test/resources/test-cases-java21/commentAfterOpeningDelimiter-forHeader.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/commentAfterOpeningDelimiter-forHeader.case rename to open-java-format/src/test/resources/test-cases-java21/commentAfterOpeningDelimiter-forHeader.case diff --git a/open-java-format/src/test/resources/test-cases/commentAfterOpeningDelimiter-multiCatch.case b/open-java-format/src/test/resources/test-cases-java21/commentAfterOpeningDelimiter-multiCatch.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/commentAfterOpeningDelimiter-multiCatch.case rename to open-java-format/src/test/resources/test-cases-java21/commentAfterOpeningDelimiter-multiCatch.case diff --git a/open-java-format/src/test/resources/test-cases/commentAfterOpeningDelimiter-tryResources.case b/open-java-format/src/test/resources/test-cases-java21/commentAfterOpeningDelimiter-tryResources.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/commentAfterOpeningDelimiter-tryResources.case rename to open-java-format/src/test/resources/test-cases-java21/commentAfterOpeningDelimiter-tryResources.case diff --git a/open-java-format/src/test/resources/test-cases/commentAfterOpeningDelimiter-typeArguments.case b/open-java-format/src/test/resources/test-cases-java21/commentAfterOpeningDelimiter-typeArguments.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/commentAfterOpeningDelimiter-typeArguments.case rename to open-java-format/src/test/resources/test-cases-java21/commentAfterOpeningDelimiter-typeArguments.case diff --git a/open-java-format/src/test/resources/test-cases/contextualKeywordAsIdentifier-non.case b/open-java-format/src/test/resources/test-cases-java21/contextualKeywordAsIdentifier-non.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/contextualKeywordAsIdentifier-non.case rename to open-java-format/src/test/resources/test-cases-java21/contextualKeywordAsIdentifier-non.case diff --git a/open-java-format/src/test/resources/test-cases/contextualKeywordAsIdentifier-sealed.case b/open-java-format/src/test/resources/test-cases-java21/contextualKeywordAsIdentifier-sealed.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/contextualKeywordAsIdentifier-sealed.case rename to open-java-format/src/test/resources/test-cases-java21/contextualKeywordAsIdentifier-sealed.case diff --git a/open-java-format/src/test/resources/test-cases/contextualKeywordAsIdentifier-value.case b/open-java-format/src/test/resources/test-cases-java21/contextualKeywordAsIdentifier-value.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/contextualKeywordAsIdentifier-value.case rename to open-java-format/src/test/resources/test-cases-java21/contextualKeywordAsIdentifier-value.case diff --git a/open-java-format/src/test/resources/test-cases/docCommentTrailingBlank.case b/open-java-format/src/test/resources/test-cases-java21/docCommentTrailingBlank.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/docCommentTrailingBlank.case rename to open-java-format/src/test/resources/test-cases-java21/docCommentTrailingBlank.case diff --git a/open-java-format/src/test/resources/test-cases/emptyArray.case b/open-java-format/src/test/resources/test-cases-java21/emptyArray.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/emptyArray.case rename to open-java-format/src/test/resources/test-cases-java21/emptyArray.case diff --git a/open-java-format/src/test/resources/test-cases/imports/fullyQualifiedJavadocReferenceNeedsNoImport.case b/open-java-format/src/test/resources/test-cases-java21/imports/fullyQualifiedJavadocReferenceNeedsNoImport.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/imports/fullyQualifiedJavadocReferenceNeedsNoImport.case rename to open-java-format/src/test/resources/test-cases-java21/imports/fullyQualifiedJavadocReferenceNeedsNoImport.case diff --git a/open-java-format/src/test/resources/test-cases/imports/importOnDemandStays.case b/open-java-format/src/test/resources/test-cases-java21/imports/importOnDemandStays.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/imports/importOnDemandStays.case rename to open-java-format/src/test/resources/test-cases-java21/imports/importOnDemandStays.case diff --git a/open-java-format/src/test/resources/test-cases/imports/importUsedOnlyByAJavadocLinkStays.case b/open-java-format/src/test/resources/test-cases-java21/imports/importUsedOnlyByAJavadocLinkStays.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/imports/importUsedOnlyByAJavadocLinkStays.case rename to open-java-format/src/test/resources/test-cases-java21/imports/importUsedOnlyByAJavadocLinkStays.case diff --git a/open-java-format/src/test/resources/test-cases/imports/importsFromTheOwnPackageGo.case b/open-java-format/src/test/resources/test-cases-java21/imports/importsFromTheOwnPackageGo.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/imports/importsFromTheOwnPackageGo.case rename to open-java-format/src/test/resources/test-cases-java21/imports/importsFromTheOwnPackageGo.case diff --git a/open-java-format/src/test/resources/test-cases/imports/importsUsedByJavadocMemberReferencesStay.case b/open-java-format/src/test/resources/test-cases-java21/imports/importsUsedByJavadocMemberReferencesStay.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/imports/importsUsedByJavadocMemberReferencesStay.case rename to open-java-format/src/test/resources/test-cases-java21/imports/importsUsedByJavadocMemberReferencesStay.case diff --git a/open-java-format/src/test/resources/test-cases/imports/javaLangImportOnDemandGoes.case b/open-java-format/src/test/resources/test-cases-java21/imports/javaLangImportOnDemandGoes.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/imports/javaLangImportOnDemandGoes.case rename to open-java-format/src/test/resources/test-cases-java21/imports/javaLangImportOnDemandGoes.case diff --git a/open-java-format/src/test/resources/test-cases/imports/javaLangImportUsedByJavadocStays.case b/open-java-format/src/test/resources/test-cases-java21/imports/javaLangImportUsedByJavadocStays.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/imports/javaLangImportUsedByJavadocStays.case rename to open-java-format/src/test/resources/test-cases-java21/imports/javaLangImportUsedByJavadocStays.case diff --git a/open-java-format/src/test/resources/test-cases/imports/javadocArrayParameterKeepsTheImportOfItsQualifier.case b/open-java-format/src/test/resources/test-cases-java21/imports/javadocArrayParameterKeepsTheImportOfItsQualifier.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/imports/javadocArrayParameterKeepsTheImportOfItsQualifier.case rename to open-java-format/src/test/resources/test-cases-java21/imports/javadocArrayParameterKeepsTheImportOfItsQualifier.case diff --git a/open-java-format/src/test/resources/test-cases/imports/javadocLinkOnALaterLineKeepsItsImport.case b/open-java-format/src/test/resources/test-cases-java21/imports/javadocLinkOnALaterLineKeepsItsImport.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/imports/javadocLinkOnALaterLineKeepsItsImport.case rename to open-java-format/src/test/resources/test-cases-java21/imports/javadocLinkOnALaterLineKeepsItsImport.case diff --git a/open-java-format/src/test/resources/test-cases/imports/javadocReferenceToANestedTypeKeepsTheOuterImport.case b/open-java-format/src/test/resources/test-cases-java21/imports/javadocReferenceToANestedTypeKeepsTheOuterImport.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/imports/javadocReferenceToANestedTypeKeepsTheOuterImport.case rename to open-java-format/src/test/resources/test-cases-java21/imports/javadocReferenceToANestedTypeKeepsTheOuterImport.case diff --git a/open-java-format/src/test/resources/test-cases/imports/javadocReferenceToOwnMemberWithoutImports.case b/open-java-format/src/test/resources/test-cases-java21/imports/javadocReferenceToOwnMemberWithoutImports.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/imports/javadocReferenceToOwnMemberWithoutImports.case rename to open-java-format/src/test/resources/test-cases-java21/imports/javadocReferenceToOwnMemberWithoutImports.case diff --git a/open-java-format/src/test/resources/test-cases/imports/javadocTagsKeepTheirImports.case b/open-java-format/src/test/resources/test-cases-java21/imports/javadocTagsKeepTheirImports.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/imports/javadocTagsKeepTheirImports.case rename to open-java-format/src/test/resources/test-cases-java21/imports/javadocTagsKeepTheirImports.case diff --git a/open-java-format/src/test/resources/test-cases/imports/typesInCaseLabelsKeepTheirImports.case b/open-java-format/src/test/resources/test-cases-java21/imports/typesInCaseLabelsKeepTheirImports.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/imports/typesInCaseLabelsKeepTheirImports.case rename to open-java-format/src/test/resources/test-cases-java21/imports/typesInCaseLabelsKeepTheirImports.case diff --git a/open-java-format/src/test/resources/test-cases/imports/unusedImportGoesFromBesideAUsedOne.case b/open-java-format/src/test/resources/test-cases-java21/imports/unusedImportGoesFromBesideAUsedOne.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/imports/unusedImportGoesFromBesideAUsedOne.case rename to open-java-format/src/test/resources/test-cases-java21/imports/unusedImportGoesFromBesideAUsedOne.case diff --git a/open-java-format/src/test/resources/test-cases/imports/unusedImportsOnTheLineOfAUsedOneGo.case b/open-java-format/src/test/resources/test-cases-java21/imports/unusedImportsOnTheLineOfAUsedOneGo.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/imports/unusedImportsOnTheLineOfAUsedOneGo.case rename to open-java-format/src/test/resources/test-cases-java21/imports/unusedImportsOnTheLineOfAUsedOneGo.case diff --git a/open-java-format/src/test/resources/test-cases/imports/unusedJavaLangImportGoes.case b/open-java-format/src/test/resources/test-cases-java21/imports/unusedJavaLangImportGoes.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/imports/unusedJavaLangImportGoes.case rename to open-java-format/src/test/resources/test-cases-java21/imports/unusedJavaLangImportGoes.case diff --git a/open-java-format/src/test/resources/test-cases/imports/unusedJavaLangImportGoesBesideAnImportOnDemand.case b/open-java-format/src/test/resources/test-cases-java21/imports/unusedJavaLangImportGoesBesideAnImportOnDemand.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/imports/unusedJavaLangImportGoesBesideAnImportOnDemand.case rename to open-java-format/src/test/resources/test-cases-java21/imports/unusedJavaLangImportGoesBesideAnImportOnDemand.case diff --git a/open-java-format/src/test/resources/test-cases/imports/usedJavaLangImportShadowsATypeOfTheOwnPackage.case b/open-java-format/src/test/resources/test-cases-java21/imports/usedJavaLangImportShadowsATypeOfTheOwnPackage.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/imports/usedJavaLangImportShadowsATypeOfTheOwnPackage.case rename to open-java-format/src/test/resources/test-cases-java21/imports/usedJavaLangImportShadowsATypeOfTheOwnPackage.case diff --git a/open-java-format/src/test/resources/test-cases/imports/usedJavaLangImportShadowsAnImportOnDemand.case b/open-java-format/src/test/resources/test-cases-java21/imports/usedJavaLangImportShadowsAnImportOnDemand.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/imports/usedJavaLangImportShadowsAnImportOnDemand.case rename to open-java-format/src/test/resources/test-cases-java21/imports/usedJavaLangImportShadowsAnImportOnDemand.case diff --git a/open-java-format/src/test/resources/test-cases/imports/usedJavaLangImportStaysOwnPackageImportGoes.case b/open-java-format/src/test/resources/test-cases-java21/imports/usedJavaLangImportStaysOwnPackageImportGoes.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/imports/usedJavaLangImportStaysOwnPackageImportGoes.case rename to open-java-format/src/test/resources/test-cases-java21/imports/usedJavaLangImportStaysOwnPackageImportGoes.case diff --git a/open-java-format/src/test/resources/test-cases/importsFixedIfRequested.case b/open-java-format/src/test/resources/test-cases-java21/importsFixedIfRequested.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/importsFixedIfRequested.case rename to open-java-format/src/test/resources/test-cases-java21/importsFixedIfRequested.case diff --git a/open-java-format/src/test/resources/test-cases/jbang/formatsFirstLineThatRunsNoCommandAsOrdinaryComment.case b/open-java-format/src/test/resources/test-cases-java21/jbang/formatsFirstLineThatRunsNoCommandAsOrdinaryComment.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/jbang/formatsFirstLineThatRunsNoCommandAsOrdinaryComment.case rename to open-java-format/src/test/resources/test-cases-java21/jbang/formatsFirstLineThatRunsNoCommandAsOrdinaryComment.case diff --git a/open-java-format/src/test/resources/test-cases/jbang/formatsLookalikeAsOrdinaryComment-DEPS-colon.case b/open-java-format/src/test/resources/test-cases-java21/jbang/formatsLookalikeAsOrdinaryComment-DEPS-colon.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/jbang/formatsLookalikeAsOrdinaryComment-DEPS-colon.case rename to open-java-format/src/test/resources/test-cases-java21/jbang/formatsLookalikeAsOrdinaryComment-DEPS-colon.case diff --git a/open-java-format/src/test/resources/test-cases/jbang/formatsLookalikeAsOrdinaryComment-DEPSSS.case b/open-java-format/src/test/resources/test-cases-java21/jbang/formatsLookalikeAsOrdinaryComment-DEPSSS.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/jbang/formatsLookalikeAsOrdinaryComment-DEPSSS.case rename to open-java-format/src/test/resources/test-cases-java21/jbang/formatsLookalikeAsOrdinaryComment-DEPSSS.case diff --git a/open-java-format/src/test/resources/test-cases/jbang/formatsLookalikeAsOrdinaryComment-DEPS_.case b/open-java-format/src/test/resources/test-cases-java21/jbang/formatsLookalikeAsOrdinaryComment-DEPS_.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/jbang/formatsLookalikeAsOrdinaryComment-DEPS_.case rename to open-java-format/src/test/resources/test-cases-java21/jbang/formatsLookalikeAsOrdinaryComment-DEPS_.case diff --git a/open-java-format/src/test/resources/test-cases/jbang/formatsLookalikeAsOrdinaryComment-Deps-mixed-case.case b/open-java-format/src/test/resources/test-cases-java21/jbang/formatsLookalikeAsOrdinaryComment-Deps-mixed-case.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/jbang/formatsLookalikeAsOrdinaryComment-Deps-mixed-case.case rename to open-java-format/src/test/resources/test-cases-java21/jbang/formatsLookalikeAsOrdinaryComment-Deps-mixed-case.case diff --git a/open-java-format/src/test/resources/test-cases/jbang/formatsLookalikeAsOrdinaryComment-JAVA21-plus.case b/open-java-format/src/test/resources/test-cases-java21/jbang/formatsLookalikeAsOrdinaryComment-JAVA21-plus.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/jbang/formatsLookalikeAsOrdinaryComment-JAVA21-plus.case rename to open-java-format/src/test/resources/test-cases-java21/jbang/formatsLookalikeAsOrdinaryComment-JAVA21-plus.case diff --git a/open-java-format/src/test/resources/test-cases/jbang/formatsLookalikeAsOrdinaryComment-TODO.case b/open-java-format/src/test/resources/test-cases-java21/jbang/formatsLookalikeAsOrdinaryComment-TODO.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/jbang/formatsLookalikeAsOrdinaryComment-TODO.case rename to open-java-format/src/test/resources/test-cases-java21/jbang/formatsLookalikeAsOrdinaryComment-TODO.case diff --git a/open-java-format/src/test/resources/test-cases/jbang/formatsLookalikeAsOrdinaryComment-commented-out-directive.case b/open-java-format/src/test/resources/test-cases-java21/jbang/formatsLookalikeAsOrdinaryComment-commented-out-directive.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/jbang/formatsLookalikeAsOrdinaryComment-commented-out-directive.case rename to open-java-format/src/test/resources/test-cases-java21/jbang/formatsLookalikeAsOrdinaryComment-commented-out-directive.case diff --git a/open-java-format/src/test/resources/test-cases/jbang/formatsLookalikeAsOrdinaryComment-deps-lower-case.case b/open-java-format/src/test/resources/test-cases-java21/jbang/formatsLookalikeAsOrdinaryComment-deps-lower-case.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/jbang/formatsLookalikeAsOrdinaryComment-deps-lower-case.case rename to open-java-format/src/test/resources/test-cases-java21/jbang/formatsLookalikeAsOrdinaryComment-deps-lower-case.case diff --git a/open-java-format/src/test/resources/test-cases/jbang/formatsLookalikeAsOrdinaryComment-space-after-slashes.case b/open-java-format/src/test/resources/test-cases-java21/jbang/formatsLookalikeAsOrdinaryComment-space-after-slashes.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/jbang/formatsLookalikeAsOrdinaryComment-space-after-slashes.case rename to open-java-format/src/test/resources/test-cases-java21/jbang/formatsLookalikeAsOrdinaryComment-space-after-slashes.case diff --git a/open-java-format/src/test/resources/test-cases/jbang/formatsLookalikeAsOrdinaryComment-three-slashes.case b/open-java-format/src/test/resources/test-cases-java21/jbang/formatsLookalikeAsOrdinaryComment-three-slashes.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/jbang/formatsLookalikeAsOrdinaryComment-three-slashes.case rename to open-java-format/src/test/resources/test-cases-java21/jbang/formatsLookalikeAsOrdinaryComment-three-slashes.case diff --git a/open-java-format/src/test/resources/test-cases/jbang/formatsShellLineAfterFirstLineAsOrdinaryComment.case b/open-java-format/src/test/resources/test-cases-java21/jbang/formatsShellLineAfterFirstLineAsOrdinaryComment.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/jbang/formatsShellLineAfterFirstLineAsOrdinaryComment.case rename to open-java-format/src/test/resources/test-cases-java21/jbang/formatsShellLineAfterFirstLineAsOrdinaryComment.case diff --git a/open-java-format/src/test/resources/test-cases/jbang/keepsDirectiveBeforeFirstLineOfCode-CDS.case b/open-java-format/src/test/resources/test-cases-java21/jbang/keepsDirectiveBeforeFirstLineOfCode-CDS.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/jbang/keepsDirectiveBeforeFirstLineOfCode-CDS.case rename to open-java-format/src/test/resources/test-cases-java21/jbang/keepsDirectiveBeforeFirstLineOfCode-CDS.case diff --git a/open-java-format/src/test/resources/test-cases/jbang/keepsDirectiveBeforeFirstLineOfCode-COMPILE_OPTIONS.case b/open-java-format/src/test/resources/test-cases-java21/jbang/keepsDirectiveBeforeFirstLineOfCode-COMPILE_OPTIONS.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/jbang/keepsDirectiveBeforeFirstLineOfCode-COMPILE_OPTIONS.case rename to open-java-format/src/test/resources/test-cases-java21/jbang/keepsDirectiveBeforeFirstLineOfCode-COMPILE_OPTIONS.case diff --git a/open-java-format/src/test/resources/test-cases/jbang/keepsDirectiveBeforeFirstLineOfCode-DEPS-alone.case b/open-java-format/src/test/resources/test-cases-java21/jbang/keepsDirectiveBeforeFirstLineOfCode-DEPS-alone.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/jbang/keepsDirectiveBeforeFirstLineOfCode-DEPS-alone.case rename to open-java-format/src/test/resources/test-cases-java21/jbang/keepsDirectiveBeforeFirstLineOfCode-DEPS-alone.case diff --git a/open-java-format/src/test/resources/test-cases/jbang/keepsDirectiveBeforeFirstLineOfCode-DEPS-over-120-columns.case b/open-java-format/src/test/resources/test-cases-java21/jbang/keepsDirectiveBeforeFirstLineOfCode-DEPS-over-120-columns.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/jbang/keepsDirectiveBeforeFirstLineOfCode-DEPS-over-120-columns.case rename to open-java-format/src/test/resources/test-cases-java21/jbang/keepsDirectiveBeforeFirstLineOfCode-DEPS-over-120-columns.case diff --git a/open-java-format/src/test/resources/test-cases/jbang/keepsDirectiveBeforeFirstLineOfCode-DEPS-property-with-default.case b/open-java-format/src/test/resources/test-cases-java21/jbang/keepsDirectiveBeforeFirstLineOfCode-DEPS-property-with-default.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/jbang/keepsDirectiveBeforeFirstLineOfCode-DEPS-property-with-default.case rename to open-java-format/src/test/resources/test-cases-java21/jbang/keepsDirectiveBeforeFirstLineOfCode-DEPS-property-with-default.case diff --git a/open-java-format/src/test/resources/test-cases/jbang/keepsDirectiveBeforeFirstLineOfCode-DEPS-tab.case b/open-java-format/src/test/resources/test-cases-java21/jbang/keepsDirectiveBeforeFirstLineOfCode-DEPS-tab.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/jbang/keepsDirectiveBeforeFirstLineOfCode-DEPS-tab.case rename to open-java-format/src/test/resources/test-cases-java21/jbang/keepsDirectiveBeforeFirstLineOfCode-DEPS-tab.case diff --git a/open-java-format/src/test/resources/test-cases/jbang/keepsDirectiveBeforeFirstLineOfCode-DEPS-trailing-comment.case b/open-java-format/src/test/resources/test-cases-java21/jbang/keepsDirectiveBeforeFirstLineOfCode-DEPS-trailing-comment.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/jbang/keepsDirectiveBeforeFirstLineOfCode-DEPS-trailing-comment.case rename to open-java-format/src/test/resources/test-cases-java21/jbang/keepsDirectiveBeforeFirstLineOfCode-DEPS-trailing-comment.case diff --git a/open-java-format/src/test/resources/test-cases/jbang/keepsDirectiveBeforeFirstLineOfCode-DEPS.case b/open-java-format/src/test/resources/test-cases-java21/jbang/keepsDirectiveBeforeFirstLineOfCode-DEPS.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/jbang/keepsDirectiveBeforeFirstLineOfCode-DEPS.case rename to open-java-format/src/test/resources/test-cases-java21/jbang/keepsDirectiveBeforeFirstLineOfCode-DEPS.case diff --git a/open-java-format/src/test/resources/test-cases/jbang/keepsDirectiveBeforeFirstLineOfCode-DESCRIPTION.case b/open-java-format/src/test/resources/test-cases-java21/jbang/keepsDirectiveBeforeFirstLineOfCode-DESCRIPTION.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/jbang/keepsDirectiveBeforeFirstLineOfCode-DESCRIPTION.case rename to open-java-format/src/test/resources/test-cases-java21/jbang/keepsDirectiveBeforeFirstLineOfCode-DESCRIPTION.case diff --git a/open-java-format/src/test/resources/test-cases/jbang/keepsDirectiveBeforeFirstLineOfCode-DOCS.case b/open-java-format/src/test/resources/test-cases-java21/jbang/keepsDirectiveBeforeFirstLineOfCode-DOCS.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/jbang/keepsDirectiveBeforeFirstLineOfCode-DOCS.case rename to open-java-format/src/test/resources/test-cases-java21/jbang/keepsDirectiveBeforeFirstLineOfCode-DOCS.case diff --git a/open-java-format/src/test/resources/test-cases/jbang/keepsDirectiveBeforeFirstLineOfCode-FILES.case b/open-java-format/src/test/resources/test-cases-java21/jbang/keepsDirectiveBeforeFirstLineOfCode-FILES.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/jbang/keepsDirectiveBeforeFirstLineOfCode-FILES.case rename to open-java-format/src/test/resources/test-cases-java21/jbang/keepsDirectiveBeforeFirstLineOfCode-FILES.case diff --git a/open-java-format/src/test/resources/test-cases/jbang/keepsDirectiveBeforeFirstLineOfCode-GAV.case b/open-java-format/src/test/resources/test-cases-java21/jbang/keepsDirectiveBeforeFirstLineOfCode-GAV.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/jbang/keepsDirectiveBeforeFirstLineOfCode-GAV.case rename to open-java-format/src/test/resources/test-cases-java21/jbang/keepsDirectiveBeforeFirstLineOfCode-GAV.case diff --git a/open-java-format/src/test/resources/test-cases/jbang/keepsDirectiveBeforeFirstLineOfCode-GROOVY.case b/open-java-format/src/test/resources/test-cases-java21/jbang/keepsDirectiveBeforeFirstLineOfCode-GROOVY.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/jbang/keepsDirectiveBeforeFirstLineOfCode-GROOVY.case rename to open-java-format/src/test/resources/test-cases-java21/jbang/keepsDirectiveBeforeFirstLineOfCode-GROOVY.case diff --git a/open-java-format/src/test/resources/test-cases/jbang/keepsDirectiveBeforeFirstLineOfCode-JAVA.case b/open-java-format/src/test/resources/test-cases-java21/jbang/keepsDirectiveBeforeFirstLineOfCode-JAVA.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/jbang/keepsDirectiveBeforeFirstLineOfCode-JAVA.case rename to open-java-format/src/test/resources/test-cases-java21/jbang/keepsDirectiveBeforeFirstLineOfCode-JAVA.case diff --git a/open-java-format/src/test/resources/test-cases/jbang/keepsDirectiveBeforeFirstLineOfCode-JAVAAGENT.case b/open-java-format/src/test/resources/test-cases-java21/jbang/keepsDirectiveBeforeFirstLineOfCode-JAVAAGENT.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/jbang/keepsDirectiveBeforeFirstLineOfCode-JAVAAGENT.case rename to open-java-format/src/test/resources/test-cases-java21/jbang/keepsDirectiveBeforeFirstLineOfCode-JAVAAGENT.case diff --git a/open-java-format/src/test/resources/test-cases/jbang/keepsDirectiveBeforeFirstLineOfCode-JAVAC_OPTIONS.case b/open-java-format/src/test/resources/test-cases-java21/jbang/keepsDirectiveBeforeFirstLineOfCode-JAVAC_OPTIONS.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/jbang/keepsDirectiveBeforeFirstLineOfCode-JAVAC_OPTIONS.case rename to open-java-format/src/test/resources/test-cases-java21/jbang/keepsDirectiveBeforeFirstLineOfCode-JAVAC_OPTIONS.case diff --git a/open-java-format/src/test/resources/test-cases/jbang/keepsDirectiveBeforeFirstLineOfCode-JAVA_OPTIONS.case b/open-java-format/src/test/resources/test-cases-java21/jbang/keepsDirectiveBeforeFirstLineOfCode-JAVA_OPTIONS.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/jbang/keepsDirectiveBeforeFirstLineOfCode-JAVA_OPTIONS.case rename to open-java-format/src/test/resources/test-cases-java21/jbang/keepsDirectiveBeforeFirstLineOfCode-JAVA_OPTIONS.case diff --git a/open-java-format/src/test/resources/test-cases/jbang/keepsDirectiveBeforeFirstLineOfCode-KOTLIN.case b/open-java-format/src/test/resources/test-cases-java21/jbang/keepsDirectiveBeforeFirstLineOfCode-KOTLIN.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/jbang/keepsDirectiveBeforeFirstLineOfCode-KOTLIN.case rename to open-java-format/src/test/resources/test-cases-java21/jbang/keepsDirectiveBeforeFirstLineOfCode-KOTLIN.case diff --git a/open-java-format/src/test/resources/test-cases/jbang/keepsDirectiveBeforeFirstLineOfCode-MAIN.case b/open-java-format/src/test/resources/test-cases-java21/jbang/keepsDirectiveBeforeFirstLineOfCode-MAIN.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/jbang/keepsDirectiveBeforeFirstLineOfCode-MAIN.case rename to open-java-format/src/test/resources/test-cases-java21/jbang/keepsDirectiveBeforeFirstLineOfCode-MAIN.case diff --git a/open-java-format/src/test/resources/test-cases/jbang/keepsDirectiveBeforeFirstLineOfCode-MANIFEST.case b/open-java-format/src/test/resources/test-cases-java21/jbang/keepsDirectiveBeforeFirstLineOfCode-MANIFEST.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/jbang/keepsDirectiveBeforeFirstLineOfCode-MANIFEST.case rename to open-java-format/src/test/resources/test-cases-java21/jbang/keepsDirectiveBeforeFirstLineOfCode-MANIFEST.case diff --git a/open-java-format/src/test/resources/test-cases/jbang/keepsDirectiveBeforeFirstLineOfCode-MODULE.case b/open-java-format/src/test/resources/test-cases-java21/jbang/keepsDirectiveBeforeFirstLineOfCode-MODULE.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/jbang/keepsDirectiveBeforeFirstLineOfCode-MODULE.case rename to open-java-format/src/test/resources/test-cases-java21/jbang/keepsDirectiveBeforeFirstLineOfCode-MODULE.case diff --git a/open-java-format/src/test/resources/test-cases/jbang/keepsDirectiveBeforeFirstLineOfCode-NATIVE_OPTIONS.case b/open-java-format/src/test/resources/test-cases-java21/jbang/keepsDirectiveBeforeFirstLineOfCode-NATIVE_OPTIONS.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/jbang/keepsDirectiveBeforeFirstLineOfCode-NATIVE_OPTIONS.case rename to open-java-format/src/test/resources/test-cases-java21/jbang/keepsDirectiveBeforeFirstLineOfCode-NATIVE_OPTIONS.case diff --git a/open-java-format/src/test/resources/test-cases/jbang/keepsDirectiveBeforeFirstLineOfCode-NOINTEGRATIONS.case b/open-java-format/src/test/resources/test-cases-java21/jbang/keepsDirectiveBeforeFirstLineOfCode-NOINTEGRATIONS.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/jbang/keepsDirectiveBeforeFirstLineOfCode-NOINTEGRATIONS.case rename to open-java-format/src/test/resources/test-cases-java21/jbang/keepsDirectiveBeforeFirstLineOfCode-NOINTEGRATIONS.case diff --git a/open-java-format/src/test/resources/test-cases/jbang/keepsDirectiveBeforeFirstLineOfCode-PREVIEW.case b/open-java-format/src/test/resources/test-cases-java21/jbang/keepsDirectiveBeforeFirstLineOfCode-PREVIEW.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/jbang/keepsDirectiveBeforeFirstLineOfCode-PREVIEW.case rename to open-java-format/src/test/resources/test-cases-java21/jbang/keepsDirectiveBeforeFirstLineOfCode-PREVIEW.case diff --git a/open-java-format/src/test/resources/test-cases/jbang/keepsDirectiveBeforeFirstLineOfCode-Q-CONFIG.case b/open-java-format/src/test/resources/test-cases-java21/jbang/keepsDirectiveBeforeFirstLineOfCode-Q-CONFIG.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/jbang/keepsDirectiveBeforeFirstLineOfCode-Q-CONFIG.case rename to open-java-format/src/test/resources/test-cases-java21/jbang/keepsDirectiveBeforeFirstLineOfCode-Q-CONFIG.case diff --git a/open-java-format/src/test/resources/test-cases/jbang/keepsDirectiveBeforeFirstLineOfCode-REPOS.case b/open-java-format/src/test/resources/test-cases-java21/jbang/keepsDirectiveBeforeFirstLineOfCode-REPOS.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/jbang/keepsDirectiveBeforeFirstLineOfCode-REPOS.case rename to open-java-format/src/test/resources/test-cases-java21/jbang/keepsDirectiveBeforeFirstLineOfCode-REPOS.case diff --git a/open-java-format/src/test/resources/test-cases/jbang/keepsDirectiveBeforeFirstLineOfCode-RUNTIME_OPTIONS.case b/open-java-format/src/test/resources/test-cases-java21/jbang/keepsDirectiveBeforeFirstLineOfCode-RUNTIME_OPTIONS.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/jbang/keepsDirectiveBeforeFirstLineOfCode-RUNTIME_OPTIONS.case rename to open-java-format/src/test/resources/test-cases-java21/jbang/keepsDirectiveBeforeFirstLineOfCode-RUNTIME_OPTIONS.case diff --git a/open-java-format/src/test/resources/test-cases/jbang/keepsDirectiveBeforeFirstLineOfCode-SOURCES.case b/open-java-format/src/test/resources/test-cases-java21/jbang/keepsDirectiveBeforeFirstLineOfCode-SOURCES.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/jbang/keepsDirectiveBeforeFirstLineOfCode-SOURCES.case rename to open-java-format/src/test/resources/test-cases-java21/jbang/keepsDirectiveBeforeFirstLineOfCode-SOURCES.case diff --git a/open-java-format/src/test/resources/test-cases/lineCommentContinuedAfterABlockComment.case b/open-java-format/src/test/resources/test-cases-java21/lineCommentContinuedAfterABlockComment.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/lineCommentContinuedAfterABlockComment.case rename to open-java-format/src/test/resources/test-cases-java21/lineCommentContinuedAfterABlockComment.case diff --git a/open-java-format/src/test/resources/test-cases/lineCommentContinuedAfterOperators.case b/open-java-format/src/test/resources/test-cases-java21/lineCommentContinuedAfterOperators.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/lineCommentContinuedAfterOperators.case rename to open-java-format/src/test/resources/test-cases-java21/lineCommentContinuedAfterOperators.case diff --git a/open-java-format/src/test/resources/test-cases/lineCommentContinuedOnTheNextLine.case b/open-java-format/src/test/resources/test-cases-java21/lineCommentContinuedOnTheNextLine.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/lineCommentContinuedOnTheNextLine.case rename to open-java-format/src/test/resources/test-cases-java21/lineCommentContinuedOnTheNextLine.case diff --git a/open-java-format/src/test/resources/test-cases/lineCommentGetsItsMissingSpaceExceptIdeMarkers.case b/open-java-format/src/test/resources/test-cases-java21/lineCommentGetsItsMissingSpaceExceptIdeMarkers.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/lineCommentGetsItsMissingSpaceExceptIdeMarkers.case rename to open-java-format/src/test/resources/test-cases-java21/lineCommentGetsItsMissingSpaceExceptIdeMarkers.case diff --git a/open-java-format/src/test/resources/test-cases/lineCommentThatFitsOnceTheCodeBreaks.case b/open-java-format/src/test/resources/test-cases-java21/lineCommentThatFitsOnceTheCodeBreaks.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/lineCommentThatFitsOnceTheCodeBreaks.case rename to open-java-format/src/test/resources/test-cases-java21/lineCommentThatFitsOnceTheCodeBreaks.case diff --git a/open-java-format/src/test/resources/test-cases/lineCommentTrailingBlank.case b/open-java-format/src/test/resources/test-cases-java21/lineCommentTrailingBlank.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/lineCommentTrailingBlank.case rename to open-java-format/src/test/resources/test-cases-java21/lineCommentTrailingBlank.case diff --git a/open-java-format/src/test/resources/test-cases/lineCommentTrailingThinSpace.case b/open-java-format/src/test/resources/test-cases-java21/lineCommentTrailingThinSpace.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/lineCommentTrailingThinSpace.case rename to open-java-format/src/test/resources/test-cases-java21/lineCommentTrailingThinSpace.case diff --git a/open-java-format/src/test/resources/test-cases/noBlankAfterLineCommentWithInteriorBlankLine.case b/open-java-format/src/test/resources/test-cases-java21/noBlankAfterLineCommentWithInteriorBlankLine.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/noBlankAfterLineCommentWithInteriorBlankLine.case rename to open-java-format/src/test/resources/test-cases-java21/noBlankAfterLineCommentWithInteriorBlankLine.case diff --git a/open-java-format/src/test/resources/test-cases/nonNlsMarkersStayOnTheLineOfTheirLiteral.case b/open-java-format/src/test/resources/test-cases-java21/nonNlsMarkersStayOnTheLineOfTheirLiteral.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/nonNlsMarkersStayOnTheLineOfTheirLiteral.case rename to open-java-format/src/test/resources/test-cases-java21/nonNlsMarkersStayOnTheLineOfTheirLiteral.case diff --git a/open-java-format/src/test/resources/test-cases/onlyWrapLineCommentOnWhitespace.case b/open-java-format/src/test/resources/test-cases-java21/onlyWrapLineCommentOnWhitespace.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/onlyWrapLineCommentOnWhitespace.case rename to open-java-format/src/test/resources/test-cases-java21/onlyWrapLineCommentOnWhitespace.case diff --git a/open-java-format/src/test/resources/test-cases/onlyWrapLineCommentOnWhitespace_noLeadingWhitespace.case b/open-java-format/src/test/resources/test-cases-java21/onlyWrapLineCommentOnWhitespace_noLeadingWhitespace.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/onlyWrapLineCommentOnWhitespace_noLeadingWhitespace.case rename to open-java-format/src/test/resources/test-cases-java21/onlyWrapLineCommentOnWhitespace_noLeadingWhitespace.case diff --git a/open-java-format/src/test/resources/test-cases/removeTrailingTabsInComments.case b/open-java-format/src/test/resources/test-cases-java21/removeTrailingTabsInComments.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/removeTrailingTabsInComments.case rename to open-java-format/src/test/resources/test-cases-java21/removeTrailingTabsInComments.case diff --git a/open-java-format/src/test/resources/test-cases/stringEscapeLength.case b/open-java-format/src/test/resources/test-cases-java21/stringEscapeLength.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/stringEscapeLength.case rename to open-java-format/src/test/resources/test-cases-java21/stringEscapeLength.case diff --git a/open-java-format/src/test/resources/test-cases/stringwrapper/0-cr.case b/open-java-format/src/test/resources/test-cases-java21/stringwrapper/0-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/stringwrapper/0-cr.case rename to open-java-format/src/test/resources/test-cases-java21/stringwrapper/0-cr.case diff --git a/open-java-format/src/test/resources/test-cases/stringwrapper/0-crlf.case b/open-java-format/src/test/resources/test-cases-java21/stringwrapper/0-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/stringwrapper/0-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/stringwrapper/0-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/stringwrapper/0-lf.case b/open-java-format/src/test/resources/test-cases-java21/stringwrapper/0-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/stringwrapper/0-lf.case rename to open-java-format/src/test/resources/test-cases-java21/stringwrapper/0-lf.case diff --git a/open-java-format/src/test/resources/test-cases/stringwrapper/1-cr.case b/open-java-format/src/test/resources/test-cases-java21/stringwrapper/1-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/stringwrapper/1-cr.case rename to open-java-format/src/test/resources/test-cases-java21/stringwrapper/1-cr.case diff --git a/open-java-format/src/test/resources/test-cases/stringwrapper/1-crlf.case b/open-java-format/src/test/resources/test-cases-java21/stringwrapper/1-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/stringwrapper/1-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/stringwrapper/1-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/stringwrapper/1-lf.case b/open-java-format/src/test/resources/test-cases-java21/stringwrapper/1-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/stringwrapper/1-lf.case rename to open-java-format/src/test/resources/test-cases-java21/stringwrapper/1-lf.case diff --git a/open-java-format/src/test/resources/test-cases/stringwrapper/10-cr.case b/open-java-format/src/test/resources/test-cases-java21/stringwrapper/10-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/stringwrapper/10-cr.case rename to open-java-format/src/test/resources/test-cases-java21/stringwrapper/10-cr.case diff --git a/open-java-format/src/test/resources/test-cases/stringwrapper/10-crlf.case b/open-java-format/src/test/resources/test-cases-java21/stringwrapper/10-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/stringwrapper/10-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/stringwrapper/10-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/stringwrapper/10-lf.case b/open-java-format/src/test/resources/test-cases-java21/stringwrapper/10-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/stringwrapper/10-lf.case rename to open-java-format/src/test/resources/test-cases-java21/stringwrapper/10-lf.case diff --git a/open-java-format/src/test/resources/test-cases/stringwrapper/11-cr.case b/open-java-format/src/test/resources/test-cases-java21/stringwrapper/11-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/stringwrapper/11-cr.case rename to open-java-format/src/test/resources/test-cases-java21/stringwrapper/11-cr.case diff --git a/open-java-format/src/test/resources/test-cases/stringwrapper/11-crlf.case b/open-java-format/src/test/resources/test-cases-java21/stringwrapper/11-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/stringwrapper/11-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/stringwrapper/11-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/stringwrapper/11-lf.case b/open-java-format/src/test/resources/test-cases-java21/stringwrapper/11-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/stringwrapper/11-lf.case rename to open-java-format/src/test/resources/test-cases-java21/stringwrapper/11-lf.case diff --git a/open-java-format/src/test/resources/test-cases/stringwrapper/12-cr.case b/open-java-format/src/test/resources/test-cases-java21/stringwrapper/12-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/stringwrapper/12-cr.case rename to open-java-format/src/test/resources/test-cases-java21/stringwrapper/12-cr.case diff --git a/open-java-format/src/test/resources/test-cases/stringwrapper/12-crlf.case b/open-java-format/src/test/resources/test-cases-java21/stringwrapper/12-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/stringwrapper/12-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/stringwrapper/12-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/stringwrapper/12-lf.case b/open-java-format/src/test/resources/test-cases-java21/stringwrapper/12-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/stringwrapper/12-lf.case rename to open-java-format/src/test/resources/test-cases-java21/stringwrapper/12-lf.case diff --git a/open-java-format/src/test/resources/test-cases/stringwrapper/13-cr.case b/open-java-format/src/test/resources/test-cases-java21/stringwrapper/13-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/stringwrapper/13-cr.case rename to open-java-format/src/test/resources/test-cases-java21/stringwrapper/13-cr.case diff --git a/open-java-format/src/test/resources/test-cases/stringwrapper/13-crlf.case b/open-java-format/src/test/resources/test-cases-java21/stringwrapper/13-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/stringwrapper/13-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/stringwrapper/13-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/stringwrapper/13-lf.case b/open-java-format/src/test/resources/test-cases-java21/stringwrapper/13-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/stringwrapper/13-lf.case rename to open-java-format/src/test/resources/test-cases-java21/stringwrapper/13-lf.case diff --git a/open-java-format/src/test/resources/test-cases/stringwrapper/14-cr.case b/open-java-format/src/test/resources/test-cases-java21/stringwrapper/14-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/stringwrapper/14-cr.case rename to open-java-format/src/test/resources/test-cases-java21/stringwrapper/14-cr.case diff --git a/open-java-format/src/test/resources/test-cases/stringwrapper/14-crlf.case b/open-java-format/src/test/resources/test-cases-java21/stringwrapper/14-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/stringwrapper/14-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/stringwrapper/14-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/stringwrapper/14-lf.case b/open-java-format/src/test/resources/test-cases-java21/stringwrapper/14-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/stringwrapper/14-lf.case rename to open-java-format/src/test/resources/test-cases-java21/stringwrapper/14-lf.case diff --git a/open-java-format/src/test/resources/test-cases/stringwrapper/15-cr.case b/open-java-format/src/test/resources/test-cases-java21/stringwrapper/15-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/stringwrapper/15-cr.case rename to open-java-format/src/test/resources/test-cases-java21/stringwrapper/15-cr.case diff --git a/open-java-format/src/test/resources/test-cases/stringwrapper/15-crlf.case b/open-java-format/src/test/resources/test-cases-java21/stringwrapper/15-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/stringwrapper/15-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/stringwrapper/15-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/stringwrapper/15-lf.case b/open-java-format/src/test/resources/test-cases-java21/stringwrapper/15-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/stringwrapper/15-lf.case rename to open-java-format/src/test/resources/test-cases-java21/stringwrapper/15-lf.case diff --git a/open-java-format/src/test/resources/test-cases/stringwrapper/16-cr.case b/open-java-format/src/test/resources/test-cases-java21/stringwrapper/16-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/stringwrapper/16-cr.case rename to open-java-format/src/test/resources/test-cases-java21/stringwrapper/16-cr.case diff --git a/open-java-format/src/test/resources/test-cases/stringwrapper/16-crlf.case b/open-java-format/src/test/resources/test-cases-java21/stringwrapper/16-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/stringwrapper/16-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/stringwrapper/16-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/stringwrapper/16-lf.case b/open-java-format/src/test/resources/test-cases-java21/stringwrapper/16-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/stringwrapper/16-lf.case rename to open-java-format/src/test/resources/test-cases-java21/stringwrapper/16-lf.case diff --git a/open-java-format/src/test/resources/test-cases/stringwrapper/2-cr.case b/open-java-format/src/test/resources/test-cases-java21/stringwrapper/2-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/stringwrapper/2-cr.case rename to open-java-format/src/test/resources/test-cases-java21/stringwrapper/2-cr.case diff --git a/open-java-format/src/test/resources/test-cases/stringwrapper/2-crlf.case b/open-java-format/src/test/resources/test-cases-java21/stringwrapper/2-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/stringwrapper/2-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/stringwrapper/2-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/stringwrapper/2-lf.case b/open-java-format/src/test/resources/test-cases-java21/stringwrapper/2-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/stringwrapper/2-lf.case rename to open-java-format/src/test/resources/test-cases-java21/stringwrapper/2-lf.case diff --git a/open-java-format/src/test/resources/test-cases/stringwrapper/3-cr.case b/open-java-format/src/test/resources/test-cases-java21/stringwrapper/3-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/stringwrapper/3-cr.case rename to open-java-format/src/test/resources/test-cases-java21/stringwrapper/3-cr.case diff --git a/open-java-format/src/test/resources/test-cases/stringwrapper/3-crlf.case b/open-java-format/src/test/resources/test-cases-java21/stringwrapper/3-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/stringwrapper/3-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/stringwrapper/3-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/stringwrapper/3-lf.case b/open-java-format/src/test/resources/test-cases-java21/stringwrapper/3-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/stringwrapper/3-lf.case rename to open-java-format/src/test/resources/test-cases-java21/stringwrapper/3-lf.case diff --git a/open-java-format/src/test/resources/test-cases/stringwrapper/4-cr.case b/open-java-format/src/test/resources/test-cases-java21/stringwrapper/4-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/stringwrapper/4-cr.case rename to open-java-format/src/test/resources/test-cases-java21/stringwrapper/4-cr.case diff --git a/open-java-format/src/test/resources/test-cases/stringwrapper/4-crlf.case b/open-java-format/src/test/resources/test-cases-java21/stringwrapper/4-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/stringwrapper/4-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/stringwrapper/4-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/stringwrapper/4-lf.case b/open-java-format/src/test/resources/test-cases-java21/stringwrapper/4-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/stringwrapper/4-lf.case rename to open-java-format/src/test/resources/test-cases-java21/stringwrapper/4-lf.case diff --git a/open-java-format/src/test/resources/test-cases/stringwrapper/5-cr.case b/open-java-format/src/test/resources/test-cases-java21/stringwrapper/5-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/stringwrapper/5-cr.case rename to open-java-format/src/test/resources/test-cases-java21/stringwrapper/5-cr.case diff --git a/open-java-format/src/test/resources/test-cases/stringwrapper/5-crlf.case b/open-java-format/src/test/resources/test-cases-java21/stringwrapper/5-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/stringwrapper/5-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/stringwrapper/5-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/stringwrapper/5-lf.case b/open-java-format/src/test/resources/test-cases-java21/stringwrapper/5-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/stringwrapper/5-lf.case rename to open-java-format/src/test/resources/test-cases-java21/stringwrapper/5-lf.case diff --git a/open-java-format/src/test/resources/test-cases/stringwrapper/6-cr.case b/open-java-format/src/test/resources/test-cases-java21/stringwrapper/6-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/stringwrapper/6-cr.case rename to open-java-format/src/test/resources/test-cases-java21/stringwrapper/6-cr.case diff --git a/open-java-format/src/test/resources/test-cases/stringwrapper/6-crlf.case b/open-java-format/src/test/resources/test-cases-java21/stringwrapper/6-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/stringwrapper/6-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/stringwrapper/6-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/stringwrapper/6-lf.case b/open-java-format/src/test/resources/test-cases-java21/stringwrapper/6-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/stringwrapper/6-lf.case rename to open-java-format/src/test/resources/test-cases-java21/stringwrapper/6-lf.case diff --git a/open-java-format/src/test/resources/test-cases/stringwrapper/7-cr.case b/open-java-format/src/test/resources/test-cases-java21/stringwrapper/7-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/stringwrapper/7-cr.case rename to open-java-format/src/test/resources/test-cases-java21/stringwrapper/7-cr.case diff --git a/open-java-format/src/test/resources/test-cases/stringwrapper/7-crlf.case b/open-java-format/src/test/resources/test-cases-java21/stringwrapper/7-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/stringwrapper/7-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/stringwrapper/7-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/stringwrapper/7-lf.case b/open-java-format/src/test/resources/test-cases-java21/stringwrapper/7-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/stringwrapper/7-lf.case rename to open-java-format/src/test/resources/test-cases-java21/stringwrapper/7-lf.case diff --git a/open-java-format/src/test/resources/test-cases/stringwrapper/8-cr.case b/open-java-format/src/test/resources/test-cases-java21/stringwrapper/8-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/stringwrapper/8-cr.case rename to open-java-format/src/test/resources/test-cases-java21/stringwrapper/8-cr.case diff --git a/open-java-format/src/test/resources/test-cases/stringwrapper/8-crlf.case b/open-java-format/src/test/resources/test-cases-java21/stringwrapper/8-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/stringwrapper/8-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/stringwrapper/8-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/stringwrapper/8-lf.case b/open-java-format/src/test/resources/test-cases-java21/stringwrapper/8-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/stringwrapper/8-lf.case rename to open-java-format/src/test/resources/test-cases-java21/stringwrapper/8-lf.case diff --git a/open-java-format/src/test/resources/test-cases/stringwrapper/9-cr.case b/open-java-format/src/test/resources/test-cases-java21/stringwrapper/9-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/stringwrapper/9-cr.case rename to open-java-format/src/test/resources/test-cases-java21/stringwrapper/9-cr.case diff --git a/open-java-format/src/test/resources/test-cases/stringwrapper/9-crlf.case b/open-java-format/src/test/resources/test-cases-java21/stringwrapper/9-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/stringwrapper/9-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/stringwrapper/9-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/stringwrapper/9-lf.case b/open-java-format/src/test/resources/test-cases-java21/stringwrapper/9-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/stringwrapper/9-lf.case rename to open-java-format/src/test/resources/test-cases-java21/stringwrapper/9-lf.case diff --git a/open-java-format/src/test/resources/test-cases/stringwrapper/adjacentLiteralsAreJoined.case b/open-java-format/src/test/resources/test-cases-java21/stringwrapper/adjacentLiteralsAreJoined.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/stringwrapper/adjacentLiteralsAreJoined.case rename to open-java-format/src/test/resources/test-cases-java21/stringwrapper/adjacentLiteralsAreJoined.case diff --git a/open-java-format/src/test/resources/test-cases/stringwrapper/adjacentLiteralsThatStayApart.case b/open-java-format/src/test/resources/test-cases-java21/stringwrapper/adjacentLiteralsThatStayApart.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/stringwrapper/adjacentLiteralsThatStayApart.case rename to open-java-format/src/test/resources/test-cases-java21/stringwrapper/adjacentLiteralsThatStayApart.case diff --git a/open-java-format/src/test/resources/test-cases/stringwrapper/ojf-issue-23-marked-literals-cr.case b/open-java-format/src/test/resources/test-cases-java21/stringwrapper/ojf-issue-23-marked-literals-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/stringwrapper/ojf-issue-23-marked-literals-cr.case rename to open-java-format/src/test/resources/test-cases-java21/stringwrapper/ojf-issue-23-marked-literals-cr.case diff --git a/open-java-format/src/test/resources/test-cases/stringwrapper/ojf-issue-23-marked-literals-crlf.case b/open-java-format/src/test/resources/test-cases-java21/stringwrapper/ojf-issue-23-marked-literals-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/stringwrapper/ojf-issue-23-marked-literals-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/stringwrapper/ojf-issue-23-marked-literals-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/stringwrapper/ojf-issue-23-marked-literals-lf.case b/open-java-format/src/test/resources/test-cases-java21/stringwrapper/ojf-issue-23-marked-literals-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/stringwrapper/ojf-issue-23-marked-literals-lf.case rename to open-java-format/src/test/resources/test-cases-java21/stringwrapper/ojf-issue-23-marked-literals-lf.case diff --git a/open-java-format/src/test/resources/test-cases/tablesAfterMultiCharacterOperators.case b/open-java-format/src/test/resources/test-cases-java21/tablesAfterMultiCharacterOperators.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/tablesAfterMultiCharacterOperators.case rename to open-java-format/src/test/resources/test-cases-java21/tablesAfterMultiCharacterOperators.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/A-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/A-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/A-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/A-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/A-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/A-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/A-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/A-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/A-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/A-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/A-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/A-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/AnnotationFields-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/AnnotationFields-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/AnnotationFields-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/AnnotationFields-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/AnnotationFields-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/AnnotationFields-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/AnnotationFields-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/AnnotationFields-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/AnnotationFields-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/AnnotationFields-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/AnnotationFields-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/AnnotationFields-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B112853497-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B112853497-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B112853497-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B112853497-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B112853497-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B112853497-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B112853497-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B112853497-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B112853497-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B112853497-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B112853497-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B112853497-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B124394008-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B124394008-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B124394008-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B124394008-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B124394008-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B124394008-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B124394008-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B124394008-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B124394008-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B124394008-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B124394008-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B124394008-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B126411718-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B126411718-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B126411718-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B126411718-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B126411718-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B126411718-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B126411718-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B126411718-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B126411718-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B126411718-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B126411718-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B126411718-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B183431894-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B183431894-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B183431894-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B183431894-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B183431894-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B183431894-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B183431894-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B183431894-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B183431894-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B183431894-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B183431894-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B183431894-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B18479811-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B18479811-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B18479811-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B18479811-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B18479811-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B18479811-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B18479811-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B18479811-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B18479811-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B18479811-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B18479811-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B18479811-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B19950219-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B19950219-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B19950219-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B19950219-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B19950219-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B19950219-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B19950219-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B19950219-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B19950219-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B19950219-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B19950219-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B19950219-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B19950468-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B19950468-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B19950468-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B19950468-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B19950468-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B19950468-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B19950468-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B19950468-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B19950468-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B19950468-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B19950468-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B19950468-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B19950815-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B19950815-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B19950815-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B19950815-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B19950815-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B19950815-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B19950815-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B19950815-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B19950815-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B19950815-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B19950815-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B19950815-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B19996259-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B19996259-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B19996259-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B19996259-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B19996259-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B19996259-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B19996259-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B19996259-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B19996259-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B19996259-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B19996259-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B19996259-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B20128174-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B20128174-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B20128174-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B20128174-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B20128174-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B20128174-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B20128174-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B20128174-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B20128174-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B20128174-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B20128174-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B20128174-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B20128588-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B20128588-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B20128588-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B20128588-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B20128588-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B20128588-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B20128588-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B20128588-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B20128588-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B20128588-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B20128588-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B20128588-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B20128760-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B20128760-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B20128760-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B20128760-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B20128760-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B20128760-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B20128760-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B20128760-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B20128760-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B20128760-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B20128760-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B20128760-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B20128921-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B20128921-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B20128921-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B20128921-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B20128921-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B20128921-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B20128921-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B20128921-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B20128921-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B20128921-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B20128921-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B20128921-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B20341001-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B20341001-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B20341001-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B20341001-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B20341001-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B20341001-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B20341001-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B20341001-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B20341001-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B20341001-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B20341001-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B20341001-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B20524742-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B20524742-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B20524742-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B20524742-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B20524742-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B20524742-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B20524742-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B20524742-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B20524742-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B20524742-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B20524742-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B20524742-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B20529113-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B20529113-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B20529113-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B20529113-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B20529113-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B20529113-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B20529113-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B20529113-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B20529113-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B20529113-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B20529113-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B20529113-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B20531711-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B20531711-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B20531711-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B20531711-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B20531711-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B20531711-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B20531711-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B20531711-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B20531711-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B20531711-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B20531711-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B20531711-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B20535125-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B20535125-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B20535125-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B20535125-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B20535125-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B20535125-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B20535125-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B20535125-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B20535125-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B20535125-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B20535125-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B20535125-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B20567842-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B20567842-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B20567842-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B20567842-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B20567842-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B20567842-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B20567842-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B20567842-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B20567842-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B20567842-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B20567842-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B20567842-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B20569245-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B20569245-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B20569245-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B20569245-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B20569245-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B20569245-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B20569245-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B20569245-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B20569245-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B20569245-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B20569245-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B20569245-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B20577626-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B20577626-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B20577626-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B20577626-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B20577626-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B20577626-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B20577626-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B20577626-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B20577626-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B20577626-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B20577626-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B20577626-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B20578077-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B20578077-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B20578077-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B20578077-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B20578077-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B20578077-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B20578077-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B20578077-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B20578077-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B20578077-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B20578077-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B20578077-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B20580212-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B20580212-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B20580212-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B20580212-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B20580212-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B20580212-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B20580212-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B20580212-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B20580212-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B20580212-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B20580212-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B20580212-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B20701054-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B20701054-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B20701054-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B20701054-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B20701054-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B20701054-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B20701054-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B20701054-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B20701054-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B20701054-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B20701054-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B20701054-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B20844369-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B20844369-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B20844369-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B20844369-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B20844369-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B20844369-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B20844369-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B20844369-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B20844369-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B20844369-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B20844369-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B20844369-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B20915776-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B20915776-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B20915776-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B20915776-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B20915776-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B20915776-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B20915776-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B20915776-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B20915776-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B20915776-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B20915776-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B20915776-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B21031147-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B21031147-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B21031147-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B21031147-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B21031147-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B21031147-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B21031147-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B21031147-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B21031147-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B21031147-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B21031147-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B21031147-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B21105569-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B21105569-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B21105569-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B21105569-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B21105569-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B21105569-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B21105569-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B21105569-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B21105569-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B21105569-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B21105569-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B21105569-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B21185365-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B21185365-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B21185365-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B21185365-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B21185365-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B21185365-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B21185365-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B21185365-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B21185365-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B21185365-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B21185365-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B21185365-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B21192435-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B21192435-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B21192435-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B21192435-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B21192435-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B21192435-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B21192435-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B21192435-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B21192435-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B21192435-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B21192435-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B21192435-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B21278211-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B21278211-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B21278211-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B21278211-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B21278211-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B21278211-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B21278211-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B21278211-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B21278211-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B21278211-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B21278211-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B21278211-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B21283374-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B21283374-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B21283374-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B21283374-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B21283374-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B21283374-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B21283374-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B21283374-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B21283374-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B21283374-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B21283374-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B21283374-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B21305044-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B21305044-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B21305044-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B21305044-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B21305044-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B21305044-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B21305044-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B21305044-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B21305044-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B21305044-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B21305044-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B21305044-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B21327412-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B21327412-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B21327412-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B21327412-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B21327412-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B21327412-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B21327412-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B21327412-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B21327412-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B21327412-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B21327412-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B21327412-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B21329312-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B21329312-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B21329312-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B21329312-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B21329312-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B21329312-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B21329312-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B21329312-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B21329312-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B21329312-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B21329312-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B21329312-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B21331232-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B21331232-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B21331232-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B21331232-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B21331232-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B21331232-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B21331232-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B21331232-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B21331232-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B21331232-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B21331232-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B21331232-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B21465217-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B21465217-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B21465217-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B21465217-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B21465217-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B21465217-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B21465217-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B21465217-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B21465217-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B21465217-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B21465217-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B21465217-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B21465477-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B21465477-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B21465477-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B21465477-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B21465477-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B21465477-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B21465477-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B21465477-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B21465477-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B21465477-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B21465477-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B21465477-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B21585653-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B21585653-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B21585653-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B21585653-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B21585653-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B21585653-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B21585653-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B21585653-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B21585653-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B21585653-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B21585653-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B21585653-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B21608216-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B21608216-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B21608216-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B21608216-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B21608216-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B21608216-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B21608216-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B21608216-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B21608216-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B21608216-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B21608216-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B21608216-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B21954779-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B21954779-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B21954779-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B21954779-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B21954779-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B21954779-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B21954779-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B21954779-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B21954779-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B21954779-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B21954779-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B21954779-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B22166687-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B22166687-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B22166687-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B22166687-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B22166687-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B22166687-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B22166687-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B22166687-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B22166687-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B22166687-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B22166687-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B22166687-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B22169269-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B22169269-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B22169269-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B22169269-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B22169269-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B22169269-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B22169269-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B22169269-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B22169269-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B22169269-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B22169269-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B22169269-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B22424362-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B22424362-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B22424362-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B22424362-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B22424362-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B22424362-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B22424362-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B22424362-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B22424362-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B22424362-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B22424362-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B22424362-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B22469536-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B22469536-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B22469536-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B22469536-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B22469536-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B22469536-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B22469536-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B22469536-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B22469536-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B22469536-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B22469536-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B22469536-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B22488373-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B22488373-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B22488373-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B22488373-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B22488373-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B22488373-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B22488373-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B22488373-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B22488373-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B22488373-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B22488373-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B22488373-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B22610221-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B22610221-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B22610221-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B22610221-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B22610221-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B22610221-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B22610221-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B22610221-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B22610221-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B22610221-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B22610221-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B22610221-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B22815364-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B22815364-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B22815364-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B22815364-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B22815364-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B22815364-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B22815364-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B22815364-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B22815364-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B22815364-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B22815364-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B22815364-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B22848286-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B22848286-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B22848286-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B22848286-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B22848286-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B22848286-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B22848286-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B22848286-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B22848286-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B22848286-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B22848286-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B22848286-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B22873322-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B22873322-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B22873322-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B22873322-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B22873322-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B22873322-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B22873322-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B22873322-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B22873322-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B22873322-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B22873322-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B22873322-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B22913048-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B22913048-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B22913048-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B22913048-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B22913048-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B22913048-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B22913048-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B22913048-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B22913048-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B22913048-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B22913048-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B22913048-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B23349153-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B23349153-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B23349153-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B23349153-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B23349153-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B23349153-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B23349153-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B23349153-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B23349153-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B23349153-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B23349153-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B23349153-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B23514513-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B23514513-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B23514513-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B23514513-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B23514513-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B23514513-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B23514513-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B23514513-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B23514513-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B23514513-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B23514513-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B23514513-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B23626035-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B23626035-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B23626035-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B23626035-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B23626035-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B23626035-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B23626035-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B23626035-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B23626035-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B23626035-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B23626035-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B23626035-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B23708487-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B23708487-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B23708487-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B23708487-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B23708487-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B23708487-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B23708487-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B23708487-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B23708487-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B23708487-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B23708487-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B23708487-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B23749160-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B23749160-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B23749160-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B23749160-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B23749160-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B23749160-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B23749160-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B23749160-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B23749160-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B23749160-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B23749160-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B23749160-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B23804934-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B23804934-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B23804934-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B23804934-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B23804934-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B23804934-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B23804934-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B23804934-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B23804934-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B23804934-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B23804934-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B23804934-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B24202287-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B24202287-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B24202287-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B24202287-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B24202287-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B24202287-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B24202287-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B24202287-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B24202287-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B24202287-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B24202287-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B24202287-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B24494875-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B24494875-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B24494875-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B24494875-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B24494875-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B24494875-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B24494875-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B24494875-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B24494875-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B24494875-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B24494875-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B24494875-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B24543625-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B24543625-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B24543625-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B24543625-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B24543625-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B24543625-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B24543625-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B24543625-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B24543625-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B24543625-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B24543625-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B24543625-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B24702438-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B24702438-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B24702438-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B24702438-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B24702438-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B24702438-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B24702438-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B24702438-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B24702438-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B24702438-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B24702438-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B24702438-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B24862959-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B24862959-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B24862959-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B24862959-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B24862959-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B24862959-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B24862959-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B24862959-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B24862959-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B24862959-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B24862959-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B24862959-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B24909927-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B24909927-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B24909927-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B24909927-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B24909927-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B24909927-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B24909927-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B24909927-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B24909927-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B24909927-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B24909927-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B24909927-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B24988078-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B24988078-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B24988078-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B24988078-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B24988078-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B24988078-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B24988078-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B24988078-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B24988078-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B24988078-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B24988078-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B24988078-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B25372815-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B25372815-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B25372815-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B25372815-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B25372815-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B25372815-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B25372815-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B25372815-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B25372815-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B25372815-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B25372815-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B25372815-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B25749989-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B25749989-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B25749989-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B25749989-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B25749989-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B25749989-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B25749989-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B25749989-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B25749989-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B25749989-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B25749989-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B25749989-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B25787055-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B25787055-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B25787055-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B25787055-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B25787055-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B25787055-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B25787055-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B25787055-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B25787055-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B25787055-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B25787055-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B25787055-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B25811323-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B25811323-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B25811323-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B25811323-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B25811323-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B25811323-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B25811323-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B25811323-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B25811323-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B25811323-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B25811323-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B25811323-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B26159561-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B26159561-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B26159561-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B26159561-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B26159561-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B26159561-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B26159561-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B26159561-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B26159561-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B26159561-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B26159561-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B26159561-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B26207047-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B26207047-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B26207047-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B26207047-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B26207047-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B26207047-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B26207047-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B26207047-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B26207047-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B26207047-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B26207047-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B26207047-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B26275739-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B26275739-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B26275739-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B26275739-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B26275739-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B26275739-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B26275739-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B26275739-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B26275739-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B26275739-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B26275739-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B26275739-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B26293162-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B26293162-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B26293162-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B26293162-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B26293162-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B26293162-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B26293162-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B26293162-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B26293162-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B26293162-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B26293162-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B26293162-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B26694550-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B26694550-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B26694550-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B26694550-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B26694550-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B26694550-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B26694550-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B26694550-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B26694550-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B26694550-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B26694550-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B26694550-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B26884608-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B26884608-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B26884608-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B26884608-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B26884608-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B26884608-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B26884608-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B26884608-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B26884608-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B26884608-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B26884608-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B26884608-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B26928842-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B26928842-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B26928842-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B26928842-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B26928842-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B26928842-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B26928842-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B26928842-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B26928842-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B26928842-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B26928842-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B26928842-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B26952926-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B26952926-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B26952926-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B26952926-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B26952926-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B26952926-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B26952926-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B26952926-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B26952926-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B26952926-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B26952926-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B26952926-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B27078833-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B27078833-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B27078833-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B27078833-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B27078833-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B27078833-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B27078833-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B27078833-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B27078833-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B27078833-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B27078833-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B27078833-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B27246427-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B27246427-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B27246427-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B27246427-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B27246427-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B27246427-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B27246427-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B27246427-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B27246427-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B27246427-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B27246427-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B27246427-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B27602933-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B27602933-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B27602933-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B27602933-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B27602933-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B27602933-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B27602933-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B27602933-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B27602933-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B27602933-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B27602933-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B27602933-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B28066276-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B28066276-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B28066276-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B28066276-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B28066276-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B28066276-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B28066276-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B28066276-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B28066276-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B28066276-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B28066276-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B28066276-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B28774859-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B28774859-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B28774859-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B28774859-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B28774859-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B28774859-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B28774859-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B28774859-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B28774859-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B28774859-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B28774859-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B28774859-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B28786284-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B28786284-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B28786284-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B28786284-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B28786284-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B28786284-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B28786284-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B28786284-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B28786284-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B28786284-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B28786284-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B28786284-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B29368546-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B29368546-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B29368546-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B29368546-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B29368546-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B29368546-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B29368546-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B29368546-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B29368546-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B29368546-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B29368546-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B29368546-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B29618429-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B29618429-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B29618429-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B29618429-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B29618429-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B29618429-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B29618429-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B29618429-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B29618429-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B29618429-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B29618429-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B29618429-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B29705613-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B29705613-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B29705613-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B29705613-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B29705613-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B29705613-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B29705613-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B29705613-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B29705613-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B29705613-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B29705613-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B29705613-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B30153869-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B30153869-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B30153869-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B30153869-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B30153869-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B30153869-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B30153869-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B30153869-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B30153869-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B30153869-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B30153869-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B30153869-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B30223986-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B30223986-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B30223986-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B30223986-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B30223986-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B30223986-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B30223986-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B30223986-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B30223986-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B30223986-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B30223986-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B30223986-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B30764810-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B30764810-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B30764810-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B30764810-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B30764810-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B30764810-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B30764810-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B30764810-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B30764810-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B30764810-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B30764810-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B30764810-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B30789352-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B30789352-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B30789352-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B30789352-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B30789352-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B30789352-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B30789352-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B30789352-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B30789352-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B30789352-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B30789352-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B30789352-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B308157568-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B308157568-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B308157568-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B308157568-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B308157568-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B308157568-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B308157568-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B308157568-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B308157568-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B308157568-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B308157568-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B308157568-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B32114928-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B32114928-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B32114928-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B32114928-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B32114928-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B32114928-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B32114928-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B32114928-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B32114928-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B32114928-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B32114928-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B32114928-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B32284705-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B32284705-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B32284705-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B32284705-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B32284705-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B32284705-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B32284705-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B32284705-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B32284705-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B32284705-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B32284705-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B32284705-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B32397217-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B32397217-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B32397217-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B32397217-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B32397217-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B32397217-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B32397217-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B32397217-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B32397217-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B32397217-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B32397217-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B32397217-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B32729600-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B32729600-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B32729600-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B32729600-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B32729600-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B32729600-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B32729600-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B32729600-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B32729600-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B32729600-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B32729600-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B32729600-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B33358723-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B33358723-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B33358723-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B33358723-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B33358723-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B33358723-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B33358723-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B33358723-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B33358723-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B33358723-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B33358723-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B33358723-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B35644813-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B35644813-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B35644813-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B35644813-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B35644813-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B35644813-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B35644813-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B35644813-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B35644813-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B35644813-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B35644813-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B35644813-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B35797074-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B35797074-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B35797074-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B35797074-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B35797074-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B35797074-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B35797074-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B35797074-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B35797074-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B35797074-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B35797074-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B35797074-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B36194204-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B36194204-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B36194204-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B36194204-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B36194204-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B36194204-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B36194204-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B36194204-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B36194204-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B36194204-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B36194204-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B36194204-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B37629610-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B37629610-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B37629610-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B37629610-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B37629610-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B37629610-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B37629610-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B37629610-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B37629610-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B37629610-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B37629610-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B37629610-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B377585941-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B377585941-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B377585941-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B377585941-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B377585941-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B377585941-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B377585941-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B377585941-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B377585941-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B377585941-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B377585941-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B377585941-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B37895033-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B37895033-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B37895033-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B37895033-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B37895033-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B37895033-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B37895033-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B37895033-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B37895033-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B37895033-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B37895033-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B37895033-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B380299722-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B380299722-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B380299722-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B380299722-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B380299722-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B380299722-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B380299722-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B380299722-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B380299722-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B380299722-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B380299722-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B380299722-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B38203081-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B38203081-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B38203081-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B38203081-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B38203081-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B38203081-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B38203081-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B38203081-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B38203081-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B38203081-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B38203081-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B38203081-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B38241237-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B38241237-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B38241237-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B38241237-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B38241237-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B38241237-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B38241237-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B38241237-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B38241237-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B38241237-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B38241237-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B38241237-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B38352414-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B38352414-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B38352414-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B38352414-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B38352414-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B38352414-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B38352414-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B38352414-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B38352414-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B38352414-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B38352414-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B38352414-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B64493529-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B64493529-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B64493529-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B64493529-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B64493529-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B64493529-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B64493529-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B64493529-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B64493529-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B64493529-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B64493529-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B64493529-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B65214682-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B65214682-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B65214682-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B65214682-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B65214682-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B65214682-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B65214682-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B65214682-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B65214682-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B65214682-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B65214682-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B65214682-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B72507902-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B72507902-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B72507902-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B72507902-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B72507902-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B72507902-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B72507902-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B72507902-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/B72507902-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/B72507902-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/B72507902-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/B72507902-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/C-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/C-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/C-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/C-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/C-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/C-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/C-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/C-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/C-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/C-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/C-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/C-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/CompactSource-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/CompactSource-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/CompactSource-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/CompactSource-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/CompactSource-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/CompactSource-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/CompactSource-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/CompactSource-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/CompactSource-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/CompactSource-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/CompactSource-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/CompactSource-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/D-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/D-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/D-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/D-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/D-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/D-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/D-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/D-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/D-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/D-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/D-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/D-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/E-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/E-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/E-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/E-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/E-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/E-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/E-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/E-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/E-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/E-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/E-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/E-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/EnumAnnotation-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/EnumAnnotation-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/EnumAnnotation-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/EnumAnnotation-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/EnumAnnotation-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/EnumAnnotation-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/EnumAnnotation-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/EnumAnnotation-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/EnumAnnotation-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/EnumAnnotation-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/EnumAnnotation-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/EnumAnnotation-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/ExpressionSwitch-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/ExpressionSwitch-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/ExpressionSwitch-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/ExpressionSwitch-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/ExpressionSwitch-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/ExpressionSwitch-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/ExpressionSwitch-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/ExpressionSwitch-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/ExpressionSwitch-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/ExpressionSwitch-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/ExpressionSwitch-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/ExpressionSwitch-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/F-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/F-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/F-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/F-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/F-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/F-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/F-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/F-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/F-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/F-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/F-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/F-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/Fields-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/Fields-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/Fields-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/Fields-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/Fields-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/Fields-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/Fields-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/Fields-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/Fields-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/Fields-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/Fields-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/Fields-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/FlexibleConstructor-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/FlexibleConstructor-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/FlexibleConstructor-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/FlexibleConstructor-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/FlexibleConstructor-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/FlexibleConstructor-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/FlexibleConstructor-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/FlexibleConstructor-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/FlexibleConstructor-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/FlexibleConstructor-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/FlexibleConstructor-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/FlexibleConstructor-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/ForMany-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/ForMany-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/ForMany-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/ForMany-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/ForMany-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/ForMany-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/ForMany-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/ForMany-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/ForMany-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/ForMany-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/ForMany-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/ForMany-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/I-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/I-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/I-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/I-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/I-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/I-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/I-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/I-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/I-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/I-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/I-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/I-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/I1-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/I1-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/I1-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/I1-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/I1-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/I1-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/I1-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/I1-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/I1-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/I1-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/I1-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/I1-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/I12-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/I12-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/I12-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/I12-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/I12-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/I12-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/I12-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/I12-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/I12-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/I12-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/I12-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/I12-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/I1205-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/I1205-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/I1205-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/I1205-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/I1205-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/I1205-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/I1205-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/I1205-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/I1205-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/I1205-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/I1205-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/I1205-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/I1260-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/I1260-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/I1260-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/I1260-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/I1260-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/I1260-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/I1260-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/I1260-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/I1260-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/I1260-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/I1260-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/I1260-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/I1260EmptyBlocks-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/I1260EmptyBlocks-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/I1260EmptyBlocks-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/I1260EmptyBlocks-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/I1260EmptyBlocks-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/I1260EmptyBlocks-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/I1260EmptyBlocks-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/I1260EmptyBlocks-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/I1260EmptyBlocks-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/I1260EmptyBlocks-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/I1260EmptyBlocks-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/I1260EmptyBlocks-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/I13-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/I13-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/I13-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/I13-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/I13-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/I13-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/I13-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/I13-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/I13-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/I13-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/I13-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/I13-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/I1309-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/I1309-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/I1309-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/I1309-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/I1309-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/I1309-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/I1309-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/I1309-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/I1309-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/I1309-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/I1309-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/I1309-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/I202-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/I202-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/I202-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/I202-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/I202-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/I202-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/I202-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/I202-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/I202-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/I202-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/I202-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/I202-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/I365-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/I365-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/I365-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/I365-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/I365-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/I365-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/I365-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/I365-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/I365-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/I365-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/I365-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/I365-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/I374-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/I374-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/I374-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/I374-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/I374-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/I374-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/I374-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/I374-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/I374-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/I374-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/I374-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/I374-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/I574-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/I574-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/I574-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/I574-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/I574-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/I574-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/I574-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/I574-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/I574-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/I574-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/I574-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/I574-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/I588-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/I588-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/I588-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/I588-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/I588-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/I588-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/I588-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/I588-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/I588-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/I588-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/I588-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/I588-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/I594-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/I594-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/I594-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/I594-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/I594-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/I594-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/I594-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/I594-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/I594-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/I594-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/I594-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/I594-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/I603-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/I603-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/I603-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/I603-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/I603-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/I603-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/I603-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/I603-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/I603-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/I603-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/I603-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/I603-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/I643-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/I643-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/I643-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/I643-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/I643-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/I643-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/I643-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/I643-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/I643-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/I643-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/I643-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/I643-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/I683-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/I683-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/I683-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/I683-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/I683-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/I683-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/I683-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/I683-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/I683-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/I683-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/I683-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/I683-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/I684-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/I684-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/I684-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/I684-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/I684-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/I684-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/I684-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/I684-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/I684-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/I684-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/I684-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/I684-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/I696-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/I696-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/I696-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/I696-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/I696-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/I696-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/I696-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/I696-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/I696-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/I696-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/I696-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/I696-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/I880-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/I880-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/I880-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/I880-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/I880-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/I880-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/I880-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/I880-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/I880-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/I880-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/I880-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/I880-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/I959-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/I959-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/I959-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/I959-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/I959-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/I959-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/I959-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/I959-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/I959-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/I959-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/I959-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/I959-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/JavaFileNoNewLine-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/JavaFileNoNewLine-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/JavaFileNoNewLine-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/JavaFileNoNewLine-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/JavaFileNoNewLine-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/JavaFileNoNewLine-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/JavaFileNoNewLine-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/JavaFileNoNewLine-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/JavaFileNoNewLine-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/JavaFileNoNewLine-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/JavaFileNoNewLine-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/JavaFileNoNewLine-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/JavaFileWithExtraSpaces-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/JavaFileWithExtraSpaces-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/JavaFileWithExtraSpaces-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/JavaFileWithExtraSpaces-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/JavaFileWithExtraSpaces-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/JavaFileWithExtraSpaces-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/JavaFileWithExtraSpaces-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/JavaFileWithExtraSpaces-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/JavaFileWithExtraSpaces-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/JavaFileWithExtraSpaces-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/JavaFileWithExtraSpaces-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/JavaFileWithExtraSpaces-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/JavaFileWithMultipleLines-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/JavaFileWithMultipleLines-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/JavaFileWithMultipleLines-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/JavaFileWithMultipleLines-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/JavaFileWithMultipleLines-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/JavaFileWithMultipleLines-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/JavaFileWithMultipleLines-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/JavaFileWithMultipleLines-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/JavaFileWithMultipleLines-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/JavaFileWithMultipleLines-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/JavaFileWithMultipleLines-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/JavaFileWithMultipleLines-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/L-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/L-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/L-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/L-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/L-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/L-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/L-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/L-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/L-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/L-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/L-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/L-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/LocalAnnotations-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/LocalAnnotations-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/LocalAnnotations-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/LocalAnnotations-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/LocalAnnotations-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/LocalAnnotations-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/LocalAnnotations-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/LocalAnnotations-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/LocalAnnotations-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/LocalAnnotations-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/LocalAnnotations-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/LocalAnnotations-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/M-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/M-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/M-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/M-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/M-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/M-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/M-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/M-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/M-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/M-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/M-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/M-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/M1-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/M1-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/M1-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/M1-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/M1-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/M1-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/M1-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/M1-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/M1-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/M1-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/M1-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/M1-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/M2-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/M2-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/M2-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/M2-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/M2-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/M2-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/M2-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/M2-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/M2-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/M2-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/M2-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/M2-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/M3-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/M3-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/M3-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/M3-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/M3-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/M3-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/M3-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/M3-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/M3-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/M3-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/M3-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/M3-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/MarkdownDoc-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/MarkdownDoc-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/MarkdownDoc-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/MarkdownDoc-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/MarkdownDoc-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/MarkdownDoc-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/MarkdownDoc-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/MarkdownDoc-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/MarkdownDoc-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/MarkdownDoc-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/MarkdownDoc-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/MarkdownDoc-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/MarkerAnnotation-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/MarkerAnnotation-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/MarkerAnnotation-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/MarkerAnnotation-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/MarkerAnnotation-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/MarkerAnnotation-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/MarkerAnnotation-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/MarkerAnnotation-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/MarkerAnnotation-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/MarkerAnnotation-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/MarkerAnnotation-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/MarkerAnnotation-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/Multivariables-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/Multivariables-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/Multivariables-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/Multivariables-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/Multivariables-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/Multivariables-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/Multivariables-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/Multivariables-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/Multivariables-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/Multivariables-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/Multivariables-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/Multivariables-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/N-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/N-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/N-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/N-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/N-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/N-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/N-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/N-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/N-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/N-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/N-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/N-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/NON-NLS-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/NON-NLS-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/NON-NLS-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/NON-NLS-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/NON-NLS-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/NON-NLS-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/NON-NLS-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/NON-NLS-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/NON-NLS-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/NON-NLS-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/NON-NLS-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/NON-NLS-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/NormalAnnotation-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/NormalAnnotation-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/NormalAnnotation-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/NormalAnnotation-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/NormalAnnotation-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/NormalAnnotation-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/NormalAnnotation-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/NormalAnnotation-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/NormalAnnotation-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/NormalAnnotation-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/NormalAnnotation-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/NormalAnnotation-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/P-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/P-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/P-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/P-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/P-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/P-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/P-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/P-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/P-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/P-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/P-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/P-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/Pair-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/Pair-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/Pair-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/Pair-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/Pair-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/Pair-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/Pair-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/Pair-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/Pair-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/Pair-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/Pair-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/Pair-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/PairedArguments-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/PairedArguments-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/PairedArguments-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/PairedArguments-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/PairedArguments-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/PairedArguments-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/PairedArguments-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/PairedArguments-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/PairedArguments-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/PairedArguments-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/PairedArguments-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/PairedArguments-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/Q-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/Q-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/Q-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/Q-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/Q-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/Q-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/Q-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/Q-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/Q-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/Q-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/Q-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/Q-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/R-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/R-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/R-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/R-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/R-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/R-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/R-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/R-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/R-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/R-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/R-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/R-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/RSL-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/RSL-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/RSL-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/RSL-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/RSL-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/RSL-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/RSL-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/RSL-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/RSL-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/RSL-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/RSL-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/RSL-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/Records-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/Records-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/Records-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/Records-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/Records-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/Records-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/Records-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/Records-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/Records-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/Records-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/Records-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/Records-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/S-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/S-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/S-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/S-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/S-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/S-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/S-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/S-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/S-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/S-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/S-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/S-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/Sealed-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/Sealed-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/Sealed-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/Sealed-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/Sealed-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/Sealed-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/Sealed-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/Sealed-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/Sealed-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/Sealed-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/Sealed-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/Sealed-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/SemicolonInClass-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/SemicolonInClass-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/SemicolonInClass-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/SemicolonInClass-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/SemicolonInClass-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/SemicolonInClass-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/SemicolonInClass-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/SemicolonInClass-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/SemicolonInClass-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/SemicolonInClass-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/SemicolonInClass-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/SemicolonInClass-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/SingleMemberAnnotation-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/SingleMemberAnnotation-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/SingleMemberAnnotation-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/SingleMemberAnnotation-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/SingleMemberAnnotation-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/SingleMemberAnnotation-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/SingleMemberAnnotation-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/SingleMemberAnnotation-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/SingleMemberAnnotation-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/SingleMemberAnnotation-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/SingleMemberAnnotation-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/SingleMemberAnnotation-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/SuperQualifier-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/SuperQualifier-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/SuperQualifier-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/SuperQualifier-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/SuperQualifier-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/SuperQualifier-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/SuperQualifier-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/SuperQualifier-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/SuperQualifier-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/SuperQualifier-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/SuperQualifier-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/SuperQualifier-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/SwitchDouble-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/SwitchDouble-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/SwitchDouble-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/SwitchDouble-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/SwitchDouble-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/SwitchDouble-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/SwitchDouble-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/SwitchDouble-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/SwitchDouble-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/SwitchDouble-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/SwitchDouble-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/SwitchDouble-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/SwitchGuardClause-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/SwitchGuardClause-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/SwitchGuardClause-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/SwitchGuardClause-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/SwitchGuardClause-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/SwitchGuardClause-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/SwitchGuardClause-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/SwitchGuardClause-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/SwitchGuardClause-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/SwitchGuardClause-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/SwitchGuardClause-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/SwitchGuardClause-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/SwitchRecord-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/SwitchRecord-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/SwitchRecord-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/SwitchRecord-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/SwitchRecord-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/SwitchRecord-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/SwitchRecord-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/SwitchRecord-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/SwitchRecord-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/SwitchRecord-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/SwitchRecord-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/SwitchRecord-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/SwitchUnderscore-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/SwitchUnderscore-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/SwitchUnderscore-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/SwitchUnderscore-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/SwitchUnderscore-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/SwitchUnderscore-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/SwitchUnderscore-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/SwitchUnderscore-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/SwitchUnderscore-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/SwitchUnderscore-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/SwitchUnderscore-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/SwitchUnderscore-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/T-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/T-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/T-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/T-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/T-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/T-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/T-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/T-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/T-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/T-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/T-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/T-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/TabularMixedSignInitializer-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/TabularMixedSignInitializer-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/TabularMixedSignInitializer-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/TabularMixedSignInitializer-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/TabularMixedSignInitializer-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/TabularMixedSignInitializer-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/TabularMixedSignInitializer-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/TabularMixedSignInitializer-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/TabularMixedSignInitializer-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/TabularMixedSignInitializer-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/TabularMixedSignInitializer-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/TabularMixedSignInitializer-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/TryWithResources-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/TryWithResources-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/TryWithResources-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/TryWithResources-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/TryWithResources-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/TryWithResources-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/TryWithResources-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/TryWithResources-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/TryWithResources-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/TryWithResources-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/TryWithResources-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/TryWithResources-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/U-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/U-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/U-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/U-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/U-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/U-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/U-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/U-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/U-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/U-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/U-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/U-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/UnaryMinus-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/UnaryMinus-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/UnaryMinus-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/UnaryMinus-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/UnaryMinus-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/UnaryMinus-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/UnaryMinus-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/UnaryMinus-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/UnaryMinus-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/UnaryMinus-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/UnaryMinus-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/UnaryMinus-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/Unformatted-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/Unformatted-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/Unformatted-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/Unformatted-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/Unformatted-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/Unformatted-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/Unformatted-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/Unformatted-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/Unformatted-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/Unformatted-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/Unformatted-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/Unformatted-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/Unformatted2-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/Unformatted2-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/Unformatted2-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/Unformatted2-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/Unformatted2-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/Unformatted2-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/Unformatted2-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/Unformatted2-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/Unformatted2-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/Unformatted2-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/Unformatted2-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/Unformatted2-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/Unformatted3-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/Unformatted3-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/Unformatted3-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/Unformatted3-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/Unformatted3-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/Unformatted3-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/Unformatted3-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/Unformatted3-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/Unformatted3-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/Unformatted3-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/Unformatted3-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/Unformatted3-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/Unnamed-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/Unnamed-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/Unnamed-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/Unnamed-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/Unnamed-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/Unnamed-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/Unnamed-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/Unnamed-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/Unnamed-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/Unnamed-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/Unnamed-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/Unnamed-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/UnnamedPattern-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/UnnamedPattern-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/UnnamedPattern-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/UnnamedPattern-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/UnnamedPattern-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/UnnamedPattern-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/UnnamedPattern-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/UnnamedPattern-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/UnnamedPattern-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/UnnamedPattern-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/UnnamedPattern-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/UnnamedPattern-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/V-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/V-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/V-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/V-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/V-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/V-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/V-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/V-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/V-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/V-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/V-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/V-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/Var-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/Var-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/Var-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/Var-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/Var-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/Var-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/Var-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/Var-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/Var-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/Var-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/Var-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/Var-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/W-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/W-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/W-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/W-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/W-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/W-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/W-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/W-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/W-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/W-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/W-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/W-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/WildBound-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/WildBound-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/WildBound-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/WildBound-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/WildBound-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/WildBound-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/WildBound-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/WildBound-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/WildBound-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/WildBound-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/WildBound-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/WildBound-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/b26306390-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/b26306390-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/b26306390-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/b26306390-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/b26306390-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/b26306390-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/b26306390-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/b26306390-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/b26306390-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/b26306390-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/b26306390-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/b26306390-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/i100-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/i100-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/i100-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/i100-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/i100-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/i100-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/i100-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/i100-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/i100-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/i100-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/i100-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/i100-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/i101-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/i101-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/i101-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/i101-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/i101-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/i101-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/i101-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/i101-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/i101-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/i101-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/i101-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/i101-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/i155-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/i155-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/i155-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/i155-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/i155-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/i155-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/i155-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/i155-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/i155-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/i155-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/i155-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/i155-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/i176-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/i176-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/i176-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/i176-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/i176-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/i176-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/i176-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/i176-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/i176-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/i176-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/i176-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/i176-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/i221-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/i221-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/i221-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/i221-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/i221-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/i221-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/i221-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/i221-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/i221-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/i221-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/i221-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/i221-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/i281-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/i281-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/i281-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/i281-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/i281-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/i281-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/i281-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/i281-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/i281-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/i281-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/i281-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/i281-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/i282-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/i282-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/i282-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/i282-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/i282-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/i282-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/i282-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/i282-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/i282-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/i282-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/i282-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/i282-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/i55-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/i55-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/i55-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/i55-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/i55-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/i55-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/i55-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/i55-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/i55-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/i55-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/i55-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/i55-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/i59-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/i59-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/i59-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/i59-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/i59-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/i59-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/i59-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/i59-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/i59-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/i59-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/i59-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/i59-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/i60-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/i60-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/i60-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/i60-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/i60-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/i60-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/i60-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/i60-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/i60-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/i60-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/i60-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/i60-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/i65-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/i65-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/i65-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/i65-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/i65-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/i65-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/i65-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/i65-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/i65-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/i65-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/i65-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/i65-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/i66-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/i66-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/i66-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/i66-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/i66-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/i66-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/i66-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/i66-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/i66-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/i66-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/i66-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/i66-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/i71-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/i71-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/i71-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/i71-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/i71-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/i71-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/i71-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/i71-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/i71-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/i71-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/i71-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/i71-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/i95-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/i95-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/i95-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/i95-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/i95-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/i95-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/i95-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/i95-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/i95-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/i95-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/i95-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/i95-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/i98-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/i98-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/i98-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/i98-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/i98-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/i98-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/i98-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/i98-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/i98-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/i98-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/i98-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/i98-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/ojf-issue-101-annotated-lambda-parameters-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/ojf-issue-101-annotated-lambda-parameters-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/ojf-issue-101-annotated-lambda-parameters-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/ojf-issue-101-annotated-lambda-parameters-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/ojf-issue-101-annotated-lambda-parameters-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/ojf-issue-101-annotated-lambda-parameters-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/ojf-issue-101-annotated-lambda-parameters-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/ojf-issue-101-annotated-lambda-parameters-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/ojf-issue-101-annotated-lambda-parameters-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/ojf-issue-101-annotated-lambda-parameters-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/ojf-issue-101-annotated-lambda-parameters-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/ojf-issue-101-annotated-lambda-parameters-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/ojf-issue-23-non-nls-trailing-marker-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/ojf-issue-23-non-nls-trailing-marker-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/ojf-issue-23-non-nls-trailing-marker-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/ojf-issue-23-non-nls-trailing-marker-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/ojf-issue-23-non-nls-trailing-marker-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/ojf-issue-23-non-nls-trailing-marker-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/ojf-issue-23-non-nls-trailing-marker-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/ojf-issue-23-non-nls-trailing-marker-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/ojf-issue-23-non-nls-trailing-marker-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/ojf-issue-23-non-nls-trailing-marker-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/ojf-issue-23-non-nls-trailing-marker-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/ojf-issue-23-non-nls-trailing-marker-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/ojf-issue-23-reflowed-literal-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/ojf-issue-23-reflowed-literal-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/ojf-issue-23-reflowed-literal-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/ojf-issue-23-reflowed-literal-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/ojf-issue-23-reflowed-literal-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/ojf-issue-23-reflowed-literal-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/ojf-issue-23-reflowed-literal-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/ojf-issue-23-reflowed-literal-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/ojf-issue-23-reflowed-literal-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/ojf-issue-23-reflowed-literal-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/ojf-issue-23-reflowed-literal-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/ojf-issue-23-reflowed-literal-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/ojf-issue-23-wrapped-arguments-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/ojf-issue-23-wrapped-arguments-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/ojf-issue-23-wrapped-arguments-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/ojf-issue-23-wrapped-arguments-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/ojf-issue-23-wrapped-arguments-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/ojf-issue-23-wrapped-arguments-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/ojf-issue-23-wrapped-arguments-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/ojf-issue-23-wrapped-arguments-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/ojf-issue-23-wrapped-arguments-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/ojf-issue-23-wrapped-arguments-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/ojf-issue-23-wrapped-arguments-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/ojf-issue-23-wrapped-arguments-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/ojf-issue-24-jbang-compact-source-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/ojf-issue-24-jbang-compact-source-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/ojf-issue-24-jbang-compact-source-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/ojf-issue-24-jbang-compact-source-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/ojf-issue-24-jbang-compact-source-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/ojf-issue-24-jbang-compact-source-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/ojf-issue-24-jbang-compact-source-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/ojf-issue-24-jbang-compact-source-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/ojf-issue-24-jbang-compact-source-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/ojf-issue-24-jbang-compact-source-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/ojf-issue-24-jbang-compact-source-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/ojf-issue-24-jbang-compact-source-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/ojf-issue-24-jbang-package-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/ojf-issue-24-jbang-package-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/ojf-issue-24-jbang-package-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/ojf-issue-24-jbang-package-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/ojf-issue-24-jbang-package-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/ojf-issue-24-jbang-package-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/ojf-issue-24-jbang-package-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/ojf-issue-24-jbang-package-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/ojf-issue-24-jbang-package-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/ojf-issue-24-jbang-package-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/ojf-issue-24-jbang-package-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/ojf-issue-24-jbang-package-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/ojf-issue-24-jbang-script-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/ojf-issue-24-jbang-script-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/ojf-issue-24-jbang-script-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/ojf-issue-24-jbang-script-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/ojf-issue-24-jbang-script-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/ojf-issue-24-jbang-script-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/ojf-issue-24-jbang-script-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/ojf-issue-24-jbang-script-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/ojf-issue-24-jbang-script-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/ojf-issue-24-jbang-script-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/ojf-issue-24-jbang-script-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/ojf-issue-24-jbang-script-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/ojf-issue-34-text-block-argument-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/ojf-issue-34-text-block-argument-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/ojf-issue-34-text-block-argument-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/ojf-issue-34-text-block-argument-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/ojf-issue-34-text-block-argument-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/ojf-issue-34-text-block-argument-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/ojf-issue-34-text-block-argument-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/ojf-issue-34-text-block-argument-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/ojf-issue-34-text-block-argument-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/ojf-issue-34-text-block-argument-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/ojf-issue-34-text-block-argument-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/ojf-issue-34-text-block-argument-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/ojf-issue-34-text-block-ternary-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/ojf-issue-34-text-block-ternary-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/ojf-issue-34-text-block-ternary-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/ojf-issue-34-text-block-ternary-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/ojf-issue-34-text-block-ternary-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/ojf-issue-34-text-block-ternary-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/ojf-issue-34-text-block-ternary-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/ojf-issue-34-text-block-ternary-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/ojf-issue-34-text-block-ternary-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/ojf-issue-34-text-block-ternary-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/ojf-issue-34-text-block-ternary-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/ojf-issue-34-text-block-ternary-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/ojf-issue-36-multiline-comments-on-one-line-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/ojf-issue-36-multiline-comments-on-one-line-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/ojf-issue-36-multiline-comments-on-one-line-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/ojf-issue-36-multiline-comments-on-one-line-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/ojf-issue-36-multiline-comments-on-one-line-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/ojf-issue-36-multiline-comments-on-one-line-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/ojf-issue-36-multiline-comments-on-one-line-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/ojf-issue-36-multiline-comments-on-one-line-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/ojf-issue-36-multiline-comments-on-one-line-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/ojf-issue-36-multiline-comments-on-one-line-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/ojf-issue-36-multiline-comments-on-one-line-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/ojf-issue-36-multiline-comments-on-one-line-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/ojf-issue-38-nbsp-line-comment-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/ojf-issue-38-nbsp-line-comment-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/ojf-issue-38-nbsp-line-comment-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/ojf-issue-38-nbsp-line-comment-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/ojf-issue-38-nbsp-line-comment-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/ojf-issue-38-nbsp-line-comment-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/ojf-issue-38-nbsp-line-comment-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/ojf-issue-38-nbsp-line-comment-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/ojf-issue-38-nbsp-line-comment-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/ojf-issue-38-nbsp-line-comment-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/ojf-issue-38-nbsp-line-comment-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/ojf-issue-38-nbsp-line-comment-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/ojf-issue-60-cast-type-in-inline-chain-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/ojf-issue-60-cast-type-in-inline-chain-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/ojf-issue-60-cast-type-in-inline-chain-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/ojf-issue-60-cast-type-in-inline-chain-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/ojf-issue-60-cast-type-in-inline-chain-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/ojf-issue-60-cast-type-in-inline-chain-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/ojf-issue-60-cast-type-in-inline-chain-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/ojf-issue-60-cast-type-in-inline-chain-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/ojf-issue-60-cast-type-in-inline-chain-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/ojf-issue-60-cast-type-in-inline-chain-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/ojf-issue-60-cast-type-in-inline-chain-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/ojf-issue-60-cast-type-in-inline-chain-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/ojf-issue-62-comment-before-lambda-close-parens-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/ojf-issue-62-comment-before-lambda-close-parens-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/ojf-issue-62-comment-before-lambda-close-parens-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/ojf-issue-62-comment-before-lambda-close-parens-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/ojf-issue-62-comment-before-lambda-close-parens-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/ojf-issue-62-comment-before-lambda-close-parens-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/ojf-issue-62-comment-before-lambda-close-parens-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/ojf-issue-62-comment-before-lambda-close-parens-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/ojf-issue-62-comment-before-lambda-close-parens-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/ojf-issue-62-comment-before-lambda-close-parens-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/ojf-issue-62-comment-before-lambda-close-parens-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/ojf-issue-62-comment-before-lambda-close-parens-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/ojf-long-generic-field-type-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/ojf-long-generic-field-type-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/ojf-long-generic-field-type-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/ojf-long-generic-field-type-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/ojf-long-generic-field-type-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/ojf-long-generic-field-type-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/ojf-long-generic-field-type-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/ojf-long-generic-field-type-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/ojf-long-generic-field-type-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/ojf-long-generic-field-type-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/ojf-long-generic-field-type-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/ojf-long-generic-field-type-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/ojf-semicolon-only-body-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/ojf-semicolon-only-body-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/ojf-semicolon-only-body-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/ojf-semicolon-only-body-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/ojf-semicolon-only-body-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/ojf-semicolon-only-body-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/ojf-semicolon-only-body-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/ojf-semicolon-only-body-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/ojf-semicolon-only-body-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/ojf-semicolon-only-body-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/ojf-semicolon-only-body-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/ojf-semicolon-only-body-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-1-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-1-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-1-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-1-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-1-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-1-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-1-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-1-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-1-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-1-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-1-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-1-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-10-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-10-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-10-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-10-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-10-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-10-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-10-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-10-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-10-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-10-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-10-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-10-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-11-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-11-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-11-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-11-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-11-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-11-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-11-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-11-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-11-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-11-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-11-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-11-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-12-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-12-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-12-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-12-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-12-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-12-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-12-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-12-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-12-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-12-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-12-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-12-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-2-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-2-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-2-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-2-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-2-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-2-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-2-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-2-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-2-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-2-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-2-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-2-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-3-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-3-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-3-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-3-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-3-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-3-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-3-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-3-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-3-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-3-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-3-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-3-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-4-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-4-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-4-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-4-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-4-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-4-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-4-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-4-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-4-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-4-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-4-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-4-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-5-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-5-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-5-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-5-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-5-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-5-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-5-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-5-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-5-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-5-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-5-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-5-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-6-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-6-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-6-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-6-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-6-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-6-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-6-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-6-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-6-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-6-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-6-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-6-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-7-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-7-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-7-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-7-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-7-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-7-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-7-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-7-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-7-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-7-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-7-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-7-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-8-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-8-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-8-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-8-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-8-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-8-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-8-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-8-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-8-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-8-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-8-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-8-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-break-lambda-arg-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-break-lambda-arg-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-break-lambda-arg-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-break-lambda-arg-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-break-lambda-arg-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-break-lambda-arg-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-break-lambda-arg-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-break-lambda-arg-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-break-lambda-arg-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-break-lambda-arg-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-break-lambda-arg-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-break-lambda-arg-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-break-lambda-arg-no-chain-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-break-lambda-arg-no-chain-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-break-lambda-arg-no-chain-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-break-lambda-arg-no-chain-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-break-lambda-arg-no-chain-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-break-lambda-arg-no-chain-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-break-lambda-arg-no-chain-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-break-lambda-arg-no-chain-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-break-lambda-arg-no-chain-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-break-lambda-arg-no-chain-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-break-lambda-arg-no-chain-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-break-lambda-arg-no-chain-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-break-lambda-expr-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-break-lambda-expr-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-break-lambda-expr-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-break-lambda-expr-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-break-lambda-expr-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-break-lambda-expr-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-break-lambda-expr-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-break-lambda-expr-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-break-lambda-expr-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-break-lambda-expr-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-break-lambda-expr-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-break-lambda-expr-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-case-statements-block-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-case-statements-block-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-case-statements-block-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-case-statements-block-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-case-statements-block-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-case-statements-block-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-case-statements-block-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-case-statements-block-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-case-statements-block-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-case-statements-block-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-case-statements-block-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-case-statements-block-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-chain-next-line-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-chain-next-line-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-chain-next-line-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-chain-next-line-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-chain-next-line-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-chain-next-line-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-chain-next-line-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-chain-next-line-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-chain-next-line-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-chain-next-line-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-chain-next-line-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-chain-next-line-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-chains-lambdas-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-chains-lambdas-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-chains-lambdas-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-chains-lambdas-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-chains-lambdas-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-chains-lambdas-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-chains-lambdas-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-chains-lambdas-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-chains-lambdas-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-chains-lambdas-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-chains-lambdas-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-chains-lambdas-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-conjure-java-runtime-1285-1-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-conjure-java-runtime-1285-1-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-conjure-java-runtime-1285-1-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-conjure-java-runtime-1285-1-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-conjure-java-runtime-1285-1-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-conjure-java-runtime-1285-1-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-conjure-java-runtime-1285-1-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-conjure-java-runtime-1285-1-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-conjure-java-runtime-1285-1-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-conjure-java-runtime-1285-1-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-conjure-java-runtime-1285-1-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-conjure-java-runtime-1285-1-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-conjure-java-runtime-1285-2-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-conjure-java-runtime-1285-2-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-conjure-java-runtime-1285-2-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-conjure-java-runtime-1285-2-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-conjure-java-runtime-1285-2-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-conjure-java-runtime-1285-2-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-conjure-java-runtime-1285-2-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-conjure-java-runtime-1285-2-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-conjure-java-runtime-1285-2-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-conjure-java-runtime-1285-2-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-conjure-java-runtime-1285-2-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-conjure-java-runtime-1285-2-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-dangling-method-reference-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-dangling-method-reference-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-dangling-method-reference-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-dangling-method-reference-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-dangling-method-reference-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-dangling-method-reference-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-dangling-method-reference-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-dangling-method-reference-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-dangling-method-reference-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-dangling-method-reference-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-dangling-method-reference-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-dangling-method-reference-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-deeply-nested-calls-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-deeply-nested-calls-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-deeply-nested-calls-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-deeply-nested-calls-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-deeply-nested-calls-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-deeply-nested-calls-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-deeply-nested-calls-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-deeply-nested-calls-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-deeply-nested-calls-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-deeply-nested-calls-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-deeply-nested-calls-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-deeply-nested-calls-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-expression-lambda-1-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-expression-lambda-1-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-expression-lambda-1-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-expression-lambda-1-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-expression-lambda-1-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-expression-lambda-1-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-expression-lambda-1-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-expression-lambda-1-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-expression-lambda-1-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-expression-lambda-1-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-expression-lambda-1-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-expression-lambda-1-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-expression-lambda-2-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-expression-lambda-2-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-expression-lambda-2-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-expression-lambda-2-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-expression-lambda-2-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-expression-lambda-2-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-expression-lambda-2-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-expression-lambda-2-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-expression-lambda-2-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-expression-lambda-2-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-expression-lambda-2-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-expression-lambda-2-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-expression-lambdas-2-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-expression-lambdas-2-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-expression-lambdas-2-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-expression-lambdas-2-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-expression-lambdas-2-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-expression-lambdas-2-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-expression-lambdas-2-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-expression-lambdas-2-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-expression-lambdas-2-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-expression-lambdas-2-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-expression-lambdas-2-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-expression-lambdas-2-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-expression-lambdas-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-expression-lambdas-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-expression-lambdas-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-expression-lambdas-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-expression-lambdas-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-expression-lambdas-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-expression-lambdas-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-expression-lambdas-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-expression-lambdas-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-expression-lambdas-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-expression-lambdas-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-expression-lambdas-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-gcv-1-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-gcv-1-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-gcv-1-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-gcv-1-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-gcv-1-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-gcv-1-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-gcv-1-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-gcv-1-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-gcv-1-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-gcv-1-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-gcv-1-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-gcv-1-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-issue-1343-text-block-indent-stable-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-issue-1343-text-block-indent-stable-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-issue-1343-text-block-indent-stable-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-issue-1343-text-block-indent-stable-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-issue-1343-text-block-indent-stable-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-issue-1343-text-block-indent-stable-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-issue-1343-text-block-indent-stable-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-issue-1343-text-block-indent-stable-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-issue-1343-text-block-indent-stable-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-issue-1343-text-block-indent-stable-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-issue-1343-text-block-indent-stable-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-issue-1343-text-block-indent-stable-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-lambda-inlining-prefers-break-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-lambda-inlining-prefers-break-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-lambda-inlining-prefers-break-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-lambda-inlining-prefers-break-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-lambda-inlining-prefers-break-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-lambda-inlining-prefers-break-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-lambda-inlining-prefers-break-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-lambda-inlining-prefers-break-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-lambda-inlining-prefers-break-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-lambda-inlining-prefers-break-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-lambda-inlining-prefers-break-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-lambda-inlining-prefers-break-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-lambda-multiline-arg-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-lambda-multiline-arg-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-lambda-multiline-arg-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-lambda-multiline-arg-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-lambda-multiline-arg-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-lambda-multiline-arg-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-lambda-multiline-arg-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-lambda-multiline-arg-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-lambda-multiline-arg-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-lambda-multiline-arg-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-lambda-multiline-arg-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-lambda-multiline-arg-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-lamda-cast-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-lamda-cast-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-lamda-cast-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-lamda-cast-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-lamda-cast-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-lamda-cast-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-lamda-cast-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-lamda-cast-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-lamda-cast-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-lamda-cast-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-lamda-cast-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-lamda-cast-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-long-fqn-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-long-fqn-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-long-fqn-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-long-fqn-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-long-fqn-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-long-fqn-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-long-fqn-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-long-fqn-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-long-fqn-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-long-fqn-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-long-fqn-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-long-fqn-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-long-method-chain-arg-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-long-method-chain-arg-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-long-method-chain-arg-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-long-method-chain-arg-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-long-method-chain-arg-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-long-method-chain-arg-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-long-method-chain-arg-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-long-method-chain-arg-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-long-method-chain-arg-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-long-method-chain-arg-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-long-method-chain-arg-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-long-method-chain-arg-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-long-method-chain-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-long-method-chain-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-long-method-chain-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-long-method-chain-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-long-method-chain-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-long-method-chain-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-long-method-chain-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-long-method-chain-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-long-method-chain-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-long-method-chain-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-long-method-chain-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-long-method-chain-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-long-method-reference-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-long-method-reference-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-long-method-reference-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-long-method-reference-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-long-method-reference-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-long-method-reference-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-long-method-reference-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-long-method-reference-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-long-method-reference-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-long-method-reference-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-long-method-reference-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-long-method-reference-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-long-safearg-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-long-safearg-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-long-safearg-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-long-safearg-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-long-safearg-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-long-safearg-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-long-safearg-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-long-safearg-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-long-safearg-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-long-safearg-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-long-safearg-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-long-safearg-lf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-sandor-lambdas-cr.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-sandor-lambdas-cr.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-sandor-lambdas-cr.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-sandor-lambdas-cr.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-sandor-lambdas-crlf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-sandor-lambdas-crlf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-sandor-lambdas-crlf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-sandor-lambdas-crlf.case diff --git a/open-java-format/src/test/resources/test-cases/testdata/palantir-sandor-lambdas-lf.case b/open-java-format/src/test/resources/test-cases-java21/testdata/palantir-sandor-lambdas-lf.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/testdata/palantir-sandor-lambdas-lf.case rename to open-java-format/src/test/resources/test-cases-java21/testdata/palantir-sandor-lambdas-lf.case diff --git a/open-java-format/src/test/resources/test-cases/trailingCommentAfterOpenBraceIsIdempotent.case b/open-java-format/src/test/resources/test-cases-java21/trailingCommentAfterOpenBraceIsIdempotent.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/trailingCommentAfterOpenBraceIsIdempotent.case rename to open-java-format/src/test/resources/test-cases-java21/trailingCommentAfterOpenBraceIsIdempotent.case diff --git a/open-java-format/src/test/resources/test-cases/trailingLineCommentGetsItsMissingSpaceExceptIdeMarkers.case b/open-java-format/src/test/resources/test-cases-java21/trailingLineCommentGetsItsMissingSpaceExceptIdeMarkers.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/trailingLineCommentGetsItsMissingSpaceExceptIdeMarkers.case rename to open-java-format/src/test/resources/test-cases-java21/trailingLineCommentGetsItsMissingSpaceExceptIdeMarkers.case diff --git a/open-java-format/src/test/resources/test-cases/voidMethod.case b/open-java-format/src/test/resources/test-cases-java21/voidMethod.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/voidMethod.case rename to open-java-format/src/test/resources/test-cases-java21/voidMethod.case diff --git a/open-java-format/src/test/resources/test-cases/wrapLineComment.case b/open-java-format/src/test/resources/test-cases-java21/wrapLineComment.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/wrapLineComment.case rename to open-java-format/src/test/resources/test-cases-java21/wrapLineComment.case diff --git a/open-java-format/src/test/resources/test-cases/wrapMarkdownDocstringComment.case b/open-java-format/src/test/resources/test-cases-java21/wrapMarkdownDocstringComment.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/wrapMarkdownDocstringComment.case rename to open-java-format/src/test/resources/test-cases-java21/wrapMarkdownDocstringComment.case diff --git a/open-java-format/src/test/resources/test-cases/wrapMarkdownDocstringRunKeepsTheSlashPrefix.case b/open-java-format/src/test/resources/test-cases-java21/wrapMarkdownDocstringRunKeepsTheSlashPrefix.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/wrapMarkdownDocstringRunKeepsTheSlashPrefix.case rename to open-java-format/src/test/resources/test-cases-java21/wrapMarkdownDocstringRunKeepsTheSlashPrefix.case diff --git a/open-java-format/src/test/resources/test-cases/wrappedLineCommentInArrayInitializer.case b/open-java-format/src/test/resources/test-cases-java21/wrappedLineCommentInArrayInitializer.case similarity index 100% rename from open-java-format/src/test/resources/test-cases/wrappedLineCommentInArrayInitializer.case rename to open-java-format/src/test/resources/test-cases-java21/wrappedLineCommentInArrayInitializer.case diff --git a/open-java-format/src/test/resources/test-cases-java25/moduleImports.case b/open-java-format/src/test/resources/test-cases-java25/moduleImports.case new file mode 100644 index 000000000..848200445 --- /dev/null +++ b/open-java-format/src/test/resources/test-cases-java25/moduleImports.case @@ -0,0 +1,18 @@ +# Module imports (JEP 511) are sorted before the ordinary imports, with a blank line between them. +---------- +import java.util.List; +import module java.sql; +import module java.base; + +class ModuleImport { + List xs; +} +---------- +import module java.base; +import module java.sql; + +import java.util.List; + +class ModuleImport { + List xs; +} diff --git a/open-java-format/src/test/resources/test-cases-java28/valueClasses.case b/open-java-format/src/test/resources/test-cases-java28/valueClasses.case new file mode 100644 index 000000000..8966f0fde --- /dev/null +++ b/open-java-format/src/test/resources/test-cases-java28/valueClasses.case @@ -0,0 +1,26 @@ +# The `value` modifier of value classes and records (JEP 401, a preview of JDK 28) goes after the other +# modifiers (#131). +---------- +value final public class PointValueClass { + final int x; + final int y; + + PointValueClass(int x, int y) { + this.x = x; + this.y = y; + } +} + +value public record PointValueRecord(int x, int y) {} +---------- +public final value class PointValueClass { + final int x; + final int y; + + PointValueClass(int x, int y) { + this.x = x; + this.y = y; + } +} + +public value record PointValueRecord(int x, int y) {}