Skip to content

Make removeMessageListener listener parameter non-nullable #3237

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Make removeMessageListener listener parameter non-nullable #3237

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions src/main/java/org/springframework/data/redis/listener/RedisMessageListenerContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@
* @author John Blum
* @author Seongjun Lee
* @author Su Ko
* @author Mingi Lee
* @see MessageListener
* @see SubscriptionListener
*/
Expand Down Expand Up @@ -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<? extends Topic> topics) {
public void removeMessageListener(MessageListener listener, Collection<? extends Topic> topics) {
removeListener(listener, topics);
}

Expand All @@ -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));
}

Expand Down Expand Up @@ -744,11 +745,12 @@ private Collection<MessageListener> resolveMessageListeners(
return mapping.computeIfAbsent(topic, k -> new CopyOnWriteArraySet<>());
}

private void removeListener(@Nullable MessageListener listener, Collection<? extends Topic> topics) {
private void removeListener(MessageListener listener, Collection<? extends Topic> 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;
}
Expand Down