Unit test for AssetHandler.maxAge

Author: jknack

coverage-report/src/test/java/org/jooby/issues/Issue356.java

@@ -4,6 +4,7 @@
 import static org.junit.Assert.assertTrue;
 
 import java.time.Duration;
+import java.util.concurrent.TimeUnit;
 
 import org.jooby.handlers.AssetHandler;
 import org.jooby.test.ServerFeature;
@@ -13,7 +14,7 @@
 public class Issue356 extends ServerFeature {
   {
     assets("/assets/file.css", new AssetHandler("/")
-      .etag(false).lastModified(false).maxAge(Duration.ofDays(1)));
+      .etag(false).lastModified(false).maxAge(TimeUnit.HOURS.toSeconds(24)));
 
     assets("/assets/favicon.ico", new AssetHandler("/")
       .etag(false).lastModified(true).maxAge(Duration.ofDays(14)));

jooby/src/main/java/org/jooby/handlers/AssetHandler.java

@@ -94,7 +94,7 @@ public class AssetHandler implements Route.Handler {
 
   private boolean etag = true;
 
-  private Optional<Duration> maxAgeOpt = Optional.empty();
+  private Optional<Duration> maxAge = Optional.empty();
 
   private boolean lastModified = true;
 
@@ -191,7 +191,7 @@ public AssetHandler cdn(final String cdn) {
    * @return This handler.
    */
   public AssetHandler maxAge(final Duration maxAge) {
-    this.maxAgeOpt = Optional.of(maxAge);
+    this.maxAge = Optional.of(maxAge);
     return this;
   }
 
@@ -200,8 +200,7 @@ public AssetHandler maxAge(final Duration maxAge) {
    * @return This handler.
    */
   public AssetHandler maxAge(final long maxAge) {
-    this.maxAgeOpt = Optional.of(Duration.ofSeconds(maxAge));
-    return this;
+    return maxAge(Duration.ofSeconds(maxAge));
   }
 
   @Override
@@ -264,7 +263,7 @@ private void doHandle(final Request req, final Response rsp, final Asset asset)
     }
 
     // cache max-age
-    maxAgeOpt.ifPresent(d -> {
+    maxAge.ifPresent(d -> {
       rsp.header("Cache-Control", "max-age=" + d.getSeconds());
     });