From 866be19024c84dca7fa7922173b0af1c7c729cb4 Mon Sep 17 00:00:00 2001
From: Moritz Halbritter <moritz.halbritter@broadcom.com>
Date: Wed, 15 Oct 2025 14:26:27 +0200
Subject: [PATCH] Add nullability annotations to tests in
 module/spring-boot-validation

See gh-47263
---
 module/spring-boot-validation/build.gradle                   | 4 ++++
 .../boot/validation/autoconfigure/ValidatorAdapterTests.java | 5 +++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/module/spring-boot-validation/build.gradle b/module/spring-boot-validation/build.gradle
index 69eff5ffb27..2db31fc2f1c 100644
--- a/module/spring-boot-validation/build.gradle
+++ b/module/spring-boot-validation/build.gradle
@@ -36,3 +36,7 @@ dependencies {
 
 	testRuntimeOnly("ch.qos.logback:logback-classic")
 }
+
+tasks.named("compileTestJava") {
+	options.nullability.checking = "tests"
+}
diff --git a/module/spring-boot-validation/src/test/java/org/springframework/boot/validation/autoconfigure/ValidatorAdapterTests.java b/module/spring-boot-validation/src/test/java/org/springframework/boot/validation/autoconfigure/ValidatorAdapterTests.java
index 034fa2299e9..6d3d3346a88 100644
--- a/module/spring-boot-validation/src/test/java/org/springframework/boot/validation/autoconfigure/ValidatorAdapterTests.java
+++ b/module/spring-boot-validation/src/test/java/org/springframework/boot/validation/autoconfigure/ValidatorAdapterTests.java
@@ -21,6 +21,7 @@ import java.util.HashMap;
 import jakarta.validation.Validator;
 import jakarta.validation.constraints.Min;
 import org.hibernate.validator.HibernateValidator;
+import org.jspecify.annotations.Nullable;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.boot.test.context.FilteredClassLoader;
@@ -173,8 +174,8 @@ class ValidatorAdapterTests {
 
 			@Override
 			@SuppressWarnings("unchecked")
-			public <T> T unwrap(Class<T> type) {
-				if (type.isInstance(this.delegate)) {
+			public <T> @Nullable T unwrap(@Nullable Class<T> type) {
+				if (type != null && type.isInstance(this.delegate)) {
 					return (T) this.delegate;
 				}
 				return this.delegate.unwrap(type);