From cae3fb578c09836e790c15e2de96c960f929572f Mon Sep 17 00:00:00 2001
From: Moritz Halbritter <moritz.halbritter@broadcom.com>
Date: Fri, 26 Sep 2025 14:57:05 +0200
Subject: [PATCH] Add nullability annotations to tests in
 module/spring-boot-http-converter

See gh-47263
---
 module/spring-boot-http-converter/build.gradle               | 4 ++++
 .../converter/autoconfigure/HttpMessageConvertersTests.java  | 5 ++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/module/spring-boot-http-converter/build.gradle b/module/spring-boot-http-converter/build.gradle
index f85739b5fa0..9bb40cb0869 100644
--- a/module/spring-boot-http-converter/build.gradle
+++ b/module/spring-boot-http-converter/build.gradle
@@ -50,3 +50,7 @@ dependencies {
 	testRuntimeOnly("org.springframework:spring-webflux")
 	testRuntimeOnly("tools.jackson.dataformat:jackson-dataformat-cbor")
 }
+
+tasks.named("compileTestJava") {
+	options.nullability.checking = "tests"
+}
diff --git a/module/spring-boot-http-converter/src/test/java/org/springframework/boot/http/converter/autoconfigure/HttpMessageConvertersTests.java b/module/spring-boot-http-converter/src/test/java/org/springframework/boot/http/converter/autoconfigure/HttpMessageConvertersTests.java
index 7f7c36853b6..e5590d40885 100644
--- a/module/spring-boot-http-converter/src/test/java/org/springframework/boot/http/converter/autoconfigure/HttpMessageConvertersTests.java
+++ b/module/spring-boot-http-converter/src/test/java/org/springframework/boot/http/converter/autoconfigure/HttpMessageConvertersTests.java
@@ -21,6 +21,7 @@ import java.util.Collection;
 import java.util.List;
 import java.util.stream.Stream;
 
+import org.jspecify.annotations.Nullable;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.http.converter.ByteArrayHttpMessageConverter;
@@ -172,10 +173,12 @@ class HttpMessageConvertersTests {
 
 	private List<HttpMessageConverter<?>> extractFormPartConverters(List<HttpMessageConverter<?>> converters) {
 		AllEncompassingFormHttpMessageConverter formConverter = findFormConverter(converters);
+		assertThat(formConverter).isNotNull();
 		return formConverter.getPartConverters();
 	}
 
-	private AllEncompassingFormHttpMessageConverter findFormConverter(Collection<HttpMessageConverter<?>> converters) {
+	private @Nullable AllEncompassingFormHttpMessageConverter findFormConverter(
+			Collection<HttpMessageConverter<?>> converters) {
 		for (HttpMessageConverter<?> converter : converters) {
 			if (converter instanceof AllEncompassingFormHttpMessageConverter allEncompassingConverter) {
 				return allEncompassingConverter;