redis session store fix #58

Author: jknack

coverage-report/src/test/java/org/jooby/jedis/JedisFeature.java

@@ -1,5 +1,8 @@
 package org.jooby.jedis;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import org.jooby.test.ServerFeature;
 import org.junit.Test;
 
@@ -20,6 +23,12 @@ public class JedisFeature extends ServerFeature {
     get("/:key/:value", req -> {
       try (Jedis jedis = req.require(Jedis.class)) {
         jedis.set(req.param("key").value(), req.param("value").value());
+
+        Map<String, String> attrs = new HashMap<>();
+        attrs.put("name", "edgar");
+        attrs.put("age", "34");
+        jedis.hmset("session:1", attrs);
+
         return jedis.get(req.param("key").value());
       }
     });

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

@@ -0,0 +1,63 @@
+package org.jooby.jedis.session;
+
+import static org.junit.Assert.assertTrue;
+
+import org.jooby.Session;
+import org.jooby.jedis.Redis;
+import org.jooby.jedis.RedisSessionStore;
+import org.jooby.test.ServerFeature;
+import org.junit.Test;
+
+import com.typesafe.config.ConfigFactory;
+import com.typesafe.config.ConfigValueFactory;
+
+public class RedisSessionDataFeature extends ServerFeature {
+
+  {
+    use(ConfigFactory.empty()
+        .withValue("db", ConfigValueFactory.fromAnyRef("redis://localhost:6379")));
+
+    use(new Redis());
+
+    session(RedisSessionStore.class);
+
+    get("/s1", req -> {
+      Session session = req.session();
+      session
+          .set("name", "edgar")
+          .set("age", 34);
+      return session.attributes();
+    });
+
+    get("/s2", req -> {
+      Session session = req.session();
+      return session.attributes();
+    });
+
+    get("/destroy", req -> {
+      req.session().destroy();;
+      return "done";
+    });
+  }
+
+  @Test
+  public void save() throws Exception {
+    request()
+        .get("/s1")
+        .expect(rsp -> {
+          assertTrue(rsp.equals("{name=edgar, age=34}") || rsp.equals("{age=34, name=edgar}"));
+        })
+        .request(r1 ->
+            r1.get("/s2")
+                .expect(rsp -> {
+                  assertTrue(rsp.equals("{name=edgar, age=34}")
+                      || rsp.equals("{age=34, name=edgar}"));
+                }).request(r2 -> {
+                  // cleanup
+                    r2.get("/destroy")
+                        .expect("done");
+                  })
+        );
+
+  }
+}

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

@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.jooby.jedis;
 
 import java.net.URI;

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

@@ -0,0 +1,83 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.jooby.jedis;
+
+import static java.util.Objects.requireNonNull;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import org.jooby.Session;
+import org.jooby.Session.Builder;
+
+import redis.clients.jedis.Jedis;
+import redis.clients.jedis.JedisPool;
+
+@Singleton
+public class RedisSessionStore implements Session.Store {
+
+  private JedisPool pool;
+
+  @Inject
+  public RedisSessionStore(final JedisPool pool) {
+    this.pool = requireNonNull(pool, "Jedis pool is required.");
+  }
+
+  @Override
+  public Session get(final Builder builder) {
+    try (Jedis jedis = pool.getResource()) {
+      Map<String, String> attrs = jedis.hgetAll("sessions:" + builder.sessionId());
+      return builder
+          .accessedAt(Long.parseLong(attrs.remove("accessedAt")))
+          .createdAt(Long.parseLong(attrs.remove("createdAt")))
+          .savedAt(Long.parseLong(attrs.remove("savedAt")))
+          .set(attrs).build();
+    }
+  }
+
+  @Override
+  public void save(final Session session) {
+    try (Jedis jedis = pool.getResource()) {
+      String key = "sessions:" + session.id();
+      Map<String, String> attrs = new HashMap<>(session.attributes());
+      attrs.put("createdAt", Long.toString(session.createdAt()));
+      attrs.put("accessedAt", Long.toString(session.accessedAt()));
+      attrs.put("savedAt", Long.toString(session.savedAt()));
+      jedis.hmset(key, attrs);
+    }
+  }
+
+  @Override
+  public void create(final Session session) {
+    save(session);
+  }
+
+  @Override
+  public void delete(final String id) {
+    try (Jedis jedis = pool.getResource()) {
+      String key = "sessions:" + id;
+      jedis.del(key);
+    }
+
+  }
+
+}