Finalize session store

Author: jknack

examples/src/main/java/examples/SessionApp.java

@@ -15,7 +15,6 @@
  */
 package examples;
 
-import io.jooby.Cookie;
 import io.jooby.ExecutionMode;
 import io.jooby.Jooby;
 import io.jooby.Session;
@@ -24,7 +23,7 @@
 public class SessionApp extends Jooby {
 
   {
-    setSessionOptions(new SessionOptions().setCookie(new Cookie("sessionId").setMaxAge(5L)));
+    setSessionOptions(new SessionOptions());
     get("/exists", ctx -> ctx.sessionOrNull() != null);
 
     get("/create", ctx -> {

jooby/src/main/java/io/jooby/Context.java

@@ -17,6 +17,7 @@
 
 import io.jooby.internal.HashValue;
 import io.jooby.internal.MissingValue;
+import io.jooby.internal.RequestSessionStore;
 import io.jooby.internal.SessionImpl;
 import io.jooby.internal.SingleValue;
 import io.jooby.internal.UrlParser;
@@ -129,36 +130,41 @@ public interface Context {
       SessionStore store = sessionOptions.getStore();
 
       Session newSession = store.newSession(sessionOptions.generateId(this));
-      store.save(newSession);
 
       // write cookie
       setResponseCookie(sessionOptions.getCookie().setValue(newSession.getId()));
 
       session = Session.create(this, newSession);
+
+      attribute("session", session);
     }
     return session;
   }
 
   default @Nullable Session sessionOrNull() {
-    Router router = getRouter();
-    SessionOptions options = router.getSessionOptions();
-    Cookie cookie = options.getCookie();
-    String name = cookie.getName();
-    String id = cookieMap().get(name);
-    if (id == null) {
-      return null;
-    }
-    SessionOptions sessionOptions = router.getSessionOptions();
-    SessionStore store = sessionOptions.getStore();
-    Session session = store.findSession(id);
+    Session session = (Session) getAttributes().get("session");
     if (session == null) {
-      return null;
-    }
-    if (cookie.getMaxAge() > 0) {
-      // Touch session
-      setResponseCookie(cookie.setValue(id));
+      Router router = getRouter();
+      SessionOptions options = router.getSessionOptions();
+      Cookie cookie = options.getCookie();
+      String name = cookie.getName();
+      String id = cookieMap().get(name);
+      if (id == null) {
+        return null;
+      }
+      SessionStore store = options.getStore();
+      session = store.findSession(id);
+      if (session == null) {
+        return null;
+      }
+      if (cookie.getMaxAge() > 0) {
+        // Touch session
+        setResponseCookie(cookie.setValue(id));
+      }
+      session = Session.create(this, session);
+      attribute("session", session);
     }
-    return Session.create(this, session);
+    return session;
   }
 
   default @Nonnull Value cookie(@Nonnull String name) {

jooby/src/main/java/io/jooby/InMemorySessionStore.java

@@ -35,16 +35,26 @@ public interface Session {
 
   @Nonnull Instant getCreationTime();
 
+  @Nonnull Session setCreationTime(@Nonnull Instant creationTime);
+
   @Nonnull Instant getLastAccessedTime();
 
   @Nonnull Duration getMaxInactiveInterval();
 
   @Nonnull Session setLastAccessedTime(@Nonnull Instant lastAccessedTime);
 
+  boolean isNew();
+
+  @Nonnull Session setNew(boolean isNew);
+
+  boolean isModify();
+
+  @Nonnull Session setModify(boolean modify);
+
   void destroy();
 
   static Session create(String id) {
-    return new SessionImpl(id, Instant.now());
+    return new SessionImpl(id);
   }
 
   static Session create(Context context, Session session) {

jooby/src/main/java/io/jooby/Session.java

@@ -1,5 +1,8 @@
 package io.jooby;
 
+import io.jooby.internal.InMemorySessionStore;
+import io.jooby.internal.RequestSessionStore;
+
 import javax.annotation.Nonnull;
 import java.security.SecureRandom;
 import java.util.Base64;
@@ -10,8 +13,6 @@ public class SessionOptions {
 
   private Function<Context, String> idGenerator = SessionOptions::defaultIdGenerator;
 
-  private String secret;
-
   private Cookie cookie = new Cookie("jooby.sid")
       .setMaxAge(-1)
       .setHttpOnly(true)
@@ -28,17 +29,8 @@ public class SessionOptions {
     return this;
   }
 
-  public @Nonnull String getSecret() {
-    return secret;
-  }
-
-  public @Nonnull SessionOptions setSecret(@Nonnull String secret) {
-    this.secret = secret;
-    return this;
-  }
-
   public SessionStore getStore() {
-    return store;
+    return new RequestSessionStore(store);
   }
 
   public void setStore(SessionStore store) {

jooby/src/main/java/io/jooby/SessionOptions.java

@@ -1,6 +1,5 @@
 package io.jooby;
 
-
 public interface SessionStore {
 
   Session newSession(String id);

jooby/src/main/java/io/jooby/SessionStore.java

@@ -0,0 +1,41 @@
+package io.jooby.internal;
+
+import io.jooby.Session;
+import io.jooby.SessionStore;
+
+import java.time.Instant;
+import java.util.concurrent.ConcurrentHashMap;
+
+public class InMemorySessionStore implements SessionStore {
+  private ConcurrentHashMap<String, Session> sessions = new ConcurrentHashMap<>();
+
+  @Override public Session newSession(String id) {
+    Instant now = Instant.now();
+    Session session = Session.create(id)
+        .setCreationTime(now)
+        .setLastAccessedTime(now)
+        .setNew(true);
+    sessions.put(id, session);
+    return session;
+  }
+
+  @Override public Session findSession(String id) {
+    Session session = sessions.get(id);
+    if (session != null) {
+      session.setLastAccessedTime(Instant.now());
+    }
+    return session;
+  }
+
+  @Override public void deleteSession(String id) {
+    sessions.remove(id);
+  }
+
+  @Override public void save(Session session) {
+    sessions.put(session.getId(), session);
+    session
+        .setNew(false)
+        .setModify(false)
+        .setLastAccessedTime(Instant.now());
+  }
+}

jooby/src/main/java/io/jooby/internal/InMemorySessionStore.java

@@ -80,6 +80,11 @@ public RequestSession(Context context, Session session) {
     return session.getCreationTime();
   }
 
+  @Nonnull @Override public Session setCreationTime(@Nonnull Instant creationTime) {
+    session.setCreationTime(creationTime);
+    return this;
+  }
+
   @Nonnull @Override public Instant getLastAccessedTime() {
     return session.getLastAccessedTime();
   }
@@ -93,13 +98,37 @@ public RequestSession(Context context, Session session) {
     return this;
   }
 
+  @Override public boolean isModify() {
+    return session.isModify();
+  }
+
+  @Nonnull @Override public Session setModify(boolean modify) {
+    session.setModify(modify);
+    return this;
+  }
+
+  @Override public boolean isNew() {
+    return session.isNew();
+  }
+
+  @Nonnull @Override public Session setNew(boolean isNew) {
+    session.setNew(isNew);
+    return this;
+  }
+
+  public Session getSession() {
+    return session;
+  }
+
   public void destroy() {
     if (context != null) {
       try {
+        context.getAttributes().remove("session");
         SessionOptions options = context.getRouter().getSessionOptions();
         context.setResponseCookie(options.getCookie().setMaxAge(0));
         options.getStore().deleteSession(session.getId());
       } finally {
+        session.destroy();
         context = null;
         session = null;
       }

jooby/src/main/java/io/jooby/internal/RequestSession.java

@@ -0,0 +1,29 @@
+package io.jooby.internal;
+
+import io.jooby.Session;
+import io.jooby.SessionStore;
+
+public class RequestSessionStore implements SessionStore {
+
+  private SessionStore store;
+
+  public RequestSessionStore(SessionStore store) {
+    this.store = store;
+  }
+
+  @Override public Session newSession(String id) {
+    return store.newSession(id);
+  }
+
+  @Override public Session findSession(String id) {
+    return store.findSession(id);
+  }
+
+  @Override public void deleteSession(String id) {
+    store.deleteSession(id);
+  }
+
+  @Override public void save(Session session) {
+    store.save(((RequestSession) session).getSession());
+  }
+}