From 233725c8f5430a307599ae53f49da162870f695a Mon Sep 17 00:00:00 2001
From: Manu Sridharan <msridhar@gmail.com>
Date: Sat, 18 Jul 2026 12:32:05 -0700
Subject: [PATCH] =?UTF-8?q?Add=20@=E2=81=A0Nullable=20annotations=20when?=
 =?UTF-8?q?=20treating=20Map.remove()=20as=20returning=20@=E2=81=A0Nullabl?=
 =?UTF-8?q?e?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes gh-37067

Signed-off-by: Manu Sridharan <msridhar@gmail.com>
---
 .../src/main/java/org/springframework/util/CompositeMap.java    | 2 +-
 .../org/springframework/messaging/simp/stomp/StompHeaders.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/spring-core/src/main/java/org/springframework/util/CompositeMap.java b/spring-core/src/main/java/org/springframework/util/CompositeMap.java
index 37e9f25034b..5af883f269e 100644
--- a/spring-core/src/main/java/org/springframework/util/CompositeMap.java
+++ b/spring-core/src/main/java/org/springframework/util/CompositeMap.java
@@ -117,7 +117,7 @@ final class CompositeMap<K, V extends @Nullable Object> implements Map<K, V> {
 	}
 
 	@Override
-	public V remove(Object key) {
+	public @Nullable V remove(Object key) {
 		V firstResult = this.first.remove(key);
 		V secondResult = this.second.remove(key);
 		if (firstResult != null) {
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompHeaders.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompHeaders.java
index 4691f842be2..d55e0f30ef5 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompHeaders.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompHeaders.java
@@ -510,7 +510,7 @@ public class StompHeaders implements MultiValueMap<String, String>, Serializable
 	}
 
 	@Override
-	public List<String> remove(Object key) {
+	public @Nullable List<String> remove(Object key) {
 		return this.headers.remove(key);
 	}