diff --git a/src/test/java/com/github/nhenneaux/jersey/connector/httpclient/JettyServer.java b/src/test/java/com/github/nhenneaux/jersey/connector/httpclient/JettyServer.java index bd300f2..4919936 100644 --- a/src/test/java/com/github/nhenneaux/jersey/connector/httpclient/JettyServer.java +++ b/src/test/java/com/github/nhenneaux/jersey/connector/httpclient/JettyServer.java @@ -1,19 +1,13 @@ package com.github.nhenneaux.jersey.connector.httpclient; import org.eclipse.jetty.alpn.server.ALPNServerConnectionFactory; +import org.eclipse.jetty.ee10.servlet.ServletContextHandler; +import org.eclipse.jetty.ee10.servlet.ServletHolder; import org.eclipse.jetty.http.HttpVersion; import org.eclipse.jetty.http2.server.HTTP2ServerConnectionFactory; -import org.eclipse.jetty.server.ConnectionFactory; -import org.eclipse.jetty.server.HttpConfiguration; -import org.eclipse.jetty.server.HttpConnectionFactory; -import org.eclipse.jetty.server.SecureRequestCustomizer; -import org.eclipse.jetty.server.Server; -import org.eclipse.jetty.server.ServerConnector; -import org.eclipse.jetty.server.SslConnectionFactory; +import org.eclipse.jetty.server.*; import org.eclipse.jetty.server.handler.ContextHandlerCollection; -import org.eclipse.jetty.servlet.ServletContextHandler; -import org.eclipse.jetty.servlet.ServletHolder; -import org.eclipse.jetty.util.MultiException; +import org.eclipse.jetty.util.ExceptionUtil; import org.eclipse.jetty.util.ssl.SslContextFactory; import org.glassfish.jersey.server.ResourceConfig; import org.glassfish.jersey.servlet.ServletContainer; @@ -53,7 +47,7 @@ public class JettyServer implements AutoCloseable { http2Connector.setPort(port); server.addConnector(http2Connector); - ServletContextHandler context = new ServletContextHandler(server,"/"); + ServletContextHandler context = new ServletContextHandler("/"); contexts.addHandler(context); final ResourceConfig resourceConfig = new ResourceConfig(); for (Class serviceClass : serviceClasses) { @@ -70,7 +64,7 @@ public class JettyServer implements AutoCloseable { try { close(); } catch (RuntimeException closeException) { - MultiException multiException = new MultiException(); + ExceptionUtil.MultiException multiException = new ExceptionUtil.MultiException(); multiException.add(e); multiException.add(closeException); multiException.ifExceptionThrowRuntime();