From 1f293cc653cbabe5c1779d370dc12ee3c7f70ab0 Mon Sep 17 00:00:00 2001
From: Moritz Halbritter <moritz.halbritter@broadcom.com>
Date: Mon, 6 Oct 2025 12:18:25 +0200
Subject: [PATCH] Add nullability annotations to tests in
 module/spring-boot-jooq

See gh-47263
---
 module/spring-boot-jooq/build.gradle                          | 4 ++++
 .../DefaultExceptionTranslatorExecuteListenerTests.java       | 3 ++-
 .../boot/jooq/autoconfigure/JooqAutoConfigurationTests.java   | 2 +-
 .../boot/jooq/autoconfigure/JooqPropertiesTests.java          | 3 ++-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/module/spring-boot-jooq/build.gradle b/module/spring-boot-jooq/build.gradle
index b88291d2ff4..3829c942b12 100644
--- a/module/spring-boot-jooq/build.gradle
+++ b/module/spring-boot-jooq/build.gradle
@@ -43,3 +43,7 @@ dependencies {
 	testRuntimeOnly("org.glassfish.jaxb:jaxb-runtime")
 	testRuntimeOnly("org.hsqldb:hsqldb")
 }
+
+tasks.named("compileTestJava") {
+	options.nullability.checking = "tests"
+}
diff --git a/module/spring-boot-jooq/src/test/java/org/springframework/boot/jooq/autoconfigure/DefaultExceptionTranslatorExecuteListenerTests.java b/module/spring-boot-jooq/src/test/java/org/springframework/boot/jooq/autoconfigure/DefaultExceptionTranslatorExecuteListenerTests.java
index ca56da04f62..6746eb26f75 100644
--- a/module/spring-boot-jooq/src/test/java/org/springframework/boot/jooq/autoconfigure/DefaultExceptionTranslatorExecuteListenerTests.java
+++ b/module/spring-boot-jooq/src/test/java/org/springframework/boot/jooq/autoconfigure/DefaultExceptionTranslatorExecuteListenerTests.java
@@ -50,6 +50,7 @@ class DefaultExceptionTranslatorExecuteListenerTests {
 	private final ExceptionTranslatorExecuteListener listener = new DefaultExceptionTranslatorExecuteListener();
 
 	@Test
+	@SuppressWarnings("NullAway") // Test null check
 	void createWhenTranslatorFactoryIsNullThrowsException() {
 		assertThatIllegalArgumentException()
 			.isThrownBy(() -> new DefaultExceptionTranslatorExecuteListener(
@@ -74,7 +75,7 @@ class DefaultExceptionTranslatorExecuteListenerTests {
 
 	@Test
 	void exceptionWhenHasCustomTranslatorFactory() {
-		SQLExceptionTranslator translator = BadSqlGrammarException::new;
+		SQLExceptionTranslator translator = (task, sql, ex) -> new BadSqlGrammarException(task, "sql", ex);
 		ExceptionTranslatorExecuteListener listener = new DefaultExceptionTranslatorExecuteListener(
 				(context) -> translator);
 		SQLException sqlException = sqlException(123);
diff --git a/module/spring-boot-jooq/src/test/java/org/springframework/boot/jooq/autoconfigure/JooqAutoConfigurationTests.java b/module/spring-boot-jooq/src/test/java/org/springframework/boot/jooq/autoconfigure/JooqAutoConfigurationTests.java
index e10e8a0e180..9a94e51f8a1 100644
--- a/module/spring-boot-jooq/src/test/java/org/springframework/boot/jooq/autoconfigure/JooqAutoConfigurationTests.java
+++ b/module/spring-boot-jooq/src/test/java/org/springframework/boot/jooq/autoconfigure/JooqAutoConfigurationTests.java
@@ -361,7 +361,7 @@ class JooqAutoConfigurationTests {
 
 		@Override
 		public ExecuteListener provide() {
-			return null;
+			return mock(ExecuteListener.class);
 		}
 
 	}
diff --git a/module/spring-boot-jooq/src/test/java/org/springframework/boot/jooq/autoconfigure/JooqPropertiesTests.java b/module/spring-boot-jooq/src/test/java/org/springframework/boot/jooq/autoconfigure/JooqPropertiesTests.java
index 2ef0d6a0251..b97664de00a 100644
--- a/module/spring-boot-jooq/src/test/java/org/springframework/boot/jooq/autoconfigure/JooqPropertiesTests.java
+++ b/module/spring-boot-jooq/src/test/java/org/springframework/boot/jooq/autoconfigure/JooqPropertiesTests.java
@@ -23,6 +23,7 @@ import java.sql.SQLException;
 import javax.sql.DataSource;
 
 import org.jooq.SQLDialect;
+import org.jspecify.annotations.Nullable;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 
@@ -44,7 +45,7 @@ import static org.mockito.Mockito.never;
  */
 class JooqPropertiesTests {
 
-	private AnnotationConfigApplicationContext context;
+	private @Nullable AnnotationConfigApplicationContext context;
 
 	@AfterEach
 	void close() {