req.cookie(String) should returns a Mutant (not a cookie) fix jooby-project#160

jknack · jknack · commit 92f5256bba02 · 2015-07-18T13:30:57.000-03:00
diff --git a/coverage-report/src/test/java/org/jooby/cookies/CookiesFeature.java b/coverage-report/src/test/java/org/jooby/cookies/CookiesFeature.java
@@ -4,9 +4,9 @@
 import static org.junit.Assert.assertTrue;
 
 import java.util.List;
-import java.util.Optional;
 
 import org.jooby.Cookie;
+import org.jooby.Mutant;
 import org.jooby.mvc.Path;
 import org.jooby.test.ServerFeature;
 import org.junit.Test;
@@ -33,8 +33,8 @@ public String list(final List<Cookie> cookies) {
     get("/get", (req, rsp) -> {
       // no path for netty
         assertTrue(req.cookies().toString().startsWith("[X=x;Version=1"));
-        Optional<Cookie> cookie = req.cookie("X");
-        rsp.send(cookie.isPresent() ? "present" : "deleted");
+        Mutant cookie = req.cookie("X");
+        rsp.send(cookie.isSet() ? "present" : "deleted");
       });
 
     get("/nocookies", (req, rsp) -> {
diff --git a/coverage-report/src/test/java/org/jooby/session/SessionIdWithSecretFeature.java b/coverage-report/src/test/java/org/jooby/session/SessionIdWithSecretFeature.java
@@ -26,7 +26,7 @@ public String generateID() {
     });
 
     get("/sessionCookie", (req, rsp) -> {
-      rsp.send("jooby.sid=" + req.cookie("jooby.sid").get().value().get() + ";"
+      rsp.send("jooby.sid=" + req.cookie("jooby.sid").value() + ";"
           + req.session().id());
     });
 
diff --git a/jooby/src/main/java/org/jooby/Request.java b/jooby/src/main/java/org/jooby/Request.java
@@ -137,7 +137,7 @@ public Map<String, Mutant> headers() {
     }
 
     @Override
-    public Optional<Cookie> cookie(final String name) {
+    public Mutant cookie(final String name) {
       return req.cookie(name);
     }
 
@@ -513,7 +513,7 @@ default Optional<MediaType> accepts(final MediaType... types) {
    * @param name Cookie's name.
    * @return A cookie or an empty optional.
    */
-  Optional<Cookie> cookie(String name);
+  Mutant cookie(String name);
 
   /**
    * @return All the cookies.
diff --git a/jooby/src/main/java/org/jooby/internal/RequestImpl.java b/jooby/src/main/java/org/jooby/internal/RequestImpl.java
@@ -209,8 +209,13 @@ public Map<String, Mutant> headers() {
   }
 
   @Override
-  public Optional<Cookie> cookie(final String name) {
-    return req.cookies().stream().filter(c -> c.name().equalsIgnoreCase(name)).findFirst();
+  public Mutant cookie(final String name) {
+    List<String> values = req.cookies().stream().filter(c -> c.name().equalsIgnoreCase(name))
+        .findFirst()
+        .map(cookie -> ImmutableList.of(cookie.value().get()))
+        .orElse(ImmutableList.of());
+
+    return new MutantImpl(require(ParserExecutor.class), new StrParamReferenceImpl(name, values));
   }
 
   @Override
diff --git a/jooby/src/main/java/org/jooby/internal/SessionManager.java b/jooby/src/main/java/org/jooby/internal/SessionManager.java
@@ -123,9 +123,9 @@ public Session create(final Request req, final Response rsp) {
   }
 
   public Session get(final Request req, final Response rsp) {
-    return req.cookie(template.name().get())
+    return req.cookie(template.name().get()).toOptional()
         .map(cookie -> {
-          String sessionId = unsign(cookie.value().get());
+          String sessionId = unsign(cookie);
           log.debug("loading session: {}", sessionId);
           Session session = store.get(
               new SessionImpl.Builder(resolver, false, sessionId, timeout)
diff --git a/jooby/src/main/java/org/jooby/internal/reqparam/RequestParam.java b/jooby/src/main/java/org/jooby/internal/reqparam/RequestParam.java
@@ -80,10 +80,12 @@ private interface GetValue {
     /**
      * Cookie
      */
-    builder.put(TypeLiteral.get(Cookie.class), (req, rsp, param) -> req.cookie(param.name).get());
+    builder.put(TypeLiteral.get(Cookie.class), (req, rsp, param) -> req.cookies().stream()
+        .filter(c -> c.name().equalsIgnoreCase(param.name)).findFirst().get());
     builder.put(TypeLiteral.get(Types.listOf(Cookie.class)), (req, rsp, param) -> req.cookies());
     builder.put(TypeLiteral.get(Types.newParameterizedType(Optional.class, Cookie.class)),
-        (req, rsp, param) -> req.cookie(param.name)
+        (req, rsp, param) -> req.cookies().stream()
+            .filter(c -> c.name().equalsIgnoreCase(param.name)).findFirst()
         );
     /**
      * Header
diff --git a/jooby/src/test/java/org/jooby/RequestForwardingTest.java b/jooby/src/test/java/org/jooby/RequestForwardingTest.java
@@ -218,13 +218,13 @@ public void headers() throws Exception {
 
   @Test
   public void cookie() throws Exception {
-    new MockUnit(Request.class, Cookie.class)
+    new MockUnit(Request.class, Mutant.class)
         .expect(unit -> {
           Request req = unit.get(Request.class);
-          expect(req.cookie("c")).andReturn(Optional.of(unit.get(Cookie.class)));
+          expect(req.cookie("c")).andReturn(unit.get(Mutant.class));
         })
         .run(unit -> {
-          assertEquals(Optional.of(unit.get(Cookie.class)),
+          assertEquals(unit.get(Mutant.class),
               new Request.Forwarding(unit.get(Request.class)).cookie("c"));
         });
   }
diff --git a/jooby/src/test/java/org/jooby/RequestTest.java b/jooby/src/test/java/org/jooby/RequestTest.java
@@ -56,7 +56,7 @@ public Map<String, Mutant> headers() {
     }
 
     @Override
-    public Optional<Cookie> cookie(final String name) {
+    public Mutant cookie(final String name) {
       throw new UnsupportedOperationException();
     }
 

Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ public Map<String, Mutant> headers() {`
`137`	`137`	`}`
`138`	`138`
`139`	`139`	`@Override`
`140`		`- public Optional<Cookie> cookie(final String name) {`
	`140`	`+ public Mutant cookie(final String name) {`
`141`	`141`	`return req.cookie(name);`
`142`	`142`	`}`
`143`	`143`
`@@ -513,7 +513,7 @@ default Optional<MediaType> accepts(final MediaType... types) {`
`513`	`513`	`* @param name Cookie's name.`
`514`	`514`	`* @return A cookie or an empty optional.`
`515`	`515`	`*/`
`516`		`- Optional<Cookie> cookie(String name);`
	`516`	`+ Mutant cookie(String name);`
`517`	`517`
`518`	`518`	`/**`
`519`	`519`	`* @return All the cookies.`
Original file line number	Diff line number	Diff line change
`@@ -209,8 +209,13 @@ public Map<String, Mutant> headers() {`
`209`	`209`	`}`
`210`	`210`
`211`	`211`	`@Override`
`212`		`- public Optional<Cookie> cookie(final String name) {`
`213`		`- return req.cookies().stream().filter(c -> c.name().equalsIgnoreCase(name)).findFirst();`
	`212`	`+ public Mutant cookie(final String name) {`
	`213`	`+ List<String> values = req.cookies().stream().filter(c -> c.name().equalsIgnoreCase(name))`
	`214`	`+ .findFirst()`
	`215`	`+ .map(cookie -> ImmutableList.of(cookie.value().get()))`
	`216`	`+ .orElse(ImmutableList.of());`
	`217`	`+`
	`218`	`+ return new MutantImpl(require(ParserExecutor.class), new StrParamReferenceImpl(name, values));`
`214`	`219`	`}`
`215`	`220`
`216`	`221`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public Map<String, Mutant> headers() {`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`@Override`
`59`		`- public Optional<Cookie> cookie(final String name) {`
	`59`	`+ public Mutant cookie(final String name) {`
`60`	`60`	`throw new UnsupportedOperationException();`
`61`	`61`	`}`
`62`	`62`