Session API: redo SessionStore and remove RequestSession

Author: jknack

jooby/src/main/java/io/jooby/DefaultContext.java

@@ -91,10 +91,10 @@ public interface DefaultContext extends Context {
     if (session == null) {
       Router router = getRouter();
       SessionOptions options = router.getSessionOptions();
-
-      String sessionId = options.generateId();
-      session = Session.create(this, options.getStore().newSession(sessionId));
-      options.getSessionId().saveSessionId(this, sessionId);
+      SessionStore store = options.getStore();
+      session = store.newSession(this);
+      getAttributes().put(Session.NAME, session);
+//      options.getSessionId().saveSessionId(this, sessionId);
     }
     return session;
   }
@@ -104,17 +104,13 @@ public interface DefaultContext extends Context {
     if (session == null) {
       Router router = getRouter();
       SessionOptions options = router.getSessionOptions();
-      SessionId strategy = options.getSessionId();
-      String sessionId = strategy.findSessionId(this);
-      if (sessionId == null) {
-        return null;
-      }
-      session = options.getStore().findSession(sessionId);
-      if (session == null) {
-        return null;
-      }
-      session = Session.create(this, session);
-      strategy.saveSessionId(this, sessionId);
+      SessionStore store = options.getStore();
+      session = store.findSession(this);
+//      if (session == null) {
+//        return null;
+//      }
+//      session = Session.create(this, session);
+//      strategy.saveSessionId(this, sessionId);
     }
     return session;
   }

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

@@ -5,7 +5,6 @@
  */
 package io.jooby;
 
-import io.jooby.internal.RequestSession;
 import io.jooby.internal.SessionImpl;
 
 import javax.annotation.Nonnull;
@@ -131,11 +130,6 @@ public interface Session {
    */
   @Nonnull ValueNode remove(@Nonnull String name);
 
-  /**
-   * Read-only attributes.
-   *
-   * @return Read-only attributes.
-   */
   @Nonnull Map<String, String> toMap();
 
   /**
@@ -216,18 +210,11 @@ public interface Session {
    * @param id Session ID.
    * @return A new session.
    */
-  static @Nonnull Session create(@Nonnull String id) {
-    return new SessionImpl(id);
+  static @Nonnull Session create(@Nonnull Context ctx, @Nonnull String id) {
+    return new SessionImpl(ctx, id);
   }
 
-  /**
-   * Creates a new session and attach it to current request.
-   *
-   * @param context Web context.
-   * @param session HTTP session.
-   * @return A request attached session.
-   */
-  static @Nonnull Session create(@Nonnull Context context, @Nonnull Session session) {
-    return new RequestSession(context, session);
+  static @Nonnull Session create(@Nonnull Context ctx, @Nonnull String id, @Nonnull Map<String, String> data) {
+    return new SessionImpl(ctx, id, data);
   }
 }

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

@@ -7,7 +7,6 @@
 
 import io.jooby.internal.InMemorySessionStore;
 import io.jooby.internal.MultipleSessionId;
-import io.jooby.internal.RequestSessionStore;
 import io.jooby.internal.SecretSessionId;
 
 import javax.annotation.Nonnull;
@@ -73,7 +72,7 @@ public SessionId getSessionId() {
    * @return Session store (defaults uses memory).
    */
   public @Nonnull SessionStore getStore() {
-    return new RequestSessionStore(store);
+    return store;
   }
 
   /**

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

@@ -27,7 +27,7 @@ public interface SessionStore {
    * @param id Session ID.
    * @return A new session.
    */
-  @Nonnull Session newSession(@Nonnull String id);
+  @Nonnull Session newSession(@Nonnull Context ctx);
 
   /**
    * Find an existing session by ID. For existing session this method must:
@@ -38,14 +38,14 @@ public interface SessionStore {
    * @param id Session ID.
    * @return An existing session or <code>null</code>.
    */
-  @Nullable Session findSession(@Nonnull String id);
+  @Nullable Session findSession(@Nonnull Context ctx);
 
   /**
    * Delete a session from store. This method must NOT call {@link Session#destroy()}.
    *
    * @param id Session ID.
    */
-  void deleteSession(@Nonnull String id);
+  void deleteSession(@Nonnull Context ctx);
 
   /**
    * Save a session. This method must save:
@@ -55,5 +55,5 @@ public interface SessionStore {
    *
    * @param session Session to save.
    */
-  void save(@Nonnull Session session);
+  void save(@Nonnull Context ctx);
 }

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

@@ -5,41 +5,80 @@
  */
 package io.jooby.internal;
 
+import io.jooby.Context;
 import io.jooby.Session;
+import io.jooby.SessionId;
+import io.jooby.SessionOptions;
 import io.jooby.SessionStore;
 
 import java.time.Instant;
+import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
 public class InMemorySessionStore implements SessionStore {
-  private ConcurrentHashMap<String, Session> sessions = new ConcurrentHashMap<>();
+  private static class SessionData {
+    private Instant lastAccessedTime;
+    private Instant creationTime;
+    private Map hash;
 
-  @Override public Session newSession(String id) {
+    public SessionData(Instant creationTime, Instant lastAccessedTime, Map hash) {
+      this.creationTime = creationTime;
+      this.lastAccessedTime = lastAccessedTime;
+      this.hash = hash;
+    }
+  }
+
+  private ConcurrentHashMap<String, SessionData> sessions = new ConcurrentHashMap<>();
+
+  @Override public Session newSession(Context ctx) {
+    SessionOptions options = sessionOptions(ctx);
+    String sessionId = options.generateId();
     Instant now = Instant.now();
-    Session session = Session.create(id)
+    Session session = Session.create(ctx, sessionId)
         .setCreationTime(now)
         .setLastAccessedTime(now)
         .setNew(true);
+    options.getSessionId().saveSessionId(ctx, sessionId);
     return session;
   }
 
-  @Override public Session findSession(String id) {
-    Session session = sessions.get(id);
-    if (session != null) {
-      session.setLastAccessedTime(Instant.now());
+  @Override public Session findSession(Context ctx) {
+    SessionOptions options = sessionOptions(ctx);
+    String sessionId = options.getSessionId().findSessionId(ctx);
+    if (sessionId == null) {
+      return null;
     }
-    return session;
+    SessionData data = sessions.get(sessionId);
+    if (data != null) {
+      Session session = Session.create(ctx, sessionId, data.hash);
+      session.setLastAccessedTime(data.lastAccessedTime);
+      session.setCreationTime(data.creationTime);
+      options.getSessionId().saveSessionId(ctx, sessionId);
+      return session;
+    }
+    return null;
+  }
+
+  @Override public void deleteSession(Context ctx) {
+    String sessionId = ctx.session().getId();
+    sessions.remove(sessionId);
+    SessionOptions options = sessionOptions(ctx);
+    SessionId store = options.getSessionId();
+    store.deleteSessionId(ctx, sessionId);
   }
 
-  @Override public void deleteSession(String id) {
-    sessions.remove(id);
+  @Override public void save(Context ctx) {
+    Session session = ctx.session();
+    String sessionId = ctx.session().getId();
+    sessions.put(sessionId,
+        new SessionData(session.getCreationTime(), Instant.now(), session.toMap()));
+    //    session
+    //        .setNew(false)
+    //        .setModify(false)
+    //        .setLastAccessedTime(Instant.now());
   }
 
-  @Override public void save(Session session) {
-    sessions.put(session.getId(), session);
-    session
-        .setNew(false)
-        .setModify(false)
-        .setLastAccessedTime(Instant.now());
+  private static SessionOptions sessionOptions(Context ctx) {
+    return ctx.getRouter().getSessionOptions();
   }
 }