From 6fb7e3dfda24ad247bf70ea063356aa1226f661b Mon Sep 17 00:00:00 2001
From: Rob Winch <rwinch@gopivotal.com>
Date: Thu, 26 Jun 2014 16:52:19 -0500
Subject: [PATCH] Add defaultMaxInactiveInterval to
 REdisOperationsSessionRepository

---
 .../RedisOperationsSessionRepository.java     | 20 ++++++++-
 ...RedisOperationsSessionRepositoryTests.java | 41 +++++++++++++++++++
 2 files changed, 59 insertions(+), 2 deletions(-)
 create mode 100644 src/test/java/org/springframework/session/redis/RedisOperationsSessionRepositoryTests.java

diff --git a/src/main/java/org/springframework/session/redis/RedisOperationsSessionRepository.java b/src/main/java/org/springframework/session/redis/RedisOperationsSessionRepository.java
index 5957e035..05d09386 100644
--- a/src/main/java/org/springframework/session/redis/RedisOperationsSessionRepository.java
+++ b/src/main/java/org/springframework/session/redis/RedisOperationsSessionRepository.java
@@ -39,11 +39,23 @@ public class RedisOperationsSessionRepository implements SessionRepository<Redis
 
     private final RedisOperations<String,Session> redisTemplate;
 
+	private Integer defaultMaxInactiveInterval;
+
     public RedisOperationsSessionRepository(RedisOperations<String, Session> redisTemplate) {
         this.redisTemplate = redisTemplate;
     }
 
-    @Override
+	/**
+	 * Sets the maximum inactive interval in seconds between requests before newly created sessions will be
+	 * invalidated. A negative time indicates that the session will never timeout.
+	 *
+	 *  @param defaultMaxInactiveInterval the number of seconds that the {@link Session} should be kept alive between client requests.
+	 */
+	public void setDefaultMaxInactiveInterval(int defaultMaxInactiveInterval) {
+		this.defaultMaxInactiveInterval = defaultMaxInactiveInterval;
+	}
+
+	@Override
     public void save(RedisSession session) {
         session.saveDelta();
     }
@@ -79,7 +91,11 @@ public class RedisOperationsSessionRepository implements SessionRepository<Redis
 
     @Override
     public RedisSession createSession() {
-        return new RedisSession();
+		RedisSession redisSession = new RedisSession();
+		if(defaultMaxInactiveInterval != null) {
+			redisSession.setMaxInactiveInterval(defaultMaxInactiveInterval);
+		}
+        return redisSession;
     }
 
     private String getKey(String sessionId) {
diff --git a/src/test/java/org/springframework/session/redis/RedisOperationsSessionRepositoryTests.java b/src/test/java/org/springframework/session/redis/RedisOperationsSessionRepositoryTests.java
new file mode 100644
index 00000000..56a906c8
--- /dev/null
+++ b/src/test/java/org/springframework/session/redis/RedisOperationsSessionRepositoryTests.java
@@ -0,0 +1,41 @@
+package org.springframework.session.redis;
+
+import static org.fest.assertions.Assertions.*;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
+import org.springframework.data.redis.core.RedisOperations;
+import org.springframework.session.MapSession;
+import org.springframework.session.Session;
+
+import static org.junit.Assert.*;
+
+@RunWith(MockitoJUnitRunner.class)
+public class RedisOperationsSessionRepositoryTests {
+	@Mock
+	RedisOperations redisOperations;
+
+	private RedisOperationsSessionRepository redisRepository;
+
+	@Before
+	public void setup() {
+		this.redisRepository = new RedisOperationsSessionRepository(redisOperations);
+	}
+
+	@Test
+	public void createSessionDefaultMaxInactiveInterval() throws Exception {
+		Session session = redisRepository.createSession();
+		assertThat(session.getMaxInactiveInterval()).isEqualTo(new MapSession().getMaxInactiveInterval());
+	}
+
+	@Test
+	public void createSessionCustomMaxInactiveInterval() throws Exception {
+		int interval = 1;
+		redisRepository.setDefaultMaxInactiveInterval(interval);
+		Session session = redisRepository.createSession();
+		assertThat(session.getMaxInactiveInterval()).isEqualTo(interval);
+	}
+}
\ No newline at end of file