Keep the flash fix jooby-project#837

jknack · jknack · commit f938e5979b8e · 2017-10-09T21:14:23.000-03:00
diff --git a/jooby/src/main/java/org/jooby/Request.java b/jooby/src/main/java/org/jooby/Request.java
@@ -289,6 +289,19 @@
  */
 public interface Request extends Registry {
 
+  /**
+   * Flash scope.
+   *
+   * @author edgar
+   * @since 1.2.0
+   */
+  interface Flash extends Map<String, String> {
+    /**
+     * Keep flash cookie for next request.
+     */
+    void keep();
+  }
+
   /**
    * Forwarding request.
    *
@@ -605,7 +618,7 @@ public <T> Optional<T> unset(final String name) {
     }
 
     @Override
-    public Map<String, String> flash() throws NoSuchElementException {
+    public Flash flash() throws NoSuchElementException {
       return req.flash();
     }
 
@@ -1308,8 +1321,8 @@ default boolean xhr() {
    * @throws Err Bad request error if the {@link FlashScope} was not installed it.
    */
   @Nonnull
-  default Map<String, String> flash() throws Err {
-    Optional<Map<String, String>> flash = ifGet(FlashScope.NAME);
+  default Flash flash() throws Err {
+    Optional<Flash> flash = ifGet(FlashScope.NAME);
     return flash.orElseThrow(() -> new Err(Status.BAD_REQUEST,
         "Flash scope isn't available. Install via: use(new FlashScope());"));
   }
diff --git a/jooby/src/main/java/org/jooby/Route.java b/jooby/src/main/java/org/jooby/Route.java
@@ -1462,7 +1462,7 @@ public String pattern() {
       return pattern;
     }
 
-    @Nonnull
+    @Nullable
     public String renderer() {
       return renderer;
     }
diff --git a/jooby/src/main/java/org/jooby/internal/handlers/FlashScopeHandler.java b/jooby/src/main/java/org/jooby/internal/handlers/FlashScopeHandler.java
diff --git a/jooby/src/main/java/org/jooby/internal/mvc/RequestParam.java b/jooby/src/main/java/org/jooby/internal/mvc/RequestParam.java
@@ -319,7 +319,8 @@ private interface GetValue {
      * Flash
      */
     builder.put(flashType, (req, rsp, param) -> {
-      if (param.type.getRawType() == Map.class) {
+      Class rawType = param.type.getRawType();
+      if (Map.class.isAssignableFrom(rawType)) {
         return req.flash();
       }
       return param.optional ? req.ifFlash(param.name) : req.flash(param.name);
diff --git a/jooby/src/main/java/org/jooby/package-info.java b/jooby/src/main/java/org/jooby/package-info.java
@@ -1,3 +1,206 @@
+/**
+ *                                  Apache License
+ *                            Version 2.0, January 2004
+ *                         http://www.apache.org/licenses/
+ *
+ *    TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+ *
+ *    1. Definitions.
+ *
+ *       "License" shall mean the terms and conditions for use, reproduction,
+ *       and distribution as defined by Sections 1 through 9 of this document.
+ *
+ *       "Licensor" shall mean the copyright owner or entity authorized by
+ *       the copyright owner that is granting the License.
+ *
+ *       "Legal Entity" shall mean the union of the acting entity and all
+ *       other entities that control, are controlled by, or are under common
+ *       control with that entity. For the purposes of this definition,
+ *       "control" means (i) the power, direct or indirect, to cause the
+ *       direction or management of such entity, whether by contract or
+ *       otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ *       outstanding shares, or (iii) beneficial ownership of such entity.
+ *
+ *       "You" (or "Your") shall mean an individual or Legal Entity
+ *       exercising permissions granted by this License.
+ *
+ *       "Source" form shall mean the preferred form for making modifications,
+ *       including but not limited to software source code, documentation
+ *       source, and configuration files.
+ *
+ *       "Object" form shall mean any form resulting from mechanical
+ *       transformation or translation of a Source form, including but
+ *       not limited to compiled object code, generated documentation,
+ *       and conversions to other media types.
+ *
+ *       "Work" shall mean the work of authorship, whether in Source or
+ *       Object form, made available under the License, as indicated by a
+ *       copyright notice that is included in or attached to the work
+ *       (an example is provided in the Appendix below).
+ *
+ *       "Derivative Works" shall mean any work, whether in Source or Object
+ *       form, that is based on (or derived from) the Work and for which the
+ *       editorial revisions, annotations, elaborations, or other modifications
+ *       represent, as a whole, an original work of authorship. For the purposes
+ *       of this License, Derivative Works shall not include works that remain
+ *       separable from, or merely link (or bind by name) to the interfaces of,
+ *       the Work and Derivative Works thereof.
+ *
+ *       "Contribution" shall mean any work of authorship, including
+ *       the original version of the Work and any modifications or additions
+ *       to that Work or Derivative Works thereof, that is intentionally
+ *       submitted to Licensor for inclusion in the Work by the copyright owner
+ *       or by an individual or Legal Entity authorized to submit on behalf of
+ *       the copyright owner. For the purposes of this definition, "submitted"
+ *       means any form of electronic, verbal, or written communication sent
+ *       to the Licensor or its representatives, including but not limited to
+ *       communication on electronic mailing lists, source code control systems,
+ *       and issue tracking systems that are managed by, or on behalf of, the
+ *       Licensor for the purpose of discussing and improving the Work, but
+ *       excluding communication that is conspicuously marked or otherwise
+ *       designated in writing by the copyright owner as "Not a Contribution."
+ *
+ *       "Contributor" shall mean Licensor and any individual or Legal Entity
+ *       on behalf of whom a Contribution has been received by Licensor and
+ *       subsequently incorporated within the Work.
+ *
+ *    2. Grant of Copyright License. Subject to the terms and conditions of
+ *       this License, each Contributor hereby grants to You a perpetual,
+ *       worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ *       copyright license to reproduce, prepare Derivative Works of,
+ *       publicly display, publicly perform, sublicense, and distribute the
+ *       Work and such Derivative Works in Source or Object form.
+ *
+ *    3. Grant of Patent License. Subject to the terms and conditions of
+ *       this License, each Contributor hereby grants to You a perpetual,
+ *       worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ *       (except as stated in this section) patent license to make, have made,
+ *       use, offer to sell, sell, import, and otherwise transfer the Work,
+ *       where such license applies only to those patent claims licensable
+ *       by such Contributor that are necessarily infringed by their
+ *       Contribution(s) alone or by combination of their Contribution(s)
+ *       with the Work to which such Contribution(s) was submitted. If You
+ *       institute patent litigation against any entity (including a
+ *       cross-claim or counterclaim in a lawsuit) alleging that the Work
+ *       or a Contribution incorporated within the Work constitutes direct
+ *       or contributory patent infringement, then any patent licenses
+ *       granted to You under this License for that Work shall terminate
+ *       as of the date such litigation is filed.
+ *
+ *    4. Redistribution. You may reproduce and distribute copies of the
+ *       Work or Derivative Works thereof in any medium, with or without
+ *       modifications, and in Source or Object form, provided that You
+ *       meet the following conditions:
+ *
+ *       (a) You must give any other recipients of the Work or
+ *           Derivative Works a copy of this License; and
+ *
+ *       (b) You must cause any modified files to carry prominent notices
+ *           stating that You changed the files; and
+ *
+ *       (c) You must retain, in the Source form of any Derivative Works
+ *           that You distribute, all copyright, patent, trademark, and
+ *           attribution notices from the Source form of the Work,
+ *           excluding those notices that do not pertain to any part of
+ *           the Derivative Works; and
+ *
+ *       (d) If the Work includes a "NOTICE" text file as part of its
+ *           distribution, then any Derivative Works that You distribute must
+ *           include a readable copy of the attribution notices contained
+ *           within such NOTICE file, excluding those notices that do not
+ *           pertain to any part of the Derivative Works, in at least one
+ *           of the following places: within a NOTICE text file distributed
+ *           as part of the Derivative Works; within the Source form or
+ *           documentation, if provided along with the Derivative Works; or,
+ *           within a display generated by the Derivative Works, if and
+ *           wherever such third-party notices normally appear. The contents
+ *           of the NOTICE file are for informational purposes only and
+ *           do not modify the License. You may add Your own attribution
+ *           notices within Derivative Works that You distribute, alongside
+ *           or as an addendum to the NOTICE text from the Work, provided
+ *           that such additional attribution notices cannot be construed
+ *           as modifying the License.
+ *
+ *       You may add Your own copyright statement to Your modifications and
+ *       may provide additional or different license terms and conditions
+ *       for use, reproduction, or distribution of Your modifications, or
+ *       for any such Derivative Works as a whole, provided Your use,
+ *       reproduction, and distribution of the Work otherwise complies with
+ *       the conditions stated in this License.
+ *
+ *    5. Submission of Contributions. Unless You explicitly state otherwise,
+ *       any Contribution intentionally submitted for inclusion in the Work
+ *       by You to the Licensor shall be under the terms and conditions of
+ *       this License, without any additional terms or conditions.
+ *       Notwithstanding the above, nothing herein shall supersede or modify
+ *       the terms of any separate license agreement you may have executed
+ *       with Licensor regarding such Contributions.
+ *
+ *    6. Trademarks. This License does not grant permission to use the trade
+ *       names, trademarks, service marks, or product names of the Licensor,
+ *       except as required for reasonable and customary use in describing the
+ *       origin of the Work and reproducing the content of the NOTICE file.
+ *
+ *    7. Disclaimer of Warranty. Unless required by applicable law or
+ *       agreed to in writing, Licensor provides the Work (and each
+ *       Contributor provides its Contributions) on an "AS IS" BASIS,
+ *       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ *       implied, including, without limitation, any warranties or conditions
+ *       of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ *       PARTICULAR PURPOSE. You are solely responsible for determining the
+ *       appropriateness of using or redistributing the Work and assume any
+ *       risks associated with Your exercise of permissions under this License.
+ *
+ *    8. Limitation of Liability. In no event and under no legal theory,
+ *       whether in tort (including negligence), contract, or otherwise,
+ *       unless required by applicable law (such as deliberate and grossly
+ *       negligent acts) or agreed to in writing, shall any Contributor be
+ *       liable to You for damages, including any direct, indirect, special,
+ *       incidental, or consequential damages of any character arising as a
+ *       result of this License or out of the use or inability to use the
+ *       Work (including but not limited to damages for loss of goodwill,
+ *       work stoppage, computer failure or malfunction, or any and all
+ *       other commercial damages or losses), even if such Contributor
+ *       has been advised of the possibility of such damages.
+ *
+ *    9. Accepting Warranty or Additional Liability. While redistributing
+ *       the Work or Derivative Works thereof, You may choose to offer,
+ *       and charge a fee for, acceptance of support, warranty, indemnity,
+ *       or other liability obligations and/or rights consistent with this
+ *       License. However, in accepting such obligations, You may act only
+ *       on Your own behalf and on Your sole responsibility, not on behalf
+ *       of any other Contributor, and only if You agree to indemnify,
+ *       defend, and hold each Contributor harmless for any liability
+ *       incurred by, or claims asserted against, such Contributor by reason
+ *       of your accepting any such warranty or additional liability.
+ *
+ *    END OF TERMS AND CONDITIONS
+ *
+ *    APPENDIX: How to apply the Apache License to your work.
+ *
+ *       To apply the Apache License to your work, attach the following
+ *       boilerplate notice, with the fields enclosed by brackets "{}"
+ *       replaced with your own identifying information. (Don't include
+ *       the brackets!)  The text should be enclosed in the appropriate
+ *       comment syntax for the file format. We also recommend that a
+ *       file or class name and description of purpose be included on the
+ *       same "printed page" as the copyright notice for easier
+ *       identification within third-party archives.
+ *
+ *    Copyright 2014 Edgar Espina
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
 /**
  * <h1>do more, more easily</h1>
  * <p>
diff --git a/jooby/src/test/java/org/jooby/RequestForwardingTest.java b/jooby/src/test/java/org/jooby/RequestForwardingTest.java
@@ -763,10 +763,10 @@ public void timestamp() throws Exception {
 
   @Test
   public void flash() throws Exception {
-    new MockUnit(Request.class, Map.class)
+    new MockUnit(Request.class, Map.class, Request.Flash.class)
         .expect(unit -> {
           Request req = unit.get(Request.class);
-          expect(req.flash()).andReturn(Collections.emptyMap());
+          expect(req.flash()).andReturn(unit.get(Request.Flash.class));
         })
         .run(unit -> {
           new Request.Forwarding(unit.get(Request.class)).flash();
diff --git a/jooby/src/test/java/org/jooby/RequestTest.java b/jooby/src/test/java/org/jooby/RequestTest.java
@@ -1,6 +1,7 @@
 package org.jooby;
 
 import static org.easymock.EasyMock.expect;
+import org.jooby.internal.handlers.FlashScopeHandler;
 import static org.junit.Assert.assertEquals;
 
 import java.io.IOException;
@@ -372,10 +373,10 @@ public List<Locale> locales(
 
   @Test
   public void setFlashAttr() throws Exception {
-    Map<String, String> flash = new HashMap<>();
+    FlashScopeHandler.FlashMap flash = new FlashScopeHandler.FlashMap(new HashMap<>());
     new RequestMock() {
       @Override
-      public Map<String, String> flash() {
+      public Flash flash() {
         return flash;
       }
     }.flash("foo", "bar");
@@ -384,11 +385,11 @@ public Map<String, String> flash() {
 
   @Test
   public void removeFlashAttr() throws Exception {
-    Map<String, String> flash = new HashMap<>();
+    FlashScopeHandler.FlashMap flash = new FlashScopeHandler.FlashMap(new HashMap<>());
     flash.put("foo", "bar");
     new RequestMock() {
       @Override
-      public Map<String, String> flash() {
+      public Request.Flash flash() {
         return flash;
       }
     }.flash("foo", null);
@@ -397,11 +398,11 @@ public Map<String, String> flash() {
 
   @Test
   public void getFlashAttr() throws Exception {
-    Map<String, String> flash = new HashMap<>();
+    FlashScopeHandler.FlashMap flash = new FlashScopeHandler.FlashMap(new HashMap<>());
     flash.put("foo", "bar");
     RequestMock req = new RequestMock() {
       @Override
-      public Map<String, String> flash() {
+      public Request.Flash flash() {
         return flash;
       }
     };
@@ -410,10 +411,10 @@ public Map<String, String> flash() {
 
   @Test(expected = Err.class)
   public void noSuchFlashAttr() throws Exception {
-    Map<String, String> flash = new HashMap<>();
+    FlashScopeHandler.FlashMap flash = new FlashScopeHandler.FlashMap(new HashMap<>());
     RequestMock req = new RequestMock() {
       @Override
-      public Map<String, String> flash() {
+      public Request.Flash flash() {
         return flash;
       }
     };
diff --git a/modules/coverage-report/src/test/java/org/jooby/issues/Issue837.java b/modules/coverage-report/src/test/java/org/jooby/issues/Issue837.java

Original file line number	Diff line number	Diff line change
`@@ -1462,7 +1462,7 @@ public String pattern() {`
`1462`	`1462`	`return pattern;`
`1463`	`1463`	`}`
`1464`	`1464`
`1465`		`- @Nonnull`
	`1465`	`+ @Nullable`
`1466`	`1466`	`public String renderer() {`
`1467`	`1467`	`return renderer;`
`1468`	`1468`	`}`