Issue #2634: Add Java8toJava11

.github/workflows/ci.yml

@@ -13,7 +13,7 @@ concurrency:
   cancel-in-progress: true
 jobs:
   sanityCheck:
-    name: spotlessCheck assemble testClasses
+    name: spotlessCheck rewriteDryRun assemble testClasses
     runs-on: ubuntu-latest
     env:
       buildcacheuser: ${{ secrets.BUILDCACHE_USER }}
@@ -31,6 +31,8 @@ jobs:
         uses: gradle/actions/setup-gradle@v4
       - name: spotlessCheck
         run: ./gradlew spotlessCheck
+      - name: rewriteDryRun
+        run: ./gradlew rewriteDryRun
       - name: assemble testClasses
         run: ./gradlew assemble testClasses
   build:
@@ -66,10 +68,10 @@ jobs:
         uses: gradle/actions/setup-gradle@v4
       - name: build (maven-only)
         if: matrix.kind == 'maven'
-        run: ./gradlew :plugin-maven:build -x spotlessCheck
+        run: ./gradlew :plugin-maven:build -x spotlessCheck -x rewriteDryRun
       - name: build (everything-but-maven)
         if: matrix.kind == 'gradle'
-        run: ./gradlew build -x spotlessCheck -PSPOTLESS_EXCLUDE_MAVEN=true
+        run: ./gradlew build -x spotlessCheck -x rewriteDryRun -PSPOTLESS_EXCLUDE_MAVEN=true
       - name: test npm
         if: matrix.kind == 'npm'
         run: ./gradlew testNpm

CHANGES.md

@@ -27,6 +27,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Added
 * Add a `lint` mode to `ReplaceRegexStep` ([#2571](https://github.com/diffplug/spotless/pull/2571))
 * `LintSuppression` now enforces unix-style paths in its `setPath` and `relativizeAsUnix` methods. ([#2629](https://github.com/diffplug/spotless/pull/2629))
+* Add `rewrite` support ([#2588](https://github.com/diffplug/spotless/pull/2588))
 
 ## [3.3.1] - 2025-07-21
 ### Fixed

build.gradle

@@ -12,6 +12,7 @@ repositories {
 apply from: rootProject.file('gradle/java-publish.gradle')
 apply from: rootProject.file('gradle/changelog.gradle')
 allprojects {
+	apply from: rootProject.file('gradle/rewrite.gradle')
 	apply from: rootProject.file('gradle/spotless.gradle')
 }
 apply from: rootProject.file('gradle/spotless-freshmark.gradle')
@@ -27,3 +28,8 @@ spotless {
 		endWithNewline()
 	}
 }
+
+dependencies {
+	rewrite(platform("org.openrewrite.recipe:rewrite-recipe-bom:3.14.1"))
+	rewrite("org.openrewrite.recipe:rewrite-migrate-java:3.17.1")
+}

gradle/rewrite.gradle

@@ -0,0 +1,7 @@
+apply plugin: 'org.openrewrite.rewrite'
+
+rewrite {
+	activeRecipe("org.openrewrite.java.migrate.Java8toJava11")
+	exportDatatables = true
+	failOnDryRunResults = true
+}

lib/src/main/java/com/diffplug/spotless/biome/BiomeStep.java

@@ -22,7 +22,6 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.nio.file.attribute.PosixFilePermission;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -161,7 +160,7 @@ private static String defaultVersion() {
 	 * @param filePath Path to the file to make executable.
 	 */
 	private static void makeExecutable(String filePath) {
-		var exePath = Paths.get(filePath);
+		var exePath = Path.of(filePath);
 		attemptToAddPosixPermission(exePath, PosixFilePermission.GROUP_EXECUTE);
 		attemptToAddPosixPermission(exePath, PosixFilePermission.OTHERS_EXECUTE);
 		attemptToAddPosixPermission(exePath, PosixFilePermission.OWNER_EXECUTE);
@@ -199,7 +198,7 @@ private static void validateBiomeConfigPath(String configPath, String version) {
 			return;
 		}
 		var atLeastV2 = BiomeSettings.versionHigherThanOrEqualTo(version, 2, 0, 0);
-		var path = Paths.get(configPath);
+		var path = Path.of(configPath);
 		var configFile = Files.isRegularFile(path) && atLeastV2 ? path : path.resolve(BiomeSettings.configName());
 		if (!Files.exists(path)) {
 			throw new IllegalArgumentException("Biome config directory does not exist: " + path);
@@ -323,13 +322,13 @@ private State createState() throws IOException, InterruptedException {
 	private String resolveExe() throws IOException, InterruptedException {
 		new ForeignExe();
 		if (pathToExe != null) {
-			if (Paths.get(pathToExe).getNameCount() == 1) {
+			if (Path.of(pathToExe).getNameCount() == 1) {
 				return resolveNameAgainstPath(pathToExe);
 			} else {
 				return pathToExe;
 			}
 		} else {
-			var downloader = new BiomeExecutableDownloader(Paths.get(downloadDir));
+			var downloader = new BiomeExecutableDownloader(Path.of(downloadDir));
 			var downloaded = downloader.ensureDownloaded(version).toString();
 			makeExecutable(downloaded);
 			return downloaded;

lib/src/main/java/com/diffplug/spotless/java/ImportSorterImpl.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2024 DiffPlug
+ * Copyright 2016-2025 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,15 @@
 package com.diffplug.spotless.java;
 
 import java.io.Serializable;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 

lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 DiffPlug
+ * Copyright 2021-2025 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,11 +18,15 @@
 import java.io.File;
 import java.io.Serializable;
 import java.lang.reflect.Constructor;
-import java.util.*;
+import java.util.Objects;
 
 import javax.annotation.Nullable;
 
-import com.diffplug.spotless.*;
+import com.diffplug.spotless.FileSignature;
+import com.diffplug.spotless.FormatterFunc;
+import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.JarState;
+import com.diffplug.spotless.Provisioner;
 
 /** Wraps up <a href="https://github.com/cqfn/diKTat">diktat</a> as a FormatterStep. */
 public class DiktatStep implements Serializable {

lib/src/main/java/com/diffplug/spotless/npm/FileFinder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2023 DiffPlug
+ * Copyright 2020-2025 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,10 @@
 import static java.util.Objects.requireNonNull;
 
 import java.io.File;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.function.Supplier;
@@ -43,8 +46,7 @@ Optional<File> tryFind() {
 		return fileCandidateFinders
 				.stream()
 				.map(Supplier::get)
-				.filter(Optional::isPresent)
-				.map(Optional::get)
+				.flatMap(Optional::stream)
 				.findFirst();
 	}
 

lib/src/main/java/com/diffplug/spotless/npm/NpmResourceHelper.java

@@ -15,11 +15,14 @@
  */
 package com.diffplug.spotless.npm;
 
-import java.io.*;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
 import java.security.MessageDigest;
 import java.time.Duration;
@@ -130,7 +133,7 @@ static File copyFileToDirAtSubpath(File file, File targetDir, String relativePat
 		Objects.requireNonNull(relativePath);
 		try {
 			// create file pointing to relativePath in targetDir
-			final Path relativeTargetFile = Paths.get(targetDir.getAbsolutePath(), relativePath);
+			final Path relativeTargetFile = Path.of(targetDir.getAbsolutePath(), relativePath);
 			assertDirectoryExists(relativeTargetFile.getParent().toFile());
 
 			Files.copy(file.toPath(), relativeTargetFile, StandardCopyOption.REPLACE_EXISTING);

lib/src/main/java/com/diffplug/spotless/npm/ShadowCopy.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 DiffPlug
+ * Copyright 2023-2025 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,7 +24,6 @@
 import java.nio.file.FileVisitResult;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.nio.file.SimpleFileVisitor;
 import java.nio.file.StandardCopyOption;
 import java.nio.file.attribute.BasicFileAttributes;
@@ -108,11 +107,11 @@ public File getEntry(String key, String fileName) {
 	}
 
 	private File entry(String key, String origName) {
-		return Paths.get(shadowCopyRoot().getAbsolutePath(), key, origName).toFile();
+		return Path.of(shadowCopyRoot().getAbsolutePath(), key, origName).toFile();
 	}
 
 	public File copyEntryInto(String key, String origName, File targetParentFolder) {
-		File target = Paths.get(targetParentFolder.getAbsolutePath(), origName).toFile();
+		File target = Path.of(targetParentFolder.getAbsolutePath(), origName).toFile();
 		if (target.exists()) {
 			logger.warn("Shadow copy destination already exists, deleting! {}: {}", key, target);
 			ThrowingEx.run(() -> Files.walkFileTree(target.toPath(), new DeleteDirectoryRecursively()));

lib/src/main/java/com/diffplug/spotless/npm/TsFmtFormatterStep.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2024 DiffPlug
+ * Copyright 2016-2025 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,9 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.Serializable;
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.TreeMap;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -68,8 +70,7 @@ public static class State extends NpmFormatterStepStateBase implements Serializa
 
 		private final File buildDir;
 
-		@Nullable
-		private final TypedTsFmtConfigFile configFile;
+		@Nullable private final TypedTsFmtConfigFile configFile;
 
 		public State(String stepName, Map<String, String> versions, File projectDir, File buildDir, File cacheDir, NpmPathResolver npmPathResolver, @Nullable TypedTsFmtConfigFile configFile, @Nullable Map<String, Object> inlineTsFmtSettings) throws IOException {
 			super(stepName,

lib/src/testCompatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0AdapterTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 DiffPlug
+ * Copyright 2023-2025 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,6 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -34,7 +33,7 @@ public class KtLintCompat0Dot48Dot0AdapterTest {
 	public void testDefaults(@TempDir Path path) throws IOException {
 		KtLintCompat0Dot48Dot0Adapter ktLintCompat0Dot48Dot0Adapter = new KtLintCompat0Dot48Dot0Adapter();
 		var content = loadAndWriteText(path, "empty_class_body.kt");
-		final Path filePath = Paths.get(path.toString(), "empty_class_body.kt");
+		final Path filePath = Path.of(path.toString(), "empty_class_body.kt");
 
 		Map<String, Object> editorConfigOverrideMap = new HashMap<>();
 
@@ -46,7 +45,7 @@ public void testDefaults(@TempDir Path path) throws IOException {
 	public void testEditorConfigCanDisable(@TempDir Path path) throws IOException {
 		KtLintCompat0Dot48Dot0Adapter ktLintCompat0Dot48Dot0Adapter = new KtLintCompat0Dot48Dot0Adapter();
 		var content = loadAndWriteText(path, "fails_no_semicolons.kt");
-		final Path filePath = Paths.get(path.toString(), "fails_no_semicolons.kt");
+		final Path filePath = Path.of(path.toString(), "fails_no_semicolons.kt");
 
 		Map<String, Object> editorConfigOverrideMap = new HashMap<>();
 		editorConfigOverrideMap.put("indent_style", "tab");

lib/src/testCompatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0AdapterTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 DiffPlug
+ * Copyright 2023-2025 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,6 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -34,7 +33,7 @@ public class KtLintCompat0Dot49Dot0AdapterTest {
 	public void testDefaults(@TempDir Path path) throws IOException {
 		KtLintCompat0Dot49Dot0Adapter ktLintCompat0Dot49Dot0Adapter = new KtLintCompat0Dot49Dot0Adapter();
 		var content = loadAndWriteText(path, "EmptyClassBody.kt");
-		final Path filePath = Paths.get(path.toString(), "EmptyClassBody.kt");
+		final Path filePath = Path.of(path.toString(), "EmptyClassBody.kt");
 
 		Map<String, Object> editorConfigOverrideMap = new HashMap<>();
 
@@ -46,7 +45,7 @@ public void testDefaults(@TempDir Path path) throws IOException {
 	public void testEditorConfigCanDisable(@TempDir Path path) throws IOException {
 		KtLintCompat0Dot49Dot0Adapter ktLintCompat0Dot49Dot0Adapter = new KtLintCompat0Dot49Dot0Adapter();
 		var content = loadAndWriteText(path, "FailsNoSemicolons.kt");
-		final Path filePath = Paths.get(path.toString(), "FailsNoSemicolons.kt");
+		final Path filePath = Path.of(path.toString(), "FailsNoSemicolons.kt");
 
 		Map<String, Object> editorConfigOverrideMap = new HashMap<>();
 		editorConfigOverrideMap.put("indent_style", "tab");

lib/src/testCompatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0AdapterTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 DiffPlug
+ * Copyright 2023-2025 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,6 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -34,7 +33,7 @@ public class KtLintCompat0Dot50Dot0AdapterTest {
 	public void testDefaults(@TempDir Path path) throws IOException {
 		KtLintCompat0Dot50Dot0Adapter KtLintCompat0Dot50Dot0Adapter = new KtLintCompat0Dot50Dot0Adapter();
 		var content = loadAndWriteText(path, "EmptyClassBody.kt");
-		final Path filePath = Paths.get(path.toString(), "EmptyClassBody.kt");
+		final Path filePath = Path.of(path.toString(), "EmptyClassBody.kt");
 
 		Map<String, Object> editorConfigOverrideMap = new HashMap<>();
 
@@ -46,7 +45,7 @@ public void testDefaults(@TempDir Path path) throws IOException {
 	public void testEditorConfigCanDisable(@TempDir Path path) throws IOException {
 		KtLintCompat0Dot50Dot0Adapter KtLintCompat0Dot50Dot0Adapter = new KtLintCompat0Dot50Dot0Adapter();
 		var content = loadAndWriteText(path, "FailsNoSemicolons.kt");
-		final Path filePath = Paths.get(path.toString(), "FailsNoSemicolons.kt");
+		final Path filePath = Path.of(path.toString(), "FailsNoSemicolons.kt");
 
 		Map<String, Object> editorConfigOverrideMap = new HashMap<>();
 		editorConfigOverrideMap.put("indent_style", "tab");

lib/src/testCompatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0AdapterTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 DiffPlug
+ * Copyright 2023-2025 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,6 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -34,7 +33,7 @@ public class KtLintCompat1Dot0Dot0AdapterTest {
 	public void testDefaults(@TempDir Path path) throws IOException {
 		KtLintCompat1Dot0Dot0Adapter KtLintCompat1Dot0Dot0Adapter = new KtLintCompat1Dot0Dot0Adapter();
 		var content = loadAndWriteText(path, "EmptyClassBody.kt");
-		final Path filePath = Paths.get(path.toString(), "EmptyClassBody.kt");
+		final Path filePath = Path.of(path.toString(), "EmptyClassBody.kt");
 
 		Map<String, Object> editorConfigOverrideMap = new HashMap<>();
 
@@ -46,7 +45,7 @@ public void testDefaults(@TempDir Path path) throws IOException {
 	public void testEditorConfigCanDisable(@TempDir Path path) throws IOException {
 		KtLintCompat1Dot0Dot0Adapter KtLintCompat1Dot0Dot0Adapter = new KtLintCompat1Dot0Dot0Adapter();
 		var content = loadAndWriteText(path, "FailsNoSemicolons.kt");
-		final Path filePath = Paths.get(path.toString(), "FailsNoSemicolons.kt");
+		final Path filePath = Path.of(path.toString(), "FailsNoSemicolons.kt");
 
 		Map<String, Object> editorConfigOverrideMap = new HashMap<>();
 		editorConfigOverrideMap.put("indent_style", "tab");