Skip to content

Commit 44a9c83

Browse files
author
Stephane Landelle
committed
Upgrade to Jetty 9
1 parent fb52c95 commit 44a9c83

22 files changed

+249
-229
lines changed

‎api/src/test/java/org/asynchttpclient/async/AbstractBasicHttpsTest.java

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,12 @@
1818
import java.io.File;
1919
import java.net.URL;
2020

21+
import org.eclipse.jetty.server.HttpConfiguration;
22+
import org.eclipse.jetty.server.HttpConnectionFactory;
23+
import org.eclipse.jetty.server.SecureRequestCustomizer;
2124
import org.eclipse.jetty.server.Server;
22-
import org.eclipse.jetty.server.ssl.SslSocketConnector;
25+
import org.eclipse.jetty.server.ServerConnector;
26+
import org.eclipse.jetty.server.SslConnectionFactory;
2327
import org.eclipse.jetty.util.ssl.SslContextFactory;
2428
import org.slf4j.Logger;
2529
import org.slf4j.LoggerFactory;
@@ -43,10 +47,17 @@ public void setUpGlobal() throws Exception {
4347

4448
String trustStoreFile = new File(cl.getResource("ssltest-cacerts.jks").toURI()).getAbsolutePath();
4549
LOGGER.info("SSL certs path: {}", trustStoreFile);
46-
sslContextFactory.setTrustStore(trustStoreFile);
50+
sslContextFactory.setTrustStorePath(trustStoreFile);
4751
sslContextFactory.setTrustStorePassword("changeit");
52+
53+
HttpConfiguration http_config = new HttpConfiguration();
54+
http_config.setSecureScheme("https");
55+
http_config.setSecurePort(port1);
4856

49-
SslSocketConnector connector = new SslSocketConnector(sslContextFactory);
57+
HttpConfiguration https_config = new HttpConfiguration(http_config);
58+
https_config.addCustomizer(new SecureRequestCustomizer());
59+
60+
ServerConnector connector = new ServerConnector(server, new SslConnectionFactory(sslContextFactory, "http/1.1"), new HttpConnectionFactory(https_config));
5061
connector.setHost("127.0.0.1");
5162
connector.setPort(port1);
5263
server.addConnector(connector);

‎api/src/test/java/org/asynchttpclient/async/AbstractBasicTest.java

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,10 @@
3737
import org.asynchttpclient.HttpResponseHeaders;
3838
import org.asynchttpclient.HttpResponseStatus;
3939
import org.asynchttpclient.Response;
40-
import org.eclipse.jetty.server.Connector;
4140
import org.eclipse.jetty.server.Request;
4241
import org.eclipse.jetty.server.Server;
42+
import org.eclipse.jetty.server.ServerConnector;
4343
import org.eclipse.jetty.server.handler.AbstractHandler;
44-
import org.eclipse.jetty.server.nio.SelectChannelConnector;
4544
import org.slf4j.Logger;
4645
import org.slf4j.LoggerFactory;
4746
import org.testng.Assert;
@@ -82,10 +81,10 @@ public static File createTempFile(byte[] pattern, int repeat) throws IOException
8281
for (int i = 0; i < repeat; i++) {
8382
out.write(pattern);
8483
}
85-
84+
8685
long expectedFileSize = PATTERN_BYTES.length * repeat;
8786
Assert.assertEquals(expectedFileSize, tmpFile.length(), "Invalid file length");
88-
87+
8988
return tmpFile;
9089
} finally {
9190
if (out != null) {
@@ -192,14 +191,13 @@ public void setUpGlobal() throws Exception {
192191
port1 = findFreePort();
193192
port2 = findFreePort();
194193

195-
Connector listener = new SelectChannelConnector();
196-
194+
ServerConnector listener = new ServerConnector(server);
197195
listener.setHost("127.0.0.1");
198196
listener.setPort(port1);
199197

200198
server.addConnector(listener);
201199

202-
listener = new SelectChannelConnector();
200+
listener = new ServerConnector(server);
203201
listener.setHost("127.0.0.1");
204202
listener.setPort(port2);
205203

‎api/src/test/java/org/asynchttpclient/async/AsyncProvidersBasicTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363

6464
public abstract class AsyncProvidersBasicTest extends AbstractBasicTest {
6565

66-
private static final String UTF_8 = "text/html;charset=UTF-8";
66+
private static final String UTF_8 = "text/html; charset=UTF-8";
6767

6868
@Test(groups = { "standalone", "default_provider", "async" })
6969
public void asyncProviderEncodingTest() throws Throwable {

‎api/src/test/java/org/asynchttpclient/async/AsyncStreamHandlerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
public abstract class AsyncStreamHandlerTest extends AbstractBasicTest {
4141

4242
private static final String RESPONSE = "param_1_";
43-
private static final String UTF8 = "text/html;charset=utf-8";
43+
private static final String UTF8 = "text/html; charset=utf-8";
4444

4545
@Test(groups = { "standalone", "default_provider" })
4646
public void asyncStreamGETTest() throws Throwable {

‎api/src/test/java/org/asynchttpclient/async/AuthTimeoutTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,17 @@
2525
import org.eclipse.jetty.security.HashLoginService;
2626
import org.eclipse.jetty.security.LoginService;
2727
import org.eclipse.jetty.security.authentication.BasicAuthenticator;
28-
import org.eclipse.jetty.server.Connector;
2928
import org.eclipse.jetty.server.Request;
3029
import org.eclipse.jetty.server.Server;
30+
import org.eclipse.jetty.server.ServerConnector;
3131
import org.eclipse.jetty.server.handler.AbstractHandler;
32-
import org.eclipse.jetty.server.nio.SelectChannelConnector;
3332
import org.eclipse.jetty.util.security.Constraint;
3433
import org.testng.annotations.Test;
3534

3635
import javax.servlet.ServletException;
3736
import javax.servlet.http.HttpServletRequest;
3837
import javax.servlet.http.HttpServletResponse;
38+
3939
import java.io.IOException;
4040
import java.io.OutputStream;
4141
import java.util.ArrayList;
@@ -64,7 +64,7 @@ public void setUpServer(String auth) throws Exception {
6464
root.addAppender(new ConsoleAppender(new PatternLayout(PatternLayout.TTCC_CONVERSION_PATTERN)));
6565

6666
port1 = findFreePort();
67-
Connector listener = new SelectChannelConnector();
67+
ServerConnector listener = new ServerConnector(server);
6868

6969
listener.setHost("127.0.0.1");
7070
listener.setPort(port1);

‎api/src/test/java/org/asynchttpclient/async/BasicAuthTest.java

Lines changed: 27 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,30 @@
1515
*/
1616
package org.asynchttpclient.async;
1717

18+
import static org.testng.Assert.*;
19+
20+
import java.io.ByteArrayInputStream;
21+
import java.io.File;
22+
import java.io.FileInputStream;
23+
import java.io.IOException;
24+
import java.net.URL;
25+
import java.util.ArrayList;
26+
import java.util.HashSet;
27+
import java.util.List;
28+
import java.util.Set;
29+
import java.util.concurrent.ExecutionException;
30+
import java.util.concurrent.Future;
31+
import java.util.concurrent.TimeUnit;
32+
import java.util.concurrent.TimeoutException;
33+
34+
import javax.servlet.ServletException;
35+
import javax.servlet.http.HttpServletRequest;
36+
import javax.servlet.http.HttpServletResponse;
37+
38+
import org.apache.log4j.ConsoleAppender;
39+
import org.apache.log4j.Level;
40+
import org.apache.log4j.Logger;
41+
import org.apache.log4j.PatternLayout;
1842
import org.asynchttpclient.AsyncHandler;
1943
import org.asynchttpclient.AsyncHttpClient;
2044
import org.asynchttpclient.AsyncHttpClientConfig;
@@ -26,47 +50,21 @@
2650
import org.asynchttpclient.SimpleAsyncHttpClient;
2751
import org.asynchttpclient.consumers.AppendableBodyConsumer;
2852
import org.asynchttpclient.generators.InputStreamBodyGenerator;
29-
import org.apache.log4j.ConsoleAppender;
30-
import org.apache.log4j.Level;
31-
import org.apache.log4j.Logger;
32-
import org.apache.log4j.PatternLayout;
3353
import org.eclipse.jetty.security.ConstraintMapping;
3454
import org.eclipse.jetty.security.ConstraintSecurityHandler;
3555
import org.eclipse.jetty.security.HashLoginService;
3656
import org.eclipse.jetty.security.LoginService;
3757
import org.eclipse.jetty.security.authentication.BasicAuthenticator;
3858
import org.eclipse.jetty.security.authentication.DigestAuthenticator;
39-
import org.eclipse.jetty.server.Connector;
4059
import org.eclipse.jetty.server.Request;
4160
import org.eclipse.jetty.server.Server;
61+
import org.eclipse.jetty.server.ServerConnector;
4262
import org.eclipse.jetty.server.handler.AbstractHandler;
43-
import org.eclipse.jetty.server.nio.SelectChannelConnector;
4463
import org.eclipse.jetty.util.security.Constraint;
4564
import org.testng.annotations.AfterClass;
4665
import org.testng.annotations.BeforeClass;
4766
import org.testng.annotations.Test;
4867

49-
import javax.servlet.ServletException;
50-
import javax.servlet.http.HttpServletRequest;
51-
import javax.servlet.http.HttpServletResponse;
52-
53-
import java.io.ByteArrayInputStream;
54-
import java.io.File;
55-
import java.io.FileInputStream;
56-
import java.io.IOException;
57-
import java.net.URL;
58-
import java.util.ArrayList;
59-
import java.util.HashSet;
60-
import java.util.List;
61-
import java.util.Set;
62-
import java.util.concurrent.ExecutionException;
63-
import java.util.concurrent.Future;
64-
import java.util.concurrent.TimeUnit;
65-
import java.util.concurrent.TimeoutException;
66-
67-
import static org.testng.Assert.assertEquals;
68-
import static org.testng.Assert.assertNotNull;
69-
7068
public abstract class BasicAuthTest extends AbstractBasicTest {
7169

7270
protected static final String MY_MESSAGE = "my message";
@@ -86,7 +84,7 @@ public void setUpGlobal() throws Exception {
8684
root.addAppender(new ConsoleAppender(new PatternLayout(PatternLayout.TTCC_CONVERSION_PATTERN)));
8785

8886
port1 = findFreePort();
89-
Connector listener = new SelectChannelConnector();
87+
ServerConnector listener = new ServerConnector(server);
9088

9189
listener.setHost("127.0.0.1");
9290
listener.setPort(port1);
@@ -129,7 +127,7 @@ private void setUpSecondServer() throws Exception {
129127
server2 = new Server();
130128
port2 = findFreePort();
131129

132-
SelectChannelConnector connector = new SelectChannelConnector();
130+
ServerConnector connector = new ServerConnector(server2);
133131
connector.setHost("127.0.0.1");
134132
connector.setPort(port2);
135133

‎api/src/test/java/org/asynchttpclient/async/DigestAuthTest.java

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -12,43 +12,42 @@
1212
*/
1313
package org.asynchttpclient.async;
1414

15-
import org.asynchttpclient.AsyncHttpClient;
16-
import org.asynchttpclient.Realm;
17-
import org.asynchttpclient.Response;
15+
import static org.testng.Assert.*;
16+
17+
import java.io.IOException;
18+
import java.util.ArrayList;
19+
import java.util.HashSet;
20+
import java.util.List;
21+
import java.util.Set;
22+
import java.util.concurrent.ExecutionException;
23+
import java.util.concurrent.Future;
24+
import java.util.concurrent.TimeUnit;
25+
import java.util.concurrent.TimeoutException;
26+
27+
import javax.servlet.ServletException;
28+
import javax.servlet.http.HttpServletRequest;
29+
import javax.servlet.http.HttpServletResponse;
30+
1831
import org.apache.log4j.ConsoleAppender;
1932
import org.apache.log4j.Level;
2033
import org.apache.log4j.Logger;
2134
import org.apache.log4j.PatternLayout;
35+
import org.asynchttpclient.AsyncHttpClient;
36+
import org.asynchttpclient.Realm;
37+
import org.asynchttpclient.Response;
2238
import org.eclipse.jetty.security.ConstraintMapping;
2339
import org.eclipse.jetty.security.ConstraintSecurityHandler;
2440
import org.eclipse.jetty.security.HashLoginService;
2541
import org.eclipse.jetty.security.LoginService;
2642
import org.eclipse.jetty.security.authentication.DigestAuthenticator;
27-
import org.eclipse.jetty.server.Connector;
2843
import org.eclipse.jetty.server.Request;
2944
import org.eclipse.jetty.server.Server;
45+
import org.eclipse.jetty.server.ServerConnector;
3046
import org.eclipse.jetty.server.handler.AbstractHandler;
31-
import org.eclipse.jetty.server.nio.SelectChannelConnector;
3247
import org.eclipse.jetty.util.security.Constraint;
3348
import org.testng.annotations.BeforeClass;
3449
import org.testng.annotations.Test;
3550

36-
import javax.servlet.ServletException;
37-
import javax.servlet.http.HttpServletRequest;
38-
import javax.servlet.http.HttpServletResponse;
39-
import java.io.IOException;
40-
import java.util.ArrayList;
41-
import java.util.HashSet;
42-
import java.util.List;
43-
import java.util.Set;
44-
import java.util.concurrent.ExecutionException;
45-
import java.util.concurrent.Future;
46-
import java.util.concurrent.TimeUnit;
47-
import java.util.concurrent.TimeoutException;
48-
49-
import static org.testng.Assert.assertEquals;
50-
import static org.testng.Assert.assertNotNull;
51-
5251
public abstract class DigestAuthTest extends AbstractBasicTest {
5352

5453
private static final String USER = "user";
@@ -63,7 +62,7 @@ public void setUpGlobal() throws Exception {
6362
root.addAppender(new ConsoleAppender(new PatternLayout(PatternLayout.TTCC_CONVERSION_PATTERN)));
6463

6564
port1 = findFreePort();
66-
Connector listener = new SelectChannelConnector();
65+
ServerConnector listener = new ServerConnector(server);
6766

6867
listener.setHost("127.0.0.1");
6968
listener.setPort(port1);

‎api/src/test/java/org/asynchttpclient/async/HttpToHttpsRedirectTest.java

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,15 @@
3030
import org.asynchttpclient.AsyncHttpClient;
3131
import org.asynchttpclient.AsyncHttpClientConfig;
3232
import org.asynchttpclient.Response;
33-
import org.eclipse.jetty.server.Connector;
33+
import org.eclipse.jetty.server.HttpConfiguration;
34+
import org.eclipse.jetty.server.HttpConnectionFactory;
3435
import org.eclipse.jetty.server.Request;
36+
import org.eclipse.jetty.server.SecureRequestCustomizer;
3537
import org.eclipse.jetty.server.Server;
38+
import org.eclipse.jetty.server.ServerConnector;
39+
import org.eclipse.jetty.server.SslConnectionFactory;
3640
import org.eclipse.jetty.server.handler.AbstractHandler;
37-
import org.eclipse.jetty.server.nio.SelectChannelConnector;
38-
import org.eclipse.jetty.server.ssl.SslSocketConnector;
41+
import org.eclipse.jetty.util.ssl.SslContextFactory;
3942
import org.testng.annotations.BeforeClass;
4043
import org.testng.annotations.Test;
4144

@@ -80,35 +83,34 @@ public void setUpGlobal() throws Exception {
8083
port1 = findFreePort();
8184
port2 = findFreePort();
8285

83-
Connector listener = new SelectChannelConnector();
86+
ServerConnector listener = new ServerConnector(server);
8487

8588
listener.setHost("127.0.0.1");
8689
listener.setPort(port1);
8790
server.addConnector(listener);
8891

89-
SslSocketConnector connector = new SslSocketConnector();
90-
connector.setHost("127.0.0.1");
91-
connector.setPort(port2);
92-
9392
ClassLoader cl = getClass().getClassLoader();
94-
// override system properties
95-
URL cacertsUrl = cl.getResource("ssltest-cacerts.jks");
96-
String trustStoreFile = new File(cacertsUrl.toURI()).getAbsolutePath();
97-
connector.setTruststore(trustStoreFile);
98-
connector.setTrustPassword("changeit");
99-
connector.setTruststoreType("JKS");
100-
101-
log.info("SSL certs path: {}", trustStoreFile);
102-
103-
// override system properties
10493
URL keystoreUrl = cl.getResource("ssltest-keystore.jks");
10594
String keyStoreFile = new File(keystoreUrl.toURI()).getAbsolutePath();
106-
connector.setKeystore(keyStoreFile);
107-
connector.setKeyPassword("changeit");
108-
connector.setKeystoreType("JKS");
109-
11095
log.info("SSL keystore path: {}", keyStoreFile);
96+
SslContextFactory sslContextFactory = new SslContextFactory(keyStoreFile);
97+
sslContextFactory.setKeyStorePassword("changeit");
11198

99+
String trustStoreFile = new File(cl.getResource("ssltest-cacerts.jks").toURI()).getAbsolutePath();
100+
log.info("SSL certs path: {}", trustStoreFile);
101+
sslContextFactory.setTrustStorePath(trustStoreFile);
102+
sslContextFactory.setTrustStorePassword("changeit");
103+
104+
HttpConfiguration http_config = new HttpConfiguration();
105+
http_config.setSecureScheme("https");
106+
http_config.setSecurePort(port2);
107+
108+
HttpConfiguration https_config = new HttpConfiguration(http_config);
109+
https_config.addCustomizer(new SecureRequestCustomizer());
110+
111+
ServerConnector connector = new ServerConnector(server, new SslConnectionFactory(sslContextFactory, "http/1.1"), new HttpConnectionFactory(https_config));
112+
connector.setHost("127.0.0.1");
113+
connector.setPort(port2);
112114
server.addConnector(connector);
113115

114116
server.setHandler(new Relative302Handler());

‎api/src/test/java/org/asynchttpclient/async/IdleStateHandlerTest.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,10 @@
2626

2727
import org.asynchttpclient.AsyncHttpClient;
2828
import org.asynchttpclient.AsyncHttpClientConfig;
29-
import org.eclipse.jetty.server.Connector;
3029
import org.eclipse.jetty.server.Request;
3130
import org.eclipse.jetty.server.Server;
31+
import org.eclipse.jetty.server.ServerConnector;
3232
import org.eclipse.jetty.server.handler.AbstractHandler;
33-
import org.eclipse.jetty.server.nio.SelectChannelConnector;
3433
import org.testng.annotations.BeforeClass;
3534
import org.testng.annotations.Test;
3635

@@ -56,7 +55,7 @@ public void setUpGlobal() throws Exception {
5655
server = new Server();
5756

5857
port1 = findFreePort();
59-
Connector listener = new SelectChannelConnector();
58+
ServerConnector listener = new ServerConnector(server);
6059

6160
listener.setHost("127.0.0.1");
6261
listener.setPort(port1);

0 commit comments

Comments
 (0)