Issue #2634: Add StreamRulesRecipes

.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))
+* Issue #2634: Add `StreamRulesRecipes` ([#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,7 @@ spotless {
 		endWithNewline()
 	}
 }
+
+dependencies {
+	rewrite("org.openrewrite.recipe:rewrite-third-party:0.27.0")
+}

gradle/rewrite.gradle

@@ -0,0 +1,7 @@
+apply plugin: 'org.openrewrite.rewrite'
+
+rewrite {
+	activeRecipe("tech.picnic.errorprone.refasterrules.StreamRulesRecipes")
+	exportDatatables = true
+	failOnDryRunResults = true
+}

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;
@@ -44,8 +47,8 @@ Optional<File> tryFind() {
 				.stream()
 				.map(Supplier::get)
 				.filter(Optional::isPresent)
-				.map(Optional::get)
-				.findFirst();
+				.findFirst()
+				.map(Optional::get);
 	}
 
 	static class Builder {

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

@@ -81,11 +81,7 @@ public boolean isLayoutPrepared() {
 		if (!packageLockJsonFile.isFile()) {
 			return false;
 		}
-		if (!serveJsFile().isFile()) {
-			return false;
-		}
-		// npmrc is optional, so must not be checked here
-		return true;
+		return serveJsFile().isFile(); // npmrc is optional, so must not be checked here
 	}
 
 	public boolean isNodeModulesPrepared() {
@@ -96,7 +92,7 @@ public boolean isNodeModulesPrepared() {
 		// check if it is NOT empty
 		return ThrowingEx.get(() -> {
 			try (Stream<Path> entries = Files.list(nodeModulesInstallDirPath)) {
-				return entries.findFirst().isPresent();
+				return entries.findAny().isPresent();
 			}
 		});
 	}

plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java

@@ -414,8 +414,7 @@ private List<FormatterFactory> getFormatterFactories() {
 	}
 
 	private List<FormatterStepFactory> getFormatterStepFactories() {
-		return Stream.of(licenseHeader)
-				.filter(Objects::nonNull)
+		return Stream.ofNullable(licenseHeader)
 				.collect(toList());
 	}
 

settings.gradle

@@ -23,6 +23,7 @@ plugins {
 	id 'com.gradle.develocity' version '3.19.2'
 	// https://github.com/equodev/equo-ide/blob/main/plugin-gradle/CHANGELOG.md
 	id 'dev.equo.ide' version '1.7.8' apply false
+	id 'org.openrewrite.rewrite' version '7.16.0' apply false
 }
 
 dependencyResolutionManagement {