Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish concurrency in UserSessionResolver impl

Browse Source
This commit is contained in:
Rossen Stoyanchev
2013-07-19 10:57:23 -04:00
parent 675ec4c3e2
commit 3272917cf2
3 changed files with 105 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
spring-messaging/src/main/java/org/springframework/messaging/simp/handler/DefaultSubscriptionRegistry.java
View File

@@ -21,6 +21,7 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.CopyOnWriteArraySet;
import org.springframework.messaging.Message;
@@ -180,11 +181,9 @@ public class DefaultSubscriptionRegistry extends AbstractSubscriptionRegistry {
*/
private static class SessionSubscriptionRegistry {
private final Map<String, SessionSubscriptionInfo> sessions =
private final ConcurrentMap<String, SessionSubscriptionInfo> sessions =
new ConcurrentHashMap<String, SessionSubscriptionInfo>();
private final Object monitor = new Object();
public SessionSubscriptionInfo getSubscriptions(String sessionId) {
return this.sessions.get(sessionId);
@@ -197,12 +196,10 @@ public class DefaultSubscriptionRegistry extends AbstractSubscriptionRegistry {
public SessionSubscriptionInfo addSubscription(String sessionId, String subscriptionId, String destination) {
SessionSubscriptionInfo info = this.sessions.get(sessionId);
if (info == null) {
synchronized(this.monitor) {
info = this.sessions.get(sessionId);
if (info == null) {
info = new SessionSubscriptionInfo(sessionId);
this.sessions.put(sessionId, info);
}
info = new SessionSubscriptionInfo(sessionId);
SessionSubscriptionInfo value = this.sessions.putIfAbsent(sessionId, info);
if (value != null) {
info = value;
}
}
info.addSubscription(destination, subscriptionId);
@@ -249,14 +246,17 @@ public class DefaultSubscriptionRegistry extends AbstractSubscriptionRegistry {
}
public void addSubscription(String destination, String subscriptionId) {
synchronized(this.monitor) {
Set<String> subs = this.subscriptions.get(destination);
if (subs == null) {
subs = new HashSet<String>(4);
this.subscriptions.put(destination, subs);
Set<String> subs = this.subscriptions.get(destination);
if (subs == null) {
synchronized(this.monitor) {
subs = this.subscriptions.get(destination);
if (subs == null) {
subs = new HashSet<String>(4);
this.subscriptions.put(destination, subs);
}
}
subs.add(subscriptionId);
}
subs.add(subscriptionId);
}
public String removeSubscription(String subscriptionId) {

13
spring-messaging/src/main/java/org/springframework/messaging/simp/handler/SimpleUserSessionResolver.java
View File

@@ -17,9 +17,9 @@
package org.springframework.messaging.simp.handler;
import java.util.Collections;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.CopyOnWriteArraySet;
@@ -30,7 +30,7 @@ import java.util.concurrent.CopyOnWriteArraySet;
public class SimpleUserSessionResolver implements MutableUserSessionResolver {
// userId -> sessionId's
private final Map<String, Set<String>> userSessionIds = new ConcurrentHashMap<String, Set<String>>();
private final ConcurrentMap<String, Set<String>> userSessionIds = new ConcurrentHashMap<String, Set<String>>();
@Override
@@ -38,7 +38,10 @@ public class SimpleUserSessionResolver implements MutableUserSessionResolver {
Set<String> sessionIds = this.userSessionIds.get(user);
if (sessionIds == null) {
sessionIds = new CopyOnWriteArraySet<String>();
this.userSessionIds.put(user, sessionIds);
Set<String> value = this.userSessionIds.putIfAbsent(user, sessionIds);
if (value != null) {
sessionIds = value;
}
}
sessionIds.add(sessionId);
}
@@ -47,8 +50,8 @@ public class SimpleUserSessionResolver implements MutableUserSessionResolver {
public void removeUserSessionId(String user, String sessionId) {
Set<String> sessionIds = this.userSessionIds.get(user);
if (sessionIds != null) {
if (sessionIds.remove(sessionId) && sessionIds.isEmpty()) {
this.userSessionIds.remove(user);
if (sessionIds.remove(sessionId)) {
this.userSessionIds.remove(user, Collections.<String>emptySet());
}
}
}

82
spring-messaging/src/test/java/org/springframework/messaging/simp/handler/SimpleUserSessionResolverTests.java Normal file
View File

@@ -0,0 +1,82 @@
/*
* Copyright 2002-2013 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.messaging.simp.handler;
import java.util.Arrays;
import java.util.Collections;
import java.util.LinkedHashSet;
import java.util.List;
import org.junit.Test;
import static org.junit.Assert.*;
/**
* Test fixture for {@link SimpleUserSessionResolver}
*
* @author Rossen Stoyanchev
* @since 4.0
*/
public class SimpleUserSessionResolverTests {
private static final String user = "joe";
private static final List<String> sessionIds = Arrays.asList("sess01", "sess02", "sess03");
@Test
public void addOneSessionId() {
SimpleUserSessionResolver resolver = new SimpleUserSessionResolver();
resolver.addUserSessionId(user, sessionIds.get(0));
assertEquals(Collections.singleton(sessionIds.get(0)), resolver.resolveUserSessionIds(user));
assertSame(Collections.emptySet(), resolver.resolveUserSessionIds("jane"));
}
@Test
public void addMultipleSessionIds() {
SimpleUserSessionResolver resolver = new SimpleUserSessionResolver();
for (String sessionId : sessionIds) {
resolver.addUserSessionId(user, sessionId);
}
assertEquals(new LinkedHashSet<>(sessionIds), resolver.resolveUserSessionIds(user));
assertEquals(Collections.emptySet(), resolver.resolveUserSessionIds("jane"));
}
@Test
public void removeSessionIds() {
SimpleUserSessionResolver resolver = new SimpleUserSessionResolver();
for (String sessionId : sessionIds) {
resolver.addUserSessionId(user, sessionId);
}
assertEquals(new LinkedHashSet<>(sessionIds), resolver.resolveUserSessionIds(user));
resolver.removeUserSessionId(user, sessionIds.get(1));
resolver.removeUserSessionId(user, sessionIds.get(2));
assertEquals(Collections.singleton(sessionIds.get(0)), resolver.resolveUserSessionIds(user));
resolver.removeUserSessionId(user, sessionIds.get(0));
assertSame(Collections.emptySet(), resolver.resolveUserSessionIds(user));
}
}