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 [8/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/TestSyncHttp.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/integration/TestSyncHttp.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/integration/TestSyncHttp.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/integration/TestSyncHttp.java Sun Aug 28 19:04:49 2016
@@ -44,9 +44,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.AbstractHttpEntity;
@@ -56,7 +56,7 @@ import org.apache.hc.core5.http.entity.E
import org.apache.hc.core5.http.entity.StringEntity;
import org.apache.hc.core5.http.impl.io.DefaultBHttpClientConnection;
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.protocol.HttpContext;
import org.apache.hc.core5.http.protocol.HttpExpectationVerifier;
import org.apache.hc.core5.http.protocol.ImmutableHttpProcessor;
@@ -120,8 +120,8 @@ public class TestSyncHttp {
@Override
public void handle(
- final HttpRequest request,
- final HttpResponse response,
+ final ClassicHttpRequest request,
+ final ClassicHttpResponse response,
final HttpContext context) throws HttpException, IOException {
String s = request.getPath();
@@ -147,8 +147,8 @@ public class TestSyncHttp {
client.connect(host, conn);
}
- final BasicHttpRequest get = new BasicHttpRequest("GET", "/?" + r);
- final HttpResponse response = this.client.execute(get, host, conn);
+ final BasicClassicHttpRequest get = new BasicClassicHttpRequest("GET", "/?" + r);
+ final ClassicHttpResponse response = this.client.execute(get, host, conn);
final byte[] received = EntityUtils.toByteArray(response.getEntity());
final byte[] expected = testData.get(r);
@@ -197,8 +197,8 @@ public class TestSyncHttp {
@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();
@@ -224,12 +224,12 @@ public class TestSyncHttp {
client.connect(host, conn);
}
- final BasicHttpRequest post = new BasicHttpRequest("POST", "/");
+ final BasicClassicHttpRequest post = new BasicClassicHttpRequest("POST", "/");
final byte[] data = testData.get(r);
final ByteArrayEntity outgoing = new ByteArrayEntity(data);
post.setEntity(outgoing);
- final HttpResponse response = this.client.execute(post, host, conn);
+ final ClassicHttpResponse response = this.client.execute(post, host, conn);
final byte[] received = EntityUtils.toByteArray(response.getEntity());
final byte[] expected = testData.get(r);
@@ -277,8 +277,8 @@ public class TestSyncHttp {
@Override
public void handle(
- final HttpRequest request,
- final HttpResponse response,
+ final ClassicHttpRequest request,
+ final ClassicHttpResponse response,
final HttpContext context) throws HttpException, IOException {
final HttpEntity entity = request.getEntity();
@@ -303,13 +303,13 @@ public class TestSyncHttp {
client.connect(host, conn);
}
- final BasicHttpRequest post = new BasicHttpRequest("POST", "/");
+ final BasicClassicHttpRequest post = new BasicClassicHttpRequest("POST", "/");
final byte[] data = testData.get(r);
final ByteArrayEntity outgoing = new ByteArrayEntity(data);
outgoing.setChunked(true);
post.setEntity(outgoing);
- final HttpResponse response = this.client.execute(post, host, conn);
+ final ClassicHttpResponse response = this.client.execute(post, host, conn);
final byte[] received = EntityUtils.toByteArray(response.getEntity());
final byte[] expected = testData.get(r);
@@ -355,8 +355,8 @@ public class TestSyncHttp {
@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();
@@ -385,13 +385,13 @@ public class TestSyncHttp {
}
// Set protocol level to HTTP/1.0
- final BasicHttpRequest post = new BasicHttpRequest("POST", "/");
+ final BasicClassicHttpRequest post = new BasicClassicHttpRequest("POST", "/");
post.setVersion(HttpVersion.HTTP_1_0);
final byte[] data = testData.get(r);
final ByteArrayEntity outgoing = new ByteArrayEntity(data);
post.setEntity(outgoing);
- final HttpResponse response = this.client.execute(post, host, conn);
+ final ClassicHttpResponse response = this.client.execute(post, host, conn);
Assert.assertEquals(HttpVersion.HTTP_1_1, response.getVersion());
final Header h1 = response.getFirstHeader("Version");
Assert.assertNotNull(h1);
@@ -443,8 +443,8 @@ public class TestSyncHttp {
@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();
@@ -471,13 +471,13 @@ public class TestSyncHttp {
client.connect(host, conn);
}
- final BasicHttpRequest post = new BasicHttpRequest("POST", "/");
+ final BasicClassicHttpRequest post = new BasicClassicHttpRequest("POST", "/");
final byte[] data = testData.get(r);
final ByteArrayEntity outgoing = new ByteArrayEntity(data);
outgoing.setChunked(true);
post.setEntity(outgoing);
- final HttpResponse response = this.client.execute(post, host, conn);
+ final ClassicHttpResponse response = this.client.execute(post, host, conn);
final byte[] received = EntityUtils.toByteArray(response.getEntity());
final byte[] expected = testData.get(r);
@@ -515,8 +515,8 @@ public class TestSyncHttp {
@Override
public void handle(
- final HttpRequest request,
- final HttpResponse response,
+ final ClassicHttpRequest request,
+ final ClassicHttpResponse response,
final HttpContext context) throws HttpException, IOException {
final StringEntity outgoing = new StringEntity("No content");
@@ -529,8 +529,8 @@ public class TestSyncHttp {
@Override
public void verify(
- final HttpRequest request,
- final HttpResponse response,
+ final ClassicHttpRequest request,
+ final ClassicHttpResponse response,
final HttpContext context) throws HttpException {
final Header someheader = request.getFirstHeader("Secret");
if (someheader != null) {
@@ -562,7 +562,7 @@ public class TestSyncHttp {
client.connect(host, conn);
}
- final BasicHttpRequest post = new BasicHttpRequest("POST", "/");
+ final BasicClassicHttpRequest post = new BasicClassicHttpRequest("POST", "/");
post.addHeader("Secret", Integer.toString(r));
final byte[] b = new byte[2048];
@@ -573,7 +573,7 @@ public class TestSyncHttp {
requestEntity.setChunked(false);
post.setEntity(requestEntity);
- final HttpResponse response = this.client.execute(post, host, conn);
+ final ClassicHttpResponse response = this.client.execute(post, host, conn);
final HttpEntity responseEntity = response.getEntity();
Assert.assertNotNull(responseEntity);
@@ -671,11 +671,11 @@ public class TestSyncHttp {
@Override
public void handle(
- final HttpRequest request,
- final HttpResponse response,
+ final ClassicHttpRequest request,
+ final ClassicHttpResponse response,
final HttpContext context) throws HttpException, IOException {
- if (request instanceof HttpRequest) {
+ if (request instanceof ClassicHttpRequest) {
int n = 1;
String s = request.getPath();
if (s.startsWith("/?n=")) {
@@ -722,13 +722,13 @@ public class TestSyncHttp {
client.connect(host, conn);
}
- final BasicHttpRequest post = new BasicHttpRequest(
+ final BasicClassicHttpRequest post = new BasicClassicHttpRequest(
"POST", "/?n=" + n);
final StringEntity outgoing = new StringEntity(pattern);
outgoing.setChunked(n % 2 == 0);
post.setEntity(outgoing);
- final HttpResponse response = this.client.execute(post, host, conn);
+ final ClassicHttpResponse response = this.client.execute(post, host, conn);
final HttpEntity incoming = response.getEntity();
Assert.assertNotNull(incoming);
final InputStream instream = incoming.getContent();
@@ -764,8 +764,8 @@ public class TestSyncHttp {
@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();
@@ -788,10 +788,10 @@ public class TestSyncHttp {
client.connect(host, conn);
}
- final BasicHttpRequest post = new BasicHttpRequest("POST", "/");
+ final BasicClassicHttpRequest post = new BasicClassicHttpRequest("POST", "/");
post.setEntity(null);
- final HttpResponse response = this.client.execute(post, host, conn);
+ final ClassicHttpResponse response = this.client.execute(post, host, conn);
Assert.assertEquals(HttpStatus.SC_OK, response.getCode());
final byte[] received = EntityUtils.toByteArray(response.getEntity());
Assert.assertEquals(0, received.length);
@@ -807,8 +807,8 @@ public class TestSyncHttp {
@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();
@@ -831,7 +831,7 @@ public class TestSyncHttp {
client.connect(host, conn);
}
- final BasicHttpRequest post = new BasicHttpRequest("POST", "/");
+ final BasicClassicHttpRequest post = new BasicClassicHttpRequest("POST", "/");
post.setEntity(null);
this.client = new HttpClient(new ImmutableHttpProcessor(
@@ -840,7 +840,7 @@ public class TestSyncHttp {
new RequestUserAgent(),
new RequestExpectContinue()));
- final HttpResponse response = this.client.execute(post, host, conn);
+ final ClassicHttpResponse response = this.client.execute(post, host, conn);
Assert.assertEquals(HttpStatus.SC_OK, response.getCode());
final byte[] received = EntityUtils.toByteArray(response.getEntity());
Assert.assertEquals(0, received.length);
@@ -856,8 +856,8 @@ public class TestSyncHttp {
@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();
@@ -880,7 +880,7 @@ public class TestSyncHttp {
client.connect(host, conn);
}
- final BasicHttpRequest post = new BasicHttpRequest("POST", "/");
+ final BasicClassicHttpRequest post = new BasicClassicHttpRequest("POST", "/");
post.setEntity(null);
this.client = new HttpClient(new ImmutableHttpProcessor(
@@ -888,7 +888,7 @@ public class TestSyncHttp {
@Override
public void process(
- final HttpRequest request,
+ final ClassicHttpRequest request,
final HttpContext context) throws HttpException, IOException {
request.addHeader(HttpHeaders.TRANSFER_ENCODING, "identity");
}
@@ -899,7 +899,7 @@ public class TestSyncHttp {
new RequestUserAgent(),
new RequestExpectContinue()));
- final HttpResponse response = this.client.execute(post, host, conn);
+ final ClassicHttpResponse response = this.client.execute(post, host, conn);
Assert.assertEquals(HttpStatus.SC_NOT_IMPLEMENTED, response.getCode());
} finally {
conn.close();
@@ -917,8 +917,8 @@ public class TestSyncHttp {
@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);
}
@@ -936,8 +936,8 @@ public class TestSyncHttp {
client.connect(host, conn);
}
- final BasicHttpRequest get = new BasicHttpRequest("GET", "/?" + r);
- final HttpResponse response = this.client.execute(get, host, conn);
+ final BasicClassicHttpRequest get = new BasicClassicHttpRequest("GET", "/?" + r);
+ final ClassicHttpResponse response = this.client.execute(get, host, conn);
Assert.assertNull(response.getEntity());
if (!this.client.keepAlive(get, response)) {
conn.close();
@@ -964,8 +964,8 @@ public class TestSyncHttp {
@Override
public void handle(
- final HttpRequest request,
- final HttpResponse response,
+ final ClassicHttpRequest request,
+ final ClassicHttpResponse response,
final HttpContext context) throws HttpException, IOException {
response.setEntity(new StringEntity("All is well", StandardCharsets.US_ASCII));
}
@@ -980,13 +980,13 @@ public class TestSyncHttp {
client.connect(host, conn);
try {
- final BasicHttpRequest get1 = new BasicHttpRequest("GET", "/");
+ final BasicClassicHttpRequest get1 = new BasicClassicHttpRequest("GET", "/");
get1.setVersion(HttpVersion.HTTP_1_0);
- final HttpResponse response1 = this.client.execute(get1, host, conn);
+ final ClassicHttpResponse response1 = this.client.execute(get1, host, conn);
Assert.assertEquals(200, response1.getCode());
EntityUtils.consume(response1.getEntity());
- final BasicHttpRequest get2 = new BasicHttpRequest("GET", "/");
- final HttpResponse response2 = this.client.execute(get2, host, conn);
+ final BasicClassicHttpRequest get2 = new BasicClassicHttpRequest("GET", "/");
+ final ClassicHttpResponse response2 = this.client.execute(get2, host, conn);
Assert.assertEquals(400, response2.getCode());
EntityUtils.consume(response2.getEntity());
Modified: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/integration/TestTruncatedChunks.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/integration/TestTruncatedChunks.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/integration/TestTruncatedChunks.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/integration/TestTruncatedChunks.java Sun Aug 28 19:04:49 2016
@@ -38,7 +38,7 @@ import java.util.concurrent.Future;
import org.apache.hc.core5.http.ContentLengthStrategy;
import org.apache.hc.core5.http.HttpEntity;
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.MalformedChunkCodingException;
import org.apache.hc.core5.http.TrailerSupplier;
@@ -53,7 +53,7 @@ import org.apache.hc.core5.http.impl.nio
import org.apache.hc.core5.http.impl.nio.BasicAsyncRequestProducer;
import org.apache.hc.core5.http.impl.nio.DefaultNHttpServerConnection;
import org.apache.hc.core5.http.impl.nio.SimpleInputBuffer;
-import org.apache.hc.core5.http.message.BasicHttpRequest;
+import org.apache.hc.core5.http.message.BasicClassicHttpRequest;
import org.apache.hc.core5.http.nio.ContentDecoder;
import org.apache.hc.core5.http.nio.ContentEncoder;
import org.apache.hc.core5.http.nio.IOControl;
@@ -181,8 +181,8 @@ public class TestTruncatedChunks extends
final int count = RndTestPatternGenerator.generateCount(1000);
final HttpHost target = new HttpHost("localhost", ((InetSocketAddress)endpoint.getAddress()).getPort());
- final BasicHttpRequest request = new BasicHttpRequest("GET", pattern + "x" + count);
- final Future<HttpResponse> future = this.client.execute(target, request);
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest("GET", pattern + "x" + count);
+ final Future<ClassicHttpResponse> future = this.client.execute(target, request);
try {
future.get();
Assert.fail("ExecutionException should have been thrown");
@@ -192,10 +192,10 @@ public class TestTruncatedChunks extends
}
}
- static class LenientAsyncResponseConsumer extends AbstractAsyncResponseConsumer<HttpResponse> {
+ static class LenientAsyncResponseConsumer extends AbstractAsyncResponseConsumer<ClassicHttpResponse> {
private final SimpleInputBuffer buffer;
- private volatile HttpResponse response;
+ private volatile ClassicHttpResponse response;
public LenientAsyncResponseConsumer() {
super();
@@ -203,7 +203,7 @@ public class TestTruncatedChunks extends
}
@Override
- protected void onResponseReceived(final HttpResponse response) {
+ protected void onResponseReceived(final ClassicHttpResponse response) {
this.response = response;
}
@@ -235,7 +235,7 @@ public class TestTruncatedChunks extends
}
@Override
- protected HttpResponse buildResult(final HttpContext context) {
+ protected ClassicHttpResponse buildResult(final HttpContext context) {
return this.response;
}
@@ -254,13 +254,13 @@ public class TestTruncatedChunks extends
final int count = RndTestPatternGenerator.generateCount(1000);
final HttpHost target = new HttpHost("localhost", ((InetSocketAddress)endpoint.getAddress()).getPort());
- final BasicHttpRequest request = new BasicHttpRequest("GET", pattern + "x" + count);
- final Future<HttpResponse> future = this.client.execute(
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest("GET", pattern + "x" + count);
+ final Future<ClassicHttpResponse> future = this.client.execute(
new BasicAsyncRequestProducer(target, request),
new LenientAsyncResponseConsumer(),
null, null);
- final HttpResponse response = future.get();
+ final ClassicHttpResponse response = future.get();
Assert.assertNotNull(response);
Assert.assertEquals(HttpStatus.SC_OK, response.getCode());
Assert.assertEquals(new String(GARBAGE, StandardCharsets.ISO_8859_1.name()),
Modified: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/io/TestUriHttpRequestHandlerMapper.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/io/TestUriHttpRequestHandlerMapper.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/io/TestUriHttpRequestHandlerMapper.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/io/TestUriHttpRequestHandlerMapper.java Sun Aug 28 19:04:49 2016
@@ -27,8 +27,8 @@
package org.apache.hc.core5.http.io;
-import org.apache.hc.core5.http.HttpRequest;
-import org.apache.hc.core5.http.message.BasicHttpRequest;
+import org.apache.hc.core5.http.ClassicHttpRequest;
+import org.apache.hc.core5.http.message.BasicClassicHttpRequest;
import org.apache.hc.core5.http.protocol.HttpCoreContext;
import org.apache.hc.core5.http.protocol.UriPatternMatcher;
import org.junit.Assert;
@@ -56,7 +56,7 @@ public class TestUriHttpRequestHandlerMa
final UriPatternMatcher<HttpRequestHandler> matcher = Mockito.spy(new UriPatternMatcher<HttpRequestHandler>());
final UriHttpRequestHandlerMapper registry = new UriHttpRequestHandlerMapper(matcher);
- final HttpRequest request = new BasicHttpRequest("GET", "/");
+ final ClassicHttpRequest request = new BasicClassicHttpRequest("GET", "/");
final HttpCoreContext context = HttpCoreContext.create();
registry.lookup(request, context);
registry.unregister("/h1");
@@ -91,15 +91,15 @@ public class TestUriHttpRequestHandlerMa
HttpRequestHandler h;
final HttpCoreContext context = HttpCoreContext.create();
- h = registry.lookup(new BasicHttpRequest("GET", "/that.view?param=value"), context);
+ h = registry.lookup(new BasicClassicHttpRequest("GET", "/that.view?param=value"), context);
Assert.assertNotNull(h);
Assert.assertTrue(h1 == h);
- h = registry.lookup(new BasicHttpRequest("GET", "/that.form?whatever"), context);
+ h = registry.lookup(new BasicClassicHttpRequest("GET", "/that.form?whatever"), context);
Assert.assertNotNull(h);
Assert.assertTrue(h2 == h);
- h = registry.lookup(new BasicHttpRequest("GET", "/whatever"), context);
+ h = registry.lookup(new BasicClassicHttpRequest("GET", "/whatever"), context);
Assert.assertNotNull(h);
Assert.assertTrue(def == h);
}
Modified: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/message/TestBasicMessages.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/message/TestBasicMessages.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/message/TestBasicMessages.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/message/TestBasicMessages.java Sun Aug 28 19:04:49 2016
@@ -29,11 +29,9 @@ package org.apache.hc.core5.http.message
import java.net.URI;
-import org.apache.hc.core5.http.HttpEntity;
import org.apache.hc.core5.http.HttpRequest;
import org.apache.hc.core5.http.HttpResponse;
import org.apache.hc.core5.http.HttpStatus;
-import org.apache.hc.core5.http.entity.BasicHttpEntity;
import org.junit.Assert;
import org.junit.Test;
@@ -76,16 +74,6 @@ public class TestBasicMessages {
}
@Test
- public void testSetResponseEntity() {
- final HttpResponse response = new BasicHttpResponse(HttpStatus.SC_OK, "OK");
- Assert.assertNull(response.getEntity());
-
- final HttpEntity entity = new BasicHttpEntity();
- response.setEntity(entity);
- Assert.assertTrue(entity == response.getEntity());
- }
-
- @Test
public void testDefaultRequestConstructors() {
HttpRequest request = new BasicHttpRequest("WHATEVER", "/");
Assert.assertEquals("WHATEVER", request.getMethod());
@@ -104,6 +92,41 @@ public class TestBasicMessages {
}
@Test
+ public void testResponseBasics() {
+ final BasicHttpResponse response = new BasicHttpResponse(200, "OK");
+ Assert.assertEquals(200, response.getCode());
+ Assert.assertEquals("OK", response.getReasonPhrase());
+ }
+
+ @Test
+ public void testResponseStatusLineMutation() {
+ final BasicHttpResponse response = new BasicHttpResponse(200, "OK");
+ Assert.assertEquals(200, response.getCode());
+ Assert.assertEquals("OK", response.getReasonPhrase());
+ response.setReasonPhrase("Kind of OK");
+ Assert.assertEquals(200, response.getCode());
+ Assert.assertEquals("Kind of OK", response.getReasonPhrase());
+ response.setCode(299);
+ Assert.assertEquals(299, response.getCode());
+ Assert.assertEquals(null, response.getReasonPhrase());
+ }
+
+ @Test
+ public void testResponseInvalidStatusCode() {
+ try {
+ new BasicHttpResponse(-200, "OK");
+ Assert.fail("IllegalArgumentException expected");
+ } catch (final IllegalArgumentException expected) {
+ }
+ final BasicHttpResponse response = new BasicHttpResponse(200, "OK");
+ try {
+ response.setCode(-1);
+ Assert.fail("IllegalArgumentException expected");
+ } catch (final IllegalArgumentException expected) {
+ }
+ }
+
+ @Test
public void testRequestBasics() throws Exception {
final HttpRequest request = new BasicHttpRequest("GET", "/stuff");
Assert.assertEquals("GET", request.getMethod());
@@ -141,15 +164,5 @@ public class TestBasicMessages {
Assert.assertEquals(new URI("http://host/"), request.getUri());
}
- @Test
- public void testSetRequestEntity() {
- final BasicHttpRequest request = new BasicHttpRequest("GET", "/");
- Assert.assertNull(request.getEntity());
-
- final HttpEntity entity = new BasicHttpEntity();
- request.setEntity(entity);
- Assert.assertTrue(entity == request.getEntity());
- }
-
}
Modified: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/protocol/TestStandardInterceptors.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/protocol/TestStandardInterceptors.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/protocol/TestStandardInterceptors.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/protocol/TestStandardInterceptors.java Sun Aug 28 19:04:49 2016
@@ -36,7 +36,7 @@ import org.apache.hc.core5.http.HeaderEl
import org.apache.hc.core5.http.HttpConnection;
import org.apache.hc.core5.http.HttpHeaders;
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.HttpVersion;
import org.apache.hc.core5.http.ProtocolException;
@@ -44,8 +44,8 @@ import org.apache.hc.core5.http.entity.B
import org.apache.hc.core5.http.entity.HttpEntityWithTrailers;
import org.apache.hc.core5.http.entity.StringEntity;
import org.apache.hc.core5.http.message.BasicHeader;
-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.junit.Assert;
import org.junit.Test;
import org.mockito.Mockito;
@@ -55,7 +55,7 @@ public class TestStandardInterceptors {
@Test
public void testRequestConnControlGenerated() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final BasicHttpRequest request = new BasicHttpRequest("GET", "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest("GET", "/");
final RequestConnControl interceptor = new RequestConnControl();
interceptor.process(request, context);
final Header header = request.getFirstHeader(HttpHeaders.CONNECTION);
@@ -66,7 +66,7 @@ public class TestStandardInterceptors {
@Test
public void testRequestConnControlConnectMethod() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final BasicHttpRequest request = new BasicHttpRequest("CONNECT", "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest("CONNECT", "/");
final RequestConnControl interceptor = new RequestConnControl();
interceptor.process(request, context);
final Header header = request.getFirstHeader(HttpHeaders.CONNECTION);
@@ -76,7 +76,7 @@ public class TestStandardInterceptors {
@Test
public void testRequestConnControlCustom() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final BasicHttpRequest request = new BasicHttpRequest("GET", "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest("GET", "/");
final Header myheader = new BasicHeader(HttpHeaders.CONNECTION, "close");
request.addHeader(myheader);
final RequestConnControl interceptor = new RequestConnControl();
@@ -101,9 +101,9 @@ public class TestStandardInterceptors {
@Test
public void testRequestContentProtocolException() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final BasicHttpRequest request1 = new BasicHttpRequest("POST", "/");
+ final BasicClassicHttpRequest request1 = new BasicClassicHttpRequest("POST", "/");
request1.addHeader(new BasicHeader(HttpHeaders.TRANSFER_ENCODING, "chunked"));
- final BasicHttpRequest request2 = new BasicHttpRequest("POST", "/");
+ final BasicClassicHttpRequest request2 = new BasicClassicHttpRequest("POST", "/");
request2.addHeader(new BasicHeader(HttpHeaders.CONTENT_LENGTH, "12"));
final RequestContent interceptor = new RequestContent();
@@ -124,7 +124,7 @@ public class TestStandardInterceptors {
@Test
public void testRequestContentNullEntity() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final BasicHttpRequest request = new BasicHttpRequest("POST", "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest("POST", "/");
final RequestContent interceptor = new RequestContent();
interceptor.process(request, context);
@@ -136,7 +136,7 @@ public class TestStandardInterceptors {
@Test
public void testRequestContentEntityContentLengthDelimitedHTTP11() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final BasicHttpRequest request = new BasicHttpRequest("POST", "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest("POST", "/");
final String s = "whatever";
final StringEntity entity = new StringEntity(s, StandardCharsets.US_ASCII);
request.setEntity(entity);
@@ -152,7 +152,7 @@ public class TestStandardInterceptors {
@Test
public void testRequestContentEntityChunkedHTTP11() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final BasicHttpRequest request = new BasicHttpRequest("POST", "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest("POST", "/");
final String s = "whatever";
final StringEntity entity = new StringEntity(s, StandardCharsets.US_ASCII);
entity.setChunked(true);
@@ -169,7 +169,7 @@ public class TestStandardInterceptors {
@Test
public void testRequestContentEntityUnknownLengthHTTP11() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final BasicHttpRequest request = new BasicHttpRequest("POST", "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest("POST", "/");
final BasicHttpEntity entity = new BasicHttpEntity();
entity.setContentLength(-1);
entity.setChunked(false);
@@ -187,7 +187,7 @@ public class TestStandardInterceptors {
public void testRequestContentEntityChunkedHTTP10() throws Exception {
final HttpContext context = new BasicHttpContext(null);
context.setProtocolVersion(HttpVersion.HTTP_1_0);
- final BasicHttpRequest request = new BasicHttpRequest("POST", "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest("POST", "/");
final String s = "whatever";
final StringEntity entity = new StringEntity(s, StandardCharsets.US_ASCII);
entity.setChunked(true);
@@ -205,7 +205,7 @@ public class TestStandardInterceptors {
@Test
public void testRequestContentTypeAndEncoding() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final BasicHttpRequest request = new BasicHttpRequest("POST", "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest("POST", "/");
final BasicHttpEntity entity = new BasicHttpEntity();
entity.setContentType("whatever");
entity.setContentEncoding("whatever");
@@ -224,7 +224,7 @@ public class TestStandardInterceptors {
@Test
public void testRequestContentNullTypeAndEncoding() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final BasicHttpRequest request = new BasicHttpRequest("POST", "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest("POST", "/");
final BasicHttpEntity entity = new BasicHttpEntity();
request.setEntity(entity);
@@ -238,7 +238,7 @@ public class TestStandardInterceptors {
public void testRequestContentEntityUnknownLengthHTTP10() throws Exception {
final HttpContext context = new BasicHttpContext(null);
context.setProtocolVersion(HttpVersion.HTTP_1_0);
- final BasicHttpRequest request = new BasicHttpRequest("POST", "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest("POST", "/");
final BasicHttpEntity entity = new BasicHttpEntity();
entity.setContentLength(-1);
entity.setChunked(false);
@@ -267,7 +267,7 @@ public class TestStandardInterceptors {
@Test
public void testRequestContentIgnoreNonenclosingRequests() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final BasicHttpRequest request = new BasicHttpRequest("POST", "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest("POST", "/");
final RequestContent interceptor = new RequestContent();
interceptor.process(request, context);
Assert.assertEquals(0, request.getAllHeaders().length);
@@ -277,7 +277,7 @@ public class TestStandardInterceptors {
public void testRequestContentOverwriteHeaders() throws Exception {
final RequestContent interceptor = new RequestContent(true);
final HttpContext context = new BasicHttpContext(null);
- final BasicHttpRequest request = new BasicHttpRequest("POST", "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest("POST", "/");
request.addHeader(new BasicHeader(HttpHeaders.CONTENT_LENGTH, "10"));
request.addHeader(new BasicHeader(HttpHeaders.TRANSFER_ENCODING, "whatever"));
request.setEntity(new StringEntity(""));
@@ -291,7 +291,7 @@ public class TestStandardInterceptors {
public void testRequestContentAddHeaders() throws Exception {
final RequestContent interceptor = new RequestContent(true);
final HttpContext context = new BasicHttpContext(null);
- final BasicHttpRequest request = new BasicHttpRequest("POST", "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest("POST", "/");
request.setEntity(new StringEntity(""));
interceptor.process(request, context);
final Header h1 = request.getFirstHeader(HttpHeaders.CONTENT_LENGTH);
@@ -304,7 +304,7 @@ public class TestStandardInterceptors {
@Test
public void testRequestContentEntityWithTrailers() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final BasicHttpRequest request = new BasicHttpRequest("POST", "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest("POST", "/");
final String s = "whatever";
final StringEntity entity = new StringEntity(s, StandardCharsets.US_ASCII);
request.setEntity(new HttpEntityWithTrailers(entity,
@@ -322,7 +322,7 @@ public class TestStandardInterceptors {
@Test
public void testRequestExpectContinueGenerated() throws Exception {
final HttpCoreContext context = HttpCoreContext.create();
- final BasicHttpRequest request = new BasicHttpRequest("POST", "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest("POST", "/");
final String s = "whatever";
final StringEntity entity = new StringEntity(s, StandardCharsets.US_ASCII);
request.setEntity(entity);
@@ -337,7 +337,7 @@ public class TestStandardInterceptors {
public void testRequestExpectContinueHTTP10() throws Exception {
final HttpCoreContext context = HttpCoreContext.create();
context.setProtocolVersion(HttpVersion.HTTP_1_0);
- final BasicHttpRequest request = new BasicHttpRequest("POST", "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest("POST", "/");
final String s = "whatever";
final StringEntity entity = new StringEntity(s, StandardCharsets.US_ASCII);
request.setEntity(entity);
@@ -350,7 +350,7 @@ public class TestStandardInterceptors {
@Test
public void testRequestExpectContinueZeroContent() throws Exception {
final HttpCoreContext context = HttpCoreContext.create();
- final BasicHttpRequest request = new BasicHttpRequest("POST", "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest("POST", "/");
final String s = "";
final StringEntity entity = new StringEntity(s, StandardCharsets.US_ASCII);
request.setEntity(entity);
@@ -374,7 +374,7 @@ public class TestStandardInterceptors {
@Test
public void testRequestExpectContinueIgnoreNonenclosingRequests() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final BasicHttpRequest request = new BasicHttpRequest("POST", "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest("POST", "/");
final RequestExpectContinue interceptor = new RequestExpectContinue();
interceptor.process(request, context);
Assert.assertEquals(0, request.getAllHeaders().length);
@@ -384,7 +384,7 @@ public class TestStandardInterceptors {
public void testRequestTargetHostGenerated() throws Exception {
final HttpContext context = new BasicHttpContext(null);
final HttpHost host = new HttpHost("somehost", 8080, "http");
- final BasicHttpRequest request = new BasicHttpRequest("GET", "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest("GET", "/");
request.setAuthority(host.toHostString());
final RequestTargetHost interceptor = new RequestTargetHost();
interceptor.process(request, context);
@@ -396,7 +396,7 @@ public class TestStandardInterceptors {
@Test
public void testRequestTargetHostFallback() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final BasicHttpRequest request = new BasicHttpRequest("GET", "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest("GET", "/");
final InetAddress address = Mockito.mock(InetAddress.class);
Mockito.when(address.getHostName()).thenReturn("somehost");
final HttpConnection conn = Mockito.mock(HttpConnection.class);
@@ -412,7 +412,7 @@ public class TestStandardInterceptors {
@Test(expected=ProtocolException.class)
public void testRequestTargetHostFallbackFailure() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final BasicHttpRequest request = new BasicHttpRequest("GET", "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest("GET", "/");
final HttpConnection conn = Mockito.mock(HttpConnection.class);
Mockito.when(conn.getRemoteAddress()).thenReturn(null);
context.setAttribute(HttpCoreContext.HTTP_CONNECTION, conn);
@@ -424,7 +424,7 @@ public class TestStandardInterceptors {
public void testRequestTargetHostNotGenerated() throws Exception {
final HttpContext context = new BasicHttpContext(null);
final HttpHost host = new HttpHost("somehost", 8080, "http");
- final BasicHttpRequest request = new BasicHttpRequest("GET", "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest("GET", "/");
request.setAuthority(host.toHostString());
request.addHeader(new BasicHeader(HttpHeaders.HOST, "whatever"));
final RequestTargetHost interceptor = new RequestTargetHost();
@@ -438,7 +438,7 @@ public class TestStandardInterceptors {
public void testRequestTargetHostMissingHostHTTP10() throws Exception {
final HttpContext context = new BasicHttpContext(null);
context.setProtocolVersion(HttpVersion.HTTP_1_0);
- final BasicHttpRequest request = new BasicHttpRequest("GET", "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest("GET", "/");
final RequestTargetHost interceptor = new RequestTargetHost();
interceptor.process(request, context);
final Header header = request.getFirstHeader(HttpHeaders.HOST);
@@ -448,7 +448,7 @@ public class TestStandardInterceptors {
@Test
public void testRequestTargetHostMissingHostHTTP11() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final BasicHttpRequest request = new BasicHttpRequest("GET", "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest("GET", "/");
final RequestTargetHost interceptor = new RequestTargetHost();
try {
interceptor.process(request, context);
@@ -468,7 +468,7 @@ public class TestStandardInterceptors {
// expected
}
try {
- interceptor.process(new BasicHttpRequest("GET", "/"), null);
+ interceptor.process(new BasicClassicHttpRequest("GET", "/"), null);
Assert.fail("IllegalArgumentException should have been thrown");
} catch (final IllegalArgumentException ex) {
// expected
@@ -479,7 +479,7 @@ public class TestStandardInterceptors {
public void testRequestTargetHostConnectHttp11() throws Exception {
final HttpContext context = new BasicHttpContext(null);
final HttpHost host = new HttpHost("somehost", 8080, "http");
- final BasicHttpRequest request = new BasicHttpRequest("CONNECT", "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest("CONNECT", "/");
request.setAuthority(host.toHostString());
final RequestTargetHost interceptor = new RequestTargetHost();
interceptor.process(request, context);
@@ -493,7 +493,7 @@ public class TestStandardInterceptors {
final HttpContext context = new BasicHttpContext(null);
context.setProtocolVersion(HttpVersion.HTTP_1_0);
final HttpHost host = new HttpHost("somehost", 8080, "http");
- final BasicHttpRequest request = new BasicHttpRequest("CONNECT", "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest("CONNECT", "/");
request.setAuthority(host.toHostString());
final RequestTargetHost interceptor = new RequestTargetHost();
interceptor.process(request, context);
@@ -504,7 +504,7 @@ public class TestStandardInterceptors {
@Test
public void testRequestUserAgentGenerated() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final BasicHttpRequest request = new BasicHttpRequest("GET", "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest("GET", "/");
final RequestUserAgent interceptor = new RequestUserAgent("some agent");
interceptor.process(request, context);
final Header header = request.getFirstHeader(HttpHeaders.USER_AGENT);
@@ -515,7 +515,7 @@ public class TestStandardInterceptors {
@Test
public void testRequestUserAgentNotGenerated() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final BasicHttpRequest request = new BasicHttpRequest("GET", "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest("GET", "/");
request.addHeader(new BasicHeader(HttpHeaders.USER_AGENT, "whatever"));
final RequestUserAgent interceptor = new RequestUserAgent("some agent");
interceptor.process(request, context);
@@ -527,7 +527,7 @@ public class TestStandardInterceptors {
@Test
public void testRequestUserAgentMissingUserAgent() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final BasicHttpRequest request = new BasicHttpRequest("GET", "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest("GET", "/");
final RequestUserAgent interceptor = new RequestUserAgent();
interceptor.process(request, context);
final Header header = request.getFirstHeader(HttpHeaders.USER_AGENT);
@@ -548,7 +548,7 @@ public class TestStandardInterceptors {
@Test
public void testResponseConnControlNoEntity() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final HttpResponse response = new BasicHttpResponse(HttpStatus.SC_OK, "OK");
+ final ClassicHttpResponse response = new BasicClassicHttpResponse(HttpStatus.SC_OK, "OK");
final ResponseConnControl interceptor = new ResponseConnControl();
interceptor.process(response, context);
final Header header = response.getFirstHeader(HttpHeaders.CONNECTION);
@@ -558,7 +558,7 @@ public class TestStandardInterceptors {
@Test
public void testResponseConnControlEntityContentLength() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final HttpResponse response = new BasicHttpResponse(HttpStatus.SC_OK, "OK");
+ final ClassicHttpResponse response = new BasicClassicHttpResponse(HttpStatus.SC_OK, "OK");
final StringEntity entity = new StringEntity("whatever");
response.setEntity(entity);
final ResponseConnControl interceptor = new ResponseConnControl();
@@ -570,10 +570,10 @@ public class TestStandardInterceptors {
@Test
public void testResponseConnControlEntityUnknownContentLength() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final BasicHttpRequest request = new BasicHttpRequest("GET", "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest("GET", "/");
request.addHeader(new BasicHeader(HttpHeaders.CONNECTION, "keep-alive"));
context.setAttribute(HttpCoreContext.HTTP_REQUEST, request);
- final HttpResponse response = new BasicHttpResponse(HttpStatus.SC_OK, "OK");
+ final ClassicHttpResponse response = new BasicClassicHttpResponse(HttpStatus.SC_OK, "OK");
final BasicHttpEntity entity = new BasicHttpEntity();
response.setEntity(entity);
final ResponseConnControl interceptor = new ResponseConnControl();
@@ -586,7 +586,7 @@ public class TestStandardInterceptors {
@Test
public void testResponseConnControlEntityChunked() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final HttpResponse response = new BasicHttpResponse(HttpStatus.SC_OK, "OK");
+ final ClassicHttpResponse response = new BasicClassicHttpResponse(HttpStatus.SC_OK, "OK");
final BasicHttpEntity entity = new BasicHttpEntity();
entity.setChunked(true);
response.setEntity(entity);
@@ -600,11 +600,11 @@ public class TestStandardInterceptors {
public void testResponseConnControlEntityUnknownContentLengthHTTP10() throws Exception {
final HttpContext context = new BasicHttpContext(null);
context.setProtocolVersion(HttpVersion.HTTP_1_0);
- final BasicHttpRequest request = new BasicHttpRequest("GET", "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest("GET", "/");
request.addHeader(new BasicHeader(HttpHeaders.CONNECTION, "keep-alive"));
context.setAttribute(HttpCoreContext.HTTP_REQUEST, request);
- final BasicHttpResponse response = new BasicHttpResponse(HttpStatus.SC_OK, "OK");
+ final BasicClassicHttpResponse response = new BasicClassicHttpResponse(HttpStatus.SC_OK, "OK");
final BasicHttpEntity entity = new BasicHttpEntity();
response.setEntity(entity);
final ResponseConnControl interceptor = new ResponseConnControl();
@@ -617,11 +617,11 @@ public class TestStandardInterceptors {
@Test
public void testResponseConnControlClientRequest() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final BasicHttpRequest request = new BasicHttpRequest("GET", "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest("GET", "/");
request.addHeader(new BasicHeader(HttpHeaders.CONNECTION, "keep-alive"));
context.setAttribute(HttpCoreContext.HTTP_REQUEST, request);
- final HttpResponse response = new BasicHttpResponse(HttpStatus.SC_OK, "OK");
+ final ClassicHttpResponse response = new BasicClassicHttpResponse(HttpStatus.SC_OK, "OK");
final StringEntity entity = new StringEntity("whatever");
response.setEntity(entity);
final ResponseConnControl interceptor = new ResponseConnControl();
@@ -634,10 +634,10 @@ public class TestStandardInterceptors {
@Test
public void testResponseConnControlClientRequest2() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final BasicHttpRequest request = new BasicHttpRequest("GET", "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest("GET", "/");
context.setAttribute(HttpCoreContext.HTTP_REQUEST, request);
- final HttpResponse response = new BasicHttpResponse(HttpStatus.SC_OK, "OK");
+ final ClassicHttpResponse response = new BasicClassicHttpResponse(HttpStatus.SC_OK, "OK");
final StringEntity entity = new StringEntity("whatever");
response.setEntity(entity);
final ResponseConnControl interceptor = new ResponseConnControl();
@@ -650,10 +650,10 @@ public class TestStandardInterceptors {
public void testResponseConnControl10Client11Response() throws Exception {
final HttpContext context = new BasicHttpContext(null);
context.setProtocolVersion(HttpVersion.HTTP_1_0);
- final BasicHttpRequest request = new BasicHttpRequest("GET", "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest("GET", "/");
context.setAttribute(HttpCoreContext.HTTP_REQUEST, request);
- final HttpResponse response = new BasicHttpResponse(HttpStatus.SC_OK, "OK");
+ final ClassicHttpResponse response = new BasicClassicHttpResponse(HttpStatus.SC_OK, "OK");
final StringEntity entity = new StringEntity("whatever");
response.setEntity(entity);
final ResponseConnControl interceptor = new ResponseConnControl();
@@ -666,7 +666,7 @@ public class TestStandardInterceptors {
@Test
public void testResponseConnControlStatusCode() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final BasicHttpRequest request = new BasicHttpRequest("GET", "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest("GET", "/");
request.addHeader(new BasicHeader(HttpHeaders.CONNECTION, "keep-alive"));
context.setAttribute(HttpCoreContext.HTTP_REQUEST, request);
@@ -682,7 +682,7 @@ public class TestStandardInterceptors {
HttpStatus.SC_NOT_IMPLEMENTED };
for (final int statusCode : statusCodes) {
- final HttpResponse response = new BasicHttpResponse(statusCode, "Unreasonable");
+ final ClassicHttpResponse response = new BasicClassicHttpResponse(statusCode, "Unreasonable");
interceptor.process(response, context);
final Header header = response.getFirstHeader(HttpHeaders.CONNECTION);
Assert.assertNotNull(header);
@@ -694,13 +694,13 @@ public class TestStandardInterceptors {
@Test
public void testResponseConnControlExplicitClose() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final BasicHttpRequest request = new BasicHttpRequest("GET", "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest("GET", "/");
request.addHeader(new BasicHeader(HttpHeaders.CONNECTION, "keep-alive"));
context.setAttribute(HttpCoreContext.HTTP_REQUEST, request);
final ResponseConnControl interceptor = new ResponseConnControl();
- final HttpResponse response = new BasicHttpResponse(200, "OK");
+ final ClassicHttpResponse response = new BasicClassicHttpResponse(200, "OK");
response.setHeader(HttpHeaders.CONNECTION, "close");
interceptor.process(response, context);
final Header header = response.getFirstHeader(HttpHeaders.CONNECTION);
@@ -718,7 +718,7 @@ public class TestStandardInterceptors {
// expected
}
try {
- final HttpResponse response = new BasicHttpResponse(HttpStatus.SC_OK, "OK");
+ final ClassicHttpResponse response = new BasicClassicHttpResponse(HttpStatus.SC_OK, "OK");
interceptor.process(response, null);
Assert.fail("IllegalArgumentException should have been thrown");
} catch (final IllegalArgumentException ex) {
@@ -729,7 +729,7 @@ public class TestStandardInterceptors {
@Test
public void testResponseContentNoEntity() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final HttpResponse response = new BasicHttpResponse(HttpStatus.SC_OK, "OK");
+ final ClassicHttpResponse response = new BasicClassicHttpResponse(HttpStatus.SC_OK, "OK");
final ResponseContent interceptor = new ResponseContent();
interceptor.process(response, context);
final Header header = response.getFirstHeader(HttpHeaders.CONTENT_LENGTH);
@@ -740,7 +740,7 @@ public class TestStandardInterceptors {
@Test
public void testResponseContentStatusNoContent() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final HttpResponse response = new BasicHttpResponse(HttpStatus.SC_OK, "OK");
+ final ClassicHttpResponse response = new BasicClassicHttpResponse(HttpStatus.SC_OK, "OK");
response.setCode(HttpStatus.SC_NO_CONTENT);
final ResponseContent interceptor = new ResponseContent();
interceptor.process(response, context);
@@ -751,7 +751,7 @@ public class TestStandardInterceptors {
@Test
public void testResponseContentStatusResetContent() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final HttpResponse response = new BasicHttpResponse(HttpStatus.SC_OK, "OK");
+ final ClassicHttpResponse response = new BasicClassicHttpResponse(HttpStatus.SC_OK, "OK");
response.setCode(HttpStatus.SC_RESET_CONTENT);
final ResponseContent interceptor = new ResponseContent();
interceptor.process(response, context);
@@ -762,7 +762,7 @@ public class TestStandardInterceptors {
@Test
public void testResponseContentStatusNotModified() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final HttpResponse response = new BasicHttpResponse(HttpStatus.SC_OK, "OK");
+ final ClassicHttpResponse response = new BasicClassicHttpResponse(HttpStatus.SC_OK, "OK");
response.setCode(HttpStatus.SC_NOT_MODIFIED);
final ResponseContent interceptor = new ResponseContent();
interceptor.process(response, context);
@@ -773,7 +773,7 @@ public class TestStandardInterceptors {
@Test
public void testResponseContentEntityChunked() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final HttpResponse response = new BasicHttpResponse(HttpStatus.SC_OK, "OK");
+ final ClassicHttpResponse response = new BasicClassicHttpResponse(HttpStatus.SC_OK, "OK");
final BasicHttpEntity entity = new BasicHttpEntity();
entity.setChunked(true);
response.setEntity(entity);
@@ -789,7 +789,7 @@ public class TestStandardInterceptors {
@Test
public void testResponseContentEntityContentLenghtDelimited() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final HttpResponse response = new BasicHttpResponse(HttpStatus.SC_OK, "OK");
+ final ClassicHttpResponse response = new BasicClassicHttpResponse(HttpStatus.SC_OK, "OK");
final BasicHttpEntity entity = new BasicHttpEntity();
entity.setContentLength (10);
response.setEntity(entity);
@@ -805,7 +805,7 @@ public class TestStandardInterceptors {
@Test
public void testResponseContentEntityUnknownContentLength() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final HttpResponse response = new BasicHttpResponse(HttpStatus.SC_OK, "OK");
+ final ClassicHttpResponse response = new BasicClassicHttpResponse(HttpStatus.SC_OK, "OK");
final BasicHttpEntity entity = new BasicHttpEntity();
response.setEntity(entity);
final ResponseContent interceptor = new ResponseContent();
@@ -820,7 +820,7 @@ public class TestStandardInterceptors {
public void testResponseContentEntityChunkedHTTP10() throws Exception {
final HttpContext context = new BasicHttpContext(null);
context.setProtocolVersion(HttpVersion.HTTP_1_0);
- final BasicHttpResponse response = new BasicHttpResponse(HttpStatus.SC_OK, "OK");
+ final BasicClassicHttpResponse response = new BasicClassicHttpResponse(HttpStatus.SC_OK, "OK");
final BasicHttpEntity entity = new BasicHttpEntity();
entity.setChunked(true);
response.setEntity(entity);
@@ -835,7 +835,7 @@ public class TestStandardInterceptors {
@Test
public void testResponseContentEntityNoContentTypeAndEncoding() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final HttpResponse response = new BasicHttpResponse(HttpStatus.SC_OK, "OK");
+ final ClassicHttpResponse response = new BasicClassicHttpResponse(HttpStatus.SC_OK, "OK");
final BasicHttpEntity entity = new BasicHttpEntity();
response.setEntity(entity);
final ResponseContent interceptor = new ResponseContent();
@@ -849,7 +849,7 @@ public class TestStandardInterceptors {
@Test
public void testResponseContentEntityContentTypeAndEncoding() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final HttpResponse response = new BasicHttpResponse(HttpStatus.SC_OK, "OK");
+ final ClassicHttpResponse response = new BasicClassicHttpResponse(HttpStatus.SC_OK, "OK");
final BasicHttpEntity entity = new BasicHttpEntity();
entity.setContentEncoding("whatever");
entity.setContentType("whatever");
@@ -880,7 +880,7 @@ public class TestStandardInterceptors {
final ResponseContent interceptor = new ResponseContent();
final HttpContext context = new BasicHttpContext(null);
try {
- final HttpResponse response = new BasicHttpResponse(HttpStatus.SC_OK, "OK");
+ final ClassicHttpResponse response = new BasicClassicHttpResponse(HttpStatus.SC_OK, "OK");
response.addHeader(new BasicHeader(HttpHeaders.CONTENT_LENGTH, "10"));
interceptor.process(response, context);
Assert.fail("ProtocolException should have been thrown");
@@ -888,7 +888,7 @@ public class TestStandardInterceptors {
// expected
}
try {
- final HttpResponse response = new BasicHttpResponse(HttpStatus.SC_OK, "OK");
+ final ClassicHttpResponse response = new BasicClassicHttpResponse(HttpStatus.SC_OK, "OK");
response.addHeader(new BasicHeader(HttpHeaders.TRANSFER_ENCODING, "stuff"));
interceptor.process(response, context);
Assert.fail("ProtocolException should have been thrown");
@@ -901,7 +901,7 @@ public class TestStandardInterceptors {
public void testResponseContentOverwriteHeaders() throws Exception {
final ResponseContent interceptor = new ResponseContent(true);
final HttpContext context = new BasicHttpContext(null);
- final HttpResponse response = new BasicHttpResponse(HttpStatus.SC_OK, "OK");
+ final ClassicHttpResponse response = new BasicClassicHttpResponse(HttpStatus.SC_OK, "OK");
response.addHeader(new BasicHeader(HttpHeaders.CONTENT_LENGTH, "10"));
response.addHeader(new BasicHeader(HttpHeaders.TRANSFER_ENCODING, "whatever"));
interceptor.process(response, context);
@@ -912,7 +912,7 @@ public class TestStandardInterceptors {
public void testResponseContentAddHeaders() throws Exception {
final ResponseContent interceptor = new ResponseContent(true);
final HttpContext context = new BasicHttpContext(null);
- final HttpResponse response = new BasicHttpResponse(HttpStatus.SC_OK, "OK");
+ final ClassicHttpResponse response = new BasicClassicHttpResponse(HttpStatus.SC_OK, "OK");
interceptor.process(response, context);
Assert.assertEquals("0", response.getFirstHeader(HttpHeaders.CONTENT_LENGTH).getValue());
Assert.assertNull(response.getFirstHeader(HttpHeaders.TRANSFER_ENCODING));
@@ -921,7 +921,7 @@ public class TestStandardInterceptors {
@Test
public void testResponseContentEntityWithTrailers() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final HttpResponse response = new BasicHttpResponse(HttpStatus.SC_OK, "OK");
+ final ClassicHttpResponse response = new BasicClassicHttpResponse(HttpStatus.SC_OK, "OK");
final String s = "whatever";
final StringEntity entity = new StringEntity(s, StandardCharsets.US_ASCII);
response.setEntity(new HttpEntityWithTrailers(entity,
@@ -939,7 +939,7 @@ public class TestStandardInterceptors {
@Test
public void testResponseDateGenerated() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final HttpResponse response = new BasicHttpResponse(HttpStatus.SC_OK, "OK");
+ final ClassicHttpResponse response = new BasicClassicHttpResponse(HttpStatus.SC_OK, "OK");
final ResponseDate interceptor = new ResponseDate();
interceptor.process(response, context);
final Header h1 = response.getFirstHeader(HttpHeaders.DATE);
@@ -952,7 +952,7 @@ public class TestStandardInterceptors {
@Test
public void testResponseDateNotGenerated() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final HttpResponse response = new BasicHttpResponse(HttpStatus.SC_OK, "OK");
+ final ClassicHttpResponse response = new BasicClassicHttpResponse(HttpStatus.SC_OK, "OK");
response.setCode(199);
final ResponseDate interceptor = new ResponseDate();
interceptor.process(response, context);
@@ -974,7 +974,7 @@ public class TestStandardInterceptors {
@Test
public void testRequestDateGenerated() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final BasicHttpRequest request = new BasicHttpRequest("POST", "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest("POST", "/");
request.setEntity(new StringEntity("stuff"));
final RequestDate interceptor = new RequestDate();
@@ -989,7 +989,7 @@ public class TestStandardInterceptors {
@Test
public void testRequestDateNotGenerated() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final BasicHttpRequest request = new BasicHttpRequest("GET", "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest("GET", "/");
final RequestDate interceptor = new RequestDate();
interceptor.process(request, context);
@@ -1011,7 +1011,7 @@ public class TestStandardInterceptors {
@Test
public void testResponseServerGenerated() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final HttpResponse response = new BasicHttpResponse(HttpStatus.SC_OK, "OK");
+ final ClassicHttpResponse response = new BasicClassicHttpResponse(HttpStatus.SC_OK, "OK");
final ResponseServer interceptor = new ResponseServer("some server");
interceptor.process(response, context);
final Header h1 = response.getFirstHeader(HttpHeaders.SERVER);
@@ -1022,7 +1022,7 @@ public class TestStandardInterceptors {
@Test
public void testResponseServerNotGenerated() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final HttpResponse response = new BasicHttpResponse(HttpStatus.SC_OK, "OK");
+ final ClassicHttpResponse response = new BasicClassicHttpResponse(HttpStatus.SC_OK, "OK");
response.addHeader(new BasicHeader(HttpHeaders.SERVER, "whatever"));
final ResponseServer interceptor = new ResponseServer("some server");
interceptor.process(response, context);
@@ -1034,7 +1034,7 @@ public class TestStandardInterceptors {
@Test
public void testResponseServerMissing() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final HttpResponse response = new BasicHttpResponse(HttpStatus.SC_OK, "OK");
+ final ClassicHttpResponse response = new BasicClassicHttpResponse(HttpStatus.SC_OK, "OK");
final ResponseServer interceptor = new ResponseServer();
interceptor.process(response, context);
final Header h1 = response.getFirstHeader(HttpHeaders.SERVER);
@@ -1055,7 +1055,7 @@ public class TestStandardInterceptors {
@Test
public void testRequestHttp10HostHeaderAbsent() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final BasicHttpRequest request = new BasicHttpRequest("GET", "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest("GET", "/");
request.setVersion(HttpVersion.HTTP_1_0);
final RequestValidateHost interceptor = new RequestValidateHost();
interceptor.process(request, context);
@@ -1064,7 +1064,7 @@ public class TestStandardInterceptors {
@Test
public void testRequestHttpHostHeader() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final BasicHttpRequest request = new BasicHttpRequest("GET", "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest("GET", "/");
request.setVersion(HttpVersion.HTTP_1_1);
request.setHeader(HttpHeaders.HOST, "host:8888");
final RequestValidateHost interceptor = new RequestValidateHost();
@@ -1075,7 +1075,7 @@ public class TestStandardInterceptors {
@Test
public void testRequestHttpHostHeaderNoPort() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final BasicHttpRequest request = new BasicHttpRequest("GET", "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest("GET", "/");
request.setVersion(HttpVersion.HTTP_1_1);
request.setHeader(HttpHeaders.HOST, "host");
final RequestValidateHost interceptor = new RequestValidateHost();
@@ -1086,7 +1086,7 @@ public class TestStandardInterceptors {
@Test
public void testRequestHttp11HostHeaderPresent() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final BasicHttpRequest request = new BasicHttpRequest("GET", "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest("GET", "/");
request.setHeader(HttpHeaders.HOST, "blah");
final RequestValidateHost interceptor = new RequestValidateHost();
interceptor.process(request, context);
@@ -1095,7 +1095,7 @@ public class TestStandardInterceptors {
@Test(expected = ProtocolException.class)
public void testRequestHttp11HostHeaderAbsent() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final BasicHttpRequest request = new BasicHttpRequest("GET", "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest("GET", "/");
final RequestValidateHost interceptor = new RequestValidateHost();
interceptor.process(request, context);
}
@@ -1103,7 +1103,7 @@ public class TestStandardInterceptors {
@Test(expected = ProtocolException.class)
public void testRequestHttp11MultipleHostHeaders() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final BasicHttpRequest request = new BasicHttpRequest("GET", "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest("GET", "/");
request.addHeader(HttpHeaders.HOST, "blah");
request.addHeader(HttpHeaders.HOST, "blah");
final RequestValidateHost interceptor = new RequestValidateHost();
Modified: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/testserver/io/HttpClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/testserver/io/HttpClient.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/testserver/io/HttpClient.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/testserver/io/HttpClient.java Sun Aug 28 19:04:49 2016
@@ -34,8 +34,8 @@ import java.net.Socket;
import org.apache.hc.core5.http.ConnectionReuseStrategy;
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.DefaultConnectionReuseStrategy;
import org.apache.hc.core5.http.impl.io.DefaultBHttpClientConnection;
import org.apache.hc.core5.http.impl.io.HttpRequestExecutor;
@@ -99,8 +99,8 @@ public class HttpClient {
conn.setSocketTimeout(this.timeout);
}
- public HttpResponse execute(
- final HttpRequest request,
+ public ClassicHttpResponse execute(
+ final ClassicHttpRequest request,
final HttpHost targetHost,
final HttpClientConnection conn) throws HttpException, IOException {
if (request.getAuthority() == null) {
@@ -108,12 +108,12 @@ public class HttpClient {
request.setScheme(targetHost.getSchemeName());
}
this.httpexecutor.preProcess(request, this.httpproc, this.context);
- final HttpResponse response = this.httpexecutor.execute(request, conn, this.context);
+ final ClassicHttpResponse response = this.httpexecutor.execute(request, conn, this.context);
this.httpexecutor.postProcess(response, this.httpproc, this.context);
return response;
}
- public boolean keepAlive(final HttpRequest request, final HttpResponse response) {
+ public boolean keepAlive(final ClassicHttpRequest request, final ClassicHttpResponse response) {
return this.connStrategy.keepAlive(request, response, this.context);
}
Modified: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/testserver/io/LoggingBHttpClientConnection.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/testserver/io/LoggingBHttpClientConnection.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/testserver/io/LoggingBHttpClientConnection.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/testserver/io/LoggingBHttpClientConnection.java Sun Aug 28 19:04:49 2016
@@ -40,8 +40,8 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hc.core5.http.ContentLengthStrategy;
import org.apache.hc.core5.http.Header;
-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.HttpVersion;
import org.apache.hc.core5.http.config.MessageConstraints;
import org.apache.hc.core5.http.impl.io.DefaultBHttpClientConnection;
@@ -67,8 +67,8 @@ public class LoggingBHttpClientConnectio
final MessageConstraints constraints,
final ContentLengthStrategy incomingContentStrategy,
final ContentLengthStrategy outgoingContentStrategy,
- final HttpMessageWriterFactory<HttpRequest> requestWriterFactory,
- final HttpMessageParserFactory<HttpResponse> responseParserFactory) {
+ final HttpMessageWriterFactory<ClassicHttpRequest> requestWriterFactory,
+ final HttpMessageParserFactory<ClassicHttpResponse> responseParserFactory) {
super(buffersize, fragmentSizeHint, chardecoder, charencoder,
constraints, incomingContentStrategy, outgoingContentStrategy,
requestWriterFactory, responseParserFactory);
@@ -106,7 +106,7 @@ public class LoggingBHttpClientConnectio
}
@Override
- protected void onResponseReceived(final HttpResponse response) {
+ protected void onResponseReceived(final ClassicHttpResponse response) {
if (response != null && this.headerlog.isDebugEnabled()) {
this.headerlog.debug(this.id + " << " + new StatusLine(
response.getVersion() != null ? response.getVersion() : HttpVersion.HTTP_1_1,
@@ -119,7 +119,7 @@ public class LoggingBHttpClientConnectio
}
@Override
- protected void onRequestSubmitted(final HttpRequest request) {
+ protected void onRequestSubmitted(final ClassicHttpRequest request) {
if (request != null && this.headerlog.isDebugEnabled()) {
this.headerlog.debug(id + " >> " + new RequestLine(request.getMethod(), request.getPath(),
request.getVersion() != null ? request.getVersion() : HttpVersion.HTTP_1_1));
Modified: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/testserver/io/LoggingBHttpServerConnection.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/testserver/io/LoggingBHttpServerConnection.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/testserver/io/LoggingBHttpServerConnection.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/testserver/io/LoggingBHttpServerConnection.java Sun Aug 28 19:04:49 2016
@@ -40,8 +40,8 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hc.core5.http.ContentLengthStrategy;
import org.apache.hc.core5.http.Header;
-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.HttpVersion;
import org.apache.hc.core5.http.config.MessageConstraints;
import org.apache.hc.core5.http.impl.io.DefaultBHttpServerConnection;
@@ -67,8 +67,8 @@ public class LoggingBHttpServerConnectio
final MessageConstraints constraints,
final ContentLengthStrategy incomingContentStrategy,
final ContentLengthStrategy outgoingContentStrategy,
- final HttpMessageParserFactory<HttpRequest> requestParserFactory,
- final HttpMessageWriterFactory<HttpResponse> responseWriterFactory) {
+ final HttpMessageParserFactory<ClassicHttpRequest> requestParserFactory,
+ final HttpMessageWriterFactory<ClassicHttpResponse> responseWriterFactory) {
super(buffersize, fragmentSizeHint, chardecoder, charencoder, constraints,
incomingContentStrategy, outgoingContentStrategy,
requestParserFactory, responseWriterFactory);
@@ -106,7 +106,7 @@ public class LoggingBHttpServerConnectio
}
@Override
- protected void onRequestReceived(final HttpRequest request) {
+ protected void onRequestReceived(final ClassicHttpRequest request) {
if (request != null && this.headerlog.isDebugEnabled()) {
this.headerlog.debug(id + " >> " + new RequestLine(request.getMethod(), request.getPath(),
request.getVersion() != null ? request.getVersion() : HttpVersion.HTTP_1_1));
@@ -118,7 +118,7 @@ public class LoggingBHttpServerConnectio
}
@Override
- protected void onResponseSubmitted(final HttpResponse response) {
+ protected void onResponseSubmitted(final ClassicHttpResponse response) {
if (response != null && this.headerlog.isDebugEnabled()) {
this.headerlog.debug(this.id + " << " + new StatusLine(
response.getVersion() != null ? response.getVersion() : HttpVersion.HTTP_1_1,
Modified: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/testserver/nio/HttpClientNio.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/testserver/nio/HttpClientNio.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/testserver/nio/HttpClientNio.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/testserver/nio/HttpClientNio.java Sun Aug 28 19:04:49 2016
@@ -36,8 +36,8 @@ 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.OoopsieRuntimeException;
import org.apache.hc.core5.http.impl.nio.BasicAsyncRequestProducer;
import org.apache.hc.core5.http.impl.nio.BasicAsyncResponseConsumer;
@@ -119,11 +119,11 @@ public class HttpClientNio {
context != null ? context : HttpCoreContext.create(), callback);
}
- public Future<HttpResponse> execute(
+ public Future<ClassicHttpResponse> execute(
final HttpHost target,
- final HttpRequest request,
+ final ClassicHttpRequest request,
final HttpContext context,
- final FutureCallback<HttpResponse> callback) {
+ final FutureCallback<ClassicHttpResponse> callback) {
return execute(
new BasicAsyncRequestProducer(target, request),
new BasicAsyncResponseConsumer(),
@@ -131,16 +131,16 @@ public class HttpClientNio {
callback);
}
- public Future<List<HttpResponse>> executePipelined(
+ public Future<List<ClassicHttpResponse>> executePipelined(
final HttpHost target,
- final List<HttpRequest> requests,
+ final List<ClassicHttpRequest> requests,
final HttpContext context,
- final FutureCallback<List<HttpResponse>> callback) {
+ final FutureCallback<List<ClassicHttpResponse>> callback) {
final List<HttpAsyncRequestProducer> requestProducers =
new ArrayList<>(requests.size());
- final List<HttpAsyncResponseConsumer<HttpResponse>> responseConsumers =
+ final List<HttpAsyncResponseConsumer<ClassicHttpResponse>> responseConsumers =
new ArrayList<>(requests.size());
- for (final HttpRequest request: requests) {
+ for (final ClassicHttpRequest request: requests) {
requestProducers.add(new BasicAsyncRequestProducer(target, request));
responseConsumers.add(new BasicAsyncResponseConsumer());
}
@@ -148,29 +148,29 @@ public class HttpClientNio {
context != null ? context : HttpCoreContext.create(), callback);
}
- public Future<HttpResponse> execute(
+ public Future<ClassicHttpResponse> execute(
final HttpHost target,
- final HttpRequest request,
+ final ClassicHttpRequest request,
final HttpContext context) {
return execute(target, request, context, null);
}
- public Future<List<HttpResponse>> executePipelined(
+ public Future<List<ClassicHttpResponse>> executePipelined(
final HttpHost target,
- final List<HttpRequest> requests,
+ final List<ClassicHttpRequest> requests,
final HttpContext context) {
return executePipelined(target, requests, context, null);
}
- public Future<HttpResponse> execute(
+ public Future<ClassicHttpResponse> execute(
final HttpHost target,
- final HttpRequest request) {
+ final ClassicHttpRequest request) {
return execute(target, request, null, null);
}
- public Future<List<HttpResponse>> executePipelined(
+ public Future<List<ClassicHttpResponse>> executePipelined(
final HttpHost target,
- final HttpRequest... requests) {
+ final ClassicHttpRequest... requests) {
return executePipelined(target, Arrays.asList(requests), null, null);
}
Modified: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/testserver/nio/LoggingNHttpClientConnection.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/testserver/nio/LoggingNHttpClientConnection.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/testserver/nio/LoggingNHttpClientConnection.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/testserver/nio/LoggingNHttpClientConnection.java Sun Aug 28 19:04:49 2016
@@ -34,8 +34,8 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hc.core5.http.Header;
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.HttpVersion;
import org.apache.hc.core5.http.impl.nio.DefaultNHttpClientConnection;
import org.apache.hc.core5.http.message.RequestLine;
@@ -82,7 +82,7 @@ public class LoggingNHttpClientConnectio
}
@Override
- public void submitRequest(final HttpRequest request) throws IOException, HttpException {
+ public void submitRequest(final ClassicHttpRequest request) throws IOException, HttpException {
if (this.log.isDebugEnabled()) {
this.log.debug(this.id + ": " + request.getMethod() + " " + request.getPath());
}
@@ -106,7 +106,7 @@ public class LoggingNHttpClientConnectio
}
@Override
- protected void onResponseReceived(final HttpResponse response) {
+ protected void onResponseReceived(final ClassicHttpResponse response) {
if (response != null && this.headerlog.isDebugEnabled()) {
this.headerlog.debug(this.id + " << " + new StatusLine(
response.getVersion() != null ? response.getVersion() : HttpVersion.HTTP_1_1,
@@ -119,7 +119,7 @@ public class LoggingNHttpClientConnectio
}
@Override
- protected void onRequestSubmitted(final HttpRequest request) {
+ protected void onRequestSubmitted(final ClassicHttpRequest request) {
if (request != null && this.headerlog.isDebugEnabled()) {
this.headerlog.debug(id + " >> " + new RequestLine(request.getMethod(), request.getPath(),
request.getVersion() != null ? request.getVersion() : HttpVersion.HTTP_1_1));