Merge pull request flipkart-incubator#99 from flipkart-incubator/gzip-5

Moving to Jetty GzipHandler
regunathb · Feb 28, 2017 · 46acc88 · 46acc88
2 parents d85402e + 0c6dba0
commit 46acc88
Showing 1 changed file with 10 additions and 11 deletions.
diff --git a/container/src/main/java/com/flipkart/poseidon/Poseidon.java b/container/src/main/java/com/flipkart/poseidon/Poseidon.java
@@ -47,6 +47,7 @@
 import org.eclipse.jetty.server.handler.ContextHandlerCollection;
 import org.eclipse.jetty.server.handler.HandlerCollection;
 import org.eclipse.jetty.server.handler.RequestLogHandler;
+import org.eclipse.jetty.server.handler.gzip.GzipHandler;
 import org.eclipse.jetty.servlet.FilterHolder;
 import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.servlet.ServletHolder;
@@ -160,12 +161,20 @@ public void start() {
     private HandlerCollection getHandlers() {
         ContextHandlerCollection contextHandlerCollection = new ContextHandlerCollection();
         contextHandlerCollection.setHandlers(new Handler[]{
-                getRequestLogHandler(getParentHandler()),
+                getRequestLogHandler(getGzipHandler(getParentHandler())),
                 getMetricsHandler()
         });
         return contextHandlerCollection;
     }
 
+    private Handler getGzipHandler(Handler handler) {
+        GzipHandler gzipHandler = new GzipHandler();
+        gzipHandler.addIncludedMethods("GET", "POST", "PUT", "DELETE", "PATCH");
+        gzipHandler.addIncludedPaths("/*");
+        gzipHandler.setHandler(handler);
+        return gzipHandler;
+    }
+
     private Handler getRequestLogHandler(Handler handler) {
         RequestLog requestLog = new Log4JAccessLog(configuration.getAccessLogConfigFilePath(),
                 () -> configuration.isAccessLogEnabled());
@@ -256,7 +265,6 @@ private void addFilters(ServletContextHandler servletContextHandler) {
             servletContextHandler.addFilter(new FilterHolder(servletTraceFilter), "/*", EnumSet.of(REQUEST));
         }
         servletContextHandler.addFilter(new FilterHolder(new RequestGzipFilter()), "/*", EnumSet.of(REQUEST));
-        servletContextHandler.addFilter(getGzipFilter(), "/*", EnumSet.of(REQUEST));
 
         List<JettyFilterConfiguration> jettyFilterConfigurations = Optional.ofNullable(configuration.getJettyConfiguration()).map(JettyConfiguration::getJettyFilterConfigurations).orElse(new ArrayList<>());
         for (JettyFilterConfiguration filterConfig : jettyFilterConfigurations) {
@@ -268,15 +276,6 @@ private void addFilters(ServletContextHandler servletContextHandler) {
         }
     }
 
-    /*
-     * Jetty9 GzipFilter, by default, enables compressing of response only for GET requests.
-     */
-    private FilterHolder getGzipFilter() {
-        FilterHolder gzipFilterHolder = new FilterHolder(new GzipFilter());
-        gzipFilterHolder.setInitParameter("methods", "GET,POST,PUT,DELETE,PATCH");
-        return gzipFilterHolder;
-    }
-
     private PoseidonServlet getPoseidonServlet() {
         return new PoseidonServlet(application, configuration);
     }