Changeset d34a7ca8 in vaadin

Timestamp:

11/09/11 08:48:21 (19 months ago)

Author:

Leif Åstrand <leif@…>

Branches:

master, 7.0, f7f1e3ece5206c335487ce25f4e709370024109d

Children:

6d2cd8be

Parents:

3159f002

git-author:

Leif Åstrand <leif@…> (11/09/11 08:48:21)

git-committer:

Leif Åstrand <leif@…> (11/09/11 08:48:21)

Message:

Moved setting cache time and date headers to WrappedResponse

Location:

src/com/vaadin/terminal

Files:

• WrappedResponse.java (modified) (1 diff)
• gwt/server/ApplicationResourceHandler.java (modified) (3 diffs)
• gwt/server/WrappedHttpServletResponse.java (modified) (1 diff)
• gwt/server/WrappedPortletResponse.java (modified) (3 diffs)

src/com/vaadin/terminal/WrappedResponse.java

@@ -13 +13 @@
     public void setHeader(String name, String value);
 
+    public void setDateHeader(String name, long timestamp);
+
     public OutputStream getOutputStream() throws IOException;
 
     public PrintWriter getWriter() throws IOException;
 
+    /**
+     * Sets time in milliseconds, -1 means no cache at all. All required headers
+     * related to caching in the response are set based on the time.
+     * 
+     * @param milliseconds
+     *            Cache time in milliseconds
+     */
+    public void setCacheTime(long milliseconds);
+
 }

src/com/vaadin/terminal/gwt/server/ApplicationResourceHandler.java

@@ -4 +4 @@
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
 import java.util.Iterator;
-import java.util.Locale;
-import java.util.TimeZone;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -23 +18 @@
 
 public class ApplicationResourceHandler implements RequestHandler {
-    private static final DateFormat HTTP_DATE_FORMAT = new SimpleDateFormat(
-            "EEE, dd MMM yyyy HH:mm:ss zzz", Locale.ENGLISH);
-    static {
-        HTTP_DATE_FORMAT.setTimeZone(TimeZone.getTimeZone("GMT"));
-    }
     private static final Pattern APP_RESOURCE_PATTERN = Pattern
             .compile("/APP/(\\d+)/.*");
@@ -72 +62 @@
 
                 // Sets cache headers
-                final long cacheTime = stream.getCacheTime();
-                if (cacheTime <= 0) {
-                    response.setHeader("Cache-Control", "no-cache");
-                    response.setHeader("Pragma", "no-cache");
-                    response.setHeader("Expires",
-                            HTTP_DATE_FORMAT.format(new Date(0)));
-                } else {
-                    response.setHeader("Cache-Control", "max-age=" + cacheTime
-                            / 1000);
-                    response.setHeader(
-                            "Expires",
-                            HTTP_DATE_FORMAT.format(new Date(System
-                                    .currentTimeMillis() + cacheTime)));
-                    // Required to apply caching in some Tomcats
-                    response.setHeader("Pragma", "cache");
-                }
+                response.setCacheTime(stream.getCacheTime());
 
                 // Copy download stream parameters directly

src/com/vaadin/terminal/gwt/server/WrappedHttpServletResponse.java

@@ -46 +46 @@
     }
 
+    public void setCacheTime(long milliseconds) {
+        doSetCacheTime(this, milliseconds);
+    }
+
+    // Implementation shared with WrappedPortletResponse
+    static void doSetCacheTime(WrappedResponse response, long milliseconds) {
+        if (milliseconds <= 0) {
+            response.setHeader("Cache-Control", "no-cache");
+            response.setHeader("Pragma", "no-cache");
+            response.setDateHeader("Expires", 0);
+        } else {
+            response.setHeader("Cache-Control", "max-age=" + milliseconds
+                    / 1000);
+            response.setDateHeader("Expires", System.currentTimeMillis()
+                    + milliseconds);
+            // Required to apply caching in some Tomcats
+            response.setHeader("Pragma", "cache");
+        }
+    }
+
+    public void setDateHeader(String name, long timestamp) {
+        response.setDateHeader(name, timestamp);
+    }
 }

src/com/vaadin/terminal/gwt/server/WrappedPortletResponse.java

@@ -4 +4 @@
 import java.io.OutputStream;
 import java.io.PrintWriter;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
+import java.util.TimeZone;
 
 import javax.portlet.MimeResponse;
@@ -12 +17 @@
 
 public class WrappedPortletResponse implements WrappedResponse {
+    private static final DateFormat HTTP_DATE_FORMAT = new SimpleDateFormat(
+            "EEE, dd MMM yyyy HH:mm:ss zzz", Locale.ENGLISH);
+    static {
+        HTTP_DATE_FORMAT.setTimeZone(TimeZone.getTimeZone("GMT"));
+    }
 
     private final PortletResponse response;
@@ -43 +53 @@
         response.setProperty(name, value);
     }
+
+    public void setDateHeader(String name, long timestamp) {
+        response.setProperty(name, HTTP_DATE_FORMAT.format(new Date(timestamp)));
+    }
+
+    public void setCacheTime(long milliseconds) {
+        WrappedHttpServletResponse.doSetCacheTime(this, milliseconds);
+    }
 }