Skip to content

Commit f72fb42

Browse files
jlouveljlouvel
committed
Removed deprecated code
 - removed internal FTP and HTTP connectors, - removed Servlet extension - removed Servlet classes in Spring extension - removed deprecated API methods
1 parent c682921 commit f72fb42

37 files changed

+292
-4464
lines changed

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

Lines changed: 168 additions & 167 deletions
Large diffs are not rendered by default.

‎org.restlet.ext.jetty/src/test/java/org/restlet/ext/jetty/connectors/BaseConnectorsTestCase.java‎

Lines changed: 18 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,23 @@
99

1010
package org.restlet.ext.jetty.connectors;
1111

12+
import static org.junit.jupiter.api.DynamicTest.dynamicTest;
13+
14+
import java.util.List;
15+
import java.util.logging.Level;
16+
import java.util.stream.Stream;
17+
1218
import org.junit.jupiter.api.DynamicTest;
1319
import org.junit.jupiter.api.TestFactory;
14-
import org.restlet.*;
20+
import org.restlet.Application;
21+
import org.restlet.Component;
22+
import org.restlet.Server;
1523
import org.restlet.data.Protocol;
1624
import org.restlet.engine.Engine;
1725
import org.restlet.engine.adapter.HttpServerHelper;
1826
import org.restlet.engine.connector.ClientHelper;
19-
import org.restlet.engine.connector.HttpClientHelper;
2027
import org.restlet.engine.connector.ServerHelper;
2128

22-
import java.util.List;
23-
import java.util.logging.Level;
24-
import java.util.stream.Stream;
25-
26-
import static org.junit.jupiter.api.DynamicTest.dynamicTest;
27-
2829
/**
2930
* Base test case that will call an abstract method for several client/server
3031
* connectors configurations.
@@ -66,26 +67,22 @@ protected void configureServer(final Server server) {
6667

6768
protected List<ConnectorTestCase> listTestCases() {
6869
return List.of(
69-
// let's focus on Jetty server extension
70-
// new ConnectorTestCase(HttpServer.INTERNAL_HTTP, HttpClient.INTERNAL),
71-
// new ConnectorTestCase(HttpServer.INTERNAL_HTTP, HttpClient.JETTY),
72-
new ConnectorTestCase(HttpServer.JETTY_HTTP, HttpClient.INTERNAL),
73-
new ConnectorTestCase(HttpServer.JETTY_HTTP, HttpClient.JETTY)
74-
);
70+
new ConnectorTestCase(HttpServer.JETTY_HTTP, HttpClient.JETTY));
7571
}
7672

7773
@TestFactory
7874
Stream<DynamicTest> testsFactory() {
79-
return listTestCases().stream()
80-
.map(testCase -> dynamicTest(
81-
testCase.getTestLabel(),
82-
() -> runTest(testCase.httpServer, testCase.httpClient)));
75+
return listTestCases().stream().map(testCase -> dynamicTest(
76+
testCase.getTestLabel(),
77+
() -> runTest(testCase.httpServer, testCase.httpClient)));
8378
}
8479

85-
private void runTest(final HttpServer server, final HttpClient client) throws Exception {
80+
private void runTest(final HttpServer server, final HttpClient client)
81+
throws Exception {
8682
if (shouldDebug()) {
8783
System.setProperty("org.eclipse.jetty.LEVEL", "TRACE");
88-
System.setProperty("sun.net.www.protocol.http.HttpURLConnection.LEVEL", "ALL");
84+
System.setProperty(
85+
"sun.net.www.protocol.http.HttpURLConnection.LEVEL", "ALL");
8986
}
9087

9188
initEngine(server, client);
@@ -134,8 +131,6 @@ private void resetEngine() {
134131
}
135132

136133
public enum HttpServer {
137-
INTERNAL_HTTP(new org.restlet.engine.connector.HttpServerHelper(null)),
138-
INTERNAL_HTTPS(new org.restlet.engine.connector.HttpsServerHelper(null)),
139134
JETTY_HTTP(new org.restlet.ext.jetty.HttpServerHelper(null)),
140135
JETTY_HTTPS(new org.restlet.ext.jetty.HttpsServerHelper(null));
141136

@@ -147,7 +142,7 @@ public enum HttpServer {
147142
}
148143

149144
public enum HttpClient {
150-
INTERNAL(new HttpClientHelper(null)), JETTY(new org.restlet.ext.jetty.HttpClientHelper(null));
145+
JETTY(new org.restlet.ext.jetty.HttpClientHelper(null));
151146

152147
final ClientHelper clientHelper;
153148

‎org.restlet.ext.jetty/src/test/java/org/restlet/ext/jetty/connectors/ServerMaxConnectionsTestCase.java‎

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,9 @@
99

1010
package org.restlet.ext.jetty.connectors;
1111

12-
import org.restlet.*;
13-
import org.restlet.data.Method;
14-
import org.restlet.data.Parameter;
15-
import org.restlet.data.Protocol;
16-
import org.restlet.data.Status;
17-
import org.restlet.engine.connector.HttpClientHelper;
18-
import org.restlet.util.Series;
12+
import static java.lang.String.format;
13+
import static org.junit.jupiter.api.Assertions.assertEquals;
14+
import static org.junit.jupiter.api.Assertions.assertTrue;
1915

2016
import java.time.Duration;
2117
import java.util.ArrayList;
@@ -25,9 +21,18 @@
2521
import java.util.concurrent.Executors;
2622
import java.util.logging.Logger;
2723

28-
import static java.lang.String.format;
29-
import static org.junit.jupiter.api.Assertions.assertEquals;
30-
import static org.junit.jupiter.api.Assertions.assertTrue;
24+
import org.restlet.Application;
25+
import org.restlet.Client;
26+
import org.restlet.Context;
27+
import org.restlet.Request;
28+
import org.restlet.Response;
29+
import org.restlet.Restlet;
30+
import org.restlet.Server;
31+
import org.restlet.data.Method;
32+
import org.restlet.data.Parameter;
33+
import org.restlet.data.Protocol;
34+
import org.restlet.data.Status;
35+
import org.restlet.util.Series;
3136

3237
/**
3338
* This tests the ability of the server to accept a fixed number of incoming connections.
@@ -86,15 +91,6 @@ private Status sendGet(final String uri) {
8691
try {
8792
final Request request = new Request(Method.GET, uri + "/" + Thread.currentThread().getName());
8893
final Client client = new Client(new Context(), Protocol.HTTP);
89-
90-
if (client.getContext().getAttributes().get("org.restlet.engine.helper") instanceof HttpClientHelper) {
91-
// Specific to the internal client
92-
// When Jetty refuses the extra connection, this does not block the underlying native HttpClient...
93-
// Let's set a timeout higher than the wait time imposed by the server (otherwise all requests will fail)
94-
String readTimeoutInMs = Long.toString(SERVER_RESOURCE_FREEZE_DURATION.toMillis() * 2);
95-
client.getContext().getParameters().add("readTimeout", readTimeoutInMs);
96-
}
97-
9894
final Response response = client.handle(request);
9995
log("client get sent " + Thread.currentThread().getName());
10096
result = response.getStatus();

‎org.restlet.ext.jetty/src/test/java/org/restlet/ext/jetty/connectors/SslBaseConnectorsTestCase.java‎

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,24 @@
99

1010
package org.restlet.ext.jetty.connectors;
1111

12+
import java.io.File;
13+
import java.io.FileOutputStream;
14+
import java.io.IOException;
15+
import java.io.InputStream;
16+
import java.io.OutputStream;
17+
import java.nio.file.Files;
18+
import java.util.List;
19+
1220
import org.junit.jupiter.api.AfterAll;
1321
import org.junit.jupiter.api.BeforeAll;
14-
import org.restlet.*;
22+
import org.restlet.Client;
23+
import org.restlet.Component;
24+
import org.restlet.Server;
1525
import org.restlet.data.Parameter;
1626
import org.restlet.data.Protocol;
1727
import org.restlet.engine.io.IoUtils;
1828
import org.restlet.util.Series;
1929

20-
import java.io.*;
21-
import java.nio.file.Files;
22-
import java.util.List;
23-
2430
/**
2531
* Base test case that will call an abstract method for several client/server
2632
* connectors configurations. (Modified for SSL support.)
@@ -39,10 +45,13 @@ public abstract class SslBaseConnectorsTestCase extends BaseConnectorsTestCase {
3945

4046
@BeforeAll
4147
public static void globalSetUp() throws IOException {
42-
testKeystoreFile = Files.createTempFile("sslBaseConnectorsTest", KEYSTORE_FILE_NAME).toFile();
48+
testKeystoreFile = Files
49+
.createTempFile("sslBaseConnectorsTest", KEYSTORE_FILE_NAME)
50+
.toFile();
4351
testKeystoreFile.delete();
4452

45-
InputStream resourceAsStream = SslBaseConnectorsTestCase.class.getResourceAsStream(KEYSTORE_FILE_NAME);
53+
InputStream resourceAsStream = SslBaseConnectorsTestCase.class
54+
.getResourceAsStream(KEYSTORE_FILE_NAME);
4655
if (resourceAsStream != null) {
4756
OutputStream outputStream = new FileOutputStream(testKeystoreFile);
4857
IoUtils.copy(resourceAsStream, outputStream);
@@ -56,13 +65,8 @@ public static void globalSetUp() throws IOException {
5665

5766
@Override
5867
protected List<ConnectorTestCase> listTestCases() {
59-
return List.of(
60-
// let's focus on Jetty server extension
61-
// new ConnectorTestCase(HttpServer.INTERNAL_HTTPS, HttpClient.JETTY),
62-
// new ConnectorTestCase(HttpServer.INTERNAL_HTTPS, HttpClient.INTERNAL),
63-
new ConnectorTestCase(HttpServer.JETTY_HTTPS, HttpClient.INTERNAL),
64-
new ConnectorTestCase(HttpServer.JETTY_HTTPS, HttpClient.JETTY)
65-
);
68+
return List.of(new ConnectorTestCase(HttpServer.JETTY_HTTPS,
69+
HttpClient.JETTY));
6670
}
6771

6872
@Override

‎org.restlet.ext.servlet/pom.xml‎

Lines changed: 0 additions & 39 deletions
This file was deleted.

0 commit comments

Comments
 (0)