X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=cachecontrol%2Fsrc%2Fmain%2Fjava%2Fde%2Fhalbekunst%2Fjuplo%2Fcachecontrol%2FCacheControl.java;h=0512de4a0a84cd7301e78c2c015dc6ab21e7580b;hb=61a37d1d42af6c569d61f77f1939af578060aa41;hp=b248227716f25f2a9583c7d7e59f649d64e16a4f;hpb=1bb1a0f0e1d347538ae93c23395bba172cd87342;p=percentcodec

diff --git a/cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol/CacheControl.java b/cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol/CacheControl.java
index b2482277..0512de4a 100644
--- a/cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol/CacheControl.java
+++ b/cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol/CacheControl.java
@@ -1,5 +1,6 @@
 package de.halbekunst.juplo.cachecontrol;
 
+import de.halbekunst.juplo.cachecontrol.AcceleratorFilter.AccelerationWrapper;
 import de.halbekunst.juplo.cachecontrol.annotations.CacheSeconds;
 import de.halbekunst.juplo.cachecontrol.annotations.Accepts;
 import de.halbekunst.juplo.cachecontrol.annotations.AdditionalHeaders;
@@ -38,8 +39,8 @@ public class CacheControl {
     CacheControl.tl.set(handle);
   }
 
-  public void init(Object handler) throws NoSuchMethodException {
-    CacheControl.tl.set(new ReflectionCacheMethodHandle(handler));
+  void init(Object handler, AccelerationWrapper wrapper) throws NoSuchMethodException {
+    CacheControl.tl.set(new ReflectionCacheMethodHandle(handler, wrapper == null ? false : wrapper.zipped));
   }
 
   public boolean decorate(
@@ -49,10 +50,10 @@ public class CacheControl {
       )
   {
     try {
-    CacheMethodHandle controller = CacheControl.tl.get();
+    CacheMethodHandle handle = CacheControl.tl.get();
 
     /** Doppelte Ausführung verhindern... */
-    if (controller == null) {
+    if (handle == null) {
       /** Dekoration wurde bereits durchgeführt! */
       return true;
     }
@@ -62,10 +63,10 @@ public class CacheControl {
      * http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.18 RFC 2616,
      * Abschnitt 14.18} einen Date-Header enthalten
      */
-    response.setDateHeader(Headers.HEADER_DATE, controller.getTimestamp());
+    response.setDateHeader(Headers.HEADER_DATE, handle.getTimestamp());
 
     /** Besondere Maßnahmen für besondere HTTP-Status-Codes ?!? */
-    int status = controller.accepts(request);
+    int status = handle.accepts(request);
     switch (status) {
       case HttpServletResponse.SC_OK: // 200
       case HttpServletResponse.SC_NO_CONTENT: // 204
@@ -102,7 +103,10 @@ public class CacheControl {
         return false;
     }
 
-    Map<String,String> headers = controller.getAdditionalHeaders(request);
+    if (handle.isZipped())
+      response.addHeader(Headers.HEADER_CONTENT_ENCODING, "gzip");
+
+    Map<String,String> headers = handle.getAdditionalHeaders(request);
     for (String name : headers.keySet())
       response.addHeader(name, headers.get(name));
 
@@ -120,10 +124,10 @@ public class CacheControl {
       }
     }
 
-    int cacheSeconds = controller.getCacheSeconds(request);
+    int cacheSeconds = handle.getCacheSeconds(request);
     if (cacheSeconds < 1) {
       log.debug("{}: caching disabled!", url);
-      response.setDateHeader(Headers.HEADER_DATE, controller.getTimestamp());
+      response.setDateHeader(Headers.HEADER_DATE, handle.getTimestamp());
       response.setDateHeader(Headers.HEADER_EXPIRES, 0);
       response.addHeader(Headers.HEADER_PRAGMA, "no-cache");
       response.addHeader(Headers.HEADER_CACHE_CONTROL, "private");
@@ -142,7 +146,7 @@ public class CacheControl {
       log.error("Exception while fetching If-Modified-Since: {}", e);
     }
 
-    long lastModified = controller.getLastModified(request);
+    long lastModified = handle.getLastModified(request);
 
     /**
      * Sicherstellen, dass der Wert keine Millisekunden enthält, da die
@@ -152,7 +156,7 @@ public class CacheControl {
     lastModified = lastModified - (lastModified % 1000);
 
     String ifNoneMatch = request.getHeader(Headers.HEADER_IF_NONE_MATCH);
-    String eTag = controller.getETag(request);
+    String eTag = handle.getETag(request);
 
     /**
      * 304-Antworten sollen nach dem {@plainlink
@@ -162,7 +166,7 @@ public class CacheControl {
      */
     if (eTag != null) {
       StringBuilder builder = new StringBuilder();
-      if (controller.isETagWeak())
+      if (handle.isETagWeak())
         builder.append("W/");
       builder.append('"');
       builder.append(eTag);
@@ -207,7 +211,7 @@ public class CacheControl {
          * Antwort stark sind (starke Gleichheit!), oder wenn die Antwort nur
          * schwache Gleichheit fordert...
          */
-        if (ifNoneMatch.equals(eTag) && (controller.isETagWeak() || !weak)) {
+        if (ifNoneMatch.equals(eTag) && (handle.isETagWeak() || !weak)) {
           log.debug("{}: ETag {} not changed -> 304 ", url, ifNoneMatch);
           response.setStatus(HttpServletResponse.SC_NOT_MODIFIED);
           return false;
@@ -245,11 +249,11 @@ public class CacheControl {
        * <code>Expires</code>-Header für HTTP/1.0-Clients setzen.
        */
       cacheControl.put("max-age", Integer.toString(cacheSeconds));
-      response.setDateHeader(Headers.HEADER_EXPIRES, (controller.getTimestamp() + (long) cacheSeconds * 1000));
+      response.setDateHeader(Headers.HEADER_EXPIRES, (handle.getTimestamp() + (long) cacheSeconds * 1000));
     }
 
     /** Dem Handler die Gelegenheit geben, den Cache-Controll-Header anzupassen */
-    controller.cacheControl(request, cacheControl);
+    handle.cacheControl(request, cacheControl);
 
 
     if (cacheControl.containsKey("private")) {
@@ -293,18 +297,6 @@ public class CacheControl {
   }
 
 
-  public interface CacheMethodHandle {
-    long getTimestamp();
-    int accepts(HttpServletRequest request);
-    int getCacheSeconds(HttpServletRequest request);
-    long getLastModified(HttpServletRequest request);
-    String getETag(HttpServletRequest request);
-    boolean isETagWeak();
-    void cacheControl(HttpServletRequest request, Map<String, String> cacheControlMap);
-    Map<String,String> getAdditionalHeaders(HttpServletRequest request);
-  }
-
-
   class ReflectionCacheMethodHandle implements CacheMethodHandle {
 
     private Object handler;
@@ -326,11 +318,13 @@ public class CacheControl {
     private boolean isCacheControlMethodDefined;
     private boolean isAdditionalHeadersMethodDefined;
     private boolean weak;
+    private boolean zipped;
 
 
-    ReflectionCacheMethodHandle(Object handler) throws NoSuchMethodException {
+    ReflectionCacheMethodHandle(Object handler, boolean zipped) throws NoSuchMethodException {
 
       this.handler = handler;
+      this.zipped = zipped;
 
       cacheSeconds = CacheControl.this.defaultCacheSeconds;
       lastModified = CacheControl.this.defaultLastModified;
@@ -436,6 +430,11 @@ public class CacheControl {
     }
 
 
+    @Override
+    public boolean isZipped() {
+      return zipped;
+    }
+
     @Override
     public long getTimestamp() {
       return now;