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 [6/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/impl/nio/TestHttpAsyncService.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/nio/TestHttpAsyncService.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/nio/TestHttpAsyncService.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/nio/TestHttpAsyncService.java Sun Aug 28 19:04:49 2016
@@ -37,8 +37,8 @@ import org.apache.hc.core5.http.Connecti
import org.apache.hc.core5.http.HeaderElements;
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.HttpResponseFactory;
import org.apache.hc.core5.http.HttpStatus;
import org.apache.hc.core5.http.impl.DefaultHttpResponseFactory;
@@ -46,8 +46,8 @@ import org.apache.hc.core5.http.impl.nio
import org.apache.hc.core5.http.impl.nio.HttpAsyncService.Outgoing;
import org.apache.hc.core5.http.impl.nio.HttpAsyncService.PipelineEntry;
import org.apache.hc.core5.http.impl.nio.HttpAsyncService.State;
-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.ContentDecoder;
import org.apache.hc.core5.http.nio.ContentEncoder;
import org.apache.hc.core5.http.nio.HttpAsyncExchange;
@@ -138,10 +138,10 @@ public class TestHttpAsyncService {
state.setResponseState(MessageState.COMPLETED);
final HttpContext exchangeContext = new BasicHttpContext();
- final HttpRequest request = new BasicHttpRequest("GET", "/");
+ final ClassicHttpRequest request = new BasicClassicHttpRequest("GET", "/");
final Incoming incoming = new Incoming(request, this.requestHandler, this.requestConsumer, exchangeContext);
state.setIncoming(incoming);
- final HttpResponse response = new BasicHttpResponse(200, "OK");
+ final ClassicHttpResponse response = new BasicClassicHttpResponse(200, "OK");
final Outgoing outgoing = new Outgoing(request, response, this.responseProducer, exchangeContext);
state.setOutgoing(outgoing);
state.setCancellable(this.cancellable);
@@ -160,7 +160,7 @@ public class TestHttpAsyncService {
state.setRequestState(MessageState.READY);
state.setResponseState(MessageState.READY);
final HttpContext exchangeContext = new BasicHttpContext();
- final HttpRequest request = new BasicHttpRequest("GET", "/");
+ final ClassicHttpRequest request = new BasicClassicHttpRequest("GET", "/");
final Incoming incoming = new Incoming(request, this.requestHandler, this.requestConsumer, exchangeContext);
state.setIncoming(incoming);
state.setCancellable(this.cancellable);
@@ -202,17 +202,17 @@ public class TestHttpAsyncService {
state.setRequestState(MessageState.READY);
state.setResponseState(MessageState.READY);
final HttpContext exchangeContext = new BasicHttpContext();
- final HttpRequest request = new BasicHttpRequest("GET", "/");
+ final ClassicHttpRequest request = new BasicClassicHttpRequest("GET", "/");
final Incoming incoming = new Incoming(request, this.requestHandler, this.requestConsumer, exchangeContext);
state.setIncoming(incoming);
- final HttpResponse response = new BasicHttpResponse(200, "OK");
+ final ClassicHttpResponse response = new BasicClassicHttpResponse(200, "OK");
final Outgoing outgoing = new Outgoing(request, response, this.responseProducer, exchangeContext);
state.setOutgoing(outgoing);
state.setCancellable(this.cancellable);
this.connContext.setAttribute(HttpAsyncService.HTTP_EXCHANGE_STATE, state);
Mockito.doThrow(new RuntimeException()).when(this.httpProcessor).process(
- Matchers.any(HttpResponse.class), Matchers.any(HttpContext.class));
+ Matchers.any(ClassicHttpResponse.class), Matchers.any(HttpContext.class));
final HttpException httpex = new HttpException();
try {
this.protocolHandler.exception(this.conn, httpex);
@@ -233,17 +233,17 @@ public class TestHttpAsyncService {
state.setRequestState(MessageState.READY);
state.setResponseState(MessageState.READY);
final HttpContext exchangeContext = new BasicHttpContext();
- final HttpRequest request = new BasicHttpRequest("GET", "/");
+ final ClassicHttpRequest request = new BasicClassicHttpRequest("GET", "/");
final Incoming incoming = new Incoming(request, this.requestHandler, this.requestConsumer, exchangeContext);
state.setIncoming(incoming);
- final HttpResponse response = new BasicHttpResponse(200, "OK");
+ final ClassicHttpResponse response = new BasicClassicHttpResponse(200, "OK");
final Outgoing outgoing = new Outgoing(request, response, this.responseProducer, exchangeContext);
state.setOutgoing(outgoing);
state.setCancellable(this.cancellable);
this.connContext.setAttribute(HttpAsyncService.HTTP_EXCHANGE_STATE, state);
Mockito.doThrow(new IOException()).when(this.httpProcessor).process(
- Matchers.any(HttpResponse.class), Matchers.any(HttpContext.class));
+ Matchers.any(ClassicHttpResponse.class), Matchers.any(HttpContext.class));
final HttpException httpex = new HttpException();
this.protocolHandler.exception(this.conn, httpex);
@@ -262,10 +262,10 @@ public class TestHttpAsyncService {
state.setRequestState(MessageState.READY);
state.setResponseState(MessageState.READY);
final HttpContext exchangeContext = new BasicHttpContext();
- final HttpRequest request = new BasicHttpRequest("GET", "/");
+ final ClassicHttpRequest request = new BasicClassicHttpRequest("GET", "/");
final Incoming incoming = new Incoming(request, this.requestHandler, this.requestConsumer, exchangeContext);
state.setIncoming(incoming);
- final HttpResponse response = new BasicHttpResponse(200, "OK");
+ final ClassicHttpResponse response = new BasicClassicHttpResponse(200, "OK");
final Outgoing outgoing = new Outgoing(request, response, this.responseProducer, exchangeContext);
state.setOutgoing(outgoing);
this.connContext.setAttribute(HttpAsyncService.HTTP_EXCHANGE_STATE, state);
@@ -288,7 +288,7 @@ public class TestHttpAsyncService {
final State state = new State();
this.connContext.setAttribute(HttpAsyncService.HTTP_EXCHANGE_STATE, state);
- final HttpRequest request = new BasicHttpRequest("GET", "/");
+ final ClassicHttpRequest request = new BasicClassicHttpRequest("GET", "/");
Mockito.when(this.conn.getHttpRequest()).thenReturn(request);
Mockito.when(this.requestHandler.processRequest(
Matchers.eq(request), Matchers.any(HttpContext.class))).thenReturn(this.requestConsumer);
@@ -331,7 +331,7 @@ public class TestHttpAsyncService {
state.setResponseState(MessageState.INIT);
this.connContext.setAttribute(HttpAsyncService.HTTP_EXCHANGE_STATE, state);
- final HttpRequest request = new BasicHttpRequest("GET", "/");
+ final ClassicHttpRequest request = new BasicClassicHttpRequest("GET", "/");
Mockito.when(this.conn.getHttpRequest()).thenReturn(request);
Mockito.when(this.requestHandler.processRequest(
Matchers.eq(request), Matchers.any(HttpContext.class))).thenReturn(this.requestConsumer);
@@ -369,14 +369,14 @@ public class TestHttpAsyncService {
final Queue<PipelineEntry> pipeline = state.getRequestQueue();
final HttpContext exchangeContext = new BasicHttpContext();
- final HttpRequest pipelinedRequest = new BasicHttpRequest("GET", "/");
+ final ClassicHttpRequest pipelinedRequest = new BasicClassicHttpRequest("GET", "/");
final PipelineEntry entry = new PipelineEntry(pipelinedRequest, pipelinedRequest,
null, requestHandler, exchangeContext);
pipeline.add(entry);
this.connContext.setAttribute(HttpAsyncService.HTTP_EXCHANGE_STATE, state);
- final HttpRequest request = new BasicHttpRequest("GET", "/");
+ final ClassicHttpRequest request = new BasicClassicHttpRequest("GET", "/");
Mockito.when(this.conn.getHttpRequest()).thenReturn(request);
Mockito.when(this.requestHandler.processRequest(
Matchers.eq(request), Matchers.any(HttpContext.class))).thenReturn(this.requestConsumer);
@@ -412,7 +412,7 @@ public class TestHttpAsyncService {
final State state = new State();
this.connContext.setAttribute(HttpAsyncService.HTTP_EXCHANGE_STATE, state);
- final HttpRequest request = new BasicHttpRequest("POST", "/stuff");
+ final ClassicHttpRequest request = new BasicClassicHttpRequest("POST", "/stuff");
request.setHeader(HttpHeaders.CONTENT_LENGTH, "5");
final NStringEntity entity = new NStringEntity("stuff");
request.setEntity(entity);
@@ -436,7 +436,7 @@ public class TestHttpAsyncService {
final State state = new State();
this.connContext.setAttribute(HttpAsyncService.HTTP_EXCHANGE_STATE, state);
- final HttpRequest request = new BasicHttpRequest("POST", "/");
+ final ClassicHttpRequest request = new BasicClassicHttpRequest("POST", "/");
request.setHeader(HttpHeaders.CONTENT_LENGTH, "5");
final NStringEntity entity = new NStringEntity("stuff");
request.setEntity(entity);
@@ -471,7 +471,7 @@ public class TestHttpAsyncService {
final State state = new State();
this.connContext.setAttribute(HttpAsyncService.HTTP_EXCHANGE_STATE, state);
- final HttpRequest request = new BasicHttpRequest("POST", "/");
+ final ClassicHttpRequest request = new BasicClassicHttpRequest("POST", "/");
request.setHeader(HttpHeaders.CONTENT_LENGTH, "5");
request.setHeader(HttpHeaders.EXPECT, HeaderElements.CONTINUE);
final NStringEntity entity = new NStringEntity("stuff");
@@ -500,11 +500,11 @@ public class TestHttpAsyncService {
Mockito.verify(this.httpProcessor).process(request, exchangeContext);
Mockito.verify(this.requestConsumer).requestReceived(request);
Mockito.verify(this.conn, Mockito.never()).suspendInput();
- Mockito.verify(this.conn).submitResponse(Matchers.argThat(new ArgumentMatcher<HttpResponse>() {
+ Mockito.verify(this.conn).submitResponse(Matchers.argThat(new ArgumentMatcher<ClassicHttpResponse>() {
@Override
public boolean matches(final Object argument) {
- final int status = ((HttpResponse) argument).getCode();
+ final int status = ((ClassicHttpResponse) argument).getCode();
return status == 100;
}
@@ -521,7 +521,7 @@ public class TestHttpAsyncService {
final State state = new State();
this.connContext.setAttribute(HttpAsyncService.HTTP_EXCHANGE_STATE, state);
- final HttpRequest request = new BasicHttpRequest("POST", "/");
+ final ClassicHttpRequest request = new BasicClassicHttpRequest("POST", "/");
request.setHeader(HttpHeaders.CONTENT_LENGTH, "5");
request.setHeader(HttpHeaders.EXPECT, HeaderElements.CONTINUE);
final NStringEntity entity = new NStringEntity("stuff");
@@ -561,7 +561,7 @@ public class TestHttpAsyncService {
final HttpContext exchangeContext = new BasicHttpContext();
- final HttpRequest request = new BasicHttpRequest("POST", "/");
+ final ClassicHttpRequest request = new BasicClassicHttpRequest("POST", "/");
request.setHeader(HttpHeaders.CONTENT_LENGTH, "5");
final NStringEntity entity = new NStringEntity("stuff");
request.setEntity(entity);
@@ -572,12 +572,12 @@ public class TestHttpAsyncService {
final HttpAsyncExchange httpexchanage = this.protocolHandler.new HttpAsyncExchangeImpl(
incoming,
- new BasicHttpRequest("GET", "/"),
- new BasicHttpResponse(100, "Continue"),
+ new BasicClassicHttpRequest("GET", "/"),
+ new BasicClassicHttpResponse(100, "Continue"),
state, this.conn, exchangeContext);
Assert.assertFalse(httpexchanage.isCompleted());
- Mockito.when(this.responseProducer.generateResponse()).thenReturn(new BasicHttpResponse(407, "Oppsie"));
+ Mockito.when(this.responseProducer.generateResponse()).thenReturn(new BasicClassicHttpResponse(407, "Oppsie"));
httpexchanage.submitResponse(this.responseProducer);
Assert.assertTrue(httpexchanage.isCompleted());
Assert.assertTrue(incoming.isEarlyResponse());
@@ -605,8 +605,8 @@ public class TestHttpAsyncService {
final HttpContext exchangeContext = new BasicHttpContext();
final HttpAsyncExchange httpexchanage = protocolHandler.new HttpAsyncExchangeImpl(
- new BasicHttpRequest("GET", "/"),
- new BasicHttpResponse(200, "OK"),
+ new BasicClassicHttpRequest("GET", "/"),
+ new BasicClassicHttpResponse(200, "OK"),
state, this.conn, exchangeContext);
httpexchanage.submitResponse(null);
}
@@ -618,7 +618,7 @@ public class TestHttpAsyncService {
state.setResponseState(MessageState.INIT);
this.connContext.setAttribute(HttpAsyncService.HTTP_EXCHANGE_STATE, state);
- final HttpRequest request = new BasicHttpRequest("POST", "/");
+ final ClassicHttpRequest request = new BasicClassicHttpRequest("POST", "/");
request.setHeader(HttpHeaders.CONTENT_LENGTH, "5");
request.setHeader(HttpHeaders.EXPECT, HeaderElements.CONTINUE);
final NStringEntity entity = new NStringEntity("stuff");
@@ -645,14 +645,14 @@ public class TestHttpAsyncService {
final Queue<PipelineEntry> pipeline = state.getRequestQueue();
final HttpContext exchangeContext = new BasicHttpContext();
- final HttpRequest pipelinedRequest = new BasicHttpRequest("GET", "/");
+ final ClassicHttpRequest pipelinedRequest = new BasicClassicHttpRequest("GET", "/");
final PipelineEntry entry = new PipelineEntry(pipelinedRequest, pipelinedRequest,
null, requestHandler, exchangeContext);
pipeline.add(entry);
this.connContext.setAttribute(HttpAsyncService.HTTP_EXCHANGE_STATE, state);
- final HttpRequest request = new BasicHttpRequest("POST", "/");
+ final ClassicHttpRequest request = new BasicClassicHttpRequest("POST", "/");
request.setHeader(HttpHeaders.CONTENT_LENGTH, "5");
request.setHeader(HttpHeaders.EXPECT, HeaderElements.CONTINUE);
final NStringEntity entity = new NStringEntity("stuff");
@@ -681,7 +681,7 @@ public class TestHttpAsyncService {
this.conn = Mockito.mock(NHttpServerConnection.class,
Mockito.withSettings().extraInterfaces(SessionBufferStatus.class));
- final HttpRequest request = new BasicHttpRequest("POST", "/");
+ final ClassicHttpRequest request = new BasicClassicHttpRequest("POST", "/");
request.setHeader(HttpHeaders.CONTENT_LENGTH, "5");
request.setHeader(HttpHeaders.EXPECT, HeaderElements.CONTINUE);
final NStringEntity entity = new NStringEntity("stuff");
@@ -709,8 +709,8 @@ public class TestHttpAsyncService {
final HttpContext exchangeContext = new BasicHttpContext();
final HttpAsyncExchange httpexchanage = protocolHandler.new HttpAsyncExchangeImpl(
- new BasicHttpRequest("GET", "/"),
- new BasicHttpResponse(100, "Continue"),
+ new BasicClassicHttpRequest("GET", "/"),
+ new BasicClassicHttpResponse(100, "Continue"),
state, this.conn, exchangeContext);
Assert.assertFalse(httpexchanage.isCompleted());
httpexchanage.submitResponse();
@@ -722,7 +722,7 @@ public class TestHttpAsyncService {
Assert.assertNotNull(responseProducer);
Assert.assertEquals(MessageState.ACK_EXPECTED, state.getRequestState());
Assert.assertEquals(MessageState.READY, state.getResponseState());
- final HttpResponse response = responseProducer.generateResponse();
+ final ClassicHttpResponse response = responseProducer.generateResponse();
Assert.assertEquals(HttpStatus.SC_CONTINUE, response.getCode());
Mockito.verify(this.conn).requestOutput();
@@ -738,7 +738,7 @@ public class TestHttpAsyncService {
public void testRequestContent() throws Exception {
final State state = new State();
final HttpContext exchangeContext = new BasicHttpContext();
- final HttpRequest request = new BasicHttpRequest("POST", "/");
+ final ClassicHttpRequest request = new BasicClassicHttpRequest("POST", "/");
request.setHeader(HttpHeaders.CONTENT_LENGTH, "5");
final NStringEntity entity = new NStringEntity("stuff");
request.setEntity(entity);
@@ -761,7 +761,7 @@ public class TestHttpAsyncService {
public void testRequestContentCompleted() throws Exception {
final State state = new State();
final HttpContext exchangeContext = new BasicHttpContext();
- final HttpRequest request = new BasicHttpRequest("POST", "/");
+ final ClassicHttpRequest request = new BasicClassicHttpRequest("POST", "/");
request.setHeader(HttpHeaders.CONTENT_LENGTH, "5");
final NStringEntity entity = new NStringEntity("stuff");
request.setEntity(entity);
@@ -795,7 +795,7 @@ public class TestHttpAsyncService {
public void testRequestCompletedWithException() throws Exception {
final State state = new State();
final HttpContext exchangeContext = new BasicHttpContext();
- final HttpRequest request = new BasicHttpRequest("POST", "/");
+ final ClassicHttpRequest request = new BasicClassicHttpRequest("POST", "/");
request.setHeader(HttpHeaders.CONTENT_LENGTH, "5");
final NStringEntity entity = new NStringEntity("stuff");
request.setEntity(entity);
@@ -828,7 +828,7 @@ public class TestHttpAsyncService {
public void testRequestContentEarlyResponse() throws Exception {
final State state = new State();
final HttpContext exchangeContext = new BasicHttpContext();
- final HttpRequest request = new BasicHttpRequest("POST", "/");
+ final ClassicHttpRequest request = new BasicClassicHttpRequest("POST", "/");
request.setHeader(HttpHeaders.CONTENT_LENGTH, "5");
final NStringEntity entity = new NStringEntity("stuff");
request.setEntity(entity);
@@ -854,7 +854,7 @@ public class TestHttpAsyncService {
public void testRequestContentCompletedEarlyResponse() throws Exception {
final State state = new State();
final HttpContext exchangeContext = new BasicHttpContext();
- final HttpRequest request = new BasicHttpRequest("POST", "/");
+ final ClassicHttpRequest request = new BasicClassicHttpRequest("POST", "/");
request.setHeader(HttpHeaders.CONTENT_LENGTH, "5");
final NStringEntity entity = new NStringEntity("stuff");
request.setEntity(entity);
@@ -883,12 +883,12 @@ public class TestHttpAsyncService {
final State state = new State();
final HttpContext exchangeContext = new BasicHttpContext();
- final HttpRequest request = new BasicHttpRequest("GET", "/");
+ final ClassicHttpRequest request = new BasicClassicHttpRequest("GET", "/");
final Incoming incoming = new Incoming(
request, this.requestHandler, this.requestConsumer, exchangeContext);
state.setIncoming(incoming);
state.setRequestState(MessageState.COMPLETED);
- final HttpResponse response = new BasicHttpResponse(200, "OK");
+ final ClassicHttpResponse response = new BasicClassicHttpResponse(200, "OK");
final Outgoing outgoing = new Outgoing(
request, response, this.responseProducer, exchangeContext);
state.setOutgoing(outgoing);
@@ -912,11 +912,11 @@ public class TestHttpAsyncService {
public void testBasicResponseWithPipelining() throws Exception {
final State state = new State();
final HttpContext exchangeContext = new BasicHttpContext();
- final HttpRequest request = new BasicHttpRequest("GET", "/");
+ final ClassicHttpRequest request = new BasicClassicHttpRequest("GET", "/");
final Incoming incoming = new Incoming(request, this.requestHandler, this.requestConsumer, exchangeContext);
state.setIncoming(incoming);
state.setRequestState(MessageState.COMPLETED);
- final HttpResponse response = new BasicHttpResponse(200, "OK");
+ final ClassicHttpResponse response = new BasicClassicHttpResponse(200, "OK");
final Outgoing outgoing = new Outgoing(request, response, this.responseProducer, exchangeContext);
response.setEntity(new NStringEntity("stuff"));
state.setOutgoing(outgoing);
@@ -924,7 +924,7 @@ public class TestHttpAsyncService {
final Queue<PipelineEntry> pipeline = state.getRequestQueue();
final HttpContext exchangeContext2 = new BasicHttpContext();
- final HttpRequest pipelinedRequest = new BasicHttpRequest("GET", "/");
+ final ClassicHttpRequest pipelinedRequest = new BasicClassicHttpRequest("GET", "/");
final PipelineEntry entry = new PipelineEntry(pipelinedRequest, pipelinedRequest,
null, requestHandler, exchangeContext2);
pipeline.add(entry);
@@ -948,11 +948,11 @@ public class TestHttpAsyncService {
public void testBasicResponseNoKeepAlive() throws Exception {
final State state = new State();
final HttpContext exchangeContext = new BasicHttpContext();
- final HttpRequest request = new BasicHttpRequest("GET", "/");
+ final ClassicHttpRequest request = new BasicClassicHttpRequest("GET", "/");
final Incoming incoming = new Incoming(request, this.requestHandler, this.requestConsumer, exchangeContext);
state.setIncoming(incoming);
state.setRequestState(MessageState.COMPLETED);
- final HttpResponse response = new BasicHttpResponse(200, "OK");
+ final ClassicHttpResponse response = new BasicClassicHttpResponse(200, "OK");
final Outgoing outgoing = new Outgoing(request, response, this.responseProducer, exchangeContext);
state.setOutgoing(outgoing);
state.setResponseState(MessageState.INIT);
@@ -975,11 +975,11 @@ public class TestHttpAsyncService {
public void testEntityEnclosingResponse() throws Exception {
final State state = new State();
final HttpContext exchangeContext = new BasicHttpContext();
- final HttpRequest request = new BasicHttpRequest("GET", "/");
+ final ClassicHttpRequest request = new BasicClassicHttpRequest("GET", "/");
final Incoming incoming = new Incoming(request, this.requestHandler, this.requestConsumer, exchangeContext);
state.setIncoming(incoming);
state.setRequestState(MessageState.COMPLETED);
- final HttpResponse response = new BasicHttpResponse(200, "OK");
+ final ClassicHttpResponse response = new BasicClassicHttpResponse(200, "OK");
final Outgoing outgoing = new Outgoing(request, response, this.responseProducer, exchangeContext);
state.setOutgoing(outgoing);
state.setResponseState(MessageState.INIT);
@@ -1004,11 +1004,11 @@ public class TestHttpAsyncService {
public void testResponseToHead() throws Exception {
final State state = new State();
final HttpContext exchangeContext = new BasicHttpContext();
- final HttpRequest request = new BasicHttpRequest("HEAD", "/");
+ final ClassicHttpRequest request = new BasicClassicHttpRequest("HEAD", "/");
final Incoming incoming = new Incoming(request, this.requestHandler, this.requestConsumer, exchangeContext);
state.setIncoming(incoming);
state.setRequestState(MessageState.COMPLETED);
- final HttpResponse response = new BasicHttpResponse(200, "OK");
+ final ClassicHttpResponse response = new BasicClassicHttpResponse(200, "OK");
final Outgoing outgoing = new Outgoing(request, response, this.responseProducer, exchangeContext);
state.setOutgoing(outgoing);
state.setResponseState(MessageState.INIT);
@@ -1032,11 +1032,11 @@ public class TestHttpAsyncService {
public void testResponseNotModified() throws Exception {
final State state = new State();
final HttpContext exchangeContext = new BasicHttpContext();
- final HttpRequest request = new BasicHttpRequest("HEAD", "/");
+ final ClassicHttpRequest request = new BasicClassicHttpRequest("HEAD", "/");
final Incoming incoming = new Incoming(request, this.requestHandler, this.requestConsumer, exchangeContext);
state.setIncoming(incoming);
state.setRequestState(MessageState.COMPLETED);
- final HttpResponse response = new BasicHttpResponse(HttpStatus.SC_NOT_MODIFIED, "Not modified");
+ final ClassicHttpResponse response = new BasicClassicHttpResponse(HttpStatus.SC_NOT_MODIFIED, "Not modified");
final Outgoing outgoing = new Outgoing(request, response, this.responseProducer, exchangeContext);
state.setOutgoing(outgoing);
state.setResponseState(MessageState.INIT);
@@ -1060,14 +1060,14 @@ public class TestHttpAsyncService {
public void testResponseContinue() throws Exception {
final State state = new State();
final HttpContext exchangeContext = new BasicHttpContext();
- final HttpRequest request = new BasicHttpRequest("POST", "/");
+ final ClassicHttpRequest request = new BasicClassicHttpRequest("POST", "/");
request.setHeader(HttpHeaders.CONTENT_LENGTH, "5");
final NStringEntity entity = new NStringEntity("stuff");
request.setEntity(entity);
final Incoming incoming = new Incoming(request, this.requestHandler, this.requestConsumer, exchangeContext);
state.setIncoming(incoming);
state.setRequestState(MessageState.ACK_EXPECTED);
- final HttpResponse response = new BasicHttpResponse(HttpStatus.SC_CONTINUE, "Continue");
+ final ClassicHttpResponse response = new BasicClassicHttpResponse(HttpStatus.SC_CONTINUE, "Continue");
final Outgoing outgoing = new Outgoing(request, response, this.responseProducer, exchangeContext);
state.setOutgoing(outgoing);
state.setResponseState(MessageState.INIT);
@@ -1081,11 +1081,11 @@ public class TestHttpAsyncService {
Assert.assertEquals(MessageState.READY, state.getResponseState());
Assert.assertEquals(null, state.getOutgoing());
- Mockito.verify(this.conn).submitResponse(Matchers.argThat(new ArgumentMatcher<HttpResponse>() {
+ Mockito.verify(this.conn).submitResponse(Matchers.argThat(new ArgumentMatcher<ClassicHttpResponse>() {
@Override
public boolean matches(final Object argument) {
- final int status = ((HttpResponse) argument).getCode();
+ final int status = ((ClassicHttpResponse) argument).getCode();
return status == 100;
}
@@ -1096,14 +1096,14 @@ public class TestHttpAsyncService {
public void testResponseFailedExpectation() throws Exception {
final State state = new State();
final HttpContext exchangeContext = new BasicHttpContext();
- final HttpRequest request = new BasicHttpRequest("POST", "/");
+ final ClassicHttpRequest request = new BasicClassicHttpRequest("POST", "/");
request.setHeader(HttpHeaders.CONTENT_LENGTH, "5");
final NStringEntity entity = new NStringEntity("stuff");
request.setEntity(entity);
final Incoming incoming = new Incoming(request, this.requestHandler, this.requestConsumer, exchangeContext);
state.setIncoming(incoming);
state.setRequestState(MessageState.ACK_EXPECTED);
- final HttpResponse response = new BasicHttpResponse(417, "Expectation failed");
+ final ClassicHttpResponse response = new BasicClassicHttpResponse(417, "Expectation failed");
final Outgoing outgoing = new Outgoing(request, response, this.responseProducer, exchangeContext);
state.setOutgoing(outgoing);
state.setResponseState(MessageState.INIT);
@@ -1146,7 +1146,7 @@ public class TestHttpAsyncService {
final Queue<PipelineEntry> pipeline = state.getRequestQueue();
final HttpContext exchangeContext = new BasicHttpContext();
- final HttpRequest request = new BasicHttpRequest("GET", "/");
+ final ClassicHttpRequest request = new BasicClassicHttpRequest("GET", "/");
final PipelineEntry entry = new PipelineEntry(request, request, null, requestHandler, exchangeContext);
pipeline.add(entry);
@@ -1176,7 +1176,7 @@ public class TestHttpAsyncService {
final Queue<PipelineEntry> pipeline = state.getRequestQueue();
final HttpContext exchangeContext = new BasicHttpContext();
- final HttpRequest request = new BasicHttpRequest("GET", "/");
+ final ClassicHttpRequest request = new BasicClassicHttpRequest("GET", "/");
final Exception ex = new Exception("Opppsie");
final PipelineEntry entry = new PipelineEntry(request, null, ex, requestHandler, exchangeContext);
pipeline.add(entry);
@@ -1191,11 +1191,11 @@ public class TestHttpAsyncService {
final Outgoing outgoing = state.getOutgoing();
Assert.assertNotNull(outgoing.getProducer());
- final HttpResponse response = outgoing.getResponse();
+ final ClassicHttpResponse response = outgoing.getResponse();
Assert.assertNotNull(response);
Assert.assertEquals(500, response.getCode());
- Mockito.verify(this.requestHandler, Mockito.never()).handle(Matchers.<HttpRequest>any(),
+ Mockito.verify(this.requestHandler, Mockito.never()).handle(Matchers.<ClassicHttpRequest>any(),
Matchers.<HttpAsyncExchange>any(), Matchers.<HttpContext>any());
Mockito.verify(this.conn).submitResponse(Matchers.same(response));
}
@@ -1209,12 +1209,12 @@ public class TestHttpAsyncService {
final HttpContext exchangeContext = new BasicHttpContext();
final HttpAsyncExchange httpexchanage = protocolHandler.new HttpAsyncExchangeImpl(
- new BasicHttpRequest("GET", "/"),
- new BasicHttpResponse(200, "OK"),
+ new BasicClassicHttpRequest("GET", "/"),
+ new BasicClassicHttpResponse(200, "OK"),
state, this.conn, exchangeContext);
Assert.assertFalse(httpexchanage.isCompleted());
- Mockito.when(this.responseProducer.generateResponse()).thenReturn(new BasicHttpResponse(200, "OK"));
+ Mockito.when(this.responseProducer.generateResponse()).thenReturn(new BasicClassicHttpResponse(200, "OK"));
httpexchanage.submitResponse(this.responseProducer);
Assert.assertTrue(httpexchanage.isCompleted());
@@ -1242,8 +1242,8 @@ public class TestHttpAsyncService {
final HttpContext exchangeContext = new BasicHttpContext();
final HttpAsyncExchange httpexchanage = protocolHandler.new HttpAsyncExchangeImpl(
- new BasicHttpRequest("GET", "/"),
- new BasicHttpResponse(200, "OK"),
+ new BasicClassicHttpRequest("GET", "/"),
+ new BasicClassicHttpResponse(200, "OK"),
state, this.conn, exchangeContext);
httpexchanage.submitResponse(null);
}
@@ -1254,8 +1254,8 @@ public class TestHttpAsyncService {
state.setRequestState(MessageState.COMPLETED);
state.setResponseState(MessageState.BODY_STREAM);
final HttpContext exchangeContext = new BasicHttpContext();
- final HttpRequest request = new BasicHttpRequest("GET", "/");
- final HttpResponse response = new BasicHttpResponse(200, "OK");
+ final ClassicHttpRequest request = new BasicClassicHttpRequest("GET", "/");
+ final ClassicHttpResponse response = new BasicClassicHttpResponse(200, "OK");
response.setEntity(new NStringEntity("stuff"));
final Outgoing outgoing = new Outgoing(request, response, this.responseProducer, exchangeContext);
state.setOutgoing(outgoing);
@@ -1278,8 +1278,8 @@ public class TestHttpAsyncService {
state.setRequestState(MessageState.COMPLETED);
state.setResponseState(MessageState.BODY_STREAM);
final HttpContext exchangeContext = new BasicHttpContext();
- final HttpRequest request = new BasicHttpRequest("GET", "/");
- final HttpResponse response = new BasicHttpResponse(200, "OK");
+ final ClassicHttpRequest request = new BasicClassicHttpRequest("GET", "/");
+ final ClassicHttpResponse response = new BasicClassicHttpResponse(200, "OK");
response.setEntity(new NStringEntity("stuff"));
final Outgoing outgoing = new Outgoing(request, response, this.responseProducer, exchangeContext);
state.setOutgoing(outgoing);
@@ -1302,8 +1302,8 @@ public class TestHttpAsyncService {
state.setRequestState(MessageState.COMPLETED);
state.setResponseState(MessageState.BODY_STREAM);
final HttpContext exchangeContext = new BasicHttpContext();
- final HttpRequest request = new BasicHttpRequest("GET", "/");
- final HttpResponse response = new BasicHttpResponse(200, "OK");
+ final ClassicHttpRequest request = new BasicClassicHttpRequest("GET", "/");
+ final ClassicHttpResponse response = new BasicClassicHttpResponse(200, "OK");
response.setEntity(new NStringEntity("stuff"));
final Outgoing outgoing = new Outgoing(request, response, this.responseProducer, exchangeContext);
state.setOutgoing(outgoing);
@@ -1370,10 +1370,10 @@ public class TestHttpAsyncService {
public void testTimeoutClosingConnection() throws Exception {
final State state = new State();
final HttpContext exchangeContext = new BasicHttpContext();
- final HttpRequest request = new BasicHttpRequest("GET", "/");
+ final ClassicHttpRequest request = new BasicClassicHttpRequest("GET", "/");
final Incoming incoming = new Incoming(request, this.requestHandler, this.requestConsumer, exchangeContext);
state.setIncoming(incoming);
- final HttpResponse response = new BasicHttpResponse(200, "OK");
+ final ClassicHttpResponse response = new BasicClassicHttpResponse(200, "OK");
final Outgoing outgoing = new Outgoing(request, response, this.responseProducer, exchangeContext);
state.setOutgoing(outgoing);
this.connContext.setAttribute(HttpAsyncService.HTTP_EXCHANGE_STATE, state);
Modified: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/nio/TestHttpMessageParser.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/nio/TestHttpMessageParser.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/nio/TestHttpMessageParser.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/nio/TestHttpMessageParser.java Sun Aug 28 19:04:49 2016
@@ -36,8 +36,8 @@ import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
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.MessageConstraintException;
import org.apache.hc.core5.http.UnsupportedHttpVersionException;
import org.apache.hc.core5.http.config.MessageConstraints;
@@ -64,9 +64,9 @@ public class TestHttpMessageParser {
@Test
public void testSimpleParsing() throws Exception {
final SessionInputBuffer inbuf = new SessionInputBufferImpl(1024, 128, StandardCharsets.US_ASCII);
- final NHttpMessageParser<HttpRequest> requestParser = new DefaultHttpRequestParser();
+ final NHttpMessageParser<ClassicHttpRequest> requestParser = new DefaultHttpRequestParser();
inbuf.fill(newChannel("GET /whatever HTTP/1.1\r\nSome header: stuff\r\n\r\n"));
- final HttpRequest request = requestParser.parse(inbuf, false);
+ final ClassicHttpRequest request = requestParser.parse(inbuf, false);
Assert.assertNotNull(request);
Assert.assertEquals("/whatever", request.getPath());
Assert.assertEquals(1, request.getAllHeaders().length);
@@ -75,10 +75,10 @@ public class TestHttpMessageParser {
@Test
public void testParsingChunkedMessages() throws Exception {
final SessionInputBuffer inbuf = new SessionInputBufferImpl(1024, 128, StandardCharsets.US_ASCII);
- final NHttpMessageParser<HttpRequest> requestParser = new DefaultHttpRequestParser();
+ final NHttpMessageParser<ClassicHttpRequest> requestParser = new DefaultHttpRequestParser();
inbuf.fill(newChannel("GET /whatev"));
- HttpRequest request = requestParser.parse(inbuf, false);
+ ClassicHttpRequest request = requestParser.parse(inbuf, false);
Assert.assertNull(request);
inbuf.fill(newChannel("er HTTP/1.1\r"));
request = requestParser.parse(inbuf, false);
@@ -95,10 +95,10 @@ public class TestHttpMessageParser {
@Test
public void testParsingFoldedHeaders() throws Exception {
final SessionInputBuffer inbuf = new SessionInputBufferImpl(1024, 128, StandardCharsets.US_ASCII);
- final NHttpMessageParser<HttpRequest> requestParser = new DefaultHttpRequestParser();
+ final NHttpMessageParser<ClassicHttpRequest> requestParser = new DefaultHttpRequestParser();
inbuf.fill(newChannel("GET /whatev"));
- HttpRequest request = requestParser.parse(inbuf, false);
+ ClassicHttpRequest request = requestParser.parse(inbuf, false);
Assert.assertNull(request);
inbuf.fill(newChannel("er HTTP/1.1\r"));
request = requestParser.parse(inbuf, false);
@@ -124,10 +124,10 @@ public class TestHttpMessageParser {
@Test
public void testParsingBadlyFoldedFirstHeader() throws Exception {
final SessionInputBuffer inbuf = new SessionInputBufferImpl(1024, 128, StandardCharsets.US_ASCII);
- final NHttpMessageParser<HttpRequest> requestParser = new DefaultHttpRequestParser();
+ final NHttpMessageParser<ClassicHttpRequest> requestParser = new DefaultHttpRequestParser();
inbuf.fill(newChannel("GET /whatev"));
- HttpRequest request = requestParser.parse(inbuf, false);
+ ClassicHttpRequest request = requestParser.parse(inbuf, false);
Assert.assertNull(request);
inbuf.fill(newChannel("er HTTP/1.1\r"));
request = requestParser.parse(inbuf, false);
@@ -150,10 +150,10 @@ public class TestHttpMessageParser {
@Test
public void testParsingEmptyFoldedHeader() throws Exception {
final SessionInputBuffer inbuf = new SessionInputBufferImpl(1024, 128, StandardCharsets.US_ASCII);
- final NHttpMessageParser<HttpRequest> requestParser = new DefaultHttpRequestParser();
+ final NHttpMessageParser<ClassicHttpRequest> requestParser = new DefaultHttpRequestParser();
inbuf.fill(newChannel("GET /whatev"));
- HttpRequest request = requestParser.parse(inbuf, false);
+ ClassicHttpRequest request = requestParser.parse(inbuf, false);
Assert.assertNull(request);
inbuf.fill(newChannel("er HTTP/1.1\r"));
request = requestParser.parse(inbuf, false);
@@ -179,22 +179,22 @@ public class TestHttpMessageParser {
@Test
public void testParsingIncompleteRequestLine() throws Exception {
final SessionInputBuffer inbuf = new SessionInputBufferImpl(1024, 128, StandardCharsets.US_ASCII);
- final NHttpMessageParser<HttpRequest> requestParser = new DefaultHttpRequestParser();
+ final NHttpMessageParser<ClassicHttpRequest> requestParser = new DefaultHttpRequestParser();
final ReadableByteChannel channel = newChannel("GET /whatever HTTP/1.0");
inbuf.fill(channel);
- final HttpRequest request = requestParser.parse(inbuf, true);
+ final ClassicHttpRequest request = requestParser.parse(inbuf, true);
Assert.assertNotNull(request);
}
@Test
public void testParsingIncompleteHeader() throws Exception {
final SessionInputBuffer inbuf = new SessionInputBufferImpl(1024, 128, StandardCharsets.US_ASCII);
- final NHttpMessageParser<HttpRequest> requestParser = new DefaultHttpRequestParser();
+ final NHttpMessageParser<ClassicHttpRequest> requestParser = new DefaultHttpRequestParser();
final ReadableByteChannel channel = newChannel("GET /whatever HTTP/1.0\r\nHeader: whatever");
inbuf.fill(channel);
- final HttpRequest request = requestParser.parse(inbuf, true);
+ final ClassicHttpRequest request = requestParser.parse(inbuf, true);
Assert.assertNotNull(request);
Assert.assertEquals(1, request.getAllHeaders().length);
Assert.assertEquals("whatever", request.getFirstHeader("Header").getValue());
@@ -203,7 +203,7 @@ public class TestHttpMessageParser {
@Test(expected = HttpException.class)
public void testParsingInvalidRequestLine() throws Exception {
final SessionInputBuffer inbuf = new SessionInputBufferImpl(1024, 128, StandardCharsets.US_ASCII);
- final NHttpMessageParser<HttpRequest> requestParser = new DefaultHttpRequestParser();
+ final NHttpMessageParser<ClassicHttpRequest> requestParser = new DefaultHttpRequestParser();
final ReadableByteChannel channel = newChannel("GET garbage\r\n");
inbuf.fill(channel);
@@ -213,11 +213,11 @@ public class TestHttpMessageParser {
@Test
public void testResetParser() throws Exception {
final SessionInputBuffer inbuf = new SessionInputBufferImpl(1024, 128, StandardCharsets.US_ASCII);
- final NHttpMessageParser<HttpRequest> requestParser = new DefaultHttpRequestParser();
+ final NHttpMessageParser<ClassicHttpRequest> requestParser = new DefaultHttpRequestParser();
ReadableByteChannel channel = newChannel("GET /whatever HTTP/1.0\r\nHeader: one\r\n\r\n");
inbuf.fill(channel);
- HttpRequest request = requestParser.parse(inbuf, false);
+ ClassicHttpRequest request = requestParser.parse(inbuf, false);
Assert.assertNotNull(request);
Assert.assertEquals(1, request.getAllHeaders().length);
Assert.assertEquals("one", request.getFirstHeader("Header").getValue());
@@ -235,7 +235,7 @@ public class TestHttpMessageParser {
@Test(expected = IOException.class)
public void testLineLimitForStatus() throws Exception {
final SessionInputBuffer inbuf = new SessionInputBufferImpl(1024, 128, StandardCharsets.US_ASCII);
- NHttpMessageParser<HttpRequest> requestParser = new DefaultHttpRequestParser(
+ NHttpMessageParser<ClassicHttpRequest> requestParser = new DefaultHttpRequestParser(
MessageConstraints.lineLen(0));
inbuf.fill(newChannel("GET /whatever HTTP/1.0\r\nHeader: one\r\n\r\n"));
requestParser.parse(inbuf, false);
@@ -250,7 +250,7 @@ public class TestHttpMessageParser {
public void testLineLimitForHeader() throws Exception {
final SessionInputBuffer inbuf = new SessionInputBufferImpl(1024, 128, StandardCharsets.US_ASCII);
- NHttpMessageParser<HttpRequest> requestParser = new DefaultHttpRequestParser(
+ NHttpMessageParser<ClassicHttpRequest> requestParser = new DefaultHttpRequestParser(
MessageConstraints.lineLen(0));
inbuf.fill(newChannel("GET /whatever HTTP/1.0\r\nHeader: one\r\n\r\n"));
requestParser.parse(inbuf, false);
@@ -270,7 +270,7 @@ public class TestHttpMessageParser {
final MessageConstraints constraints = MessageConstraints.custom()
.setMaxHeaderCount(2).setMaxLineLength(15).build();
- final NHttpMessageParser<HttpRequest> requestParser = new DefaultHttpRequestParser(constraints);
+ final NHttpMessageParser<ClassicHttpRequest> requestParser = new DefaultHttpRequestParser(constraints);
inbuf.fill(newChannel("GET / HTTP/1.0\r\nHeader: 9012345\r\n" +
" 23456789012345\r\n 23456789012345\r\n 23456789012345\r\n\r\n"));
requestParser.parse(inbuf, false);
@@ -282,7 +282,7 @@ public class TestHttpMessageParser {
final MessageConstraints constraints = MessageConstraints.custom()
.setMaxHeaderCount(2).setMaxLineLength(-1).build();
- final NHttpMessageParser<HttpRequest> requestParser = new DefaultHttpRequestParser(constraints);
+ final NHttpMessageParser<ClassicHttpRequest> requestParser = new DefaultHttpRequestParser(constraints);
inbuf.fill(newChannel("GET /whatever HTTP/1.0\r\nHeader: one\r\nHeader: two\r\n\r\n"));
requestParser.parse(inbuf, false);
requestParser.reset();
@@ -296,7 +296,7 @@ public class TestHttpMessageParser {
public void testDetectLineLimitEarly() throws Exception {
final SessionInputBuffer inbuf = new SessionInputBufferImpl(2, 128, StandardCharsets.US_ASCII);
- final NHttpMessageParser<HttpRequest> requestParser = new DefaultHttpRequestParser(
+ final NHttpMessageParser<ClassicHttpRequest> requestParser = new DefaultHttpRequestParser(
MessageConstraints.lineLen(2));
final ReadableByteChannel channel = newChannel("GET / HTTP/1.0\r\nHeader: one\r\n\r\n");
Assert.assertEquals(2, inbuf.fill(channel));
@@ -310,9 +310,9 @@ public class TestHttpMessageParser {
final SessionInputBuffer inbuf = new SessionInputBufferImpl(1024, 128, StandardCharsets.US_ASCII);
final MessageConstraints constraints = MessageConstraints.custom()
.setMaxEmptyLineCount(3).build();
- final NHttpMessageParser<HttpRequest> requestParser = new DefaultHttpRequestParser(constraints);
+ final NHttpMessageParser<ClassicHttpRequest> requestParser = new DefaultHttpRequestParser(constraints);
inbuf.fill(newChannel("\r\n\r\nGET /whatever HTTP/1.1\r\nSome header: stuff\r\n\r\n"));
- final HttpRequest request = requestParser.parse(inbuf, false);
+ final ClassicHttpRequest request = requestParser.parse(inbuf, false);
Assert.assertNotNull(request);
Assert.assertEquals("/whatever", request.getPath());
Assert.assertEquals(1, request.getAllHeaders().length);
@@ -324,7 +324,7 @@ public class TestHttpMessageParser {
final MessageConstraints constraints = MessageConstraints.custom()
.setMaxEmptyLineCount(3).build();
- final NHttpMessageParser<HttpRequest> requestParser = new DefaultHttpRequestParser(constraints);
+ final NHttpMessageParser<ClassicHttpRequest> requestParser = new DefaultHttpRequestParser(constraints);
inbuf.fill(newChannel("\r\n\r\n\r\nGET /whatever HTTP/1.0\r\nHeader: one\r\nHeader: two\r\n\r\n"));
requestParser.parse(inbuf, false);
}
@@ -332,7 +332,7 @@ public class TestHttpMessageParser {
@Test(expected = UnsupportedHttpVersionException.class)
public void testParsingUnsupportedRequestVersion() throws Exception {
final SessionInputBuffer inbuf = new SessionInputBufferImpl(1024, 128, StandardCharsets.US_ASCII);
- final NHttpMessageParser<HttpRequest> requestParser = new DefaultHttpRequestParser();
+ final NHttpMessageParser<ClassicHttpRequest> requestParser = new DefaultHttpRequestParser();
inbuf.fill(newChannel("GET /whatever HTTP/2.0\r\nSome header: stuff\r\n\r\n"));
requestParser.parse(inbuf, false);
}
@@ -340,7 +340,7 @@ public class TestHttpMessageParser {
@Test(expected = UnsupportedHttpVersionException.class)
public void testParsingUnsupportedVersion() throws Exception {
final SessionInputBuffer inbuf = new SessionInputBufferImpl(1024, 128, StandardCharsets.US_ASCII);
- final NHttpMessageParser<HttpResponse> requestParser = new DefaultHttpResponseParser();
+ final NHttpMessageParser<ClassicHttpResponse> requestParser = new DefaultHttpResponseParser();
inbuf.fill(newChannel("HTTP/2.0 200 OK\r\nSome header: stuff\r\n\r\n"));
requestParser.parse(inbuf, false);
}
@@ -348,7 +348,7 @@ public class TestHttpMessageParser {
@Test(expected = HttpException.class)
public void testParsingInvalidStatusLine() throws Exception {
final SessionInputBuffer inbuf = new SessionInputBufferImpl(1024, 128, StandardCharsets.US_ASCII);
- final NHttpMessageParser<HttpResponse> responseParser = new DefaultHttpResponseParser();
+ final NHttpMessageParser<ClassicHttpResponse> responseParser = new DefaultHttpResponseParser();
final ReadableByteChannel channel = newChannel("HTTP 200 OK\r\n");
inbuf.fill(channel);
@@ -358,7 +358,7 @@ public class TestHttpMessageParser {
@Test(expected = HttpException.class)
public void testParsingInvalidHeader() throws Exception {
final SessionInputBuffer inbuf = new SessionInputBufferImpl(1024, 128, StandardCharsets.US_ASCII);
- final NHttpMessageParser<HttpResponse> responseParser = new DefaultHttpResponseParser();
+ final NHttpMessageParser<ClassicHttpResponse> responseParser = new DefaultHttpResponseParser();
final ReadableByteChannel channel = newChannel("HTTP/1.0 200 OK\r\nstuff\r\n\r\n");
inbuf.fill(channel);
Modified: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/nio/TestNHttpConnectionBase.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/nio/TestNHttpConnectionBase.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/nio/TestNHttpConnectionBase.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/nio/TestNHttpConnectionBase.java Sun Aug 28 19:04:49 2016
@@ -34,7 +34,7 @@ import java.nio.channels.SelectionKey;
import org.apache.hc.core5.http.ContentLengthStrategy;
import org.apache.hc.core5.http.HttpEntity;
import org.apache.hc.core5.http.HttpHeaders;
-import org.apache.hc.core5.http.message.BasicHttpResponse;
+import org.apache.hc.core5.http.message.BasicClassicHttpResponse;
import org.apache.hc.core5.http.nio.NHttpConnection;
import org.apache.hc.core5.reactor.IOSession;
import org.apache.hc.core5.util.CharArrayBuffer;
@@ -190,7 +190,7 @@ public class TestNHttpConnectionBase {
@Test
public void testCreateEntityWithContentLength() throws Exception {
- final BasicHttpResponse response = new BasicHttpResponse(200, "OK");
+ final BasicClassicHttpResponse response = new BasicClassicHttpResponse(200, "OK");
response.addHeader(HttpHeaders.CONTENT_LENGTH, "10");
response.addHeader(HttpHeaders.CONTENT_TYPE, "stuff");
response.addHeader(HttpHeaders.CONTENT_ENCODING, "blah");
@@ -205,7 +205,7 @@ public class TestNHttpConnectionBase {
@Test
public void testCreateEntityChunkCoded() throws Exception {
- final BasicHttpResponse response = new BasicHttpResponse(200, "OK");
+ final BasicClassicHttpResponse response = new BasicClassicHttpResponse(200, "OK");
response.addHeader(HttpHeaders.TRANSFER_ENCODING, "chunked");
response.addHeader(HttpHeaders.CONTENT_TYPE, "stuff");
response.addHeader(HttpHeaders.CONTENT_ENCODING, "blah");
Modified: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/nio/TestUriHttpAsyncRequestHandlerMapper.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/nio/TestUriHttpAsyncRequestHandlerMapper.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/nio/TestUriHttpAsyncRequestHandlerMapper.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/nio/TestUriHttpAsyncRequestHandlerMapper.java Sun Aug 28 19:04:49 2016
@@ -27,8 +27,8 @@
package org.apache.hc.core5.http.impl.nio;
-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.nio.HttpAsyncRequestHandler;
import org.apache.hc.core5.http.protocol.HttpCoreContext;
import org.apache.hc.core5.http.protocol.UriPatternMatcher;
@@ -59,7 +59,7 @@ public class TestUriHttpAsyncRequestHand
new UriPatternMatcher<HttpAsyncRequestHandler<?>>());
final UriHttpAsyncRequestHandlerMapper registry = new UriHttpAsyncRequestHandlerMapper(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");
@@ -95,15 +95,15 @@ public class TestUriHttpAsyncRequestHand
HttpAsyncRequestHandler<?> 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/integration/SimpleRequestHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/integration/SimpleRequestHandler.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/integration/SimpleRequestHandler.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/integration/SimpleRequestHandler.java Sun Aug 28 19:04:49 2016
@@ -31,8 +31,8 @@ import java.io.IOException;
import org.apache.hc.core5.http.HttpEntity;
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.ContentType;
import org.apache.hc.core5.http.entity.EntityUtils;
import org.apache.hc.core5.http.io.HttpRequestHandler;
@@ -54,8 +54,8 @@ final class SimpleRequestHandler impleme
@Override
public void handle(
- final HttpRequest request,
- final HttpResponse response,
+ final ClassicHttpRequest request,
+ final ClassicHttpResponse response,
final HttpContext context) throws HttpException, IOException {
final String s = request.getPath();