Add SessionExpiredEvent and SessionDeletedEvent

Fixes gh-258

spring-session/src/main/java/org/springframework/session/MapSessionRepository.java

@@ -15,7 +15,8 @@
  */
 package org.springframework.session;
 
-import org.springframework.session.events.SessionDestroyedEvent;
+import org.springframework.session.events.SessionDeletedEvent;
+import org.springframework.session.events.SessionExpiredEvent;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
@@ -26,7 +27,7 @@ import java.util.concurrent.ConcurrentHashMap;
  * distributed maps provided by NoSQL stores like Redis and Hazelcast.
  *
  * <p>
- * The implementation does NOT support firing {@link SessionDestroyedEvent}.
+ * The implementation does NOT support firing {@link SessionDeletedEvent} or {@link SessionExpiredEvent}.
  * </p>
  *
  * @author Rob Winch

spring-session/src/main/java/org/springframework/session/data/redis/RedisOperationsSessionRepository.java

@@ -30,7 +30,8 @@ import org.springframework.session.ExpiringSession;
 import org.springframework.session.MapSession;
 import org.springframework.session.Session;
 import org.springframework.session.SessionRepository;
-import org.springframework.session.events.SessionDestroyedEvent;
+import org.springframework.session.events.SessionDeletedEvent;
+import org.springframework.session.events.SessionExpiredEvent;
 import org.springframework.session.web.http.SessionRepositoryFilter;
 import org.springframework.util.Assert;
 
@@ -41,7 +42,7 @@ import org.springframework.util.Assert;
  * {@link org.springframework.data.redis.core.RedisOperations}. In a web
  * environment, this is typically used in combination with
  * {@link SessionRepositoryFilter}. This implementation supports
- * {@link SessionDestroyedEvent} through {@link SessionMessageListener}.
+ * {@link SessionDeletedEvent} and {@link SessionExpiredEvent} through {@link SessionMessageListener}.
  * </p>
  *
  * <h2>Creating a new instance</h2>

spring-session/src/main/java/org/springframework/session/data/redis/SessionMessageListener.java

@@ -21,12 +21,14 @@ import org.springframework.context.ApplicationEvent;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.data.redis.connection.Message;
 import org.springframework.data.redis.connection.MessageListener;
-import org.springframework.session.events.SessionDestroyedEvent;
+import org.springframework.session.events.SessionDeletedEvent;
+import org.springframework.session.events.SessionExpiredEvent;
 import org.springframework.util.Assert;
 
 /**
- * Listen for Redis {@link Message} notifications. If it is a "del" or "expired"
- * translate into a {@link SessionDestroyedEvent}.
+ * Listen for Redis {@link Message} notifications. If it is a "del"
+ * translate into a {@link SessionDeletedEvent}. If it is an "expired"
+ * translate into a {@link SessionExpiredEvent}.
  *
  * @author Rob Winch
  * @since 1.0
@@ -69,7 +71,11 @@ public class SessionMessageListener implements MessageListener {
 			logger.debug("Publishing SessionDestroyedEvent for session " + sessionId);
 		}
 
-		publishEvent(new SessionDestroyedEvent(this, sessionId));
+		if(channel.endsWith(":del")) {
+			publishEvent(new SessionDeletedEvent(this, sessionId));
+		} else {
+			publishEvent(new SessionExpiredEvent(this, sessionId));
+		}
 	}
 
 	private void publishEvent(ApplicationEvent event) {

spring-session/src/main/java/org/springframework/session/events/SessionDeletedEvent.java

@@ -0,0 +1,36 @@
+/*
+ * Copyright 2002-2015 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.session.events;
+
+import org.springframework.session.Session;
+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
+ * @since 1.1
+ *
+ */
+@SuppressWarnings("serial")
+public class SessionDeletedEvent extends SessionDestroyedEvent {
+
+	public SessionDeletedEvent(Object source, String sessionId) {
+		super(source, sessionId);
+	}
+	
+}

spring-session/src/main/java/org/springframework/session/events/SessionDestroyedEvent.java

@@ -17,19 +17,16 @@ package org.springframework.session.events;
 
 import org.springframework.context.ApplicationEvent;
 import org.springframework.session.Session;
-import org.springframework.session.SessionRepository;
 
 /**
- * For {@link SessionRepository} implementations that support it, this event is
- * fired when a {@link Session} is destroyed either explicitly or via
- * expiration.
+ * Base class for events fired when a {@link Session} is destroyed explicitly.
  *
  * @author Rob Winch
  * @since 1.0
  *
  */
 @SuppressWarnings("serial")
-public class SessionDestroyedEvent extends ApplicationEvent {
+public abstract class SessionDestroyedEvent extends ApplicationEvent {
 	private final String sessionId;
 
 	public SessionDestroyedEvent(Object source, String sessionId) {

spring-session/src/main/java/org/springframework/session/events/SessionExpiredEvent.java

@@ -0,0 +1,35 @@
+/*
+ * Copyright 2002-2015 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.session.events;
+
+import org.springframework.session.Session;
+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
+ * @since 1.1
+ *
+ */
+@SuppressWarnings("serial")
+public class SessionExpiredEvent extends SessionDestroyedEvent {
+
+	public SessionExpiredEvent(Object source, String sessionId) {
+		super(source, sessionId);
+	}
+}