roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agillil...@apache.org
Subject svn commit: r369269 - /incubator/roller/trunk/src/org/roller/presentation/filters/CompressionFilter.java
Date Sun, 15 Jan 2006 22:14:49 GMT
Author: agilliland
Date: Sun Jan 15 14:14:45 2006
New Revision: 369269

URL: http://svn.apache.org/viewcvs?rev=369269&view=rev
Log:
code reformatting.


Modified:
    incubator/roller/trunk/src/org/roller/presentation/filters/CompressionFilter.java

Modified: incubator/roller/trunk/src/org/roller/presentation/filters/CompressionFilter.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/filters/CompressionFilter.java?rev=369269&r1=369268&r2=369269&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/presentation/filters/CompressionFilter.java (original)
+++ incubator/roller/trunk/src/org/roller/presentation/filters/CompressionFilter.java Sun
Jan 15 14:14:45 2006
@@ -3,7 +3,6 @@
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.zip.GZIPOutputStream;
-
 import javax.servlet.Filter;
 import javax.servlet.FilterChain;
 import javax.servlet.FilterConfig;
@@ -12,114 +11,100 @@
 import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-/** Filter that compresses output with gzip
- *  (assuming that browser supports gzip).
- *  <P>
- *  Taken from More Servlets and JavaServer Pages
- *  from Prentice Hall and Sun Microsystems Press,
- *  http://www.moreservlets.com/.
- *  &copy; 2002 Marty Hall; may be freely used or adapted.
- * 
+
+/** 
+ * Filter that compresses output with gzip (assuming that browser supports gzip).
+ * <P>
+ * Taken from More Servlets and JavaServer Pages from Prentice Hall and 
+ * Sun Microsystems Press, http://www.moreservlets.com/.
+ * &copy; 2002 Marty Hall; may be freely used or adapted.
+ *
  * @web.filter name="PageGzipFilter"
- * *web.filter-mapping url-pattern="/page/*"
  */
 
-public class CompressionFilter implements Filter
-{
-    private static Log mLogger =
-        LogFactory.getFactory().getInstance(CompressionFilter.class);
+public class CompressionFilter implements Filter {
+    
+    private static Log mLogger = LogFactory.getLog(CompressionFilter.class);
+    
+    /** 
+     * If browser does not support gzip, invoke resource
+     * normally. If browser <I>does</I> support gzip,
+     * set the Content-Encoding response header and
+     * invoke resource with a wrapped response that
+     * collects all the output. Extract the output
+     * and write it into a gzipped byte array. Finally,
+     * write that array to the client's output stream.
+     */
+    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
+            throws ServletException, IOException {
         
-	/** If browser does not support gzip, invoke resource
-	 *  normally. If browser <I>does</I> support gzip,
-	 *  set the Content-Encoding response header and
-	 *  invoke resource with a wrapped response that
-	 *  collects all the output. Extract the output
-	 *  and write it into a gzipped byte array. Finally,
-	 *  write that array to the client's output stream.
-	 */
-	public void doFilter(
-		ServletRequest request,
-		ServletResponse response,
-		FilterChain chain)
-		throws ServletException, IOException
-	{
-		HttpServletRequest req = (HttpServletRequest) request;
-		HttpServletResponse res = (HttpServletResponse) response;
-		if (!isGzipSupported(req))
-		{
-			// Invoke resource normally.
-			chain.doFilter(req, res);
-		}
-		else
-		{
-			// Tell browser we are sending it gzipped data.
-			res.setHeader("Content-Encoding", "gzip");
-
-			// Invoke resource, accumulating output in the wrapper.
+        HttpServletRequest req = (HttpServletRequest) request;
+        HttpServletResponse res = (HttpServletResponse) response;
+        
+        if (!isGzipSupported(req)) {
+            // Invoke resource normally.
+            chain.doFilter(req, res);
+        } else {
+            // Tell browser we are sending it gzipped data.
+            res.setHeader("Content-Encoding", "gzip");
+            
+            // Invoke resource, accumulating output in the wrapper.
             ByteArrayResponseWrapper responseWrapper =
-                new ByteArrayResponseWrapper(response);
+                    new ByteArrayResponseWrapper(response);
+            
+            chain.doFilter(req, responseWrapper);
             
-			chain.doFilter(req, responseWrapper);
-
             ByteArrayOutputStream outputStream = responseWrapper.getByteArrayOutputStream();
-
-			// Get character array representing output.
-            if (mLogger.isDebugEnabled())
-            {
+            
+            // Get character array representing output.
+            if (mLogger.isDebugEnabled()) {
                 mLogger.debug("Pre-zip size:" + outputStream.size());
             }
             
-			// Make a writer that compresses data and puts
-			// it into a byte array.
-			ByteArrayOutputStream byteStream = new ByteArrayOutputStream();
-			GZIPOutputStream zipOut = new GZIPOutputStream(byteStream);
-
-			// Compress original output and put it into byte array.
+            // Make a writer that compresses data and puts
+            // it into a byte array.
+            ByteArrayOutputStream byteStream = new ByteArrayOutputStream();
+            GZIPOutputStream zipOut = new GZIPOutputStream(byteStream);
+            
+            // Compress original output and put it into byte array.
             zipOut.write(responseWrapper.getByteArrayOutputStream().toByteArray());
-
-			// Gzip streams must be explicitly closed.
+            
+            // Gzip streams must be explicitly closed.
             zipOut.close();
-
-            if (mLogger.isDebugEnabled())
-            {
+            
+            if (mLogger.isDebugEnabled()) {
                 mLogger.debug("Gzip size:" + byteStream.size());
             }
             
             // Update the Content-Length header.
-			res.setContentLength(byteStream.size());
-
+            res.setContentLength(byteStream.size());
+            
             ByteArrayOutputStreamWrapper newOut =
-                (ByteArrayOutputStreamWrapper) responseWrapper.getOutputStream();
+                    (ByteArrayOutputStreamWrapper) responseWrapper.getOutputStream();
             newOut.clear();
             newOut.setFinallized();
-        
+            
             /* now force close of OutputStream */
             newOut.write(byteStream.toByteArray());
-            newOut.close();            
-		}
-	}
-
-	/** Store the FilterConfig object in case subclasses
-	 *  want it.
-	 */
-	public void init(FilterConfig config) throws ServletException
-	{
-	}
-
-	public void destroy()
-	{
-	}
+            newOut.close();
+        }
+        
+    }
+    
 
-	private boolean isGzipSupported(HttpServletRequest req)
-	{
-		String browserEncodings = req.getHeader("Accept-Encoding");
-		return (
-			(browserEncodings != null)
-				&& (browserEncodings.indexOf("gzip") != -1));
-	}
- 
+    public void init(FilterConfig config) throws ServletException {}
+    
+    
+    public void destroy() {}
+    
+    
+    private boolean isGzipSupported(HttpServletRequest req) {
+        String browserEncodings = req.getHeader("Accept-Encoding");
+        return ((browserEncodings != null)
+                    && (browserEncodings.indexOf("gzip") != -1));
+    }
+    
 }



Mime
View raw message