Session API: remove anonymous classes for SessionToken implementations

Author: jknack

jooby/src/main/java/io/jooby/SessionId.java

@@ -5,9 +5,9 @@
  */
 package io.jooby;
 
-import io.jooby.internal.InMemorySessionStore;
-import io.jooby.internal.MultipleSessionId;
-import io.jooby.internal.SecretSessionId;
+import io.jooby.internal.MemorySessionStore;
+import io.jooby.internal.MultipleSessionToken;
+import io.jooby.internal.SecretSessionToken;
 
 import javax.annotation.Nonnull;
 import java.security.SecureRandom;
@@ -34,36 +34,36 @@ public class SessionOptions {
 
   private static final SecureRandom secure = new SecureRandom();
 
-  private SessionStore store = new InMemorySessionStore();
+  private SessionStore store = new MemorySessionStore();
 
-  private final SessionId sessionId;
+  private final SessionToken sessionToken;
 
   /**
    * Creates a session options.
    *
    * @param secret Secret key. Used to signed the cookie.
-   * @param sessionId session ID.
+   * @param sessionToken session ID.
    */
-  public SessionOptions(@Nonnull String secret, @Nonnull SessionId... sessionId) {
-    this.sessionId = new SecretSessionId(createSessionId(sessionId), secret);
+  public SessionOptions(@Nonnull String secret, @Nonnull SessionToken... sessionToken) {
+    this.sessionToken = new SecretSessionToken(createSessionId(sessionToken), secret);
   }
 
   /**
    * Creates a session options.
    *
-   * @param sessionId session ID.
+   * @param sessionToken session ID.
    */
-  public SessionOptions(@Nonnull SessionId... sessionId) {
-    this.sessionId = createSessionId(sessionId);
+  public SessionOptions(@Nonnull SessionToken... sessionToken) {
+    this.sessionToken = createSessionId(sessionToken);
   }
 
   /**
-   * Session ID strategy (cookie or header).
+   * Session token strategy (cookie or header).
    *
-   * @return Session ID strategy (cookie or header).
+   * @return Session token strategy (cookie or header).
    */
-  public SessionId getSessionId() {
-    return sessionId;
+  public SessionToken getSessionToken() {
+    return sessionToken;
   }
 
   /**
@@ -97,13 +97,13 @@ public SessionId getSessionId() {
     return Base64.getUrlEncoder().withoutPadding().encodeToString(bytes);
   }
 
-  private static SessionId createSessionId(@Nonnull SessionId[] sessionId) {
+  private static SessionToken createSessionId(@Nonnull SessionToken[] sessionId) {
     if (sessionId.length == 0) {
-      return SessionId.cookie(DEFAULT_COOKIE);
+      return SessionToken.cookie(DEFAULT_COOKIE);
     } else if (sessionId.length == 1) {
       return sessionId[0];
     } else {
-      return new MultipleSessionId(sessionId);
+      return new MultipleSessionToken(sessionId);
     }
   }
 }

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

@@ -0,0 +1,107 @@
+/**
+ * Jooby https://jooby.io
+ * Apache License Version 2.0 https://jooby.io/LICENSE.txt
+ * Copyright 2014 Edgar Espina
+ */
+package io.jooby;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+/**
+ * Find, save and delete a session token (cookie or header) into/from the web {@link Context}.
+ *
+ * @author edgar
+ */
+public interface SessionToken {
+
+  class CookieID implements SessionToken {
+
+    private final Cookie cookie;
+
+    public CookieID(@Nonnull Cookie cookie) {
+      this.cookie = cookie;
+    }
+
+    @Nullable @Override public String findToken(@Nonnull Context ctx) {
+      return ctx.cookieMap().get(cookie.getName());
+    }
+
+    @Override public void saveToken(@Nonnull Context ctx, @Nonnull String token) {
+      String existingId = findToken(ctx);
+      // write cookie for new or expiring session
+      if (existingId == null || cookie.getMaxAge() > 0) {
+        ctx.setResponseCookie(cookie.clone().setValue(token));
+      }
+    }
+
+    @Override public void deleteToken(@Nonnull Context ctx, @Nonnull String token) {
+      ctx.setResponseCookie(cookie.clone().setMaxAge(0));
+    }
+  }
+
+  class HeaderID implements SessionToken {
+
+    private final String name;
+
+    public HeaderID(String name) {
+      this.name = name;
+    }
+
+    @Nullable @Override public String findToken(@Nonnull Context ctx) {
+      return ctx.headerMap().get(name);
+    }
+
+    @Override public void saveToken(@Nonnull Context ctx, @Nonnull String token) {
+      ctx.setResponseHeader(name, token);
+    }
+
+    @Override public void deleteToken(@Nonnull Context ctx, @Nonnull String token) {
+      ctx.removeResponseHeader(name);
+    }
+  }
+
+  /**
+   * Find session ID.
+   *
+   * @param ctx Web context.
+   * @return Session ID or <code>null</code>.
+   */
+  @Nullable String findToken(@Nonnull Context ctx);
+
+  /**
+   * Save session ID in the web context.
+   *
+   * @param ctx Web context.
+   * @param token
+   */
+  void saveToken(@Nonnull Context ctx, @Nonnull String token);
+
+  /**
+   * Delete session ID in the web context.
+   *
+   * @param ctx Web context.
+   * @param token Session ID to save.
+   */
+  void deleteToken(@Nonnull Context ctx, @Nonnull String token);
+
+  /**
+   * Create a cookie-based Session ID.
+   *
+   * @param cookie Cookie template.
+   * @return Session ID.
+   */
+  static @Nonnull SessionToken cookie(@Nonnull Cookie cookie) {
+    return new CookieID(cookie);
+  }
+
+  /**
+   * Create a header-based Session ID.
+   *
+   * @param name Header name.
+   * @return Session ID.
+   */
+  static @Nonnull SessionToken header(@Nonnull String name) {
+    return new HeaderID(name);
+  }
+}

jooby/src/main/java/io/jooby/SessionToken.java

@@ -7,15 +7,15 @@
 
 import io.jooby.Context;
 import io.jooby.Session;
-import io.jooby.SessionId;
+import io.jooby.SessionToken;
 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 {
+public class MemorySessionStore implements SessionStore {
   private static class SessionData {
     private Instant lastAccessedTime;
     private Instant creationTime;
@@ -38,13 +38,13 @@ public SessionData(Instant creationTime, Instant lastAccessedTime, Map hash) {
         .setCreationTime(now)
         .setLastAccessedTime(now)
         .setNew(true);
-    options.getSessionId().saveSessionId(ctx, sessionId);
+    options.getSessionToken().saveToken(ctx, sessionId);
     return session;
   }
 
   @Override public Session findSession(Context ctx) {
     SessionOptions options = sessionOptions(ctx);
-    String sessionId = options.getSessionId().findSessionId(ctx);
+    String sessionId = options.getSessionToken().findToken(ctx);
     if (sessionId == null) {
       return null;
     }
@@ -53,7 +53,7 @@ public SessionData(Instant creationTime, Instant lastAccessedTime, Map hash) {
       Session session = Session.create(ctx, sessionId, data.hash);
       session.setLastAccessedTime(data.lastAccessedTime);
       session.setCreationTime(data.creationTime);
-      options.getSessionId().saveSessionId(ctx, sessionId);
+      options.getSessionToken().saveToken(ctx, sessionId);
       return session;
     }
     return null;
@@ -63,8 +63,8 @@ public SessionData(Instant creationTime, Instant lastAccessedTime, Map hash) {
     String sessionId = ctx.session().getId();
     sessions.remove(sessionId);
     SessionOptions options = sessionOptions(ctx);
-    SessionId store = options.getSessionId();
-    store.deleteSessionId(ctx, sessionId);
+    SessionToken store = options.getSessionToken();
+    store.deleteToken(ctx, sessionId);
   }
 
   @Override public void save(Context ctx) {