From 369552d5a0fa2792a82800234f1e222c00f7d609 Mon Sep 17 00:00:00 2001 From: Kiminni Date: Thu, 16 Oct 2025 20:31:39 +0900 Subject: [PATCH] Make removeMessageListener listener parameter non-nullable Signed-off-by: Kiminni --- .../redis/listener/RedisMessageListenerContainer.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/springframework/data/redis/listener/RedisMessageListenerContainer.java b/src/main/java/org/springframework/data/redis/listener/RedisMessageListenerContainer.java index a090b69038..5e9f4c1228 100644 --- a/src/main/java/org/springframework/data/redis/listener/RedisMessageListenerContainer.java +++ b/src/main/java/org/springframework/data/redis/listener/RedisMessageListenerContainer.java @@ -104,6 +104,7 @@ * @author John Blum * @author Seongjun Lee * @author Su Ko + * @author Mingi Lee * @see MessageListener * @see SubscriptionListener */ @@ -591,7 +592,7 @@ public void addMessageListener(MessageListener listener, Topic topic) { * @param listener message listener. * @param topics message listener topics. */ - public void removeMessageListener(@Nullable MessageListener listener, Collection topics) { + public void removeMessageListener(MessageListener listener, Collection topics) { removeListener(listener, topics); } @@ -605,7 +606,7 @@ public void removeMessageListener(@Nullable MessageListener listener, Collection * @param listener message listener. * @param topic message topic. */ - public void removeMessageListener(@Nullable MessageListener listener, Topic topic) { + public void removeMessageListener(MessageListener listener, Topic topic) { removeMessageListener(listener, Collections.singleton(topic)); } @@ -744,11 +745,12 @@ private Collection resolveMessageListeners( return mapping.computeIfAbsent(topic, k -> new CopyOnWriteArraySet<>()); } - private void removeListener(@Nullable MessageListener listener, Collection topics) { + private void removeListener(MessageListener listener, Collection topics) { + Assert.notNull(listener, "MessageListener must not be null"); Assert.notNull(topics, "Topics must not be null"); - if (listener != null && listenerTopics.get(listener) == null) { + if (listenerTopics.get(listener) == null) { // Listener not subscribed return; }