API Change: Jooby.use(Session.Store) -> Jooby.session(Session.Store) fix #57

Author: jknack

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

@@ -520,7 +520,7 @@ public static boolean valid(final String value, final String secret) {
   Optional<String> domain();
 
   /**
-   * Gets the maximum age in seconds of this Cookie.
+   * Gets the maximum age of this cookie (in seconds).
    *
    * <p>
    * By default, <code>-1</code> is returned, which indicates that the cookie will persist until

…by/internal/hbs/LocalsValueResolver.java …y/internal/hbs/RequestValueResolver.javajooby-hbs/src/main/java/org/jooby/internal/hbs/LocalsValueResolver.java renamed to jooby-hbs/src/main/java/org/jooby/internal/hbs/RequestValueResolver.java jooby-hbs/src/main/java/org/jooby/internal/hbs/LocalsValueResolver.java renamed to jooby-hbs/src/main/java/org/jooby/internal/hbs/RequestValueResolver.java

@@ -75,6 +75,7 @@
 
 import javax.inject.Singleton;
 
+import org.jooby.Session.Store;
 import org.jooby.internal.AppPrinter;
 import org.jooby.internal.AssetFormatter;
 import org.jooby.internal.AssetHandler;
@@ -485,7 +486,7 @@ public Jooby() {
   private List<BodyParser> parsers = new LinkedList<>();
 
   /** Session store. */
-  private Session.Definition session = new Session.Definition(new Session.MemoryStore());
+  private Session.Definition session = new Session.Definition(Session.Mem.class);
 
   /** Flag to control the addition of the asset formatter. */
   private boolean assetFormatter = false;
@@ -532,6 +533,18 @@ public <T> T require(final Class<T> type) {
     return injector.getInstance(type);
   }
 
+  /**
+   * Setup a session store to use. Useful if you want/need to persist sessions between shutdowns.
+   * Sessions are not persisted by defaults.
+   *
+   * @param store A session store.
+   * @return A session store definition.
+   */
+  public Session.Definition session(final Class<? extends Session.Store> store) {
+    this.session = new Session.Definition(requireNonNull(store, "A session store is required."));
+    return this.session;
+  }
+
   /**
    * Setup a session store to use. Useful if you want/need to persist sessions between shutdowns.
    * Sessions are not persisted by defaults.
@@ -2684,6 +2697,7 @@ private Injector bootstrap() throws Exception {
     Stage stage = "dev".equals(env.name()) ? Stage.DEVELOPMENT : Stage.PRODUCTION;
 
     // dependency injection
+    @SuppressWarnings("unchecked")
     Injector injector = Guice.createInjector(stage, binder -> {
 
       // type converters
@@ -2721,9 +2735,6 @@ private Injector bootstrap() throws Exception {
         Multibinder<BodyFormatter> formatterBinder = Multibinder
             .newSetBinder(binder, BodyFormatter.class);
 
-        // session definition
-        binder.bind(Session.Definition.class).toInstance(session);
-
         // Routes
         Multibinder<Route.Definition> definitions = Multibinder
             .newSetBinder(binder, Route.Definition.class);
@@ -2794,7 +2805,15 @@ private Injector bootstrap() throws Exception {
         binder.bindScope(RequestScoped.class, requestScope);
 
         // session manager
-        binder.bind(SessionManager.class).toInstance(new SessionManager(config, session));
+        binder.bind(SessionManager.class).asEagerSingleton();
+        binder.bind(Session.Definition.class).toInstance(session);
+        Object sstore = session.store();
+        if (sstore instanceof Class) {
+          binder.bind(Session.Store.class).to((Class<? extends Store>) sstore)
+              .asEagerSingleton();
+        } else {
+          binder.bind(Session.Store.class).toInstance((Store) sstore);;
+        }
 
         binder.bind(Request.class).toProvider(() -> {
           throw new OutOfScopeException(Request.class.getName());

…nternal/hbs/LocalsValueResolverTest.java …ternal/hbs/RequestValueResolverTest.javajooby-hbs/src/test/java/org/jooby/internal/hbs/LocalsValueResolverTest.java renamed to jooby-hbs/src/test/java/org/jooby/internal/hbs/RequestValueResolverTest.java jooby-hbs/src/test/java/org/jooby/internal/hbs/LocalsValueResolverTest.java renamed to jooby-hbs/src/test/java/org/jooby/internal/hbs/RequestValueResolverTest.java

@@ -345,15 +345,22 @@ public Object m1() {
   private MockUnit.Block session = unit -> {
     Binder binder = unit.get(Binder.class);
 
-    AnnotatedBindingBuilder<SessionManager> smbinding = unit.mock(AnnotatedBindingBuilder.class);
-    smbinding.toInstance(isA(SessionManager.class));
+    AnnotatedBindingBuilder<SessionManager> smABB = unit.mock(AnnotatedBindingBuilder.class);
+    smABB.asEagerSingleton();
 
-    expect(binder.bind(SessionManager.class)).andReturn(smbinding);
+    ScopedBindingBuilder ssSBB = unit.mock(ScopedBindingBuilder.class);
+    ssSBB.asEagerSingleton();
 
-    AnnotatedBindingBuilder<Session.Definition> binding = unit.mock(AnnotatedBindingBuilder.class);
-    binding.toInstance(isA(Session.Definition.class));
+    AnnotatedBindingBuilder<Store> ssABB= unit.mock(AnnotatedBindingBuilder.class);
+    expect(ssABB.to(Session.Mem.class)).andReturn(ssSBB);
 
-    expect(binder.bind(Session.Definition.class)).andReturn(binding);
+    expect(binder.bind(SessionManager.class)).andReturn(smABB);
+    expect(binder.bind(Session.Store.class)).andReturn(ssABB);
+
+    AnnotatedBindingBuilder<Session.Definition> sdABB = unit.mock(AnnotatedBindingBuilder.class);
+    sdABB.toInstance(isA(Session.Definition.class));
+
+    expect(binder.bind(Session.Definition.class)).andReturn(sdABB);
   };
 
   private MockUnit.Block boot = unit -> {
@@ -2105,17 +2112,22 @@ public void useStore() throws Exception {
         .expect(unit -> {
           Binder binder = unit.get(Binder.class);
 
-          AnnotatedBindingBuilder<SessionManager> smbinding = unit
-              .mock(AnnotatedBindingBuilder.class);
-          smbinding.toInstance(isA(SessionManager.class));
+          AnnotatedBindingBuilder<SessionManager> smABB = unit.mock(AnnotatedBindingBuilder.class);
+          smABB.asEagerSingleton();
+
+          ScopedBindingBuilder ssSBB = unit.mock(ScopedBindingBuilder.class);
+          ssSBB.asEagerSingleton();
+
+          AnnotatedBindingBuilder<Store> ssABB= unit.mock(AnnotatedBindingBuilder.class);
+          expect(ssABB.to(unit.get(Session.Store.class).getClass())).andReturn(ssSBB);
 
-          expect(binder.bind(SessionManager.class)).andReturn(smbinding);
+          expect(binder.bind(SessionManager.class)).andReturn(smABB);
+          expect(binder.bind(Session.Store.class)).andReturn(ssABB);
 
-          AnnotatedBindingBuilder<Session.Definition> binding = unit
-              .mock(AnnotatedBindingBuilder.class);
-          binding.toInstance(unit.capture(Session.Definition.class));
+          AnnotatedBindingBuilder<Session.Definition> sdABB = unit.mock(AnnotatedBindingBuilder.class);
+          sdABB.toInstance(unit.capture(Session.Definition.class));
 
-          expect(binder.bind(Session.Definition.class)).andReturn(binding);
+          expect(binder.bind(Session.Definition.class)).andReturn(sdABB);
         })
         .expect(routes)
         .expect(routeHandler)
@@ -2127,14 +2139,14 @@ public void useStore() throws Exception {
         .run(unit -> {
 
           Jooby jooby = new Jooby();
-          jooby.session(unit.get(Store.class));
+          jooby.session(unit.get(Store.class).getClass());
 
           jooby.start();
 
         }, boot,
             unit -> {
               Definition def = unit.captured(Session.Definition.class).iterator().next();
-              assertEquals(unit.get(Store.class), def.store());
+              assertEquals(unit.get(Store.class).getClass(), def.store());
             });
   }