From 3ba07ec0a843cacb76fa1c5d47f51ade0d9d84ac Mon Sep 17 00:00:00 2001 From: Rob Winch Date: Wed, 12 Aug 2015 16:32:51 -0500 Subject: [PATCH] Polish add SessionDeletedEvent & SessionExpiredEvent * Add @author Mark Anderson for proper credit * SessionDestroyedEvent no longer abstract to preserve passivity Issue gh-258 --- .../session/data/redis/SessionMessageListener.java | 1 + .../springframework/session/events/SessionDeletedEvent.java | 4 ++-- .../session/events/SessionDestroyedEvent.java | 2 +- .../springframework/session/events/SessionExpiredEvent.java | 2 +- .../web/socket/handler/WebSocketRegistryListener.java | 1 + .../session/data/redis/SessionMessageListenerTests.java | 5 +++-- 6 files changed, 9 insertions(+), 6 deletions(-) diff --git a/spring-session/src/main/java/org/springframework/session/data/redis/SessionMessageListener.java b/spring-session/src/main/java/org/springframework/session/data/redis/SessionMessageListener.java index 0d98a0e..f36919d 100644 --- a/spring-session/src/main/java/org/springframework/session/data/redis/SessionMessageListener.java +++ b/spring-session/src/main/java/org/springframework/session/data/redis/SessionMessageListener.java @@ -31,6 +31,7 @@ import org.springframework.util.Assert; * translate into a {@link SessionExpiredEvent}. * * @author Rob Winch + * @author Mark Anderson * @since 1.0 */ public class SessionMessageListener implements MessageListener { diff --git a/spring-session/src/main/java/org/springframework/session/events/SessionDeletedEvent.java b/spring-session/src/main/java/org/springframework/session/events/SessionDeletedEvent.java index 7ced0dd..432a1cb 100644 --- a/spring-session/src/main/java/org/springframework/session/events/SessionDeletedEvent.java +++ b/spring-session/src/main/java/org/springframework/session/events/SessionDeletedEvent.java @@ -22,7 +22,7 @@ import org.springframework.session.SessionRepository; * For {@link SessionRepository} implementations that support it, this event is * fired when a {@link Session} is destroyed via deletion. * - * @author Rob Winch + * @author Mark Anderson * @since 1.1 * */ @@ -32,5 +32,5 @@ public class SessionDeletedEvent extends SessionDestroyedEvent { public SessionDeletedEvent(Object source, String sessionId) { super(source, sessionId); } - + } diff --git a/spring-session/src/main/java/org/springframework/session/events/SessionDestroyedEvent.java b/spring-session/src/main/java/org/springframework/session/events/SessionDestroyedEvent.java index 6534551..9da8a39 100644 --- a/spring-session/src/main/java/org/springframework/session/events/SessionDestroyedEvent.java +++ b/spring-session/src/main/java/org/springframework/session/events/SessionDestroyedEvent.java @@ -26,7 +26,7 @@ import org.springframework.session.Session; * */ @SuppressWarnings("serial") -public abstract class SessionDestroyedEvent extends ApplicationEvent { +public class SessionDestroyedEvent extends ApplicationEvent { private final String sessionId; public SessionDestroyedEvent(Object source, String sessionId) { diff --git a/spring-session/src/main/java/org/springframework/session/events/SessionExpiredEvent.java b/spring-session/src/main/java/org/springframework/session/events/SessionExpiredEvent.java index 38310e4..3dbd773 100644 --- a/spring-session/src/main/java/org/springframework/session/events/SessionExpiredEvent.java +++ b/spring-session/src/main/java/org/springframework/session/events/SessionExpiredEvent.java @@ -22,7 +22,7 @@ import org.springframework.session.SessionRepository; * For {@link SessionRepository} implementations that support it, this event is * fired when a {@link Session} is destroyed via expiration. * - * @author Rob Winch + * @author Mark Anderson * @since 1.1 * */ diff --git a/spring-session/src/main/java/org/springframework/session/web/socket/handler/WebSocketRegistryListener.java b/spring-session/src/main/java/org/springframework/session/web/socket/handler/WebSocketRegistryListener.java index ebc02ac..f7fbfc7 100644 --- a/spring-session/src/main/java/org/springframework/session/web/socket/handler/WebSocketRegistryListener.java +++ b/spring-session/src/main/java/org/springframework/session/web/socket/handler/WebSocketRegistryListener.java @@ -41,6 +41,7 @@ import org.springframework.web.socket.messaging.SessionDisconnectEvent; * * * @author Rob Winch + * @author Mark Anderson * @since 1.0 */ public final class WebSocketRegistryListener implements ApplicationListener { diff --git a/spring-session/src/test/java/org/springframework/session/data/redis/SessionMessageListenerTests.java b/spring-session/src/test/java/org/springframework/session/data/redis/SessionMessageListenerTests.java index de575eb..d97c724 100644 --- a/spring-session/src/test/java/org/springframework/session/data/redis/SessionMessageListenerTests.java +++ b/spring-session/src/test/java/org/springframework/session/data/redis/SessionMessageListenerTests.java @@ -37,6 +37,7 @@ import org.springframework.session.events.SessionExpiredEvent; /** * * @author Rob Winch + * @author Mark Anderson * */ @RunWith(MockitoJUnitRunner.class) @@ -49,7 +50,7 @@ public class SessionMessageListenerTests { @Captor ArgumentCaptor deletedEvent; - + @Captor ArgumentCaptor expiredEvent; @@ -93,7 +94,7 @@ public class SessionMessageListenerTests { verify(eventPublisher).publishEvent(deletedEvent.capture()); assertThat(deletedEvent.getValue().getSource()).isEqualTo(listener); } - + @Test public void onMessageExpiredSource() throws Exception { mockMessage("__keyevent@0__:expired","spring:session:sessions:123");