Upgraded Jetty to version 9.3.21.v20170918.

Author: thboileau

modules/org.restlet.ext.jetty/src/main/java/org/restlet/ext/jetty/JettyServerHelper.java

@@ -28,7 +28,6 @@
 import java.net.Socket;
 import java.util.Arrays;
 import java.util.concurrent.Executor;
-import java.util.logging.Level;
 
 import javax.servlet.ServletException;
 
@@ -38,12 +37,8 @@
 import org.eclipse.jetty.server.Connector;
 import org.eclipse.jetty.server.HttpChannel;
 import org.eclipse.jetty.server.HttpConfiguration;
-import org.eclipse.jetty.server.HttpConnectionFactory;
 import org.eclipse.jetty.server.LowResourceMonitor;
 import org.eclipse.jetty.server.ServerConnector;
-import org.eclipse.jetty.spdy.server.NPNServerConnectionFactory;
-import org.eclipse.jetty.spdy.server.http.HTTPSPDYServerConnectionFactory;
-import org.eclipse.jetty.spdy.server.http.PushStrategy;
 import org.eclipse.jetty.util.thread.QueuedThreadPool;
 import org.eclipse.jetty.util.thread.ScheduledExecutorScheduler;
 import org.eclipse.jetty.util.thread.Scheduler;
@@ -236,7 +231,7 @@ public WrappedServer(JettyServerHelper server, ThreadPool threadPool) {
          *            The channel to handle.
          */
         @Override
-        public void handle(HttpChannel<?> channel) throws IOException,
+        public void handle(HttpChannel channel) throws IOException,
                 ServletException {
             try {
                 helper.handle(new JettyServerCall(helper.getHelped(), channel));
@@ -247,7 +242,7 @@ public void handle(HttpChannel<?> channel) throws IOException,
         }
 
         @Override
-        public void handleAsync(HttpChannel<?> channel) throws IOException,
+        public void handleAsync(HttpChannel channel) throws IOException,
                 ServletException {
             // TODO: should we handle async differently?
             try {

modules/org.restlet.ext.jetty/src/main/java/org/restlet/ext/jetty/internal/JettyHandler.java

@@ -106,7 +106,7 @@ public void handle(String target, Request request,
             HttpServletRequest servletRequest,
             HttpServletResponse servletResponse) throws IOException,
             ServletException {
-        final HttpChannel<?> channel = request.getHttpChannel();
+        final HttpChannel channel = request.getHttpChannel();
         final Request baseRequest = (servletRequest instanceof Request) ? (Request) servletRequest
                 : channel.getRequest();
         this.helper

modules/org.restlet.ext.jetty/src/main/java/org/restlet/ext/jetty/internal/JettyServerCall.java

@@ -54,7 +54,7 @@
 public class JettyServerCall extends ServerCall {
 
     /** The wrapped Jetty HTTP channel. */
-    private final HttpChannel<?> channel;
+    private final HttpChannel channel;
 
     /** Indicates if the request headers were parsed and added. */
     private volatile boolean requestHeadersAdded;
@@ -67,7 +67,7 @@ public class JettyServerCall extends ServerCall {
      * @param channel
      *            The wrapped Jetty HTTP channel.
      */
-    public JettyServerCall(Server server, HttpChannel<?> channel) {
+    public JettyServerCall(Server server, HttpChannel channel) {
         super(server);
         this.channel = channel;
         this.requestHeadersAdded = false;
@@ -119,7 +119,7 @@ public List<Certificate> getCertificates() {
      * 
      * @return The wrapped Jetty HTTP channel.
      */
-    public HttpChannel<?> getChannel() {
+    public HttpChannel getChannel() {
         return this.channel;
     }
 
@@ -204,7 +204,7 @@ public InputStream getRequestHeadStream() {
     public String getRequestUri() {
         String queryString = getChannel().getRequest().getQueryString();
 
-        return getChannel().getRequest().getUri().toString()
+        return getChannel().getRequest().getRequestURL().toString()
                 + (isNullOrEmpty(queryString) ? "" : "?" + queryString);
     }
 

modules/org.restlet.ext.jetty/src/main/java/org/restlet/ext/jetty/internal/RestletSslContextFactory.java

@@ -26,15 +26,13 @@
 
 import java.io.IOException;
 import java.net.InetAddress;
-import java.util.logging.Level;
 
 import javax.net.ssl.SSLEngine;
 import javax.net.ssl.SSLServerSocket;
 import javax.net.ssl.SSLServerSocketFactory;
 import javax.net.ssl.SSLSocket;
 
 import org.eclipse.jetty.util.ssl.SslContextFactory;
-import org.restlet.Context;
 
 /**
  * Jetty SSL context factory based on a Restlet SSL context one.
@@ -56,17 +54,6 @@ public RestletSslContextFactory(
         setSslContext(restletSslContextFactory.createSslContext());
     }
 
-    @Override
-    public void checkKeyStore() {
-        try {
-            if (getSslContext() == null)
-                super.checkKeyStore();
-        } catch (IllegalStateException e) {
-            Context.getCurrentLogger().log(Level.FINE,
-                    "Unable to check Jetty SSL keystore", e);
-        }
-    }
-
     @Override
     public SSLEngine newSSLEngine() {
         return getSslContext().createSSLEngine();