X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=cachecontrol%2Fsrc%2Fmain%2Fjava%2Fde%2Fhalbekunst%2Fjuplo%2Fcachecontrol%2FAcceleratorFilter.java;h=9125554cce1572eb9d12c88ea66fda6d71dabcf1;hb=4f2efacd03f5660a1ba4b1d7b0f2380d8a9ec8ef;hp=f76c7132cfd1c3b0de341011d23e2d3bf8b0c1d2;hpb=1bb1a0f0e1d347538ae93c23395bba172cd87342;p=percentcodec diff --git a/cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol/AcceleratorFilter.java b/cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol/AcceleratorFilter.java index f76c7132..9125554c 100644 --- a/cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol/AcceleratorFilter.java +++ b/cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol/AcceleratorFilter.java @@ -1,8 +1,6 @@ package de.halbekunst.juplo.cachecontrol; -import de.halbekunst.juplo.cachecontrol.CacheControl.CacheMethodHandle; import java.io.IOException; -import java.io.OutputStream; import java.io.PrintWriter; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -38,18 +36,11 @@ import org.springframework.beans.factory.annotation.Configurable; public class AcceleratorFilter implements Filter { private final static Logger log = LoggerFactory.getLogger(AcceleratorFilter.class); - private final static Map ADDITIONAL_HEADERS_NONE = Collections.unmodifiableMap(new HashMap()); - private final static Map ADDITIONAL_HEADERS_GZIP; + private final static Map EMPTY = Collections.unmodifiableMap(new HashMap()); public final static String REQUEST_URI_ATTRIBUTE = "javax.servlet.include.request_uri"; public final static String RESPONSE_WRAPPER = AcceleratorFilter.class.getName() + ".RESPONSE_WRAPPER"; - static { - Map map = new HashMap(1); - map.put(Headers.HEADER_CONTENT_ENCODING, "gzip"); - ADDITIONAL_HEADERS_GZIP = Collections.unmodifiableMap(map); - } - @Autowired CacheControl cacheControl; @Autowired(required=true) Integer buffer; @@ -82,7 +73,6 @@ public class AcceleratorFilter implements Filter { chain.doFilter(request, wrapper); /** Dekoration auslösen, falls sie bisher nicht ausgelöst wurde... */ cacheControl.decorate(httpRequest, httpResponse, wrapper); - wrapper.finish(); } @Override @@ -99,9 +89,9 @@ public class AcceleratorFilter implements Filter { private final HttpServletRequest request; private final HttpServletResponse response; - private boolean zipped; - private int buffer; - private GZIPServletOutputStream out; + boolean zipped; // CacheControll greift direkt auf dieses Flag zu! + + private CountingServletOutputStream out; private ServletOutputStream stream; private PrintWriter writer; @@ -131,7 +121,6 @@ public class AcceleratorFilter implements Filter { weak = AcceleratorFilter.this.weak; cacheParams = new HashMap(); - buffer = AcceleratorFilter.this.buffer; zipped = false; Enumeration values = request.getHeaders(Headers.HEADER_ACCEPT_ENCODING); while (values.hasMoreElements()) { @@ -141,12 +130,10 @@ public class AcceleratorFilter implements Filter { break; } } - } - - - public void finish() throws IOException { - if (zipped && out != null) - out.zout.finish(); + if (zipped) + out = new GZIPServletOutputStream(); + else + out = new WrappedServletOutputStream(); } @@ -285,7 +272,6 @@ public class AcceleratorFilter implements Filter { throw new IllegalStateException("ServletOutputStream and PrintWriter cannot be requested both!"); if (stream == null) { - out = new GZIPServletOutputStream(); stream = out; } @@ -299,7 +285,6 @@ public class AcceleratorFilter implements Filter { throw new IllegalStateException("ServletOutputStream and PrintWriter cannot be requested both!"); if (writer == null) { - out = new GZIPServletOutputStream(); writer = new PrintWriter(out); } @@ -317,15 +302,7 @@ public class AcceleratorFilter implements Filter { @Override public void setBufferSize(int size) { - if (out != null && this.buffer != out.left) - throw new IllegalStateException("setBufferSize() cannot be called after content has been written!"); - - if (size < 0) - size = 0; - - this.buffer = size; - if (out != null) - out.left = size; + out.setBuffer(size); response.setBufferSize(size); } @@ -348,7 +325,15 @@ public class AcceleratorFilter implements Filter { public void reset() { response.reset(); - out = null; + try { + if (zipped) + out = new GZIPServletOutputStream(); + else + out = new WrappedServletOutputStream(); + } + catch (IOException e) { + throw new IllegalStateException(e); + } stream = null; writer = null; @@ -358,6 +343,11 @@ public class AcceleratorFilter implements Filter { + @Override + public boolean isZipped() { + return out.isZipped(); + } + @Override public long getTimestamp() { return now; @@ -395,13 +385,10 @@ public class AcceleratorFilter implements Filter { @Override public Map getAdditionalHeaders(HttpServletRequest request) { - if (zipped && !out.empty) - return ADDITIONAL_HEADERS_GZIP; - else - return ADDITIONAL_HEADERS_NONE; + return EMPTY; } - public void guessingFinished() { + public void supressGuessing() { guessing = false; } @@ -550,46 +537,65 @@ public class AcceleratorFilter implements Filter { } - class GZIPServletOutputStream extends ServletOutputStream { + abstract class CountingServletOutputStream extends ServletOutputStream { + + abstract void setBuffer(int size) throws IllegalStateException; + abstract boolean isZipped(); + } + + + final class GZIPServletOutputStream extends CountingServletOutputStream { + + final static int MINMAL_BUFFER_SIZE = 128; + + + private final GZIPOutputStream out; + private int buffer, left; + private boolean empty; - private final OutputStream out; - private final GZIPOutputStream zout; - int left; - boolean empty; public GZIPServletOutputStream() throws IOException { - if (zipped) { - this.zout = new GZIPOutputStream(response.getOutputStream(), buffer); - this.out = this.zout; - } - else { - this.zout = null; - this.out = response.getOutputStream(); - } + this.out = new GZIPOutputStream(response.getOutputStream()); empty = true; + setBuffer(AcceleratorFilter.this.buffer); left = buffer; } + @Override + boolean isZipped() { + return !empty; + } + + @Override + void setBuffer(int size) { + if (!empty) + throw new IllegalStateException("attemp to change buffer size after writing data to response!"); + + if (size > MINMAL_BUFFER_SIZE) { + buffer = size; + left = buffer; + } + } + + @Override public void close() throws IOException { try { - AcceleratorFilter.this.cacheControl.decorate(AccelerationWrapper.this.request, response, buffer); + AcceleratorFilter.this.cacheControl.decorate(AccelerationWrapper.this.request, response, AccelerationWrapper.this); } catch (Exception e) { log.error("Error while guessing Cache-Header's", e); response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); } - if (!empty && zout != null) - zout.finish(); out.close(); } @Override public void flush() throws IOException { try { - AcceleratorFilter.this.cacheControl.decorate(AccelerationWrapper.this.request, response, buffer); + AcceleratorFilter.this.cacheControl.decorate(AccelerationWrapper.this.request, response, AccelerationWrapper.this); } catch (Exception e) { log.error("Error while guessing Cache-Header's", e); @@ -603,7 +609,7 @@ public class AcceleratorFilter implements Filter { public void write(int i) throws IOException { if (left == 0) { try { - AcceleratorFilter.this.cacheControl.decorate(AccelerationWrapper.this.request, response, buffer); + AcceleratorFilter.this.cacheControl.decorate(AccelerationWrapper.this.request, response, AccelerationWrapper.this); } catch (Exception e) { log.error("Error while guessing Cache-Header's", e); @@ -615,5 +621,47 @@ public class AcceleratorFilter implements Filter { out.write(i); } } + + + final class WrappedServletOutputStream extends CountingServletOutputStream { + + private final ServletOutputStream out; + private boolean empty; + + + public WrappedServletOutputStream() throws IOException { + this.out = response.getOutputStream(); + empty = true; + } + + + @Override + boolean isZipped() { + return false; + } + + @Override + void setBuffer(int size) { + if (!empty) + throw new IllegalStateException("attemp to change buffer size after writing data to response!"); + } + + + @Override + public void close() throws IOException { + out.close(); + } + + @Override + public void flush() throws IOException { + out.flush(); + } + + @Override + public void write(int i) throws IOException { + empty = false; + out.write(i); + } + } } }