|
13 | 13 | import hudson.util.Secret;
|
14 | 14 | import java.io.IOException;
|
15 | 15 | import java.util.List;
|
16 |
| -import javax.servlet.ServletException; |
17 |
| -import javax.servlet.http.HttpServletRequest; |
18 |
| -import javax.servlet.http.HttpServletResponse; |
19 | 16 | import jenkins.model.Jenkins;
|
| 17 | +import org.eclipse.jetty.http.HttpStatus; |
20 | 18 | import org.eclipse.jetty.http.HttpVersion;
|
21 | 19 | import org.eclipse.jetty.server.Connector;
|
22 | 20 | import org.eclipse.jetty.server.Handler;
|
23 | 21 | import org.eclipse.jetty.server.HttpConfiguration;
|
24 | 22 | import org.eclipse.jetty.server.HttpConnectionFactory;
|
25 | 23 | import org.eclipse.jetty.server.Request;
|
| 24 | +import org.eclipse.jetty.server.Response; |
26 | 25 | import org.eclipse.jetty.server.SecureRequestCustomizer;
|
27 | 26 | import org.eclipse.jetty.server.Server;
|
28 | 27 | import org.eclipse.jetty.server.ServerConnector;
|
29 | 28 | import org.eclipse.jetty.server.SslConnectionFactory;
|
30 |
| -import org.eclipse.jetty.server.handler.AbstractHandler; |
31 |
| -import org.eclipse.jetty.server.handler.HandlerCollection; |
| 29 | +import org.eclipse.jetty.util.Callback; |
32 | 30 | import org.eclipse.jetty.util.ssl.SslContextFactory;
|
33 | 31 | import org.jenkinsci.plugins.plaincredentials.impl.StringCredentialsImpl;
|
34 | 32 | import org.junit.AfterClass;
|
@@ -128,18 +126,13 @@ public static void startJetty() throws Exception {
|
128 | 126 | // Set the connectors
|
129 | 127 | server.setConnectors(new Connector[] {http, https});
|
130 | 128 |
|
131 |
| - HandlerCollection handlerCollection = new HandlerCollection(); |
132 |
| - handlerCollection.setHandlers(new Handler[] { |
133 |
| - new AbstractHandler() { |
134 |
| - public void handle( |
135 |
| - String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) |
136 |
| - throws IOException, ServletException { |
137 |
| - response.setStatus(HttpServletResponse.SC_OK); |
138 |
| - baseRequest.setHandled(true); |
139 |
| - } |
| 129 | + server.setHandler(new Handler.Abstract() { |
| 130 | + @Override |
| 131 | + public boolean handle(Request request, Response response, Callback callback) throws IOException { |
| 132 | + response.setStatus(HttpStatus.OK_200); |
| 133 | + return true; |
140 | 134 | }
|
141 | 135 | });
|
142 |
| - server.setHandler(handlerCollection); |
143 | 136 | server.start();
|
144 | 137 | }
|
145 | 138 |
|
|
0 commit comments