package de.halbekunst.juplo.cachecontrol;
+import java.io.ByteArrayOutputStream;
import java.io.IOException;
+import java.io.OutputStream;
import java.io.PrintWriter;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import javax.servlet.ServletOutputStream;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
+import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletResponseWrapper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowire;
httpRequest.setAttribute(RESPONSE_WRAPPER, wrapper);
cacheControl.init(wrapper);
chain.doFilter(request, wrapper);
- /** Dekoration auslösen, falls sie bisher nicht ausgelöst wurde... */
- cacheControl.decorate(httpRequest, httpResponse, wrapper);
+ wrapper.finish();
}
@Override
}
- class AccelerationWrapper extends HttpServletResponseWrapper implements CacheMethodHandle {
+ class AccelerationWrapper implements HttpServletResponse, CacheMethodHandle {
private final HttpServletRequest request;
private final HttpServletResponse response;
boolean zipped; // CacheControll greift direkt auf dieses Flag zu!
+ boolean forceCompression = false;
private CountingServletOutputStream out;
private ServletOutputStream stream;
AccelerationWrapper(HttpServletRequest request, HttpServletResponse response) throws IOException {
- super(response);
this.request = request;
this.response = response;
if (zipped)
out = new GZIPServletOutputStream();
else
- out = new WrappedServletOutputStream();
+ out = new CountingServletOutputStream();
+ }
+
+ public void finish() throws IOException {
+ out.close();
}
public void addDateHeader(String name, long value) {
if (!guessing) {
- super.addDateHeader(name, value);
+ response.addDateHeader(name, value);
return;
}
}
/** Unknown header: pass throug! */
- super.addDateHeader(name, value);
+ response.addDateHeader(name, value);
}
@Override
public void addHeader(String name, String value) {
if (!guessing) {
- super.addHeader(name, value);
+ response.addHeader(name, value);
return;
}
public void addIntHeader(String name, int value) {
if (!guessing) {
- super.addIntHeader(name, value);
+ response.addIntHeader(name, value);
return;
}
public void setDateHeader(String name, long value) {
if (!guessing) {
- super.setDateHeader(name, value);
+ response.setDateHeader(name, value);
return;
}
}
/** Unknown header: pass throug! */
- super.setDateHeader(name, value);
+ response.setDateHeader(name, value);
}
@Override
public void setHeader(String name, String value) {
if (!guessing) {
- super.setHeader(name, value);
+ response.setHeader(name, value);
return;
}
public void setIntHeader(String name, int value) {
if (!guessing) {
- super.setIntHeader(name, value);
+ response.setIntHeader(name, value);
return;
}
@Override
public void flushBuffer() throws IOException {
+ forceCompression = true;
cacheControl.decorate(request, response, this);
response.flushBuffer();
}
public void resetBuffer() {
response.resetBuffer();
+ try {
+ if (zipped)
+ out = new GZIPServletOutputStream();
+ else
+ out = new CountingServletOutputStream();
+ }
+ catch (IOException e) {
+ throw new IllegalStateException(e);
+ }
stream = null;
writer = null;
}
if (zipped)
out = new GZIPServletOutputStream();
else
- out = new WrappedServletOutputStream();
+ out = new CountingServletOutputStream();
}
catch (IOException e) {
throw new IllegalStateException(e);
writer = null;
/** Cookies has been cleared! Reinitialize decorator... */
+ forceCompression = false;
cacheControl.init(this);
}
/** Pass header through, if no value from intrest was found */
if (overwrite)
- super.setHeader(name, value);
+ response.setHeader(name, value);
else
- super.addHeader(name, value);
+ response.addHeader(name, value);
}
private void calculateCacheSeconds() {
}
}
+ @Override
+ public void addCookie(Cookie cookie) {
+ // TODO: Je nach Vary-Einstellung ETag anpassen?
+ response.addCookie(cookie);
+ }
- abstract class CountingServletOutputStream extends ServletOutputStream {
+ @Override
+ public boolean containsHeader(String name) {
+ return response.containsHeader(name);
+ }
- abstract void setBuffer(int size) throws IllegalStateException;
- abstract boolean isZipped();
+ @Override
+ public String encodeURL(String url) {
+ return response.encodeURL(url);
}
+ @Override
+ public String encodeRedirectURL(String url) {
+ return response.encodeRedirectURL(url);
+ }
- final class GZIPServletOutputStream extends CountingServletOutputStream {
+ @Override
+ public String encodeUrl(String url) {
+ return response.encodeUrl(url);
+ }
- final static int MINMAL_BUFFER_SIZE = 128;
+ @Override
+ public String encodeRedirectUrl(String url) {
+ return response.encodeRedirectUrl(url);
+ }
+ @Override
+ public void sendError(int sc, String msg) throws IOException {
+ // TODO: Decoration anpassen/anstoßen?!?
+ response.sendError(sc,msg);
+ }
- private final GZIPOutputStream out;
- private int buffer, left;
- private boolean empty;
+ @Override
+ public void sendError(int sc) throws IOException {
+ // TODO: Decoration anpassen/anstoßen?!?
+ response.sendError(sc);
+ }
+ @Override
+ public void sendRedirect(String location) throws IOException {
+ // TODO: Decoration anpassen/anstoßen?!?
+ response.sendRedirect(location);
+ }
- public GZIPServletOutputStream() throws IOException {
- this.out = new GZIPOutputStream(response.getOutputStream());
- empty = true;
- setBuffer(AcceleratorFilter.this.buffer);
+ @Override
+ public String getCharacterEncoding() {
+ return response.getCharacterEncoding();
+ }
+
+ @Override
+ public String getContentType() {
+ return response.getContentType();
+ }
+
+ @Override
+ public void setCharacterEncoding(String charset) {
+ // TODO: Je nach Vary-Einstellung ETag anpassen?
+ response.setCharacterEncoding(charset);
+ }
+
+ @Override
+ public void setContentType(String type) {
+ // TODO: Je nach Vary-Einstellung ETag anpassen?
+ response.setContentType(type);
+ }
+
+ @Override
+ public int getBufferSize() {
+ return response.getBufferSize();
+ }
+
+ @Override
+ public boolean isCommitted() {
+ // TODO: Eigene commit-Kontrolle wegen Dekorations-Einstiegspunkt?!?
+ return response.isCommitted();
+ }
+
+ @Override
+ public void setLocale(Locale loc) {
+ // TODO: Je nach Vary-Einstellung ETag anpassen?
+ response.setLocale(loc);
+ }
+
+ @Override
+ public Locale getLocale() {
+ return getLocale();
+ }
+
+
+ class CountingServletOutputStream extends ServletOutputStream {
+
+ private OutputStream out;
+ int left;
+ boolean empty;
+
+
+ CountingServletOutputStream() throws IOException {
+ out = response.getOutputStream();
left = buffer;
+ empty = true;
}
- @Override
+ void setBuffer(int size) throws IllegalStateException {}
+
boolean isZipped() {
- return !empty;
+ return false;
}
- @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;
- }
+ void finish() throws IOException {
+ decorate();
}
-
- @Override
- public void close() throws IOException {
+ void decorate() throws IOException {
try {
AcceleratorFilter.this.cacheControl.decorate(AccelerationWrapper.this.request, response, AccelerationWrapper.this);
}
log.error("Error while guessing Cache-Header's", e);
response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
}
+ }
+
+ @Override
+ public void close() throws IOException {
+ decorate();
out.close();
}
@Override
public void flush() throws IOException {
- try {
- 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);
- }
-
+ decorate();
out.flush();
}
@Override
public void write(int i) throws IOException {
- if (left == 0) {
- try {
- 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);
- }
- }
empty = false;
+ if (left == 0)
+ decorate();
left--;
out.write(i);
}
}
- final class WrappedServletOutputStream extends CountingServletOutputStream {
+ final class GZIPServletOutputStream extends CountingServletOutputStream {
+
+ final static int MINIMAL_BUFFER_SIZE = 128;
- private final ServletOutputStream out;
- private boolean empty;
+ private ByteArrayOutputStream buffer;
+ private OutputStream out;
+ private GZIPOutputStream zout;
+ private int bufferSize;
+ private boolean decorated = false;
- public WrappedServletOutputStream() throws IOException {
- this.out = response.getOutputStream();
- empty = true;
+ public GZIPServletOutputStream() throws IOException {
+ setBuffer(AcceleratorFilter.this.buffer);
}
+ @Override
+ void finish() throws IOException {
+ decorate();
+ zout.finish();
+ super.out.write(buffer.toByteArray());
+ }
+
@Override
boolean isZipped() {
- return false;
+ if (decorated)
+ return true;
+ return !empty;
}
@Override
- void setBuffer(int size) {
+ void setBuffer(int size) throws IllegalStateException {
if (!empty)
throw new IllegalStateException("attemp to change buffer size after writing data to response!");
+
+ if (size > MINIMAL_BUFFER_SIZE) {
+ left = size;
+ try {
+ bufferSize = size;
+ out = response.getOutputStream();
+ buffer = new ByteArrayOutputStream(size);
+ zout = new GZIPOutputStream(buffer, size);
+ super.out = zout;
+ }
+ catch (IOException e) {
+ throw new IllegalStateException(e);
+ }
+ }
}
+
@Override
public void close() throws IOException {
+ decorate();
+ zout.close();
+ out.write(buffer.toByteArray());
out.close();
}
@Override
public void flush() throws IOException {
+ decorate();
+ out.write(buffer.toByteArray());
out.flush();
}
@Override
public void write(int i) throws IOException {
empty = false;
- out.write(i);
+ if (left == 0) {
+ if (!decorated) {
+ decorate();
+ decorated = true;
+ }
+ out.write(buffer.toByteArray());
+ buffer.reset();
+ left = bufferSize;
+ }
+ left--;
+ zout.write(i);
}
}
}
projects / percentcodec / blobdiff