Fix NPE add EqualsAvoidsNull #TODO

Vincent Potucek · Vincent Potucek · commit 60010642fcf7 · 2025-12-15T13:13:00.000+01:00
Signed-off-by: Vincent Potucek &lt;vpotucek@me.com&gt;
diff --git a/.github/workflows/build-pull-request.yml b/.github/workflows/build-pull-request.yml
@@ -1,22 +1,22 @@
-name: Build Pull Request
+name: Build Pull Request 🏭️
 on: pull_request
 permissions:
   contents: read
 jobs:
   build:
-    name: Build Pull Request
+    name: Build 🏗
     if: ${{ github.repository == 'spring-projects/spring-boot' }}
     runs-on: ${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }}
     steps:
-      - name: Check Out Code
+      - name: Checkout Code 📥
         uses: actions/checkout@v6
-      - name: Build
+      - name: Build 📦
         id: build
         uses: ./.github/actions/build
-      - name: Print JVM Thread Dumps When Cancelled
+      - name: Log Potentially Cancelled JVM Thread Dumps 📋
         if: cancelled()
         uses: ./.github/actions/print-jvm-thread-dumps
-      - name: Upload Build Reports
+      - name: Upload Build Report 📊
         if: failure()
         uses: actions/upload-artifact@v5
         with:
diff --git a/.github/workflows/run-codeql-analysis.yml b/.github/workflows/run-codeql-analysis.yml
@@ -1,11 +1,12 @@
-name: "Run CodeQL Analysis"
+name: Run CodeQL Analysis 📊
 on:
   push:
   pull_request:
   workflow_dispatch:
 permissions: read-all
 jobs:
   run-analysis:
+    name: Inspect 🔎
     permissions:
       actions: read
       contents: read
diff --git a/.github/workflows/sanity.yml b/.github/workflows/sanity.yml
@@ -0,0 +1,19 @@
+name: Sanity Check 🕊️
+on:
+  push:
+  pull_request:
+  workflow_dispatch:
+permissions: read-all
+jobs:
+  verify:
+    name: Verify 📊
+    if: ${{ github.repository == 'spring-projects/spring-boot' }}
+    runs-on: ${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }}
+    steps:
+      - name: Checkout Code 📥
+        uses: actions/checkout@v6
+      - name: Build 📦
+        id: build
+        uses: ./.github/actions/build
+      - name: Rewrite ♻️
+        run: ./gradlew rewriteDryRun
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
@@ -20,6 +20,7 @@ plugins {
 	id "checkstyle"
 	id "eclipse"
 	id "org.jetbrains.dokka" version "2.1.0"
+	id "org.openrewrite.rewrite" version "7.22.0" apply false
 }
 
 repositories {
@@ -185,3 +186,6 @@ eclipse {
 }
 
 jar.dependsOn check
+
+apply from: rootProject.file("${rootDir}/config/rewrite.gradle")
+//apply from: rootProject.file("${rootDir}/gradle/rewrite.gradle")
diff --git a/buildSrc/config/rewrite.gradle b/buildSrc/config/rewrite.gradle
@@ -0,0 +1,19 @@
+project.apply(plugin: "org.openrewrite.rewrite")
+
+dependencies {
+	rewrite("org.openrewrite.recipe:rewrite-static-analysis:2.23.0")
+	rewrite("org.openrewrite.recipe:rewrite-testing-frameworks:3.23.0")
+}
+
+rewrite {
+	activeRecipe("org.springframework.boot.openrewrite.SanityCheck")
+	configFile = project.getRootProject().file("${rootDir}/config/rewrite.yml")
+	exclusion( // incompatible
+		"**AggregatorPlugin.java",
+		"**AntoraConventions.java",
+		"**ArchitectureCheckTests.java",
+		"**architecture/junit/enumsource**",
+	)
+	setExportDatatables(true)
+	setFailOnDryRunResults(true)
+}
diff --git a/buildSrc/config/rewrite.yml b/buildSrc/config/rewrite.yml
@@ -0,0 +1,16 @@
+---
+type: specs.openrewrite.org/v1beta/recipe
+name: org.springframework.boot.openrewrite.SanityCheck
+displayName: Apply all common best practices
+description: Comprehensive code quality recipe combining modernization, security, and best practices.
+recipeList:
+  - org.openrewrite.gradle.UpdateGradleWrapper
+  - org.openrewrite.java.testing.junit.JupiterBestPractices
+  - org.openrewrite.java.testing.junit5.CleanupAssertions
+  - org.openrewrite.staticanalysis.EqualsAvoidsNull
+  - tech.picnic.errorprone.refasterrules.TimeRulesRecipes
+  - tech.picnic.errorprone.refasterrules.EqualityRulesRecipes
+# - tech.picnic.errorprone.refasterrules.NullRulesRecipes
+# - tech.picnic.errorprone.refasterrules.StreamRulesRecipes
+# - tech.picnic.errorprone.refasterrules.StringRulesRecipes
+---
diff --git a/buildSrc/src/main/java/org/springframework/boot/build/DeployedPlugin.java b/buildSrc/src/main/java/org/springframework/boot/build/DeployedPlugin.java
@@ -47,14 +47,14 @@ public void apply(Project project) {
 		project.afterEvaluate((evaluated) -> project.getPlugins().withType(JavaPlugin.class).all((javaPlugin) -> {
 			if (((Jar) project.getTasks().getByName(JavaPlugin.JAR_TASK_NAME)).isEnabled()) {
 				project.getComponents()
-					.matching((component) -> component.getName().equals("java"))
+					.matching((component) -> "java".equals(component.getName()))
 					.all(mavenPublication::from);
 			}
 		}));
 		project.getPlugins()
 			.withType(JavaPlatformPlugin.class)
 			.all((javaPlugin) -> project.getComponents()
-				.matching((component) -> component.getName().equals("javaPlatform"))
+				.matching((component) -> "javaPlatform".equals(component.getName()))
 				.all(mavenPublication::from));
 	}
 
diff --git a/buildSrc/src/main/java/org/springframework/boot/build/MavenRepositoryPlugin.java b/buildSrc/src/main/java/org/springframework/boot/build/MavenRepositoryPlugin.java
@@ -62,10 +62,10 @@ public void apply(Project project) {
 			mavenRepository.setUrl(repositoryLocation.toURI());
 		});
 		project.getTasks()
-			.matching((task) -> task.getName().equals(PUBLISH_TO_PROJECT_REPOSITORY_TASK_NAME))
+			.matching((task) -> PUBLISH_TO_PROJECT_REPOSITORY_TASK_NAME.equals(task.getName()))
 			.all((task) -> setUpProjectRepository(project, task, repositoryLocation));
 		project.getTasks()
-			.matching((task) -> task.getName().equals("publishPluginMavenPublicationToProjectRepository"))
+			.matching((task) -> "publishPluginMavenPublicationToProjectRepository".equals(task.getName()))
 			.all((task) -> setUpProjectRepository(project, task, repositoryLocation));
 	}
 
diff --git a/buildSrc/src/main/java/org/springframework/boot/build/antora/CheckJavadocMacros.java b/buildSrc/src/main/java/org/springframework/boot/build/antora/CheckJavadocMacros.java
@@ -336,7 +336,7 @@ private WellKnownAnchor(Origin origin) {
 		}
 
 		private static WellKnownAnchor of(String anchor, Origin origin) {
-			if (anchor.equals("enum-constant-summary")) {
+			if ("enum-constant-summary".equals(anchor)) {
 				return new WellKnownAnchor(origin);
 			}
 			return null;
diff --git a/buildSrc/src/main/java/org/springframework/boot/build/architecture/AutoConfigurationChecker.java b/buildSrc/src/main/java/org/springframework/boot/build/architecture/AutoConfigurationChecker.java
@@ -117,7 +117,7 @@ private JavaClass[] getImportedClasses(JavaClass javaClass) {
 
 		private boolean isBootClass(JavaClass javaClass) {
 			String pkg = javaClass.getPackage().getName();
-			return pkg.equals(SPRING_BOOT_ROOT_PACKAGE) || pkg.startsWith(SPRING_BOOT_ROOT_PACKAGE + ".");
+			return SPRING_BOOT_ROOT_PACKAGE.equals(pkg) || pkg.startsWith(SPRING_BOOT_ROOT_PACKAGE + ".");
 		}
 
 	}
diff --git a/buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/StandardLibraryUpdateResolver.java b/buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/StandardLibraryUpdateResolver.java
@@ -74,7 +74,7 @@ public List<LibraryWithVersionOptions> findLibraryUpdates(Collection<Library> li
 	}
 
 	protected boolean isLibraryExcluded(Library library) {
-		return library.getName().equals("Spring Boot");
+		return "Spring Boot".equals(library.getName());
 	}
 
 	protected List<VersionOption> getVersionOptions(Library library) {
diff --git a/buildSrc/src/main/java/org/springframework/boot/build/classpath/CheckClasspathForProhibitedDependencies.java b/buildSrc/src/main/java/org/springframework/boot/build/classpath/CheckClasspathForProhibitedDependencies.java
@@ -85,7 +85,7 @@ private boolean prohibited(ModuleVersionIdentifier id) {
 	}
 
 	private boolean prohibitedSlf4j(ModuleVersionIdentifier id) {
-		return id.getGroup().equals("org.slf4j") && id.getName().equals("jcl-over-slf4j");
+		return "org.slf4j".equals(id.getGroup()) && "jcl-over-slf4j".equals(id.getName());
 	}
 
 	private boolean prohibitedJbossSpec(ModuleVersionIdentifier id) {
diff --git a/buildSrc/src/main/java/org/springframework/boot/build/starters/DocumentStarters.java b/buildSrc/src/main/java/org/springframework/boot/build/starters/DocumentStarters.java
@@ -139,7 +139,7 @@ private Starter(String name, String description, Set<String> dependencies) {
 		}
 
 		private boolean isProduction() {
-			return this.name.equals("spring-boot-starter-actuator");
+			return "spring-boot-starter-actuator".equals(this.name);
 		}
 
 		private boolean isTechnical() {
diff --git a/buildSrc/src/test/java/org/springframework/boot/build/ConventionsPluginTests.java b/buildSrc/src/test/java/org/springframework/boot/build/ConventionsPluginTests.java
@@ -70,7 +70,7 @@ void setup(@TempDir File projectDir) throws IOException {
 	}
 
 	@Test
-	void jarIncludesLegalFiles() throws IOException {
+	void jarIncludesLegalFiles() throws Exception {
 		try (PrintWriter out = new PrintWriter(new FileWriter(this.buildFile))) {
 			out.println("plugins {");
 			out.println("    id 'java'");
@@ -101,7 +101,7 @@ void jarIncludesLegalFiles() throws IOException {
 	}
 
 	@Test
-	void sourceJarIsBuilt() throws IOException {
+	void sourceJarIsBuilt() throws Exception {
 		try (PrintWriter out = new PrintWriter(new FileWriter(this.buildFile))) {
 			out.println("plugins {");
 			out.println("    id 'java'");
@@ -132,7 +132,7 @@ void sourceJarIsBuilt() throws IOException {
 	}
 
 	@Test
-	void javadocJarIsBuilt() throws IOException {
+	void javadocJarIsBuilt() throws Exception {
 		try (PrintWriter out = new PrintWriter(new FileWriter(this.buildFile))) {
 			out.println("plugins {");
 			out.println("    id 'java'");
@@ -176,7 +176,7 @@ private void assertThatNoticeIsPresent(JarFile jar) throws IOException {
 	}
 
 	@Test
-	void testRetryIsConfiguredWithThreeRetriesOnCI() throws IOException {
+	void retryIsConfiguredWithThreeRetriesOnCI() throws Exception {
 		try (PrintWriter out = new PrintWriter(new FileWriter(this.buildFile))) {
 			out.println("plugins {");
 			out.println("    id 'java'");
@@ -198,7 +198,7 @@ void testRetryIsConfiguredWithThreeRetriesOnCI() throws IOException {
 	}
 
 	@Test
-	void testRetryIsConfiguredWithZeroRetriesLocally() throws IOException {
+	void retryIsConfiguredWithZeroRetriesLocally() throws Exception {
 		try (PrintWriter out = new PrintWriter(new FileWriter(this.buildFile))) {
 			out.println("plugins {");
 			out.println("    id 'java'");
diff --git a/buildSrc/src/test/java/org/springframework/boot/build/autoconfigure/DocumentAutoConfigurationClassesTests.java b/buildSrc/src/test/java/org/springframework/boot/build/autoconfigure/DocumentAutoConfigurationClassesTests.java
@@ -43,7 +43,7 @@ class DocumentAutoConfigurationClassesTests {
 	private File temp;
 
 	@Test
-	void classesAreDocumented() throws IOException {
+	void classesAreDocumented() throws Exception {
 		File output = documentAutoConfigurationClasses((metadataDir) -> {
 			writeAutoConfigurationMetadata("spring-boot-one", List.of("org.springframework.boot.one.AAutoConfiguration",
 					"org.springframework.boot.one.BAutoConfiguration"), metadataDir);
@@ -56,7 +56,7 @@ void classesAreDocumented() throws IOException {
 	}
 
 	@Test
-	void whenMetadataIsRemovedThenOutputForThatMetadataIsNoLongerPresent() throws IOException {
+	void whenMetadataIsRemovedThenOutputForThatMetadataIsNoLongerPresent() throws Exception {
 		documentAutoConfigurationClasses((metadataDir) -> {
 			writeAutoConfigurationMetadata("spring-boot-one", List.of("org.springframework.boot.one.AAutoConfiguration",
 					"org.springframework.boot.one.BAutoConfiguration"), metadataDir);
diff --git a/buildSrc/src/test/java/org/springframework/boot/build/bom/BomPluginIntegrationTests.java b/buildSrc/src/test/java/org/springframework/boot/build/bom/BomPluginIntegrationTests.java
@@ -18,7 +18,6 @@
 
 import java.io.File;
 import java.io.FileWriter;
-import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.function.Consumer;
 
@@ -51,7 +50,7 @@ void setup(@TempDir File projectDir) {
 	}
 
 	@Test
-	void libraryModulesAreIncludedInDependencyManagementOfGeneratedPom() throws IOException {
+	void libraryModulesAreIncludedInDependencyManagementOfGeneratedPom() throws Exception {
 		try (PrintWriter out = new PrintWriter(new FileWriter(this.buildFile))) {
 			out.println("plugins {");
 			out.println("    id 'org.springframework.boot.bom'");
@@ -88,7 +87,7 @@ void libraryModulesAreIncludedInDependencyManagementOfGeneratedPom() throws IOEx
 	}
 
 	@Test
-	void libraryPluginsAreIncludedInPluginManagementOfGeneratedPom() throws IOException {
+	void libraryPluginsAreIncludedInPluginManagementOfGeneratedPom() throws Exception {
 		try (PrintWriter out = new PrintWriter(new FileWriter(this.buildFile))) {
 			out.println("plugins {");
 			out.println("    id 'org.springframework.boot.bom'");
@@ -143,7 +142,7 @@ void libraryImportsAreIncludedInDependencyManagementOfGeneratedPom() throws Exce
 	}
 
 	@Test
-	void moduleExclusionsAreIncludedInDependencyManagementOfGeneratedPom() throws IOException {
+	void moduleExclusionsAreIncludedInDependencyManagementOfGeneratedPom() throws Exception {
 		try (PrintWriter out = new PrintWriter(new FileWriter(this.buildFile))) {
 			out.println("plugins {");
 			out.println("    id 'org.springframework.boot.bom'");
@@ -177,7 +176,7 @@ void moduleExclusionsAreIncludedInDependencyManagementOfGeneratedPom() throws IO
 	}
 
 	@Test
-	void moduleTypesAreIncludedInDependencyManagementOfGeneratedPom() throws IOException {
+	void moduleTypesAreIncludedInDependencyManagementOfGeneratedPom() throws Exception {
 		try (PrintWriter out = new PrintWriter(new FileWriter(this.buildFile))) {
 			out.println("plugins {");
 			out.println("    id 'org.springframework.boot.bom'");
@@ -209,7 +208,7 @@ void moduleTypesAreIncludedInDependencyManagementOfGeneratedPom() throws IOExcep
 	}
 
 	@Test
-	void moduleClassifiersAreIncludedInDependencyManagementOfGeneratedPom() throws IOException {
+	void moduleClassifiersAreIncludedInDependencyManagementOfGeneratedPom() throws Exception {
 		try (PrintWriter out = new PrintWriter(new FileWriter(this.buildFile))) {
 			out.println("plugins {");
 			out.println("    id 'org.springframework.boot.bom'");
@@ -268,7 +267,7 @@ void moduleClassifiersAreIncludedInDependencyManagementOfGeneratedPom() throws I
 	}
 
 	@Test
-	void libraryNamedSpringBootHasNoVersionProperty() throws IOException {
+	void libraryNamedSpringBootHasNoVersionProperty() throws Exception {
 		try (PrintWriter out = new PrintWriter(new FileWriter(this.buildFile))) {
 			out.println("plugins {");
 			out.println("    id 'org.springframework.boot.bom'");
diff --git a/buildSrc/src/test/java/org/springframework/boot/build/bom/bomr/UpgradeApplicatorTests.java b/buildSrc/src/test/java/org/springframework/boot/build/bom/bomr/UpgradeApplicatorTests.java
@@ -18,7 +18,6 @@
 
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Files;
 import java.util.Collections;
@@ -46,7 +45,7 @@ class UpgradeApplicatorTests {
 	File temp;
 
 	@Test
-	void whenUpgradeIsAppliedToLibraryWithVersionThenBomIsUpdated() throws IOException {
+	void whenUpgradeIsAppliedToLibraryWithVersionThenBomIsUpdated() throws Exception {
 		File bom = new File(this.temp, "bom.gradle");
 		FileCopyUtils.copy(new File("src/test/resources/bom.gradle"), bom);
 		String originalContents = Files.readString(bom.toPath());
@@ -61,7 +60,7 @@ void whenUpgradeIsAppliedToLibraryWithVersionThenBomIsUpdated() throws IOExcepti
 	}
 
 	@Test
-	void whenUpgradeIsAppliedToLibraryWithVersionPropertyThenGradlePropertiesIsUpdated() throws IOException {
+	void whenUpgradeIsAppliedToLibraryWithVersionPropertyThenGradlePropertiesIsUpdated() throws Exception {
 		File bom = new File(this.temp, "bom.gradle");
 		FileCopyUtils.copy(new File("src/test/resources/bom.gradle"), bom);
 		File gradleProperties = new File(this.temp, "gradle.properties");
diff --git a/buildSrc/src/test/java/org/springframework/boot/build/context/properties/ConfigurationPropertiesAnalyzerTests.java b/buildSrc/src/test/java/org/springframework/boot/build/context/properties/ConfigurationPropertiesAnalyzerTests.java
diff --git a/buildSrc/src/test/java/org/springframework/boot/build/optional/OptionalDependenciesPluginIntegrationTests.java b/buildSrc/src/test/java/org/springframework/boot/build/optional/OptionalDependenciesPluginIntegrationTests.java
diff --git a/buildSrc/src/test/java/org/springframework/boot/build/test/autoconfigure/TestSliceMetadataTests.java b/buildSrc/src/test/java/org/springframework/boot/build/test/autoconfigure/TestSliceMetadataTests.java
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
diff --git a/gradlew.bat b/gradlew.bat

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ plugins {`
`20`	`20`	`id "checkstyle"`
`21`	`21`	`id "eclipse"`
`22`	`22`	`id "org.jetbrains.dokka" version "2.1.0"`
	`23`	`+ id "org.openrewrite.rewrite" version "7.22.0" apply false`
`23`	`24`	`}`
`24`	`25`
`25`	`26`	`repositories {`
`@@ -185,3 +186,6 @@ eclipse {`
`185`	`186`	`}`
`186`	`187`
`187`	`188`	`jar.dependsOn check`
	`189`	`+`
	`190`	`+apply from: rootProject.file("${rootDir}/config/rewrite.gradle")`
	`191`	`+//apply from: rootProject.file("${rootDir}/gradle/rewrite.gradle")`
Original file line number	Diff line number	Diff line change
`@@ -336,7 +336,7 @@ private WellKnownAnchor(Origin origin) {`
`336`	`336`	`}`
`337`	`337`
`338`	`338`	`private static WellKnownAnchor of(String anchor, Origin origin) {`
`339`		`- if (anchor.equals("enum-constant-summary")) {`
	`339`	`+ if ("enum-constant-summary".equals(anchor)) {`
`340`	`340`	`return new WellKnownAnchor(origin);`
`341`	`341`	`}`
`342`	`342`	`return null;`
Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ private JavaClass[] getImportedClasses(JavaClass javaClass) {`
`117`	`117`
`118`	`118`	`private boolean isBootClass(JavaClass javaClass) {`
`119`	`119`	`String pkg = javaClass.getPackage().getName();`
`120`		`- return pkg.equals(SPRING_BOOT_ROOT_PACKAGE) \|\| pkg.startsWith(SPRING_BOOT_ROOT_PACKAGE + ".");`
	`120`	`+ return SPRING_BOOT_ROOT_PACKAGE.equals(pkg) \|\| pkg.startsWith(SPRING_BOOT_ROOT_PACKAGE + ".");`
`121`	`121`	`}`
`122`	`122`
`123`	`123`	`}`