Skip to content

Commit 3975e72

Browse files
committed
Fix deprecation warnings
1 parent d3a2861 commit 3975e72

File tree

4 files changed

+12
-17
lines changed

4 files changed

+12
-17
lines changed

Diff for: client/src/test/java/org/asynchttpclient/AsyncStreamLifecycleTest.java

+5-6
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
import static org.asynchttpclient.Dsl.asyncHttpClient;
1919
import static org.testng.Assert.*;
20-
import io.netty.handler.codec.http.HttpHeaders;
2120

2221
import java.io.IOException;
2322
import java.io.PrintWriter;
@@ -29,17 +28,18 @@
2928
import java.util.concurrent.atomic.AtomicBoolean;
3029
import java.util.concurrent.atomic.AtomicInteger;
3130

31+
import javax.servlet.AsyncContext;
3232
import javax.servlet.ServletException;
3333
import javax.servlet.http.HttpServletRequest;
3434
import javax.servlet.http.HttpServletResponse;
3535

36-
import org.eclipse.jetty.continuation.Continuation;
37-
import org.eclipse.jetty.continuation.ContinuationSupport;
3836
import org.eclipse.jetty.server.Request;
3937
import org.eclipse.jetty.server.handler.AbstractHandler;
4038
import org.testng.annotations.AfterClass;
4139
import org.testng.annotations.Test;
4240

41+
import io.netty.handler.codec.http.HttpHeaders;
42+
4343
/**
4444
* Tests default asynchronous life cycle.
4545
*
@@ -61,8 +61,7 @@ public AbstractHandler configureHandler() throws Exception {
6161
public void handle(String s, Request request, HttpServletRequest req, final HttpServletResponse resp) throws IOException, ServletException {
6262
resp.setContentType("text/plain;charset=utf-8");
6363
resp.setStatus(200);
64-
final Continuation continuation = ContinuationSupport.getContinuation(req);
65-
continuation.suspend();
64+
final AsyncContext asyncContext = request.startAsync();
6665
final PrintWriter writer = resp.getWriter();
6766
executorService.submit(new Runnable() {
6867
public void run() {
@@ -86,7 +85,7 @@ public void run() {
8685
logger.info("Delivering part2.");
8786
writer.write("part2");
8887
writer.flush();
89-
continuation.complete();
88+
asyncContext.complete();
9089
}
9190
});
9291
request.setHandled(true);

Diff for: client/src/test/java/org/asynchttpclient/PerRequestTimeoutTest.java

+3-5
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,11 @@
2525
import java.util.concurrent.TimeUnit;
2626
import java.util.concurrent.TimeoutException;
2727

28+
import javax.servlet.AsyncContext;
2829
import javax.servlet.ServletException;
2930
import javax.servlet.http.HttpServletRequest;
3031
import javax.servlet.http.HttpServletResponse;
3132

32-
import org.eclipse.jetty.continuation.Continuation;
33-
import org.eclipse.jetty.continuation.ContinuationSupport;
3433
import org.eclipse.jetty.server.Request;
3534
import org.eclipse.jetty.server.handler.AbstractHandler;
3635
import org.testng.annotations.Test;
@@ -60,8 +59,7 @@ public AbstractHandler configureHandler() throws Exception {
6059
private class SlowHandler extends AbstractHandler {
6160
public void handle(String target, Request baseRequest, HttpServletRequest request, final HttpServletResponse response) throws IOException, ServletException {
6261
response.setStatus(HttpServletResponse.SC_OK);
63-
final Continuation continuation = ContinuationSupport.getContinuation(request);
64-
continuation.suspend();
62+
final AsyncContext asyncContext = request.startAsync();
6563
new Thread(new Runnable() {
6664
public void run() {
6765
try {
@@ -81,7 +79,7 @@ public void run() {
8179
Thread.sleep(3000);
8280
response.getOutputStream().print(MSG);
8381
response.getOutputStream().flush();
84-
continuation.complete();
82+
asyncContext.complete();
8583
} catch (InterruptedException e) {
8684
logger.error(e.getMessage(), e);
8785
} catch (IOException e) {

Diff for: client/src/test/java/org/asynchttpclient/netty/NettyRequestThrottleTimeoutTest.java

+3-5
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import java.util.concurrent.Semaphore;
2525
import java.util.concurrent.TimeUnit;
2626

27+
import javax.servlet.AsyncContext;
2728
import javax.servlet.ServletException;
2829
import javax.servlet.http.HttpServletRequest;
2930
import javax.servlet.http.HttpServletResponse;
@@ -32,8 +33,6 @@
3233
import org.asynchttpclient.AsyncCompletionHandler;
3334
import org.asynchttpclient.AsyncHttpClient;
3435
import org.asynchttpclient.Response;
35-
import org.eclipse.jetty.continuation.Continuation;
36-
import org.eclipse.jetty.continuation.ContinuationSupport;
3736
import org.eclipse.jetty.server.Request;
3837
import org.eclipse.jetty.server.handler.AbstractHandler;
3938
import org.testng.annotations.Test;
@@ -51,15 +50,14 @@ private class SlowHandler extends AbstractHandler {
5150
public void handle(String target, Request baseRequest, HttpServletRequest request, final HttpServletResponse response)
5251
throws IOException, ServletException {
5352
response.setStatus(HttpServletResponse.SC_OK);
54-
final Continuation continuation = ContinuationSupport.getContinuation(request);
55-
continuation.suspend();
53+
final AsyncContext asyncContext = request.startAsync();
5654
new Thread(new Runnable() {
5755
public void run() {
5856
try {
5957
Thread.sleep(SLEEPTIME_MS);
6058
response.getOutputStream().print(MSG);
6159
response.getOutputStream().flush();
62-
continuation.complete();
60+
asyncContext.complete();
6361
} catch (InterruptedException e) {
6462
logger.error(e.getMessage(), e);
6563
} catch (IOException e) {

Diff for: client/src/test/java/org/asynchttpclient/request/body/multipart/part/MultipartPartTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ public void testVisitPostContents() {
193193

194194
@Test
195195
public void transferToShouldWriteStringPart() throws IOException, URISyntaxException {
196-
String text = FileUtils.readFileToString(TestUtils.resourceAsFile("test_sample_message.eml"));
196+
String text = FileUtils.readFileToString(TestUtils.resourceAsFile("test_sample_message.eml"), UTF_8);
197197

198198
List<Part> parts = new ArrayList<>();
199199
parts.add(new StringPart("test_sample_message.eml", text));

0 commit comments

Comments
 (0)