API Change: Remove application prefix from session properties: application.session.* -> session.* fix #62

Author: jknack

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

@@ -23,16 +23,17 @@ public class JedisCustomDbPropertyFeature extends ServerFeature {
 
     get("/:key/:value", req -> {
       try (Jedis jedis = req.require(Key.get(Jedis.class, Names.named("mydb")))) {
-        jedis.set(req.param("key").value(), req.param("value").value());
-        return jedis.get(req.param("key").value());
+        String key = req.param("key").value();
+        jedis.setex(key, 120, req.param("value").value());
+        return jedis.get(key);
       }
     });
   }
 
   @Test
   public void connect() throws Exception {
     request()
-        .get("/foo/bar")
+        .get("/foo2/bar")
         .expect("bar");
   }
 }

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

@@ -1,8 +1,5 @@
 package org.jooby.jedis;
 
-import java.util.HashMap;
-import java.util.Map;
-
 import org.jooby.test.ServerFeature;
 import org.junit.Test;
 
@@ -22,14 +19,9 @@ 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());
+        String key = req.param("key").value();
+        jedis.setex(key, 120, req.param("value").value());
+        return jedis.get(key);
       }
     });
   }

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

@@ -16,7 +16,7 @@ public class RedisSessionDataFeature extends ServerFeature {
   {
     use(ConfigFactory.empty()
         .withValue("db", ConfigValueFactory.fromAnyRef("redis://localhost:6379"))
-        .withValue("application.session.timeout", ConfigValueFactory.fromAnyRef(120)));
+        .withValue("session.timeout", ConfigValueFactory.fromAnyRef(120)));
 
     use(new Redis());
 

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

@@ -16,7 +16,7 @@ public class RedisSessionDataNoTimeoutFeature extends ServerFeature {
   {
     use(ConfigFactory.empty()
         .withValue("db", ConfigValueFactory.fromAnyRef("redis://localhost:6379"))
-        .withValue("application.session.timeout", ConfigValueFactory.fromAnyRef("0")));
+        .withValue("session.timeout", ConfigValueFactory.fromAnyRef("0")));
 
     use(new Redis());
 

coverage-report/src/test/java/org/jooby/session/SessionConfigCookieFeature.java

@@ -23,14 +23,14 @@ public class SessionConfigCookieFeature extends ServerFeature {
     use(ConfigFactory
         .empty()
         .withValue("application.secret", ConfigValueFactory.fromAnyRef("fixed"))
-        .withValue("application.session.cookie.name", ConfigValueFactory.fromAnyRef("custom.sid"))
-        .withValue("application.session.cookie.path", ConfigValueFactory.fromAnyRef("/session"))
-        .withValue("application.session.cookie.comment",
+        .withValue("session.cookie.name", ConfigValueFactory.fromAnyRef("custom.sid"))
+        .withValue("session.cookie.path", ConfigValueFactory.fromAnyRef("/session"))
+        .withValue("session.cookie.comment",
             ConfigValueFactory.fromAnyRef("jooby cookie"))
-        .withValue("application.session.cookie.domain", ConfigValueFactory.fromAnyRef("localhost"))
-        .withValue("application.session.cookie.maxAge", ConfigValueFactory.fromAnyRef(60))
-        .withValue("application.session.cookie.httpOnly", ConfigValueFactory.fromAnyRef(true))
-        .withValue("application.session.cookie.secure", ConfigValueFactory.fromAnyRef(false)));
+        .withValue("session.cookie.domain", ConfigValueFactory.fromAnyRef("localhost"))
+        .withValue("session.cookie.maxAge", ConfigValueFactory.fromAnyRef(60))
+        .withValue("session.cookie.httpOnly", ConfigValueFactory.fromAnyRef(true))
+        .withValue("session.cookie.secure", ConfigValueFactory.fromAnyRef(false)));
 
     session(new Session.Mem());
 

coverage-report/src/test/java/org/jooby/session/ShouldDestroyAndExpireCookieOnTimeoutFeature.java

@@ -13,7 +13,7 @@
 public class ShouldDestroyAndExpireCookieOnTimeoutFeature extends ServerFeature {
 
   {
-    use(ConfigFactory.empty().withValue("application.session.cookie.maxAge", ConfigValueFactory.fromAnyRef("1s")));
+    use(ConfigFactory.empty().withValue("session.cookie.maxAge", ConfigValueFactory.fromAnyRef("1s")));
 
     session(new Session.Mem());
 

jooby-jedis/README.md

@@ -158,7 +158,7 @@ jedis.pool.jmxNamePrefix = redis-pool
 
 # session store, key prefix and timeout in seconds 
 jedis.session.prefix = sessions
-jedis.session.timeout = ${application.session.timeout}
+jedis.session.timeout = ${session.timeout}
 
 ```
 

jooby-jedis/src/main/resources/org/jooby/jedis/jedis.conf

@@ -23,4 +23,4 @@ jedis.pool.jmxNamePrefix = redis-pool
 
 # session store, key prefix and timeout in seconds 
 jedis.session.prefix = sessions
-jedis.session.timeout = ${application.session.timeout}
+jedis.session.timeout = ${session.timeout}

jooby/src/main/java/org/jooby/Jooby.java

@@ -2981,10 +2981,7 @@ private Config defaultConfig(final Config config, final String env) {
             .build()
         )
         .put("timeout", "30m")
-        .put("saveInterval", "60s")
-        .put("preserveOnStop", true);
-
-    defaults.put("session", session.build());
+        .put("saveInterval", "60s");
 
     // set tmpdir
     String deftmpdir = "java.io.tmpdir";
@@ -3030,6 +3027,7 @@ private Config defaultConfig(final Config config, final String env) {
     Map<String, Object> application = ImmutableMap.<String, Object> builder()
         .put("application", defaults)
         .put("runtime", runtime)
+        .put("session", session.build())
         .build();
     return ConfigValueFactory.fromMap(application, "jooby-defaults").toConfig();
   }

jooby/src/main/java/org/jooby/internal/SessionManager.java

@@ -75,7 +75,7 @@ public SessionManager(final Config config, final Definition def, final Session.S
         ? config.getString("application.secret")
         : null;
 
-    Config $session = config.getConfig("application.session");
+    Config $session = config.getConfig("session");
 
     // save interval
     this.saveInterval = def.saveInterval()