From 97ce87223054156398eda98bd88ddff0d0f757f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= <stephane.nicoll@broadcom.com>
Date: Thu, 1 May 2025 10:06:15 +0200
Subject: [PATCH] Configure nullability checks with ErrorProne

See gh-1562

Co-authored-by: Andy Wilkinson <andy.wilkinson@broadcom.com>
Co-authored-by: Brian Clozel <brian.clozel@broadcom.com>
---
 gradle/plugins/conventions-plugin/build.gradle              | 1 +
 .../ws/gradle/conventions/ConventionsPlugin.java            | 6 +++++-
 gradle/plugins/gradle.properties                            | 1 +
 src/checkstyle/checkstyle-suppressions.xml                  | 2 ++
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/gradle/plugins/conventions-plugin/build.gradle b/gradle/plugins/conventions-plugin/build.gradle
index 04665704..4bfaba73 100644
--- a/gradle/plugins/conventions-plugin/build.gradle
+++ b/gradle/plugins/conventions-plugin/build.gradle
@@ -15,6 +15,7 @@ dependencies {
 	checkstyle("io.spring.javaformat:spring-javaformat-checkstyle:${javaFormatVersion}")
 
 	implementation("com.github.ben-manes:gradle-versions-plugin:$gradleVersionsPluginVersion")
+	implementation("io.spring.gradle.nullability:nullability-plugin:$nullabilityPluginVersion")
 	implementation("io.spring.javaformat:spring-javaformat-gradle-plugin:$javaFormatVersion")
 
 	testImplementation("org.junit.jupiter:junit-jupiter")
diff --git a/gradle/plugins/conventions-plugin/src/main/java/org/springframework/ws/gradle/conventions/ConventionsPlugin.java b/gradle/plugins/conventions-plugin/src/main/java/org/springframework/ws/gradle/conventions/ConventionsPlugin.java
index 435ed0a4..3b46bbcf 100644
--- a/gradle/plugins/conventions-plugin/src/main/java/org/springframework/ws/gradle/conventions/ConventionsPlugin.java
+++ b/gradle/plugins/conventions-plugin/src/main/java/org/springframework/ws/gradle/conventions/ConventionsPlugin.java
@@ -16,6 +16,7 @@
 
 package org.springframework.ws.gradle.conventions;
 
+import io.spring.gradle.nullability.NullabilityPlugin;
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
 import org.gradle.api.plugins.JavaBasePlugin;
@@ -37,7 +38,10 @@ public class ConventionsPlugin implements Plugin<Project> {
 			new JavaBasePluginConventions().apply(project);
 			new CheckstyleConventions().apply(project);
 		});
-		project.getPlugins().withType(JavaPlugin.class).all((plugin) -> new JavaPluginConventions().apply(project));
+		project.getPlugins().withType(JavaPlugin.class).all((plugin) -> {
+			project.getPlugins().apply(NullabilityPlugin.class);
+			new JavaPluginConventions().apply(project);
+		});
 		project.getPlugins()
 			.withType(MavenPublishPlugin.class)
 			.all((plugin) -> new MavenPublishPluginConventions().apply(project));
diff --git a/gradle/plugins/gradle.properties b/gradle/plugins/gradle.properties
index b80bde94..51c28b67 100644
--- a/gradle/plugins/gradle.properties
+++ b/gradle/plugins/gradle.properties
@@ -2,3 +2,4 @@ assertJVersion=3.25.3
 gradleVersionsPluginVersion=0.52.0
 javaFormatVersion=0.0.45
 junitVersion=5.11.0
+nullabilityPluginVersion=0.0.1
\ No newline at end of file
diff --git a/src/checkstyle/checkstyle-suppressions.xml b/src/checkstyle/checkstyle-suppressions.xml
index eb2c567f..a41d9018 100644
--- a/src/checkstyle/checkstyle-suppressions.xml
+++ b/src/checkstyle/checkstyle-suppressions.xml
@@ -8,4 +8,6 @@
 	<suppress files="." checks="SpringMethodVisibility"/>
 
 	<suppress files=".+TransportConstants\.java" checks="InterfaceIsType"/>
+	<!-- Ignore this check for @Nullable annotations -->
+	<suppress files="[\\/]src[\\/]main[\\/]java[\\/]" checks="AnnotationLocation" />
 </suppressions>
\ No newline at end of file