[prone] Add StreamRulesRecipes

Signed-off-by: Vincent Potucek <[email protected]>

Author: Vincent Potucek

.github/actions/build/action.yml

@@ -59,3 +59,8 @@ runs:
         version=$(sed -n 's/version=\(.*\)/\1/p' gradle.properties)
         echo "Version is $version"
         echo "version=$version" >> $GITHUB_OUTPUT
+    - name: SanityCheck
+      id: build
+      if: ${{ inputs.publish == 'false' }}
+      shell: bash
+      run: ./gradlew rewriteDryRun -Dorg.gradle.jvmargs=-Xmx8G

build.gradle

@@ -7,6 +7,7 @@ plugins {
 	id 'com.gradleup.shadow' version "9.2.2" apply false
 	id 'me.champeau.jmh' version '0.7.2' apply false
 	id 'io.spring.nullability' version '0.0.8' apply false
+    id 'org.openrewrite.rewrite' version '7.20.0' apply false
 }
 
 ext {
@@ -16,6 +17,8 @@ ext {
 
 description = "Spring Framework"
 
+apply from: "$rootDir/gradle/rewrite.gradle"
+
 configure(allprojects) { project ->
 	apply plugin: "org.springframework.build.localdev"
 	group = "org.springframework"

gradle/rewrite.gradle

@@ -0,0 +1,12 @@
+apply plugin: 'org.openrewrite.rewrite'
+
+rewrite {
+  activeRecipe('org.springframework.openrewrite.SanityCheck')
+  setExportDatatables(true)
+  setFailOnDryRunResults(true)
+}
+
+dependencies {
+    rewrite(platform('org.openrewrite.recipe:rewrite-recipe-bom:3.18.0'))
+    rewrite('org.openrewrite.recipe:rewrite-rewrite:0.15.0')
+}

rewrite.yml

@@ -0,0 +1,19 @@
+---
+type: specs.openrewrite.org/v1beta/recipe
+name: org.springframework.openrewrite.SanityCheck
+displayName: Apply all Java & Gradle best practices
+description: Comprehensive code quality recipe combining modernization, security, and best practices.
+tags:
+  - java
+  - gradle
+  - static-analysis
+  - cleanup
+recipeList:
+  - org.openrewrite.gradle.EnableGradleBuildCache
+  - org.openrewrite.gradle.EnableGradleParallelExecution
+  - org.openrewrite.gradle.GradleBestPractices
+  - tech.picnic.errorprone.refasterrules.StreamRulesRecipes
+  # TBD
+  # - org.openrewrite.java.migrate.Java8toJava11 # https://github.com/google/error-prone/pull/5328
+  # - org.openrewrite.java.migrate.UpgradeToJava17 # https://github.com/checkstyle/checkstyle/pull/17730
+---

spring-context/src/main/java/org/springframework/context/aot/ReflectiveProcessorAotContributionBuilder.java

@@ -20,8 +20,8 @@
 import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.Set;
-import java.util.stream.StreamSupport;
 
+import com.google.common.collect.Streams;
 import org.jspecify.annotations.Nullable;
 
 import org.springframework.aot.generate.GenerationContext;
@@ -65,7 +65,7 @@ public class ReflectiveProcessorAotContributionBuilder {
 	 * @param classes the classes to inspect
 	 */
 	public ReflectiveProcessorAotContributionBuilder withClasses(Iterable<Class<?>> classes) {
-		this.classes.addAll(StreamSupport.stream(classes.spliterator(), false)
+		this.classes.addAll(Streams.stream(classes)
 				.filter(registrar::isCandidate).toList());
 		return this;
 	}

spring-web/src/main/java/org/springframework/http/server/DefaultPathContainer.java

@@ -23,7 +23,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 import org.jspecify.annotations.Nullable;
 
@@ -33,6 +32,8 @@
 import org.springframework.util.MultiValueMap;
 import org.springframework.util.StringUtils;
 
+import static java.util.stream.Collectors.joining;
+
 /**
  * Default implementation of {@link PathContainer}.
  *
@@ -191,7 +192,7 @@ static PathContainer subPath(PathContainer container, int fromIndex, int toIndex
 		Assert.isTrue(fromIndex < toIndex, () -> "fromIndex: " + fromIndex + " should be < toIndex " + toIndex);
 
 		List<Element> subList = elements.subList(fromIndex, toIndex);
-		String path = subList.stream().map(Element::value).collect(Collectors.joining(""));
+		String path = subList.stream().map(Element::value).collect(joining());
 		return new DefaultPathContainer(path, subList);
 	}
 

spring-webflux/src/test/java/org/springframework/web/reactive/function/server/AttributesTestVisitor.java

@@ -21,7 +21,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.Optional;
 import java.util.function.Function;
 import java.util.stream.Stream;
 
@@ -64,7 +63,7 @@ public void endNested(RequestPredicate predicate) {
 
 	@Override
 	public void route(RequestPredicate predicate, HandlerFunction<?> handlerFunction) {
-		Stream<Map<String, Object>> current = Optional.ofNullable(attributes).stream();
+		Stream<Map<String, Object>> current = Stream.ofNullable(attributes);
 		Stream<Map<String, Object>> nested = nestedAttributes.stream().filter(Objects::nonNull);
 		routerFunctionsAttributes.add(Stream.concat(current, nested).toList());
 		attributes = null;

spring-webmvc/src/test/java/org/springframework/web/servlet/function/AttributesTestVisitor.java

@@ -63,7 +63,7 @@ public void endNested(RequestPredicate predicate) {
 
 	@Override
 	public void route(RequestPredicate predicate, HandlerFunction<?> handlerFunction) {
-		Stream<Map<String, Object>> current = Optional.ofNullable(attributes).stream();
+		Stream<Map<String, Object>> current = Stream.ofNullable(attributes);
 		Stream<Map<String, Object>> nested = nestedAttributes.stream().filter(Objects::nonNull);
 		routerFunctionsAttributes.add(Stream.concat(current, nested).toList());
 		attributes = null;