You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2016/08/28 19:04:51 UTC
svn commit: r1758141 [7/9] - in /httpcomponents/httpcore/trunk:
httpcore5-ab/src/main/java/org/apache/hc/core5/http/benchmark/
httpcore5-ab/src/test/java/org/apache/hc/core5/http/benchmark/
httpcore5-h2/src/main/java/org/apache/hc/core5/http2/ httpcore...
Modified: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/integration/TestAsyncHttp.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/integration/TestAsyncHttp.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/integration/TestAsyncHttp.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/integration/TestAsyncHttp.java Sun Aug 28 19:04:49 2016
@@ -42,9 +42,9 @@ import org.apache.hc.core5.http.HttpEnti
import org.apache.hc.core5.http.HttpException;
import org.apache.hc.core5.http.HttpHeaders;
import org.apache.hc.core5.http.HttpHost;
-import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.ClassicHttpRequest;
import org.apache.hc.core5.http.HttpRequestInterceptor;
-import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.ClassicHttpResponse;
import org.apache.hc.core5.http.HttpStatus;
import org.apache.hc.core5.http.HttpVersion;
import org.apache.hc.core5.http.entity.ByteArrayEntity;
@@ -54,8 +54,8 @@ import org.apache.hc.core5.http.impl.nio
import org.apache.hc.core5.http.impl.nio.BasicAsyncRequestHandler;
import org.apache.hc.core5.http.impl.nio.BasicAsyncResponseProducer;
import org.apache.hc.core5.http.io.HttpRequestHandler;
-import org.apache.hc.core5.http.message.BasicHttpRequest;
-import org.apache.hc.core5.http.message.BasicHttpResponse;
+import org.apache.hc.core5.http.message.BasicClassicHttpRequest;
+import org.apache.hc.core5.http.message.BasicClassicHttpResponse;
import org.apache.hc.core5.http.nio.ContentEncoder;
import org.apache.hc.core5.http.nio.HttpAsyncExchange;
import org.apache.hc.core5.http.nio.HttpAsyncExpectationVerifier;
@@ -148,16 +148,16 @@ public class TestAsyncHttp extends HttpC
final String expectedPattern = createExpectedString(pattern, count);
- final Queue<Future<HttpResponse>> queue = new ConcurrentLinkedQueue<>();
+ final Queue<Future<ClassicHttpResponse>> queue = new ConcurrentLinkedQueue<>();
for (int i = 0; i < 30; i++) {
- final BasicHttpRequest request = new BasicHttpRequest("GET", createRequestUri(pattern, count));
- final Future<HttpResponse> future = this.client.execute(target, request);
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest("GET", createRequestUri(pattern, count));
+ final Future<ClassicHttpResponse> future = this.client.execute(target, request);
queue.add(future);
}
while (!queue.isEmpty()) {
- final Future<HttpResponse> future = queue.remove();
- final HttpResponse response = future.get();
+ final Future<ClassicHttpResponse> future = queue.remove();
+ final ClassicHttpResponse response = future.get();
Assert.assertNotNull(response);
Assert.assertEquals(expectedPattern, EntityUtils.toString(response.getEntity()));
}
@@ -174,16 +174,16 @@ public class TestAsyncHttp extends HttpC
final String pattern = RndTestPatternGenerator.generateText();
final int count = RndTestPatternGenerator.generateCount(1000);
- final Queue<Future<HttpResponse>> queue = new ConcurrentLinkedQueue<>();
+ final Queue<Future<ClassicHttpResponse>> queue = new ConcurrentLinkedQueue<>();
for (int i = 0; i < 30; i++) {
- final BasicHttpRequest request = new BasicHttpRequest("HEAD", createRequestUri(pattern, count));
- final Future<HttpResponse> future = this.client.execute(target, request);
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest("HEAD", createRequestUri(pattern, count));
+ final Future<ClassicHttpResponse> future = this.client.execute(target, request);
queue.add(future);
}
while (!queue.isEmpty()) {
- final Future<HttpResponse> future = queue.remove();
- final HttpResponse response = future.get();
+ final Future<ClassicHttpResponse> future = queue.remove();
+ final ClassicHttpResponse response = future.get();
Assert.assertNotNull(response);
Assert.assertEquals(HttpStatus.SC_OK, response.getCode());
}
@@ -202,19 +202,19 @@ public class TestAsyncHttp extends HttpC
final String expectedPattern = createExpectedString(pattern, count);
- final Queue<Future<HttpResponse>> queue = new ConcurrentLinkedQueue<>();
+ final Queue<Future<ClassicHttpResponse>> queue = new ConcurrentLinkedQueue<>();
for (int i = 0; i < 30; i++) {
- final BasicHttpRequest request = new BasicHttpRequest(
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest(
"POST", createRequestUri(pattern, count));
final NStringEntity entity = new NStringEntity(expectedPattern, ContentType.DEFAULT_TEXT);
request.setEntity(entity);
- final Future<HttpResponse> future = this.client.execute(target, request);
+ final Future<ClassicHttpResponse> future = this.client.execute(target, request);
queue.add(future);
}
while (!queue.isEmpty()) {
- final Future<HttpResponse> future = queue.remove();
- final HttpResponse response = future.get();
+ final Future<ClassicHttpResponse> future = queue.remove();
+ final ClassicHttpResponse response = future.get();
Assert.assertNotNull(response);
Assert.assertEquals(expectedPattern, EntityUtils.toString(response.getEntity()));
}
@@ -233,20 +233,20 @@ public class TestAsyncHttp extends HttpC
final String expectedPattern = createExpectedString(pattern, count);
- final Queue<Future<HttpResponse>> queue = new ConcurrentLinkedQueue<>();
+ final Queue<Future<ClassicHttpResponse>> queue = new ConcurrentLinkedQueue<>();
for (int i = 0; i < 30; i++) {
- final BasicHttpRequest request = new BasicHttpRequest(
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest(
"POST", createRequestUri(pattern, count));
final NStringEntity entity = new NStringEntity(expectedPattern, ContentType.DEFAULT_TEXT);
entity.setChunked(true);
request.setEntity(entity);
- final Future<HttpResponse> future = this.client.execute(target, request);
+ final Future<ClassicHttpResponse> future = this.client.execute(target, request);
queue.add(future);
}
while (!queue.isEmpty()) {
- final Future<HttpResponse> future = queue.remove();
- final HttpResponse response = future.get();
+ final Future<ClassicHttpResponse> future = queue.remove();
+ final ClassicHttpResponse response = future.get();
Assert.assertNotNull(response);
Assert.assertEquals(expectedPattern, EntityUtils.toString(response.getEntity()));
}
@@ -258,8 +258,8 @@ public class TestAsyncHttp extends HttpC
@Override
public void handle(
- final HttpRequest request,
- final HttpResponse response,
+ final ClassicHttpRequest request,
+ final ClassicHttpResponse response,
final HttpContext context) throws HttpException, IOException {
final HttpEntity incoming = request.getEntity();
@@ -285,19 +285,19 @@ public class TestAsyncHttp extends HttpC
final String expectedPattern = createExpectedString(pattern, count);
- final Queue<Future<HttpResponse>> queue = new ConcurrentLinkedQueue<>();
+ final Queue<Future<ClassicHttpResponse>> queue = new ConcurrentLinkedQueue<>();
for (int i = 0; i < 30; i++) {
- final BasicHttpRequest request = new BasicHttpRequest("POST", createRequestUri(pattern, count));
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest("POST", createRequestUri(pattern, count));
request.setVersion(HttpVersion.HTTP_1_0);
final NStringEntity entity = new NStringEntity(expectedPattern, ContentType.DEFAULT_TEXT);
request.setEntity(entity);
- final Future<HttpResponse> future = this.client.execute(target, request);
+ final Future<ClassicHttpResponse> future = this.client.execute(target, request);
queue.add(future);
}
while (!queue.isEmpty()) {
- final Future<HttpResponse> future = queue.remove();
- final HttpResponse response = future.get();
+ final Future<ClassicHttpResponse> future = queue.remove();
+ final ClassicHttpResponse response = future.get();
Assert.assertNotNull(response);
Assert.assertEquals(HttpVersion.HTTP_1_1, response.getVersion());
final Header h1 = response.getFirstHeader("Version");
@@ -318,18 +318,18 @@ public class TestAsyncHttp extends HttpC
final String pattern = RndTestPatternGenerator.generateText();
final int count = RndTestPatternGenerator.generateCount(1000);
- final Queue<Future<HttpResponse>> queue = new ConcurrentLinkedQueue<>();
+ final Queue<Future<ClassicHttpResponse>> queue = new ConcurrentLinkedQueue<>();
for (int i = 0; i < 30; i++) {
- final BasicHttpRequest request = new BasicHttpRequest(
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest(
"POST", createRequestUri(pattern, count));
request.setEntity(null);
- final Future<HttpResponse> future = this.client.execute(target, request);
+ final Future<ClassicHttpResponse> future = this.client.execute(target, request);
queue.add(future);
}
while (!queue.isEmpty()) {
- final Future<HttpResponse> future = queue.remove();
- final HttpResponse response = future.get();
+ final Future<ClassicHttpResponse> future = queue.remove();
+ final ClassicHttpResponse response = future.get();
Assert.assertNotNull(response);
Assert.assertEquals(HttpStatus.SC_OK, response.getCode());
}
@@ -358,13 +358,13 @@ public class TestAsyncHttp extends HttpC
final String pattern = RndTestPatternGenerator.generateText();
final int count = RndTestPatternGenerator.generateCount(1000);
- final BasicHttpRequest request = new BasicHttpRequest(
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest(
"POST", createRequestUri(pattern, count));
request.setEntity(null);
- final Future<HttpResponse> future = this.client.execute(target, request);
+ final Future<ClassicHttpResponse> future = this.client.execute(target, request);
- final HttpResponse response = future.get();
+ final ClassicHttpResponse response = future.get();
Assert.assertNotNull(response);
Assert.assertEquals(HttpStatus.SC_OK, response.getCode());
}
@@ -380,7 +380,7 @@ public class TestAsyncHttp extends HttpC
@Override
public void process(
- final HttpRequest request,
+ final ClassicHttpRequest request,
final HttpContext context) throws HttpException, IOException {
request.addHeader(HttpHeaders.TRANSFER_ENCODING, "identity");
}
@@ -402,13 +402,13 @@ public class TestAsyncHttp extends HttpC
final String pattern = RndTestPatternGenerator.generateText();
final int count = RndTestPatternGenerator.generateCount(1000);
- final BasicHttpRequest request = new BasicHttpRequest(
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest(
"POST", createRequestUri(pattern, count));
request.setEntity(null);
- final Future<HttpResponse> future = this.client.execute(target, request);
+ final Future<ClassicHttpResponse> future = this.client.execute(target, request);
- final HttpResponse response = future.get();
+ final ClassicHttpResponse response = future.get();
Assert.assertNotNull(response);
Assert.assertEquals(HttpStatus.SC_NOT_IMPLEMENTED, response.getCode());
}
@@ -426,21 +426,21 @@ public class TestAsyncHttp extends HttpC
final String expectedPattern = createExpectedString(pattern, count);
- final Queue<Future<HttpResponse>> queue = new ConcurrentLinkedQueue<>();
+ final Queue<Future<ClassicHttpResponse>> queue = new ConcurrentLinkedQueue<>();
for (int i = 0; i < 30; i++) {
- final BasicHttpRequest request = new BasicHttpRequest(
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest(
"POST", createRequestUri(pattern, count));
final NStringEntity entity = new NStringEntity(expectedPattern, ContentType.DEFAULT_TEXT);
request.setEntity(entity);
final HttpContext context = new BasicHttpContext();
- final Future<HttpResponse> future = this.client.execute(target, request, context);
+ final Future<ClassicHttpResponse> future = this.client.execute(target, request, context);
queue.add(future);
}
while (!queue.isEmpty()) {
- final Future<HttpResponse> future = queue.remove();
- final HttpResponse response = future.get();
+ final Future<ClassicHttpResponse> future = queue.remove();
+ final ClassicHttpResponse response = future.get();
Assert.assertNotNull(response);
Assert.assertEquals(expectedPattern, EntityUtils.toString(response.getEntity()));
}
@@ -454,10 +454,10 @@ public class TestAsyncHttp extends HttpC
public void verify(
final HttpAsyncExchange httpexchange,
final HttpContext context) throws HttpException {
- final HttpRequest request = httpexchange.getRequest();
+ final ClassicHttpRequest request = httpexchange.getRequest();
final String s = request.getPath();
if (!s.equals("AAAAAx10")) {
- final HttpResponse response = new BasicHttpResponse(HttpStatus.SC_EXPECTATION_FAILED, "Expectation failed");
+ final ClassicHttpResponse response = new BasicClassicHttpResponse(HttpStatus.SC_EXPECTATION_FAILED, "Expectation failed");
response.setEntity(new NStringEntity("Expectation failed", ContentType.TEXT_PLAIN));
httpexchange.submitResponse(new BasicAsyncResponseProducer(response));
} else {
@@ -477,42 +477,42 @@ public class TestAsyncHttp extends HttpC
final HttpHost target = start();
- final BasicHttpRequest request1 = new BasicHttpRequest(
+ final BasicClassicHttpRequest request1 = new BasicClassicHttpRequest(
"POST", createRequestUri("AAAAA", 10));
request1.setEntity(new NStringEntity(createExpectedString("AAAAA", 10)));
- final BasicHttpRequest request2 = new BasicHttpRequest(
+ final BasicClassicHttpRequest request2 = new BasicClassicHttpRequest(
"POST", createRequestUri("AAAAA", 10));
request2.setEntity(new NStringEntity(createExpectedString("AAAAA", 10)));
- final BasicHttpRequest request3 = new BasicHttpRequest(
+ final BasicClassicHttpRequest request3 = new BasicClassicHttpRequest(
"POST", createRequestUri("BBBBB", 10));
request3.setEntity(new NStringEntity(createExpectedString("BBBBB", 10)));
- final HttpRequest[] requests = new HttpRequest[] { request1, request2, request3 };
+ final ClassicHttpRequest[] requests = new ClassicHttpRequest[] { request1, request2, request3 };
- final Queue<Future<HttpResponse>> queue = new ConcurrentLinkedQueue<>();
- for (final HttpRequest request : requests) {
+ final Queue<Future<ClassicHttpResponse>> queue = new ConcurrentLinkedQueue<>();
+ for (final ClassicHttpRequest request : requests) {
final HttpContext context = new BasicHttpContext();
- final Future<HttpResponse> future = this.client.execute(target, request, context);
+ final Future<ClassicHttpResponse> future = this.client.execute(target, request, context);
queue.add(future);
}
- final Future<HttpResponse> future1 = queue.remove();
- final HttpResponse response1 = future1.get();
+ final Future<ClassicHttpResponse> future1 = queue.remove();
+ final ClassicHttpResponse response1 = future1.get();
Assert.assertEquals(HttpStatus.SC_OK, response1.getCode());
- final Future<HttpResponse> future2 = queue.remove();
- final HttpResponse response2 = future2.get();
+ final Future<ClassicHttpResponse> future2 = queue.remove();
+ final ClassicHttpResponse response2 = future2.get();
Assert.assertEquals(HttpStatus.SC_OK, response2.getCode());
- final Future<HttpResponse> future3 = queue.remove();
- final HttpResponse response3 = future3.get();
+ final Future<ClassicHttpResponse> future3 = queue.remove();
+ final ClassicHttpResponse response3 = future3.get();
Assert.assertEquals(HttpStatus.SC_EXPECTATION_FAILED, response3.getCode());
}
@Test
public void testHttpHeadsDelayedResponse() throws Exception {
- class DelayedRequestHandler implements HttpAsyncRequestHandler<HttpRequest> {
+ class DelayedRequestHandler implements HttpAsyncRequestHandler<ClassicHttpRequest> {
private final SimpleRequestHandler requestHandler;
@@ -522,18 +522,18 @@ public class TestAsyncHttp extends HttpC
}
@Override
- public HttpAsyncRequestConsumer<HttpRequest> processRequest(
- final HttpRequest request,
+ public HttpAsyncRequestConsumer<ClassicHttpRequest> processRequest(
+ final ClassicHttpRequest request,
final HttpContext context) {
return new BasicAsyncRequestConsumer();
}
@Override
public void handle(
- final HttpRequest request,
+ final ClassicHttpRequest request,
final HttpAsyncExchange httpexchange,
final HttpContext context) throws HttpException, IOException {
- final HttpResponse response = new BasicHttpResponse(HttpStatus.SC_OK, "OK");
+ final ClassicHttpResponse response = new BasicClassicHttpResponse(HttpStatus.SC_OK, "OK");
new Thread() {
@Override
public void run() {
@@ -561,16 +561,16 @@ public class TestAsyncHttp extends HttpC
final String pattern = RndTestPatternGenerator.generateText();
final int count = RndTestPatternGenerator.generateCount(1000);
- final Queue<Future<HttpResponse>> queue = new ConcurrentLinkedQueue<>();
+ final Queue<Future<ClassicHttpResponse>> queue = new ConcurrentLinkedQueue<>();
for (int i = 0; i < 30; i++) {
- final BasicHttpRequest request = new BasicHttpRequest("HEAD", createRequestUri(pattern, count));
- final Future<HttpResponse> future = this.client.execute(target, request);
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest("HEAD", createRequestUri(pattern, count));
+ final Future<ClassicHttpResponse> future = this.client.execute(target, request);
queue.add(future);
}
while (!queue.isEmpty()) {
- final Future<HttpResponse> future = queue.remove();
- final HttpResponse response = future.get();
+ final Future<ClassicHttpResponse> future = queue.remove();
+ final ClassicHttpResponse response = future.get();
Assert.assertNotNull(response);
Assert.assertEquals(HttpStatus.SC_OK, response.getCode());
}
@@ -593,10 +593,10 @@ public class TestAsyncHttp extends HttpC
} catch (final InterruptedException ie) {
}
// Set the entity after delaying...
- final HttpRequest request = httpexchange.getRequest();
+ final ClassicHttpRequest request = httpexchange.getRequest();
final String s = request.getPath();
if (!s.equals("AAAAAx10")) {
- final HttpResponse response = new BasicHttpResponse(HttpStatus.SC_EXPECTATION_FAILED, "Expectation failed");
+ final ClassicHttpResponse response = new BasicClassicHttpResponse(HttpStatus.SC_EXPECTATION_FAILED, "Expectation failed");
response.setEntity(new NStringEntity("Expectation failed", ContentType.TEXT_PLAIN));
httpexchange.submitResponse(new BasicAsyncResponseProducer(response));
} else {
@@ -617,35 +617,35 @@ public class TestAsyncHttp extends HttpC
final HttpHost target = start();
- final BasicHttpRequest request1 = new BasicHttpRequest(
+ final BasicClassicHttpRequest request1 = new BasicClassicHttpRequest(
"POST", createRequestUri("AAAAA", 10));
request1.setEntity(new NStringEntity(createExpectedString("AAAAA", 10)));
- final BasicHttpRequest request2 = new BasicHttpRequest(
+ final BasicClassicHttpRequest request2 = new BasicClassicHttpRequest(
"POST", createRequestUri("AAAAA", 10));
request2.setEntity(new NStringEntity(createExpectedString("AAAAA", 10)));
- final BasicHttpRequest request3 = new BasicHttpRequest(
+ final BasicClassicHttpRequest request3 = new BasicClassicHttpRequest(
"POST", createRequestUri("BBBBB", 10));
request3.setEntity(new NStringEntity(createExpectedString("BBBBB", 10)));
- final HttpRequest[] requests = new HttpRequest[] { request1, request2, request3 };
+ final ClassicHttpRequest[] requests = new ClassicHttpRequest[] { request1, request2, request3 };
- final Queue<Future<HttpResponse>> queue = new ConcurrentLinkedQueue<>();
- for (final HttpRequest request : requests) {
+ final Queue<Future<ClassicHttpResponse>> queue = new ConcurrentLinkedQueue<>();
+ for (final ClassicHttpRequest request : requests) {
final HttpContext context = new BasicHttpContext();
- final Future<HttpResponse> future = this.client.execute(target, request, context);
+ final Future<ClassicHttpResponse> future = this.client.execute(target, request, context);
queue.add(future);
}
- final Future<HttpResponse> future1 = queue.remove();
- final HttpResponse response1 = future1.get();
+ final Future<ClassicHttpResponse> future1 = queue.remove();
+ final ClassicHttpResponse response1 = future1.get();
Assert.assertEquals(HttpStatus.SC_OK, response1.getCode());
- final Future<HttpResponse> future2 = queue.remove();
- final HttpResponse response2 = future2.get();
+ final Future<ClassicHttpResponse> future2 = queue.remove();
+ final ClassicHttpResponse response2 = future2.get();
Assert.assertEquals(HttpStatus.SC_OK, response2.getCode());
- final Future<HttpResponse> future3 = queue.remove();
- final HttpResponse response3 = future3.get();
+ final Future<ClassicHttpResponse> future3 = queue.remove();
+ final ClassicHttpResponse response3 = future3.get();
Assert.assertEquals(HttpStatus.SC_EXPECTATION_FAILED, response3.getCode());
}
@@ -660,10 +660,10 @@ public class TestAsyncHttp extends HttpC
new Thread() {
@Override
public void run() {
- final HttpRequest request = httpexchange.getRequest();
+ final ClassicHttpRequest request = httpexchange.getRequest();
final String s = request.getPath();
if (!s.equals("AAAAAx10")) {
- final HttpResponse response = new BasicHttpResponse(HttpStatus.SC_EXPECTATION_FAILED, "Expectation failed");
+ final ClassicHttpResponse response = new BasicClassicHttpResponse(HttpStatus.SC_EXPECTATION_FAILED, "Expectation failed");
response.setEntity(new NStringEntity("Expectation failed", ContentType.TEXT_PLAIN));
httpexchange.submitResponse(new BasicAsyncResponseProducer(response));
} else {
@@ -688,21 +688,21 @@ public class TestAsyncHttp extends HttpC
final HttpHost target = start();
for (int i = 0; i < 3; i++) {
- final BasicHttpRequest request1 = new BasicHttpRequest("POST", createRequestUri("AAAAA", 10));
+ final BasicClassicHttpRequest request1 = new BasicClassicHttpRequest("POST", createRequestUri("AAAAA", 10));
final HttpEntity entity1 = new NStringEntity(createExpectedString("AAAAA", 10));
request1.setEntity(entity1);
final HttpContext context = new BasicHttpContext();
- final Future<HttpResponse> future1 = this.client.execute(target, request1, context);
- final HttpResponse response1 = future1.get();
+ final Future<ClassicHttpResponse> future1 = this.client.execute(target, request1, context);
+ final ClassicHttpResponse response1 = future1.get();
Assert.assertEquals(HttpStatus.SC_OK, response1.getCode());
- final BasicHttpRequest request2 = new BasicHttpRequest("POST", createRequestUri("BBBBB", 10));
+ final BasicClassicHttpRequest request2 = new BasicClassicHttpRequest("POST", createRequestUri("BBBBB", 10));
final HttpEntity entity2 = new NStringEntity(createExpectedString("BBBBB", 500));
request2.setEntity(entity2);
- final Future<HttpResponse> future2 = this.client.execute(target, request2, context);
- final HttpResponse response2 = future2.get();
+ final Future<ClassicHttpResponse> future2 = this.client.execute(target, request2, context);
+ final ClassicHttpResponse response2 = future2.get();
Assert.assertEquals(HttpStatus.SC_EXPECTATION_FAILED, response2.getCode());
}
}
@@ -718,10 +718,10 @@ public class TestAsyncHttp extends HttpC
new Thread() {
@Override
public void run() {
- final HttpRequest request = httpexchange.getRequest();
+ final ClassicHttpRequest request = httpexchange.getRequest();
final String s = request.getPath();
if (!s.equals("AAAAAx10")) {
- final HttpResponse response = new BasicHttpResponse(HttpStatus.SC_EXPECTATION_FAILED, "Expectation failed");
+ final ClassicHttpResponse response = new BasicClassicHttpResponse(HttpStatus.SC_EXPECTATION_FAILED, "Expectation failed");
response.setEntity(new NStringEntity("Expectation failed", ContentType.TEXT_PLAIN));
httpexchange.submitResponse(new BasicAsyncResponseProducer(response));
} else {
@@ -746,23 +746,23 @@ public class TestAsyncHttp extends HttpC
final HttpHost target = start();
for (int i = 0; i < 10; i++) {
- final BasicHttpRequest request1 = new BasicHttpRequest("POST", createRequestUri("AAAAA", 10));
+ final BasicClassicHttpRequest request1 = new BasicClassicHttpRequest("POST", createRequestUri("AAAAA", 10));
final NStringEntity entity1 = new NStringEntity(createExpectedString("AAAAA", 10));
entity1.setChunked(i % 2 == 0);
request1.setEntity(entity1);
final HttpContext context = new BasicHttpContext();
- final Future<HttpResponse> future1 = this.client.execute(target, request1, context);
- final HttpResponse response1 = future1.get();
+ final Future<ClassicHttpResponse> future1 = this.client.execute(target, request1, context);
+ final ClassicHttpResponse response1 = future1.get();
Assert.assertEquals(HttpStatus.SC_OK, response1.getCode());
- final BasicHttpRequest request2 = new BasicHttpRequest("POST", createRequestUri("BBBBB", 10));
+ final BasicClassicHttpRequest request2 = new BasicClassicHttpRequest("POST", createRequestUri("BBBBB", 10));
final NStringEntity entity2 = new NStringEntity(createExpectedString("BBBBB", 10));
entity2.setChunked(i % 2 == 0);
request2.setEntity(entity2);
- final Future<HttpResponse> future2 = this.client.execute(target, request2, context);
- final HttpResponse response2 = future2.get();
+ final Future<ClassicHttpResponse> future2 = this.client.execute(target, request2, context);
+ final ClassicHttpResponse response2 = future2.get();
Assert.assertEquals(HttpStatus.SC_EXPECTATION_FAILED, response2.getCode());
}
}
@@ -778,10 +778,10 @@ public class TestAsyncHttp extends HttpC
new Thread() {
@Override
public void run() {
- final HttpRequest request = httpexchange.getRequest();
+ final ClassicHttpRequest request = httpexchange.getRequest();
final String s = request.getPath();
if (!s.equals("AAAAAx10")) {
- final HttpResponse response = new BasicHttpResponse(HttpStatus.SC_EXPECTATION_FAILED, "Expectation failed");
+ final ClassicHttpResponse response = new BasicClassicHttpResponse(HttpStatus.SC_EXPECTATION_FAILED, "Expectation failed");
response.setEntity(new NStringEntity("Expectation failed", ContentType.TEXT_PLAIN));
final AtomicInteger count = new AtomicInteger(0);
@@ -820,23 +820,23 @@ public class TestAsyncHttp extends HttpC
final HttpHost target = start();
for (int i = 0; i < 10; i++) {
- final BasicHttpRequest request1 = new BasicHttpRequest("POST", createRequestUri("AAAAA", 10));
+ final BasicClassicHttpRequest request1 = new BasicClassicHttpRequest("POST", createRequestUri("AAAAA", 10));
final NStringEntity entity1 = new NStringEntity(createExpectedString("AAAAA", 10));
entity1.setChunked(i % 2 == 0);
request1.setEntity(entity1);
final HttpContext context = new BasicHttpContext();
- final Future<HttpResponse> future1 = this.client.execute(target, request1, context);
- final HttpResponse response1 = future1.get();
+ final Future<ClassicHttpResponse> future1 = this.client.execute(target, request1, context);
+ final ClassicHttpResponse response1 = future1.get();
Assert.assertEquals(HttpStatus.SC_OK, response1.getCode());
- final BasicHttpRequest request2 = new BasicHttpRequest("POST", createRequestUri("BBBBB", 10));
+ final BasicClassicHttpRequest request2 = new BasicClassicHttpRequest("POST", createRequestUri("BBBBB", 10));
final NStringEntity entity2 = new NStringEntity(createExpectedString("BBBBB", 10));
entity2.setChunked(i % 2 == 0);
request2.setEntity(entity2);
- final Future<HttpResponse> future2 = this.client.execute(target, request2, context);
- final HttpResponse response2 = future2.get();
+ final Future<ClassicHttpResponse> future2 = this.client.execute(target, request2, context);
+ final ClassicHttpResponse response2 = future2.get();
Assert.assertEquals(HttpStatus.SC_EXPECTATION_FAILED, response2.getCode());
}
}
@@ -844,22 +844,22 @@ public class TestAsyncHttp extends HttpC
@Test
public void testHttpExceptionInHandler() throws Exception {
- class FailingRequestHandler implements HttpAsyncRequestHandler<HttpRequest> {
+ class FailingRequestHandler implements HttpAsyncRequestHandler<ClassicHttpRequest> {
public FailingRequestHandler() {
super();
}
@Override
- public HttpAsyncRequestConsumer<HttpRequest> processRequest(
- final HttpRequest request,
+ public HttpAsyncRequestConsumer<ClassicHttpRequest> processRequest(
+ final ClassicHttpRequest request,
final HttpContext context) {
return new BasicAsyncRequestConsumer();
}
@Override
public void handle(
- final HttpRequest request,
+ final ClassicHttpRequest request,
final HttpAsyncExchange httpexchange,
final HttpContext context) throws HttpException, IOException {
throw new HttpException("Boom");
@@ -876,16 +876,16 @@ public class TestAsyncHttp extends HttpC
final String pattern = RndTestPatternGenerator.generateText();
final int count = RndTestPatternGenerator.generateCount(1000);
- final Queue<Future<HttpResponse>> queue = new ConcurrentLinkedQueue<>();
+ final Queue<Future<ClassicHttpResponse>> queue = new ConcurrentLinkedQueue<>();
for (int i = 0; i < 1; i++) {
- final BasicHttpRequest request = new BasicHttpRequest("GET", createRequestUri(pattern, count));
- final Future<HttpResponse> future = this.client.execute(target, request);
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest("GET", createRequestUri(pattern, count));
+ final Future<ClassicHttpResponse> future = this.client.execute(target, request);
queue.add(future);
}
while (!queue.isEmpty()) {
- final Future<HttpResponse> future = queue.remove();
- final HttpResponse response = future.get();
+ final Future<ClassicHttpResponse> future = queue.remove();
+ final ClassicHttpResponse response = future.get();
Assert.assertNotNull(response);
Assert.assertEquals(HttpStatus.SC_INTERNAL_SERVER_ERROR, response.getCode());
}
@@ -901,16 +901,16 @@ public class TestAsyncHttp extends HttpC
final String pattern = RndTestPatternGenerator.generateText();
final int count = RndTestPatternGenerator.generateCount(1000);
- final Queue<Future<HttpResponse>> queue = new ConcurrentLinkedQueue<>();
+ final Queue<Future<ClassicHttpResponse>> queue = new ConcurrentLinkedQueue<>();
for (int i = 0; i < 30; i++) {
- final BasicHttpRequest request = new BasicHttpRequest("GET", createRequestUri(pattern, count));
- final Future<HttpResponse> future = this.client.execute(target, request);
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest("GET", createRequestUri(pattern, count));
+ final Future<ClassicHttpResponse> future = this.client.execute(target, request);
queue.add(future);
}
while (!queue.isEmpty()) {
- final Future<HttpResponse> future = queue.remove();
- final HttpResponse response = future.get();
+ final Future<ClassicHttpResponse> future = queue.remove();
+ final ClassicHttpResponse response = future.get();
Assert.assertNotNull(response);
Assert.assertEquals(HttpStatus.SC_NOT_IMPLEMENTED, response.getCode());
}
@@ -922,8 +922,8 @@ public class TestAsyncHttp extends HttpC
@Override
public void handle(
- final HttpRequest request,
- final HttpResponse response,
+ final ClassicHttpRequest request,
+ final ClassicHttpResponse response,
final HttpContext context) throws HttpException, IOException {
response.setCode(HttpStatus.SC_NO_CONTENT);
}
@@ -934,16 +934,16 @@ public class TestAsyncHttp extends HttpC
this.client.setMaxPerRoute(3);
this.client.setMaxTotal(3);
- final Queue<Future<HttpResponse>> queue = new ConcurrentLinkedQueue<>();
+ final Queue<Future<ClassicHttpResponse>> queue = new ConcurrentLinkedQueue<>();
for (int i = 0; i < 30; i++) {
- final BasicHttpRequest request = new BasicHttpRequest("GET", "/");
- final Future<HttpResponse> future = this.client.execute(target, request);
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest("GET", "/");
+ final Future<ClassicHttpResponse> future = this.client.execute(target, request);
queue.add(future);
}
while (!queue.isEmpty()) {
- final Future<HttpResponse> future = queue.remove();
- final HttpResponse response = future.get();
+ final Future<ClassicHttpResponse> future = queue.remove();
+ final ClassicHttpResponse response = future.get();
Assert.assertNotNull(response);
Assert.assertNull(response.getEntity());
}
@@ -955,8 +955,8 @@ public class TestAsyncHttp extends HttpC
@Override
public void handle(
- final HttpRequest request,
- final HttpResponse response,
+ final ClassicHttpRequest request,
+ final ClassicHttpResponse response,
final HttpContext context) throws HttpException, IOException {
response.setCode(HttpStatus.SC_OK);
response.setEntity(new NStringEntity("All is well", StandardCharsets.US_ASCII));
@@ -976,15 +976,15 @@ public class TestAsyncHttp extends HttpC
this.client.setMaxPerRoute(3);
this.client.setMaxTotal(3);
- final BasicHttpRequest request1 = new BasicHttpRequest("GET", "/");
+ final BasicClassicHttpRequest request1 = new BasicClassicHttpRequest("GET", "/");
request1.setVersion(HttpVersion.HTTP_1_0);
- final Future<HttpResponse> future1 = this.client.execute(target, request1);
- final HttpResponse response1 = future1.get();
+ final Future<ClassicHttpResponse> future1 = this.client.execute(target, request1);
+ final ClassicHttpResponse response1 = future1.get();
Assert.assertNotNull(response1);
Assert.assertEquals(200, response1.getCode());
- final BasicHttpRequest request2 = new BasicHttpRequest("GET", "/");
- final Future<HttpResponse> future2 = this.client.execute(target, request2);
- final HttpResponse response2 = future2.get();
+ final BasicClassicHttpRequest request2 = new BasicClassicHttpRequest("GET", "/");
+ final Future<ClassicHttpResponse> future2 = this.client.execute(target, request2);
+ final ClassicHttpResponse response2 = future2.get();
Assert.assertNotNull(response2);
Assert.assertEquals(400, response2.getCode());
}
Modified: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/integration/TestClientOutOfSequenceResponse.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/integration/TestClientOutOfSequenceResponse.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/integration/TestClientOutOfSequenceResponse.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/integration/TestClientOutOfSequenceResponse.java Sun Aug 28 19:04:49 2016
@@ -35,11 +35,11 @@ import java.util.concurrent.Future;
import org.apache.hc.core5.http.HttpException;
import org.apache.hc.core5.http.HttpHost;
-import org.apache.hc.core5.http.HttpRequest;
-import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.ClassicHttpRequest;
+import org.apache.hc.core5.http.ClassicHttpResponse;
import org.apache.hc.core5.http.impl.nio.DefaultNHttpClientConnectionFactory;
import org.apache.hc.core5.http.impl.nio.HttpAsyncRequestExecutor;
-import org.apache.hc.core5.http.message.BasicHttpRequest;
+import org.apache.hc.core5.http.message.BasicClassicHttpRequest;
import org.apache.hc.core5.http.protocol.HttpProcessor;
import org.apache.hc.core5.http.protocol.ImmutableHttpProcessor;
import org.apache.hc.core5.http.protocol.RequestConnControl;
@@ -99,10 +99,10 @@ public class TestClientOutOfSequenceResp
client.start();
final HttpHost target = new HttpHost("localhost", server.getLocalPort());
- final HttpRequest get1 = new BasicHttpRequest("GET", "/");
- final Future<HttpResponse> future1 = client.execute(target, get1);
- final HttpRequest get2 = new BasicHttpRequest("GET", "/");
- final Future<HttpResponse> future2 = client.execute(target, get2);
+ final ClassicHttpRequest get1 = new BasicClassicHttpRequest("GET", "/");
+ final Future<ClassicHttpResponse> future1 = client.execute(target, get1);
+ final ClassicHttpRequest get2 = new BasicClassicHttpRequest("GET", "/");
+ final Future<ClassicHttpResponse> future2 = client.execute(target, get2);
final Socket socket = server.accept();
Thread.sleep(100);
@@ -114,11 +114,11 @@ public class TestClientOutOfSequenceResp
socket.getOutputStream().flush();
}
- final HttpResponse response1 = future1.get();
+ final ClassicHttpResponse response1 = future1.get();
Assert.assertEquals(200, response1.getCode());
try {
- final HttpResponse response2 = future2.get();
+ final ClassicHttpResponse response2 = future2.get();
Assert.assertEquals(200, response2.getCode());
} catch (final ExecutionException ex) {
Assert.assertTrue(ex.getCause() instanceof HttpException);
Modified: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/integration/TestCustomSSL.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/integration/TestCustomSSL.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/integration/TestCustomSSL.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/integration/TestCustomSSL.java Sun Aug 28 19:04:49 2016
@@ -40,11 +40,11 @@ import javax.net.ssl.SSLSession;
import org.apache.hc.core5.http.HttpException;
import org.apache.hc.core5.http.HttpHost;
-import org.apache.hc.core5.http.HttpRequest;
-import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.ClassicHttpRequest;
+import org.apache.hc.core5.http.ClassicHttpResponse;
import org.apache.hc.core5.http.impl.nio.BasicAsyncRequestHandler;
import org.apache.hc.core5.http.io.HttpRequestHandler;
-import org.apache.hc.core5.http.message.BasicHttpRequest;
+import org.apache.hc.core5.http.message.BasicClassicHttpRequest;
import org.apache.hc.core5.http.nio.NHttpConnection;
import org.apache.hc.core5.http.protocol.HttpContext;
import org.apache.hc.core5.http.protocol.HttpCoreContext;
@@ -121,8 +121,8 @@ public class TestCustomSSL extends HttpC
@Override
public void handle(
- final HttpRequest request,
- final HttpResponse response,
+ final ClassicHttpRequest request,
+ final ClassicHttpResponse response,
final HttpContext context) throws HttpException, IOException {
final NHttpConnection conn = (NHttpConnection) context.getAttribute(
HttpCoreContext.HTTP_CONNECTION);
@@ -143,9 +143,9 @@ public class TestCustomSSL extends HttpC
final InetSocketAddress address = (InetSocketAddress) endpoint.getAddress();
final HttpHost target = new HttpHost("localhost", address.getPort());
- final BasicHttpRequest request = new BasicHttpRequest("GET", "/");
- final Future<HttpResponse> future = this.client.execute(target, request);
- final HttpResponse response = future.get();
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest("GET", "/");
+ final Future<ClassicHttpResponse> future = this.client.execute(target, request);
+ final ClassicHttpResponse response = future.get();
Assert.assertNotNull(response);
Assert.assertEquals(200, response.getCode());
}
Modified: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/integration/TestHttpAsyncHandlerCancellable.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/integration/TestHttpAsyncHandlerCancellable.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/integration/TestHttpAsyncHandlerCancellable.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/integration/TestHttpAsyncHandlerCancellable.java Sun Aug 28 19:04:49 2016
@@ -38,12 +38,12 @@ import java.util.concurrent.TimeUnit;
import org.apache.hc.core5.concurrent.Cancellable;
import org.apache.hc.core5.http.HttpException;
-import org.apache.hc.core5.http.HttpRequest;
-import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.ClassicHttpRequest;
+import org.apache.hc.core5.http.ClassicHttpResponse;
import org.apache.hc.core5.http.entity.BasicHttpEntity;
import org.apache.hc.core5.http.entity.ContentType;
import org.apache.hc.core5.http.impl.nio.BasicAsyncRequestConsumer;
-import org.apache.hc.core5.http.message.BasicHttpResponse;
+import org.apache.hc.core5.http.message.BasicClassicHttpResponse;
import org.apache.hc.core5.http.nio.ContentEncoder;
import org.apache.hc.core5.http.nio.HttpAsyncExchange;
import org.apache.hc.core5.http.nio.HttpAsyncRequestConsumer;
@@ -77,8 +77,8 @@ public class TestHttpAsyncHandlerCancell
final HttpAsyncResponseProducer responseProducer = new HttpAsyncResponseProducer() {
@Override
- public HttpResponse generateResponse() {
- final HttpResponse response = new BasicHttpResponse(200, "OK");
+ public ClassicHttpResponse generateResponse() {
+ final ClassicHttpResponse response = new BasicClassicHttpResponse(200, "OK");
final BasicHttpEntity entity = new BasicHttpEntity();
entity.setContentType(ContentType.DEFAULT_BINARY.toString());
entity.setChunked(true);
@@ -108,18 +108,18 @@ public class TestHttpAsyncHandlerCancell
};
- this.server.registerHandler("*", new HttpAsyncRequestHandler<HttpRequest>() {
+ this.server.registerHandler("*", new HttpAsyncRequestHandler<ClassicHttpRequest>() {
@Override
- public HttpAsyncRequestConsumer<HttpRequest> processRequest(
- final HttpRequest request,
+ public HttpAsyncRequestConsumer<ClassicHttpRequest> processRequest(
+ final ClassicHttpRequest request,
final HttpContext context) throws HttpException, IOException {
return new BasicAsyncRequestConsumer();
}
@Override
public void handle(
- final HttpRequest data,
+ final ClassicHttpRequest data,
final HttpAsyncExchange httpExchange,
final HttpContext context)
throws HttpException, IOException {
@@ -162,18 +162,18 @@ public class TestHttpAsyncHandlerCancell
}
};
- this.server.registerHandler("*", new HttpAsyncRequestHandler<HttpRequest>() {
+ this.server.registerHandler("*", new HttpAsyncRequestHandler<ClassicHttpRequest>() {
@Override
- public HttpAsyncRequestConsumer<HttpRequest> processRequest(
- final HttpRequest request,
+ public HttpAsyncRequestConsumer<ClassicHttpRequest> processRequest(
+ final ClassicHttpRequest request,
final HttpContext context) throws HttpException, IOException {
return new BasicAsyncRequestConsumer();
}
@Override
public void handle(
- final HttpRequest data,
+ final ClassicHttpRequest data,
final HttpAsyncExchange httpExchange,
final HttpContext context)
throws HttpException, IOException {
Modified: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/integration/TestHttpAsyncHandlersBrokenExpectContinue.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/integration/TestHttpAsyncHandlersBrokenExpectContinue.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/integration/TestHttpAsyncHandlersBrokenExpectContinue.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/integration/TestHttpAsyncHandlersBrokenExpectContinue.java Sun Aug 28 19:04:49 2016
@@ -36,11 +36,11 @@ import java.util.concurrent.Future;
import org.apache.hc.core5.http.HttpEntity;
import org.apache.hc.core5.http.HttpException;
import org.apache.hc.core5.http.HttpHost;
-import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.ClassicHttpResponse;
import org.apache.hc.core5.http.HttpStatus;
import org.apache.hc.core5.http.impl.nio.BasicAsyncRequestHandler;
import org.apache.hc.core5.http.impl.nio.HttpAsyncRequestExecutor;
-import org.apache.hc.core5.http.message.BasicHttpRequest;
+import org.apache.hc.core5.http.message.BasicClassicHttpRequest;
import org.apache.hc.core5.http.nio.HttpAsyncExchange;
import org.apache.hc.core5.http.nio.HttpAsyncExpectationVerifier;
import org.apache.hc.core5.http.nio.entity.NStringEntity;
@@ -144,22 +144,22 @@ public class TestHttpAsyncHandlersBroken
for (int i = 0; i < 2; i++) {
- final BasicHttpRequest request1 = new BasicHttpRequest("POST", createRequestUri("AAAAA", 10));
+ final BasicClassicHttpRequest request1 = new BasicClassicHttpRequest("POST", createRequestUri("AAAAA", 10));
final HttpEntity entity1 = new NStringEntity(createExpectedString("AAAAA", 1000));
request1.setEntity(entity1);
final HttpContext context = new BasicHttpContext();
- final Future<HttpResponse> future1 = this.client.execute(target, request1, context);
- final HttpResponse response1 = future1.get();
+ final Future<ClassicHttpResponse> future1 = this.client.execute(target, request1, context);
+ final ClassicHttpResponse response1 = future1.get();
Assert.assertEquals(HttpStatus.SC_OK, response1.getCode());
- final BasicHttpRequest request2 = new BasicHttpRequest("POST", createRequestUri("BBBBB", 10));
+ final BasicClassicHttpRequest request2 = new BasicClassicHttpRequest("POST", createRequestUri("BBBBB", 10));
final NStringEntity entity2 = new NStringEntity(createExpectedString("BBBBB", 1000));
entity2.setChunked(true);
request2.setEntity(entity2);
- final Future<HttpResponse> future2 = this.client.execute(target, request2, context);
- final HttpResponse response2 = future2.get();
+ final Future<ClassicHttpResponse> future2 = this.client.execute(target, request2, context);
+ final ClassicHttpResponse response2 = future2.get();
Assert.assertEquals(HttpStatus.SC_OK, response2.getCode());
}
}
Modified: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/integration/TestHttpAsyncHandlersPipelining.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/integration/TestHttpAsyncHandlersPipelining.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/integration/TestHttpAsyncHandlersPipelining.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/integration/TestHttpAsyncHandlersPipelining.java Sun Aug 28 19:04:49 2016
@@ -42,8 +42,8 @@ import org.apache.hc.core5.http.Connecti
import org.apache.hc.core5.http.HttpException;
import org.apache.hc.core5.http.HttpHeaders;
import org.apache.hc.core5.http.HttpHost;
-import org.apache.hc.core5.http.HttpRequest;
-import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.ClassicHttpRequest;
+import org.apache.hc.core5.http.ClassicHttpResponse;
import org.apache.hc.core5.http.HttpStatus;
import org.apache.hc.core5.http.entity.ContentType;
import org.apache.hc.core5.http.entity.EntityUtils;
@@ -54,8 +54,8 @@ import org.apache.hc.core5.http.impl.nio
import org.apache.hc.core5.http.impl.nio.BasicAsyncResponseConsumer;
import org.apache.hc.core5.http.impl.nio.BasicAsyncResponseProducer;
import org.apache.hc.core5.http.io.HttpRequestHandler;
-import org.apache.hc.core5.http.message.BasicHttpRequest;
-import org.apache.hc.core5.http.message.BasicHttpResponse;
+import org.apache.hc.core5.http.message.BasicClassicHttpRequest;
+import org.apache.hc.core5.http.message.BasicClassicHttpResponse;
import org.apache.hc.core5.http.nio.HttpAsyncExchange;
import org.apache.hc.core5.http.nio.HttpAsyncRequestConsumer;
import org.apache.hc.core5.http.nio.HttpAsyncRequestHandler;
@@ -154,22 +154,22 @@ public class TestHttpAsyncHandlersPipeli
final String expectedPattern = createExpectedString(pattern, count);
- final Queue<Future<List<HttpResponse>>> queue = new ConcurrentLinkedQueue<>();
+ final Queue<Future<List<ClassicHttpResponse>>> queue = new ConcurrentLinkedQueue<>();
for (int i = 0; i < 10; i++) {
final String requestUri = createRequestUri(pattern, count);
- final Future<List<HttpResponse>> future = this.client.executePipelined(target,
- new BasicHttpRequest("GET", requestUri),
- new BasicHttpRequest("GET", requestUri),
- new BasicHttpRequest("GET", requestUri));
+ final Future<List<ClassicHttpResponse>> future = this.client.executePipelined(target,
+ new BasicClassicHttpRequest("GET", requestUri),
+ new BasicClassicHttpRequest("GET", requestUri),
+ new BasicClassicHttpRequest("GET", requestUri));
queue.add(future);
}
while (!queue.isEmpty()) {
- final Future<List<HttpResponse>> future = queue.remove();
- final List<HttpResponse> responses = future.get();
+ final Future<List<ClassicHttpResponse>> future = queue.remove();
+ final List<ClassicHttpResponse> responses = future.get();
Assert.assertNotNull(responses);
Assert.assertEquals(3, responses.size());
- for (final HttpResponse response: responses) {
+ for (final ClassicHttpResponse response: responses) {
Assert.assertEquals(HttpStatus.SC_OK, response.getCode());
Assert.assertEquals(expectedPattern, EntityUtils.toString(response.getEntity()));
}
@@ -187,23 +187,23 @@ public class TestHttpAsyncHandlersPipeli
final String pattern = RndTestPatternGenerator.generateText();
final int count = RndTestPatternGenerator.generateCount(1000);
- final Queue<Future<List<HttpResponse>>> queue = new ConcurrentLinkedQueue<>();
+ final Queue<Future<List<ClassicHttpResponse>>> queue = new ConcurrentLinkedQueue<>();
for (int i = 0; i < 10; i++) {
final String requestUri = createRequestUri(pattern, count);
- final HttpRequest head1 = new BasicHttpRequest("HEAD", requestUri);
- final HttpRequest head2 = new BasicHttpRequest("HEAD", requestUri);
- final HttpRequest post1 = new BasicHttpRequest("POST", requestUri);
+ final ClassicHttpRequest head1 = new BasicClassicHttpRequest("HEAD", requestUri);
+ final ClassicHttpRequest head2 = new BasicClassicHttpRequest("HEAD", requestUri);
+ final ClassicHttpRequest post1 = new BasicClassicHttpRequest("POST", requestUri);
post1.setEntity(new NStringEntity("stuff", ContentType.TEXT_PLAIN));
- final Future<List<HttpResponse>> future = this.client.executePipelined(target, head1, head2, post1);
+ final Future<List<ClassicHttpResponse>> future = this.client.executePipelined(target, head1, head2, post1);
queue.add(future);
}
while (!queue.isEmpty()) {
- final Future<List<HttpResponse>> future = queue.remove();
- final List<HttpResponse> responses = future.get();
+ final Future<List<ClassicHttpResponse>> future = queue.remove();
+ final List<ClassicHttpResponse> responses = future.get();
Assert.assertNotNull(responses);
Assert.assertEquals(3, responses.size());
- for (final HttpResponse response: responses) {
+ for (final ClassicHttpResponse response: responses) {
Assert.assertEquals(HttpStatus.SC_OK, response.getCode());
}
}
@@ -222,32 +222,32 @@ public class TestHttpAsyncHandlersPipeli
final String expectedPattern = createExpectedString(pattern, count);
- final Queue<Future<List<HttpResponse>>> queue = new ConcurrentLinkedQueue<>();
+ final Queue<Future<List<ClassicHttpResponse>>> queue = new ConcurrentLinkedQueue<>();
for (int i = 0; i < 10; i++) {
final String requestUri = createRequestUri(pattern, count);
- final HttpRequest request1 = new BasicHttpRequest("POST", requestUri);
+ final ClassicHttpRequest request1 = new BasicClassicHttpRequest("POST", requestUri);
final NStringEntity entity1 = new NStringEntity(expectedPattern, ContentType.DEFAULT_TEXT);
entity1.setChunked(RndTestPatternGenerator.generateBoolean());
request1.setEntity(entity1);
- final HttpRequest request2 = new BasicHttpRequest("POST", requestUri);
+ final ClassicHttpRequest request2 = new BasicClassicHttpRequest("POST", requestUri);
final NStringEntity entity2 = new NStringEntity(expectedPattern, ContentType.DEFAULT_TEXT);
entity2.setChunked(RndTestPatternGenerator.generateBoolean());
request2.setEntity(entity2);
- final HttpRequest request3 = new BasicHttpRequest("POST", requestUri);
+ final ClassicHttpRequest request3 = new BasicClassicHttpRequest("POST", requestUri);
final NStringEntity entity3 = new NStringEntity(expectedPattern, ContentType.DEFAULT_TEXT);
entity3.setChunked(RndTestPatternGenerator.generateBoolean());
request3.setEntity(entity3);
- final Future<List<HttpResponse>> future = this.client.executePipelined(target,
+ final Future<List<ClassicHttpResponse>> future = this.client.executePipelined(target,
request1, request2, request3);
queue.add(future);
}
while (!queue.isEmpty()) {
- final Future<List<HttpResponse>> future = queue.remove();
- final List<HttpResponse> responses = future.get();
+ final Future<List<ClassicHttpResponse>> future = queue.remove();
+ final List<ClassicHttpResponse> responses = future.get();
Assert.assertNotNull(responses);
Assert.assertEquals(3, responses.size());
- for (final HttpResponse response: responses) {
+ for (final ClassicHttpResponse response: responses) {
Assert.assertEquals(HttpStatus.SC_OK, response.getCode());
Assert.assertEquals(expectedPattern, EntityUtils.toString(response.getEntity()));
}
@@ -257,7 +257,7 @@ public class TestHttpAsyncHandlersPipeli
@Test
public void testHttpDelayedResponse() throws Exception {
- class DelayedRequestHandler implements HttpAsyncRequestHandler<HttpRequest> {
+ class DelayedRequestHandler implements HttpAsyncRequestHandler<ClassicHttpRequest> {
private final SimpleRequestHandler requestHandler;
@@ -267,18 +267,18 @@ public class TestHttpAsyncHandlersPipeli
}
@Override
- public HttpAsyncRequestConsumer<HttpRequest> processRequest(
- final HttpRequest request,
+ public HttpAsyncRequestConsumer<ClassicHttpRequest> processRequest(
+ final ClassicHttpRequest request,
final HttpContext context) {
return new BasicAsyncRequestConsumer();
}
@Override
public void handle(
- final HttpRequest request,
+ final ClassicHttpRequest request,
final HttpAsyncExchange httpexchange,
final HttpContext context) throws HttpException, IOException {
- final BasicHttpResponse response = new BasicHttpResponse(HttpStatus.SC_OK, "OK");
+ final BasicClassicHttpResponse response = new BasicClassicHttpResponse(HttpStatus.SC_OK, "OK");
new Thread() {
@Override
public void run() {
@@ -312,30 +312,30 @@ public class TestHttpAsyncHandlersPipeli
final String expectedPattern2 = createExpectedString(pattern2, count);
final String expectedPattern3 = createExpectedString(pattern3, count);
- final Queue<Future<List<HttpResponse>>> queue = new ConcurrentLinkedQueue<>();
+ final Queue<Future<List<ClassicHttpResponse>>> queue = new ConcurrentLinkedQueue<>();
for (int i = 0; i < 1; i++) {
- final HttpRequest request1 = new BasicHttpRequest("GET", createRequestUri(pattern1, count));
- final HttpRequest request2 = new BasicHttpRequest("POST",
+ final ClassicHttpRequest request1 = new BasicClassicHttpRequest("GET", createRequestUri(pattern1, count));
+ final ClassicHttpRequest request2 = new BasicClassicHttpRequest("POST",
createRequestUri(pattern2, count));
final NStringEntity entity2 = new NStringEntity(expectedPattern2, ContentType.DEFAULT_TEXT);
entity2.setChunked(RndTestPatternGenerator.generateBoolean());
request2.setEntity(entity2);
- final HttpRequest request3 = new BasicHttpRequest("POST",
+ final ClassicHttpRequest request3 = new BasicClassicHttpRequest("POST",
createRequestUri(pattern3, count));
final NStringEntity entity3 = new NStringEntity(expectedPattern3, ContentType.DEFAULT_TEXT);
entity3.setChunked(RndTestPatternGenerator.generateBoolean());
request3.setEntity(entity3);
- final Future<List<HttpResponse>> future = this.client.executePipelined(target,
+ final Future<List<ClassicHttpResponse>> future = this.client.executePipelined(target,
request1, request2, request3);
queue.add(future);
}
while (!queue.isEmpty()) {
- final Future<List<HttpResponse>> future = queue.remove();
- final List<HttpResponse> responses = future.get();
+ final Future<List<ClassicHttpResponse>> future = queue.remove();
+ final List<ClassicHttpResponse> responses = future.get();
Assert.assertNotNull(responses);
Assert.assertEquals(3, responses.size());
- for (final HttpResponse response: responses) {
+ for (final ClassicHttpResponse response: responses) {
Assert.assertEquals(HttpStatus.SC_OK, response.getCode());
}
Assert.assertEquals(expectedPattern1, EntityUtils.toString(responses.get(0).getEntity()));
@@ -350,8 +350,8 @@ public class TestHttpAsyncHandlersPipeli
@Override
public void handle(
- final HttpRequest request,
- final HttpResponse response,
+ final ClassicHttpRequest request,
+ final ClassicHttpResponse response,
final HttpContext context) throws HttpException, IOException {
response.setCode(HttpStatus.SC_OK);
response.setEntity(new StringEntity("all is well", ContentType.TEXT_PLAIN));
@@ -362,8 +362,8 @@ public class TestHttpAsyncHandlersPipeli
@Override
public void handle(
- final HttpRequest request,
- final HttpResponse response,
+ final ClassicHttpRequest request,
+ final ClassicHttpResponse response,
final HttpContext context) throws HttpException, IOException {
response.setCode(HttpStatus.SC_INTERNAL_SERVER_ERROR);
response.setHeader(HttpHeaders.CONNECTION, "Close");
@@ -378,23 +378,23 @@ public class TestHttpAsyncHandlersPipeli
for (int i = 0; i < 3; i++) {
- final HttpAsyncRequestProducer p1 = new BasicAsyncRequestProducer(target, new BasicHttpRequest("GET", "/"));
- final HttpAsyncRequestProducer p2 = new BasicAsyncRequestProducer(target, new BasicHttpRequest("GET", "/"));
- final HttpAsyncRequestProducer p3 = new BasicAsyncRequestProducer(target, new BasicHttpRequest("GET", "/boom"));
+ final HttpAsyncRequestProducer p1 = new BasicAsyncRequestProducer(target, new BasicClassicHttpRequest("GET", "/"));
+ final HttpAsyncRequestProducer p2 = new BasicAsyncRequestProducer(target, new BasicClassicHttpRequest("GET", "/"));
+ final HttpAsyncRequestProducer p3 = new BasicAsyncRequestProducer(target, new BasicClassicHttpRequest("GET", "/boom"));
final List<HttpAsyncRequestProducer> requestProducers = new ArrayList<>();
requestProducers.add(p1);
requestProducers.add(p2);
requestProducers.add(p3);
- final HttpAsyncResponseConsumer<HttpResponse> c1 = new BasicAsyncResponseConsumer();
- final HttpAsyncResponseConsumer<HttpResponse> c2 = new BasicAsyncResponseConsumer();
- final HttpAsyncResponseConsumer<HttpResponse> c3 = new BasicAsyncResponseConsumer();
- final List<HttpAsyncResponseConsumer<HttpResponse>> responseConsumers = new ArrayList<>();
+ final HttpAsyncResponseConsumer<ClassicHttpResponse> c1 = new BasicAsyncResponseConsumer();
+ final HttpAsyncResponseConsumer<ClassicHttpResponse> c2 = new BasicAsyncResponseConsumer();
+ final HttpAsyncResponseConsumer<ClassicHttpResponse> c3 = new BasicAsyncResponseConsumer();
+ final List<HttpAsyncResponseConsumer<ClassicHttpResponse>> responseConsumers = new ArrayList<>();
responseConsumers.add(c1);
responseConsumers.add(c2);
responseConsumers.add(c3);
- final Future<List<HttpResponse>> future = this.client.executePipelined(target, requestProducers, responseConsumers, null, null);
+ final Future<List<ClassicHttpResponse>> future = this.client.executePipelined(target, requestProducers, responseConsumers, null, null);
try {
future.get();
} catch (final ExecutionException ex) {
Modified: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/integration/TestHttpAsyncPrematureTermination.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/integration/TestHttpAsyncPrematureTermination.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/integration/TestHttpAsyncPrematureTermination.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/integration/TestHttpAsyncPrematureTermination.java Sun Aug 28 19:04:49 2016
@@ -38,13 +38,13 @@ import org.apache.hc.core5.concurrent.Fu
import org.apache.hc.core5.http.HttpConnection;
import org.apache.hc.core5.http.HttpException;
import org.apache.hc.core5.http.HttpHost;
-import org.apache.hc.core5.http.HttpRequest;
-import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.ClassicHttpRequest;
+import org.apache.hc.core5.http.ClassicHttpResponse;
import org.apache.hc.core5.http.entity.ContentType;
import org.apache.hc.core5.http.entity.InputStreamEntity;
import org.apache.hc.core5.http.impl.nio.BasicAsyncRequestConsumer;
import org.apache.hc.core5.http.impl.nio.BasicAsyncResponseProducer;
-import org.apache.hc.core5.http.message.BasicHttpRequest;
+import org.apache.hc.core5.http.message.BasicClassicHttpRequest;
import org.apache.hc.core5.http.nio.ContentEncoder;
import org.apache.hc.core5.http.nio.HttpAsyncExchange;
import org.apache.hc.core5.http.nio.HttpAsyncRequestConsumer;
@@ -87,11 +87,11 @@ public class TestHttpAsyncPrematureTermi
@Test
public void testConnectionTerminatedProcessingRequest() throws Exception {
- this.server.registerHandler("*", new HttpAsyncRequestHandler<HttpRequest>() {
+ this.server.registerHandler("*", new HttpAsyncRequestHandler<ClassicHttpRequest>() {
@Override
- public HttpAsyncRequestConsumer<HttpRequest> processRequest(
- final HttpRequest request,
+ public HttpAsyncRequestConsumer<ClassicHttpRequest> processRequest(
+ final ClassicHttpRequest request,
final HttpContext context) throws HttpException, IOException {
final HttpConnection conn = (HttpConnection) context.getAttribute(
HttpCoreContext.HTTP_CONNECTION);
@@ -101,10 +101,10 @@ public class TestHttpAsyncPrematureTermi
@Override
public void handle(
- final HttpRequest request,
+ final ClassicHttpRequest request,
final HttpAsyncExchange httpExchange,
final HttpContext context) throws HttpException, IOException {
- final HttpResponse response = httpExchange.getResponse();
+ final ClassicHttpResponse response = httpExchange.getResponse();
response.setEntity(new NStringEntity("all is well", ContentType.TEXT_PLAIN));
httpExchange.submitResponse();
}
@@ -115,7 +115,7 @@ public class TestHttpAsyncPrematureTermi
final CountDownLatch latch = new CountDownLatch(1);
- final FutureCallback<HttpResponse> callback = new FutureCallback<HttpResponse>() {
+ final FutureCallback<ClassicHttpResponse> callback = new FutureCallback<ClassicHttpResponse>() {
@Override
public void cancelled() {
@@ -128,13 +128,13 @@ public class TestHttpAsyncPrematureTermi
}
@Override
- public void completed(final HttpResponse response) {
+ public void completed(final ClassicHttpResponse response) {
Assert.fail();
}
};
- final HttpRequest request = new BasicHttpRequest("GET", "/");
+ final ClassicHttpRequest request = new BasicClassicHttpRequest("GET", "/");
final HttpContext context = new BasicHttpContext();
this.client.execute(target, request, context, callback);
@@ -152,24 +152,24 @@ public class TestHttpAsyncPrematureTermi
super.close();
}
};
- this.server.registerHandler("*", new HttpAsyncRequestHandler<HttpRequest>() {
+ this.server.registerHandler("*", new HttpAsyncRequestHandler<ClassicHttpRequest>() {
@Override
- public HttpAsyncRequestConsumer<HttpRequest> processRequest(
- final HttpRequest request,
+ public HttpAsyncRequestConsumer<ClassicHttpRequest> processRequest(
+ final ClassicHttpRequest request,
final HttpContext context) throws HttpException, IOException {
return new BasicAsyncRequestConsumer();
}
@Override
public void handle(
- final HttpRequest request,
+ final ClassicHttpRequest request,
final HttpAsyncExchange httpExchange,
final HttpContext context) throws HttpException, IOException {
final HttpConnection conn = (HttpConnection) context.getAttribute(
HttpCoreContext.HTTP_CONNECTION);
conn.shutdown();
- final HttpResponse response = httpExchange.getResponse();
+ final ClassicHttpResponse response = httpExchange.getResponse();
response.setEntity(new InputStreamEntity(testInputStream, -1));
httpExchange.submitResponse();
}
@@ -180,7 +180,7 @@ public class TestHttpAsyncPrematureTermi
final CountDownLatch latch = new CountDownLatch(1);
- final FutureCallback<HttpResponse> callback = new FutureCallback<HttpResponse>() {
+ final FutureCallback<ClassicHttpResponse> callback = new FutureCallback<ClassicHttpResponse>() {
@Override
public void cancelled() {
@@ -193,13 +193,13 @@ public class TestHttpAsyncPrematureTermi
}
@Override
- public void completed(final HttpResponse response) {
+ public void completed(final ClassicHttpResponse response) {
Assert.fail();
}
};
- final HttpRequest request = new BasicHttpRequest("GET", "/");
+ final ClassicHttpRequest request = new BasicClassicHttpRequest("GET", "/");
final HttpContext context = new BasicHttpContext();
this.client.execute(target, request, context, callback);
@@ -209,21 +209,21 @@ public class TestHttpAsyncPrematureTermi
@Test
public void testConnectionTerminatedSendingResponse() throws Exception {
- this.server.registerHandler("*", new HttpAsyncRequestHandler<HttpRequest>() {
+ this.server.registerHandler("*", new HttpAsyncRequestHandler<ClassicHttpRequest>() {
@Override
- public HttpAsyncRequestConsumer<HttpRequest> processRequest(
- final HttpRequest request,
+ public HttpAsyncRequestConsumer<ClassicHttpRequest> processRequest(
+ final ClassicHttpRequest request,
final HttpContext context) throws HttpException, IOException {
return new BasicAsyncRequestConsumer();
}
@Override
public void handle(
- final HttpRequest request,
+ final ClassicHttpRequest request,
final HttpAsyncExchange httpExchange,
final HttpContext context) throws HttpException, IOException {
- final HttpResponse response = httpExchange.getResponse();
+ final ClassicHttpResponse response = httpExchange.getResponse();
response.setEntity(new NStringEntity("all is well", ContentType.TEXT_PLAIN));
httpExchange.submitResponse(new BasicAsyncResponseProducer(response) {
@@ -243,7 +243,7 @@ public class TestHttpAsyncPrematureTermi
final CountDownLatch latch = new CountDownLatch(1);
- final FutureCallback<HttpResponse> callback = new FutureCallback<HttpResponse>() {
+ final FutureCallback<ClassicHttpResponse> callback = new FutureCallback<ClassicHttpResponse>() {
@Override
public void cancelled() {
@@ -256,13 +256,13 @@ public class TestHttpAsyncPrematureTermi
}
@Override
- public void completed(final HttpResponse response) {
+ public void completed(final ClassicHttpResponse response) {
Assert.fail();
}
};
- final HttpRequest request = new BasicHttpRequest("GET", "/");
+ final ClassicHttpRequest request = new BasicClassicHttpRequest("GET", "/");
final HttpContext context = new BasicHttpContext();
this.client.execute(target, request, context, callback);
Modified: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/integration/TestHttpAsyncTimeout.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/integration/TestHttpAsyncTimeout.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/integration/TestHttpAsyncTimeout.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/integration/TestHttpAsyncTimeout.java Sun Aug 28 19:04:49 2016
@@ -37,11 +37,11 @@ import java.util.concurrent.TimeUnit;
import org.apache.hc.core5.concurrent.FutureCallback;
import org.apache.hc.core5.http.HttpHost;
-import org.apache.hc.core5.http.HttpRequest;
-import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.ClassicHttpRequest;
+import org.apache.hc.core5.http.ClassicHttpResponse;
import org.apache.hc.core5.http.impl.nio.BasicAsyncRequestProducer;
import org.apache.hc.core5.http.impl.nio.BasicAsyncResponseConsumer;
-import org.apache.hc.core5.http.message.BasicHttpRequest;
+import org.apache.hc.core5.http.message.BasicClassicHttpRequest;
import org.apache.hc.core5.http.protocol.BasicHttpContext;
import org.apache.hc.core5.http.protocol.HttpContext;
import org.apache.hc.core5.http.testserver.nio.HttpCoreNIOTestBase;
@@ -109,7 +109,7 @@ public class TestHttpAsyncTimeout extend
final CountDownLatch latch = new CountDownLatch(1);
- final FutureCallback<HttpResponse> callback = new FutureCallback<HttpResponse>() {
+ final FutureCallback<ClassicHttpResponse> callback = new FutureCallback<ClassicHttpResponse>() {
@Override
public void cancelled() {
@@ -122,13 +122,13 @@ public class TestHttpAsyncTimeout extend
}
@Override
- public void completed(final HttpResponse response) {
+ public void completed(final ClassicHttpResponse response) {
Assert.fail();
}
};
- final HttpRequest request = new BasicHttpRequest("GET", "/");
+ final ClassicHttpRequest request = new BasicClassicHttpRequest("GET", "/");
final HttpContext context = new BasicHttpContext();
this.client.execute(
new BasicAsyncRequestProducer(target, request),
Modified: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/integration/TestServerSidePipelining.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/integration/TestServerSidePipelining.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/integration/TestServerSidePipelining.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/integration/TestServerSidePipelining.java Sun Aug 28 19:04:49 2016
@@ -40,8 +40,8 @@ import java.net.Socket;
import org.apache.hc.core5.http.HttpEntity;
import org.apache.hc.core5.http.HttpException;
import org.apache.hc.core5.http.HttpHeaders;
-import org.apache.hc.core5.http.HttpRequest;
-import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.ClassicHttpRequest;
+import org.apache.hc.core5.http.ClassicHttpResponse;
import org.apache.hc.core5.http.entity.ContentType;
import org.apache.hc.core5.http.entity.EntityUtils;
import org.apache.hc.core5.http.impl.nio.BasicAsyncRequestHandler;
@@ -81,8 +81,8 @@ public class TestServerSidePipelining ex
@Override
public void handle(
- final HttpRequest request,
- final HttpResponse response,
+ final ClassicHttpRequest request,
+ final ClassicHttpResponse response,
final HttpContext context) throws HttpException, IOException {
final String content = "thank you very much";
final NStringEntity entity = new NStringEntity(content, ContentType.DEFAULT_TEXT);
@@ -94,8 +94,8 @@ public class TestServerSidePipelining ex
@Override
public void handle(
- final HttpRequest request,
- final HttpResponse response,
+ final ClassicHttpRequest request,
+ final ClassicHttpResponse response,
final HttpContext context) throws HttpException, IOException {
final String content = "and goodbye";
final NStringEntity entity = new NStringEntity(content, ContentType.DEFAULT_TEXT);
@@ -108,8 +108,8 @@ public class TestServerSidePipelining ex
@Override
public void handle(
- final HttpRequest request,
- final HttpResponse response,
+ final ClassicHttpRequest request,
+ final ClassicHttpResponse response,
final HttpContext context) throws HttpException, IOException {
final HttpEntity requestEntity = request.getEntity();
final HttpEntity responseEntity;