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

jknack · jknack · commit 6d1f011fba19 · 2015-03-25T21:51:38.000-03:00
diff --git a/coverage-report/src/test/java/org/jooby/session/SessionConfigCookieFeature.java b/coverage-report/src/test/java/org/jooby/session/SessionConfigCookieFeature.java
@@ -32,7 +32,7 @@ public class SessionConfigCookieFeature extends ServerFeature {
         .withValue("application.session.cookie.httpOnly", ConfigValueFactory.fromAnyRef(true))
         .withValue("application.session.cookie.secure", ConfigValueFactory.fromAnyRef(false)));
 
-    use(new Session.MemoryStore());
+    session(new Session.MemoryStore());
 
     get("/session", (req, rsp) -> {
       rsp.send(req.session().id());
diff --git a/coverage-report/src/test/java/org/jooby/session/SessionCookieFeature.java b/coverage-report/src/test/java/org/jooby/session/SessionCookieFeature.java
@@ -23,7 +23,7 @@ public class SessionCookieFeature extends ServerFeature {
     use(ConfigFactory.empty().withValue("application.secret",
         ConfigValueFactory.fromAnyRef("fixed")));
 
-    use(new Session.MemoryStore()).cookie()
+    session(new Session.MemoryStore()).cookie()
         .name("custom.sid")
         .path("/session")
         .comment("jooby cookie")
diff --git a/coverage-report/src/test/java/org/jooby/session/SessionCookieNoSecretFeature.java b/coverage-report/src/test/java/org/jooby/session/SessionCookieNoSecretFeature.java
@@ -18,7 +18,7 @@
 public class SessionCookieNoSecretFeature extends ServerFeature {
 
   {
-    use(new Session.MemoryStore()).cookie()
+    session(new Session.MemoryStore()).cookie()
         .name("custom.sid")
         .path("/session")
         .maxAge(60);
diff --git a/coverage-report/src/test/java/org/jooby/session/SessionIdWithSecretFeature.java b/coverage-report/src/test/java/org/jooby/session/SessionIdWithSecretFeature.java
@@ -13,7 +13,7 @@ public class SessionIdWithSecretFeature extends ServerFeature {
     use(ConfigFactory.empty().withValue("application.secret",
         ConfigValueFactory.fromAnyRef("1234$")));
 
-    use(new Session.MemoryStore() {
+    session(new Session.MemoryStore() {
       @Override
       public String generateID() {
         return "1234";
diff --git a/coverage-report/src/test/java/org/jooby/session/SessionRestoreFeature.java b/coverage-report/src/test/java/org/jooby/session/SessionRestoreFeature.java
@@ -28,7 +28,7 @@ public class SessionRestoreFeature extends ServerFeature {
     lastAccessed.set(System.currentTimeMillis() - 200);
     lastSaved.set(lastAccessed.get());
     expiryAt.set(lastAccessed.get() + 2000);
-    use(new Session.MemoryStore() {
+    session(new Session.MemoryStore() {
       @Override
       public Session get(final Session.Builder builder) {
         assertEquals("678", builder.sessionId());
diff --git a/coverage-report/src/test/java/org/jooby/session/SessionSaveIntervalFeature.java b/coverage-report/src/test/java/org/jooby/session/SessionSaveIntervalFeature.java
@@ -13,7 +13,7 @@ public class SessionSaveIntervalFeature extends ServerFeature {
   private static final CountDownLatch saveCalls = new CountDownLatch(2);
 
   {
-    use(new Session.MemoryStore() {
+    session(new Session.MemoryStore() {
       @Override
       public void save(final Session session) {
         saveCalls.countDown();
diff --git a/coverage-report/src/test/java/org/jooby/session/SessionWithNoTimeOutFeature.java b/coverage-report/src/test/java/org/jooby/session/SessionWithNoTimeOutFeature.java
@@ -10,7 +10,7 @@
 public class SessionWithNoTimeOutFeature extends ServerFeature {
 
   {
-    use(new Session.MemoryStore()).timeout(-1);
+    session(new Session.MemoryStore()).timeout(-1);
 
     get("/session", (req, rsp) -> {
       Session session = req.session();
diff --git a/coverage-report/src/test/java/org/jooby/session/ShouldDestroyAndExpireCookieFeature.java b/coverage-report/src/test/java/org/jooby/session/ShouldDestroyAndExpireCookieFeature.java
@@ -14,7 +14,7 @@ public class ShouldDestroyAndExpireCookieFeature extends ServerFeature {
   private static final CountDownLatch latch = new CountDownLatch(1);
 
   {
-    use(new Session.MemoryStore() {
+    session(new Session.MemoryStore() {
       @Override
       public void delete(final String id) {
         super.delete(id);
diff --git a/coverage-report/src/test/java/org/jooby/session/ShouldDestroyAndExpireCookieOnTimeoutFeature.java b/coverage-report/src/test/java/org/jooby/session/ShouldDestroyAndExpireCookieOnTimeoutFeature.java
@@ -14,7 +14,7 @@ public class ShouldDestroyAndExpireCookieOnTimeoutFeature extends ServerFeature
   private static final CountDownLatch latch = new CountDownLatch(1);
 
   {
-    use(new Session.MemoryStore() {
+    session(new Session.MemoryStore() {
       @Override
       public void delete(final String id) {
         super.delete(id);
diff --git a/coverage-report/src/test/java/org/jooby/session/ShouldHaveSavedSessionEventWithEmptyResponseFeature.java b/coverage-report/src/test/java/org/jooby/session/ShouldHaveSavedSessionEventWithEmptyResponseFeature.java
@@ -13,7 +13,7 @@ public class ShouldHaveSavedSessionEventWithEmptyResponseFeature extends ServerF
   private static final CountDownLatch latch = new CountDownLatch(1);
 
   {
-    use(new Session.MemoryStore() {
+    session(new Session.MemoryStore() {
 
       @Override
       public void create(final Session session) {
diff --git a/coverage-report/src/test/java/org/jooby/session/ShouldHaveSavedSessionFeature.java b/coverage-report/src/test/java/org/jooby/session/ShouldHaveSavedSessionFeature.java
@@ -13,7 +13,7 @@ public class ShouldHaveSavedSessionFeature extends ServerFeature {
   private static final CountDownLatch latch = new CountDownLatch(1);
 
   {
-    use(new Session.MemoryStore() {
+    session(new Session.MemoryStore() {
 
       @Override
       public void create(final Session session) {
diff --git a/coverage-report/src/test/java/org/jooby/session/ShouldNotSetCookieOnTmpSessionFeature.java b/coverage-report/src/test/java/org/jooby/session/ShouldNotSetCookieOnTmpSessionFeature.java
@@ -13,7 +13,7 @@ public class ShouldNotSetCookieOnTmpSessionFeature extends ServerFeature {
   private static final CountDownLatch latch = new CountDownLatch(1);
 
   {
-    use(new Session.MemoryStore() {
+    session(new Session.MemoryStore() {
       @Override
       public void delete(final String id) {
         super.delete(id);
diff --git a/coverage-report/src/test/java/org/jooby/session/ShouldPreventSaveOnUnmodifiedSessionFeature.java b/coverage-report/src/test/java/org/jooby/session/ShouldPreventSaveOnUnmodifiedSessionFeature.java
@@ -15,7 +15,7 @@ public class ShouldPreventSaveOnUnmodifiedSessionFeature extends ServerFeature {
   private static CountDownLatch latch = null;
 
   {
-    use(new Session.MemoryStore() {
+    session(new Session.MemoryStore() {
 
       @Override
       public void create(final Session session) {
diff --git a/jooby/src/main/java/org/jooby/Jooby.java b/jooby/src/main/java/org/jooby/Jooby.java
@@ -536,12 +536,11 @@ public <T> T require(final Class<T> type) {
    * Setup a session store to use. Useful if you want/need to persist sessions between shutdowns.
    * Sessions are not persisted by defaults.
    *
-   * @param sessionStore A session store.
+   * @param store A session store.
    * @return A session store definition.
    */
-  public Session.Definition use(final Session.Store sessionStore) {
-    this.session = new Session.Definition(requireNonNull(sessionStore,
-        "A session store is required."));
+  public Session.Definition session(final Session.Store store) {
+    this.session = new Session.Definition(requireNonNull(store, "A session store is required."));
     return this.session;
   }
 
diff --git a/jooby/src/test/java/org/jooby/JoobyTest.java b/jooby/src/test/java/org/jooby/JoobyTest.java
@@ -2127,7 +2127,7 @@ public void useStore() throws Exception {
         .run(unit -> {
 
           Jooby jooby = new Jooby();
-          jooby.use(unit.get(Store.class));
+          jooby.session(unit.get(Store.class));
 
           jooby.start();
 

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`public class SessionCookieNoSecretFeature extends ServerFeature {`
`19`	`19`
`20`	`20`	`{`
`21`		`- use(new Session.MemoryStore()).cookie()`
	`21`	`+ session(new Session.MemoryStore()).cookie()`
`22`	`22`	`.name("custom.sid")`
`23`	`23`	`.path("/session")`
`24`	`24`	`.maxAge(60);`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ public class SessionSaveIntervalFeature extends ServerFeature {`
`13`	`13`	`private static final CountDownLatch saveCalls = new CountDownLatch(2);`
`14`	`14`
`15`	`15`	`{`
`16`		`- use(new Session.MemoryStore() {`
	`16`	`+ session(new Session.MemoryStore() {`
`17`	`17`	`@Override`
`18`	`18`	`public void save(final Session session) {`
`19`	`19`	`saveCalls.countDown();`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`public class SessionWithNoTimeOutFeature extends ServerFeature {`
`11`	`11`
`12`	`12`	`{`
`13`		`- use(new Session.MemoryStore()).timeout(-1);`
	`13`	`+ session(new Session.MemoryStore()).timeout(-1);`
`14`	`14`
`15`	`15`	`get("/session", (req, rsp) -> {`
`16`	`16`	`Session session = req.session();`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ public class ShouldDestroyAndExpireCookieFeature extends ServerFeature {`
`14`	`14`	`private static final CountDownLatch latch = new CountDownLatch(1);`
`15`	`15`
`16`	`16`	`{`
`17`		`- use(new Session.MemoryStore() {`
	`17`	`+ session(new Session.MemoryStore() {`
`18`	`18`	`@Override`
`19`	`19`	`public void delete(final String id) {`
`20`	`20`	`super.delete(id);`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ public class ShouldHaveSavedSessionEventWithEmptyResponseFeature extends ServerF`
`13`	`13`	`private static final CountDownLatch latch = new CountDownLatch(1);`
`14`	`14`
`15`	`15`	`{`
`16`		`- use(new Session.MemoryStore() {`
	`16`	`+ session(new Session.MemoryStore() {`
`17`	`17`
`18`	`18`	`@Override`
`19`	`19`	`public void create(final Session session) {`