Skip to content

Allow multiple destinations per subscription in DefaultSubscriptionRegistry #26986

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

Closed
wants to merge 2 commits into from
Closed

Allow multiple destinations per subscription in DefaultSubscriptionRegistry #26986

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
454dcb8
Fix DefaultSubscriptionRegistry to allow multiple destinations per su…
May 27, 2021
4644168
Make method name plural
May 29, 2021
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
63 changes: 37 additions & 26 deletions .../src/main/java/org/springframework/messaging/simp/broker/DefaultSubscriptionRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,23 @@

package org.springframework.messaging.simp.broker;

import static java.util.Collections.emptySet;

import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.util.Queue;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.BiConsumer;
import java.util.stream.Stream;

import org.springframework.expression.EvaluationContext;
import org.springframework.expression.Expression;
Expand Down Expand Up @@ -186,10 +192,8 @@ private Expression getSelectorExpression(MessageHeaders headers) {
protected void removeSubscriptionInternal(String sessionId, String subscriptionId, Message<?> message) {
SessionInfo info = this.sessionRegistry.getSession(sessionId);
if (info != null) {
Subscription subscription = info.removeSubscription(subscriptionId);
if (subscription != null) {
this.destinationCache.updateAfterRemovedSubscription(sessionId, subscription);
}
info.removeSubscription(subscriptionId)
.forEach(subscription -> this.destinationCache.updateAfterRemovedSubscription(sessionId, subscription));
}
}

Expand All @@ -212,10 +216,11 @@ protected MultiValueMap<String, String> findSubscriptionsInternal(String destina
SessionInfo info = this.sessionRegistry.getSession(sessionId);
if (info != null) {
for (String subscriptionId : subscriptionIds) {
Subscription subscription = info.getSubscription(subscriptionId);
if (subscription != null && evaluateExpression(subscription.getSelector(), message)) {
result.add(sessionId, subscription.getId());
}
info.getSubscriptions(subscriptionId).forEach(subscription -> {
if (evaluateExpression(subscription.getSelector(), message)) {
result.add(sessionId, subscription.getId());
}
});
}
}
});
Expand Down Expand Up @@ -371,9 +376,7 @@ private void removeInternal(String destination, String sessionId, String subscri
}

public void updateAfterRemovedSession(String sessionId, SessionInfo info) {
for (Subscription subscription : info.getSubscriptions()) {
updateAfterRemovedSubscription(sessionId, subscription);
}
info.getSubscriptions().forEach(subscription -> updateAfterRemovedSubscription(sessionId, subscription));
}
}

Expand Down Expand Up @@ -411,24 +414,25 @@ public SessionInfo removeSubscriptions(String sessionId) {
private static final class SessionInfo {

// subscriptionId -> Subscription
private final Map<String, Subscription> subscriptionMap = new ConcurrentHashMap<>();
private final Map<String, Set<Subscription>> subscriptionMap = new ConcurrentHashMap<>();

public Collection<Subscription> getSubscriptions() {
return this.subscriptionMap.values();
public Stream<Subscription> getSubscriptions() {
return this.subscriptionMap.values().stream().flatMap(Set::stream);
}

@Nullable
public Subscription getSubscription(String subscriptionId) {
return this.subscriptionMap.get(subscriptionId);
public Stream<Subscription> getSubscriptions(String subscriptionId) {
return this.subscriptionMap.getOrDefault(subscriptionId, emptySet()).stream();
}

public void addSubscription(Subscription subscription) {
this.subscriptionMap.putIfAbsent(subscription.getId(), subscription);
this.subscriptionMap.computeIfAbsent(subscription.getId(), id -> new HashSet<>())
.add(subscription);
}

@Nullable
public Subscription removeSubscription(String subscriptionId) {
return this.subscriptionMap.remove(subscriptionId);
public Stream<Subscription> removeSubscription(String subscriptionId) {
return Optional.ofNullable(this.subscriptionMap.remove(subscriptionId))
.map(Set::stream)
.orElse(Stream.empty());
}
}

Expand Down Expand Up @@ -474,18 +478,25 @@ public Expression getSelector() {

@Override
public boolean equals(@Nullable Object other) {
return (this == other ||
(other instanceof Subscription && this.id.equals(((Subscription) other).id)));
if (this == other) {
return true;
}
if (other instanceof Subscription) {
Subscription that = (Subscription)other;
return Objects.equals(this.id, that.id)
&& Objects.equals(this.destination, that.destination);
}
return false;
}

@Override
public int hashCode() {
return this.id.hashCode();
return Objects.hash(this.id, this.destination);
}

@Override
public String toString() {
return "subscription(id=" + this.id + ")";
return "subscription(id=" + this.id + "; destination=" + this.destination + ")";
}
}

Expand Down
21 changes: 21 additions & 0 deletions ...test/java/org/springframework/messaging/simp/broker/DefaultSubscriptionRegistryTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,27 @@ public void registerSameSubscriptionTwice() {
assertThat(actual.size()).isEqualTo(1);
assertThat(actual.get(sessId)).containsExactly(subId);
}

@Test
public void registerSameSubscriptionForDifferentDestinations() {
String sessId = "sess01";
String subId = "subs01";
String dest1 = "/foo";
String dest2 = "user/foo";

this.registry.registerSubscription(subscribeMessage(sessId, subId, dest1));
this.registry.registerSubscription(subscribeMessage(sessId, subId, dest2));

MultiValueMap<String, String> actual = this.registry.findSubscriptions(createMessage(dest1));
assertThat(actual).isNotNull();
assertThat(actual.size()).isEqualTo(1);
assertThat(actual.get(sessId)).containsExactly(subId);

actual = this.registry.findSubscriptions(createMessage(dest2));
assertThat(actual).isNotNull();
assertThat(actual.size()).isEqualTo(1);
assertThat(actual.get(sessId)).containsExactly(subId);
}

@Test
public void registerSubscriptionMultipleSessions() {
Expand Down