upgraded jetty (replaced gzip filter with handler); new json.org vers…

…ion; no javax.servlet provided; #697

core/pom.xml

@@ -79,7 +79,7 @@
         <dependency>
             <groupId>org.apache.xmlgraphics</groupId>
             <artifactId>xmlgraphics-commons</artifactId>
-            <version>2.0.1</version>
+            <version>2.1</version>
         </dependency>
 
         <dependency>
@@ -96,8 +96,7 @@
         <dependency>
             <groupId>org.json</groupId>
             <artifactId>json</artifactId>
-            <!-- keep oldish version as we want to support 1.5 for a while -->
-            <version>20140107</version>
+            <version>${json.org.version}</version>
             <scope>test</scope>
         </dependency>
 

pom.xml

@@ -23,8 +23,9 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <slf4j.version>1.7.13</slf4j.version>
+        <slf4j.version>1.7.21</slf4j.version>
         <log4j.version>1.2.17</log4j.version>
+        <json.org.version>20160212</json.org.version>
 
         <!-- netbeans formatting rules -->
         <org-netbeans-modules-editor-indent.CodeStyle.usedProfile>project</org-netbeans-modules-editor-indent.CodeStyle.usedProfile>
@@ -86,7 +87,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.3</version>
+                <version>3.5.1</version>
                 <configuration>
                     <!--
                     <compilerArgument>-Xlint:unchecked</compilerArgument>

web/pom.xml

@@ -16,7 +16,7 @@
         <version>0.7-SNAPSHOT</version>
     </parent>
     <properties>
-        <jetty.version>8.1.18.v20150929</jetty.version>
+        <jetty.version>9.3.8.v20160314</jetty.version>
     </properties>
 
     <dependencies>
@@ -29,7 +29,7 @@
         <dependency>
             <groupId>org.json</groupId>
             <artifactId>json</artifactId>            
-            <version>20140107</version>
+            <version>${json.org.version}</version>
         </dependency>    
 
         <dependency>
@@ -45,12 +45,6 @@
             <version>4.0</version>
         </dependency>
 
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <version>3.1.0</version>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>

web/src/main/java/com/graphhopper/http/CORSFilter.java

@@ -18,18 +18,13 @@
 package com.graphhopper.http;
 
 import java.io.IOException;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
+import javax.servlet.*;
 import javax.servlet.http.HttpServletResponse;
 
-import org.eclipse.jetty.servlets.UserAgentFilter;
-
 /**
  * @author Peter Karich
  */
-public class CORSFilter extends UserAgentFilter
+public class CORSFilter implements Filter
 {
     @Override
     public void doFilter( ServletRequest request, ServletResponse response, FilterChain chain ) throws IOException, ServletException
@@ -40,7 +35,16 @@ public void doFilter( ServletRequest request, ServletResponse response, FilterCh
             rsp.setHeader("Access-Control-Allow-Origin", "*");
         }
 
-        super.doFilter(request, response, chain);
+        chain.doFilter(request, response);
+    }
+
+    @Override
+    public void init( FilterConfig filterConfig ) throws ServletException
+    {
     }
 
+    @Override
+    public void destroy()
+    {
+    }
 }

web/src/main/java/com/graphhopper/http/GHServer.java

@@ -24,17 +24,16 @@
 import com.google.inject.servlet.GuiceFilter;
 import com.graphhopper.util.CmdArgs;
 
-
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.servlet.ServletHolder;
 
 import java.util.EnumSet;
 import javax.servlet.DispatcherType;
 
-import org.eclipse.jetty.server.Handler;
+import org.eclipse.jetty.server.*;
 import org.eclipse.jetty.server.handler.HandlerList;
 import org.eclipse.jetty.server.handler.ResourceHandler;
-import org.eclipse.jetty.server.nio.SelectChannelConnector;
+import org.eclipse.jetty.server.handler.gzip.GzipHandler;
 import org.eclipse.jetty.servlet.FilterHolder;
 import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.slf4j.Logger;
@@ -86,7 +85,7 @@ public void start( Injector injector ) throws Exception
         FilterHolder guiceFilter = new FilterHolder(injector.getInstance(GuiceFilter.class));
         servHandler.addFilter(guiceFilter, "/*", EnumSet.allOf(DispatcherType.class));
 
-        SelectChannelConnector connector0 = new SelectChannelConnector();
+        ServerConnector connector0 = new ServerConnector(server);
         int httpPort = args.getInt("jetty.port", 8989);
         String host = args.get("jetty.host", "");
         connector0.setPort(httpPort);
@@ -100,7 +99,15 @@ public void start( Injector injector ) throws Exception
         {
             resHandler, servHandler
         });
-        server.setHandler(handlers);
+
+        GzipHandler gzipHandler = new GzipHandler();
+        gzipHandler.setIncludedMethods("GET", "POST");
+        // Note: gzip only affects the response body like our previous 'GHGZIPHook' behaviour: http://stackoverflow.com/a/31565805/194609
+        // If no mimeTypes are defined the content-type is not "application/gzip"
+        // gzipHandler.setIncludedMimeTypes();
+        gzipHandler.setHandler(handlers);
+
+        server.setHandler(gzipHandler);
         server.start();
         logger.info("Started server at HTTP " + host + ":" + httpPort);
     }

web/src/main/java/com/graphhopper/http/GHServletModule.java

@@ -48,9 +48,6 @@ public GHServletModule( CmdArgs args )
     @Override
     protected void configureServlets()
     {
-        filter("*").through(GHGZIPHook.class, params);
-        bind(GHGZIPHook.class).in(Singleton.class);
-
         filter("*").through(CORSFilter.class, params);
         bind(CORSFilter.class).in(Singleton.class);