Change maxAge from long to Duration in AssetHandler

mdesharnais · mdesharnais · commit e3a76485a0da · 2016-04-26T09:30:09.000+02:00
Issue jooby-project#356
diff --git a/coverage-report/src/test/java/org/jooby/issues/Issue356.java b/coverage-report/src/test/java/org/jooby/issues/Issue356.java
@@ -1,5 +1,7 @@
 package org.jooby.issues;
 
+import java.time.Duration;
+
 import org.jooby.handlers.AssetHandler;
 import org.jooby.test.ServerFeature;
 
@@ -13,16 +15,16 @@
 public class Issue356 extends ServerFeature {
   {
     assets("/assets/file.css", new AssetHandler("/")
-      .etag(false).lastModified(false).maxAge(86400));
+      .etag(false).lastModified(false).maxAge(Duration.ofDays(1)));
 
     assets("/assets/favicon.ico", new AssetHandler("/")
-      .etag(false).lastModified(true).maxAge(1209600));
+      .etag(false).lastModified(true).maxAge(Duration.ofDays(14)));
 
     assets("/assets/file.js", new AssetHandler("/")
-      .etag(true).lastModified(false).maxAge(172800));
+      .etag(true).lastModified(false).maxAge(Duration.ofDays(2)));
 
     assets("/assets/empty.css", new AssetHandler("/")
-      .etag(true).lastModified(true).maxAge(604800));
+      .etag(true).lastModified(true).maxAge(Duration.ofDays(7)));
   }
 
   @Test
diff --git a/jooby-assets/src/main/java/org/jooby/assets/Assets.java b/jooby-assets/src/main/java/org/jooby/assets/Assets.java
@@ -18,7 +18,8 @@
  */
 package org.jooby.assets;
 
-import java.util.concurrent.TimeUnit;
+import java.time.Duration;
+import java.util.Optional;
 
 import org.jooby.Env;
 import org.jooby.Jooby;
@@ -266,8 +267,11 @@ public void configure(final Env env, final Config config, final Binder binder) {
           : new AssetHandler("/")
               .etag(conf.getBoolean("assets.etag"))
               .cdn(conf.getString("assets.cdn"))
-              .lastModified(conf.getBoolean("assets.lastModified"))
-              .maxAge(conf.getDuration("assets.cache.maxAge", TimeUnit.SECONDS));
+              .lastModified(conf.getBoolean("assets.lastModified"));
+
+      if (conf.hasPath("assets.cache.maxAge")) {
+        handler.maxAge(Duration.parse(conf.getString("assets.cache.maxAge")));
+      }
 
       compiler.patterns().forEach(
           pattern -> routes.addBinding()
diff --git a/jooby-assets/src/test/java/org/jooby/assets/AssetsTest.java b/jooby-assets/src/test/java/org/jooby/assets/AssetsTest.java
@@ -182,7 +182,7 @@ public void configuredist() throws Exception {
         .withValue("assets.etag", ConfigValueFactory.fromAnyRef(true))
         .withValue("application.path", ConfigValueFactory.fromAnyRef("/"))
         .withValue("assets.cdn", ConfigValueFactory.fromAnyRef(""))
-        .withValue("assets.cache.maxAge", ConfigValueFactory.fromAnyRef("365d"))
+        .withValue("assets.cache.maxAge", ConfigValueFactory.fromAnyRef("P365D"))
         .withValue("assets.lastModified", ConfigValueFactory.fromAnyRef(true))
         .withValue("assets.watch", ConfigValueFactory.fromAnyRef(false));
     new MockUnit(Env.class, Config.class, Binder.class, Request.class, Response.class,
diff --git a/jooby/src/main/java/org/jooby/handlers/AssetHandler.java b/jooby/src/main/java/org/jooby/handlers/AssetHandler.java
@@ -25,8 +25,10 @@
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.text.MessageFormat;
+import java.time.Duration;
 import java.util.Date;
 import java.util.Map;
+import java.util.Optional;
 
 import org.jooby.Asset;
 import org.jooby.Jooby;
@@ -92,7 +94,7 @@ public class AssetHandler implements Route.Handler {
 
   private boolean etag = true;
 
-  private long maxAge = -1;
+  private Optional<Duration> maxAgeOpt = Optional.empty();
 
   private boolean lastModified = true;
 
@@ -184,12 +186,21 @@ public AssetHandler cdn(final String cdn) {
     return this;
   }
 
+  /**
+   * @param maxAge Set the cache header max-age value.
+   * @return This handler.
+   */
+  public AssetHandler maxAge(final Duration maxAge) {
+    this.maxAgeOpt = Optional.of(maxAge);
+    return this;
+  }
+
   /**
    * @param maxAge Set the cache header max-age value in seconds.
    * @return This handler.
    */
   public AssetHandler maxAge(final long maxAge) {
-    this.maxAge = maxAge;
+    this.maxAgeOpt = Optional.of(Duration.ofSeconds(maxAge));
     return this;
   }
 
@@ -253,9 +264,9 @@ private void doHandle(final Request req, final Response rsp, final Asset asset)
     }
 
     // cache max-age
-    if (maxAge > 0) {
-      rsp.header("Cache-Control", "max-age=" + maxAge);
-    }
+    maxAgeOpt.ifPresent(d -> {
+      rsp.header("Cache-Control", "max-age=" + d.getSeconds());
+    });
 
     send(req, rsp, asset);
   }
diff --git a/jooby/src/main/resources/org/jooby/jooby.conf b/jooby/src/main/resources/org/jooby/jooby.conf
@@ -153,7 +153,8 @@ assets {
 
   charset = ${application.charset}
 
-  cache.maxAge = -1
+  # Either null or a string in the ISO 8601 format according to `java.time.Duration.parse(CharSequence)`.
+  cache.maxAge = null
 
 }
 

Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,8 @@ assets {`
`153`	`153`
`154`	`154`	`charset = ${application.charset}`
`155`	`155`
`156`		`- cache.maxAge = -1`
	`156`	+ # Either null or a string in the ISO 8601 format according to `java.time.Duration.parse(CharSequence)`.
	`157`	`+ cache.maxAge = null`
`157`	`158`
`158`	`159`	`}`
`159`	`160`