get should handle expired session, fix #58

* remove integration tests and simplify build

Author: jknack

.travis.yml

@@ -6,5 +6,3 @@ jdk:
   - oraclejdk8
 after_success:
   - mvn -Dlogback.configurationFile=logback-travis.xml clean package coveralls:report -P coverage
-services:
-  - redis-server

coverage-report/src/test/java/org/jooby/jedis/session/RedisSessionDataFeature.java

@@ -116,9 +116,10 @@ session.timeout = 15
 
 # 120 minutes
 session.timeout = 120m
-```
 
-If no timeout is required, use ```-1```.
+# no timeout
+session.timeout = -1
+```
 
 #### key prefix
 

coverage-report/src/test/java/org/jooby/jedis/session/RedisSessionDataNoTimeoutFeature.java

@@ -78,9 +78,10 @@
  *
  * # 120 minutes
  * session.timeout = 120m
- * </pre>
  *
- * If no timeout is required, use <code>-1</code>.
+ * # no timeout
+ * session.timeout = -1
+ * </pre>
  *
  * <h3>key prefix</h3>
  * <p>
@@ -137,6 +138,10 @@ public Session get(final Builder builder) {
     try {
       String key = key(builder.sessionId());
       Map<String, String> attrs = jedis.hgetAll(key);
+      if (attrs == null || attrs.size() == 0) {
+        // expired
+        return null;
+      }
       if (timeout > 0) {
         // touch session
         jedis.expire(key, timeout);

jooby-jedis/README.md

@@ -3,6 +3,7 @@
 import static org.easymock.EasyMock.expect;
 import static org.junit.Assert.assertEquals;
 
+import java.util.Collections;
 import java.util.Map;
 
 import org.jooby.MockUnit;
@@ -51,6 +52,39 @@ public void save() throws Exception {
         });
   }
 
+  @Test
+  public void saveNoTimeout() throws Exception {
+    Map<String, String> attrs = ImmutableMap.of("x", "X");
+    Map<String, String> attrsToSave = ImmutableMap
+        .of(
+            "x", "X",
+            "_accessedAt", "2",
+            "_createdAt", "1",
+            "_savedAt", "3"
+        );
+    new MockUnit(JedisPool.class, Session.class)
+        .expect(unit -> {
+          Session session = unit.get(Session.class);
+          expect(session.id()).andReturn("1234");
+          expect(session.attributes()).andReturn(attrs);
+          expect(session.createdAt()).andReturn(1L);
+          expect(session.accessedAt()).andReturn(2L);
+          expect(session.savedAt()).andReturn(3L);
+        })
+        .expect(unit -> {
+          Jedis jedis = unit.mock(Jedis.class);
+          expect(jedis.hmset("sessions:1234", attrsToSave)).andReturn("sessions:1234");
+          jedis.close();
+
+          JedisPool pool = unit.get(JedisPool.class);
+          expect(pool.getResource()).andReturn(jedis);
+        })
+        .run(unit -> {
+          new RedisSessionStore(unit.get(JedisPool.class), "sessions", "0")
+              .save(unit.get(Session.class));
+        });
+  }
+
   @Test
   public void create() throws Exception {
     Map<String, String> attrs = ImmutableMap.of("x", "X");
@@ -174,4 +208,87 @@ public void get() throws Exception {
         });
   }
 
+  @Test
+  public void getNoTimeout() throws Exception {
+    Map<String, String> attrs = Maps.newHashMap(ImmutableMap
+        .of(
+            "x", "X",
+            "_accessedAt", "2",
+            "_createdAt", "1",
+            "_savedAt", "3"
+        ));
+
+    new MockUnit(JedisPool.class, Session.class, Session.Builder.class)
+        .expect(unit -> {
+          Session.Builder sb = unit.get(Session.Builder.class);
+          expect(sb.sessionId()).andReturn("1234");
+          expect(sb.accessedAt(2)).andReturn(sb);
+          expect(sb.createdAt(1)).andReturn(sb);
+          expect(sb.savedAt(3)).andReturn(sb);
+          expect(sb.set(ImmutableMap.of("x", "X"))).andReturn(sb);
+          expect(sb.build()).andReturn(unit.get(Session.class));
+        })
+        .expect(unit -> {
+          Jedis jedis = unit.mock(Jedis.class);
+          expect(jedis.hgetAll("sessions:1234")).andReturn(attrs);
+          jedis.close();
+
+          JedisPool pool = unit.get(JedisPool.class);
+          expect(pool.getResource()).andReturn(jedis);
+        })
+        .run(unit -> {
+          assertEquals(unit.get(Session.class), new RedisSessionStore(
+              unit.get(JedisPool.class), "sessions", "0")
+              .get(unit.get(Session.Builder.class)));
+        });
+  }
+
+  @Test
+  public void getNullExpired() throws Exception {
+    Map<String, String> attrs = null;
+
+    new MockUnit(JedisPool.class, Session.Builder.class)
+        .expect(unit -> {
+          Session.Builder sb = unit.get(Session.Builder.class);
+          expect(sb.sessionId()).andReturn("1234");
+        })
+        .expect(unit -> {
+          Jedis jedis = unit.mock(Jedis.class);
+          expect(jedis.hgetAll("sessions:1234")).andReturn(attrs);
+          jedis.close();
+
+          JedisPool pool = unit.get(JedisPool.class);
+          expect(pool.getResource()).andReturn(jedis);
+        })
+        .run(unit -> {
+          assertEquals(null, new RedisSessionStore(
+              unit.get(JedisPool.class), "sessions", "30m")
+              .get(unit.get(Session.Builder.class)));
+        });
+  }
+
+  @Test
+  public void getEmptyExpired() throws Exception {
+    Map<String, String> attrs = Collections.emptyMap();
+
+    new MockUnit(JedisPool.class, Session.Builder.class)
+        .expect(unit -> {
+          Session.Builder sb = unit.get(Session.Builder.class);
+          expect(sb.sessionId()).andReturn("1234");
+        })
+        .expect(unit -> {
+          Jedis jedis = unit.mock(Jedis.class);
+          expect(jedis.hgetAll("sessions:1234")).andReturn(attrs);
+          jedis.close();
+
+          JedisPool pool = unit.get(JedisPool.class);
+          expect(pool.getResource()).andReturn(jedis);
+        })
+        .run(unit -> {
+          assertEquals(null, new RedisSessionStore(
+              unit.get(JedisPool.class), "sessions", "30m")
+              .get(unit.get(Session.Builder.class)));
+        });
+  }
+
 }

jooby-jedis/src/main/java/org/jooby/jedis/RedisSessionStore.java

@@ -116,9 +116,10 @@ session.timeout = 15
 
 # 120 minutes
 session.timeout = 120m
-```
 
-If no timeout is required, use ```-1```.
+# no timeout
+session.timeout = -1
+```
 
 #### key prefix