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/09/27 17:49:09 UTC
svn commit: r1762526 [2/3] - in /httpcomponents/httpcore/trunk: ./
httpcore5-ab/src/test/java/org/apache/hc/core5/http/benchmark/
httpcore5/src/examples/org/apache/hc/core5/http/examples/
httpcore5/src/main/java/org/apache/hc/core5/http/ httpcore5/src/...
Modified: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestHttpService.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestHttpService.java?rev=1762526&r1=1762525&r2=1762526&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestHttpService.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestHttpService.java Tue Sep 27 17:49:09 2016
@@ -29,12 +29,12 @@ package org.apache.hc.core5.http.impl.io
import java.io.InputStream;
+import org.apache.hc.core5.http.ClassicHttpRequest;
+import org.apache.hc.core5.http.ClassicHttpResponse;
import org.apache.hc.core5.http.ConnectionReuseStrategy;
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.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.MethodNotSupportedException;
@@ -48,19 +48,44 @@ import org.apache.hc.core5.http.message.
import org.apache.hc.core5.http.message.BasicClassicHttpResponse;
import org.apache.hc.core5.http.protocol.HttpContext;
import org.apache.hc.core5.http.protocol.HttpCoreContext;
-import org.apache.hc.core5.http.protocol.HttpExpectationVerifier;
+import org.apache.hc.core5.http.io.HttpExpectationVerifier;
import org.apache.hc.core5.http.protocol.HttpProcessor;
import org.junit.Assert;
+import org.junit.Before;
import org.junit.Test;
+import org.mockito.Mock;
import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
public class TestHttpService {
+ @Mock
+ private HttpProcessor httprocessor;
+ @Mock
+ private ConnectionReuseStrategy connReuseStrategy;
+ @Mock
+ private HttpResponseFactory<ClassicHttpResponse> responseFactory;
+ @Mock
+ private HttpRequestHandlerMapper handlerResolver;
+ @Mock
+ private HttpRequestHandler requestHandler;
+ @Mock
+ private HttpServerConnection conn;
+
+ private HttpService httpservice;
+
+ @Before
+ public void settup() {
+ MockitoAnnotations.initMocks(this);
+ httpservice = new HttpService(
+ httprocessor,
+ connReuseStrategy,
+ responseFactory,
+ handlerResolver);
+ }
+
@Test
public void testInvalidInitialization() throws Exception {
- final ConnectionReuseStrategy connReuseStrategy = Mockito.mock(ConnectionReuseStrategy.class);
- final HttpResponseFactory responseFactory = Mockito.mock(HttpResponseFactory.class);
- final HttpRequestHandlerMapper handlerResolver = Mockito.mock(HttpRequestHandlerMapper.class);
try {
new HttpService(
null,
@@ -74,18 +99,7 @@ public class TestHttpService {
@Test
public void testBasicExecution() throws Exception {
- final HttpProcessor httprocessor = Mockito.mock(HttpProcessor.class);
- final ConnectionReuseStrategy connReuseStrategy = Mockito.mock(ConnectionReuseStrategy.class);
- final HttpResponseFactory responseFactory = Mockito.mock(HttpResponseFactory.class);
- final HttpRequestHandlerMapper handlerResolver = Mockito.mock(HttpRequestHandlerMapper.class);
-
- final HttpService httpservice = new HttpService(
- httprocessor,
- connReuseStrategy,
- responseFactory,
- handlerResolver);
final HttpCoreContext context = HttpCoreContext.create();
- final HttpServerConnection conn = Mockito.mock(HttpServerConnection.class);
final ClassicHttpRequest request = new BasicClassicHttpRequest("GET", "/");
Mockito.when(conn.receiveRequestHeader()).thenReturn(request);
final ClassicHttpResponse response = new BasicClassicHttpResponse(200, "OK");
@@ -100,8 +114,8 @@ public class TestHttpService {
Assert.assertSame(request, context.getRequest());
Assert.assertSame(response, context.getResponse());
- Mockito.verify(httprocessor).process(request, context);
- Mockito.verify(httprocessor).process(response, context);
+ Mockito.verify(httprocessor).process(request, request.getEntity(), context);
+ Mockito.verify(httprocessor).process(response, response.getEntity(), context);
Mockito.verify(conn).sendResponseHeader(response);
Mockito.verify(conn).sendResponseEntity(response);
Mockito.verify(conn).flush();
@@ -110,18 +124,7 @@ public class TestHttpService {
@Test
public void testExecutionEntityEnclosingRequest() throws Exception {
- final HttpProcessor httprocessor = Mockito.mock(HttpProcessor.class);
- final ConnectionReuseStrategy connReuseStrategy = Mockito.mock(ConnectionReuseStrategy.class);
- final HttpResponseFactory responseFactory = Mockito.mock(HttpResponseFactory.class);
- final HttpRequestHandlerMapper handlerResolver = Mockito.mock(HttpRequestHandlerMapper.class);
-
- final HttpService httpservice = new HttpService(
- httprocessor,
- connReuseStrategy,
- responseFactory,
- handlerResolver);
final HttpCoreContext context = HttpCoreContext.create();
- final HttpServerConnection conn = Mockito.mock(HttpServerConnection.class);
final ClassicHttpRequest request = new BasicClassicHttpRequest("POST", "/");
final InputStream instream = Mockito.mock(InputStream.class);
final InputStreamEntity entity = new InputStreamEntity(instream, -1);
@@ -141,9 +144,9 @@ public class TestHttpService {
Assert.assertSame(response, context.getResponse());
Mockito.verify(conn).receiveRequestEntity(request);
- Mockito.verify(httprocessor).process(request, context);
+ Mockito.verify(httprocessor).process(request, request.getEntity(), context);
Mockito.verify(instream).close();
- Mockito.verify(httprocessor).process(response, context);
+ Mockito.verify(httprocessor).process(response, response.getEntity(), context);
Mockito.verify(conn).sendResponseHeader(response);
Mockito.verify(conn).sendResponseEntity(response);
Mockito.verify(conn).flush();
@@ -152,18 +155,7 @@ public class TestHttpService {
@Test
public void testExecutionEntityEnclosingRequestWithExpectContinue() throws Exception {
- final HttpProcessor httprocessor = Mockito.mock(HttpProcessor.class);
- final ConnectionReuseStrategy connReuseStrategy = Mockito.mock(ConnectionReuseStrategy.class);
- final HttpResponseFactory responseFactory = Mockito.mock(HttpResponseFactory.class);
- final HttpRequestHandlerMapper handlerResolver = Mockito.mock(HttpRequestHandlerMapper.class);
-
- final HttpService httpservice = new HttpService(
- httprocessor,
- connReuseStrategy,
- responseFactory,
- handlerResolver);
final HttpCoreContext context = HttpCoreContext.create();
- final HttpServerConnection conn = Mockito.mock(HttpServerConnection.class);
final ClassicHttpRequest request = new BasicClassicHttpRequest("POST", "/");
request.addHeader(HttpHeaders.EXPECT, HeaderElements.CONTINUE);
final InputStream instream = Mockito.mock(InputStream.class);
@@ -187,9 +179,9 @@ public class TestHttpService {
Mockito.verify(conn).sendResponseHeader(resp100);
Mockito.verify(conn).receiveRequestEntity(request);
- Mockito.verify(httprocessor).process(request, context);
+ Mockito.verify(httprocessor).process(request, request.getEntity(), context);
Mockito.verify(instream).close();
- Mockito.verify(httprocessor).process(response, context);
+ Mockito.verify(httprocessor).process(response, response.getEntity(), context);
Mockito.verify(conn).sendResponseHeader(response);
Mockito.verify(conn).sendResponseEntity(response);
Mockito.verify(conn, Mockito.times(2)).flush();
@@ -198,11 +190,6 @@ public class TestHttpService {
@Test
public void testExecutionEntityEnclosingRequestCustomExpectationVerifier() throws Exception {
- final HttpProcessor httprocessor = Mockito.mock(HttpProcessor.class);
- final ConnectionReuseStrategy connReuseStrategy = Mockito.mock(ConnectionReuseStrategy.class);
- final HttpResponseFactory responseFactory = Mockito.mock(HttpResponseFactory.class);
- final HttpRequestHandlerMapper handlerResolver = Mockito.mock(HttpRequestHandlerMapper.class);
-
final HttpExpectationVerifier expectationVerifier = new HttpExpectationVerifier() {
@Override
@@ -222,7 +209,6 @@ public class TestHttpService {
handlerResolver,
expectationVerifier);
final HttpCoreContext context = HttpCoreContext.create();
- final HttpServerConnection conn = Mockito.mock(HttpServerConnection.class);
final ClassicHttpRequest request = new BasicClassicHttpRequest("POST", "/");
request.addHeader(HttpHeaders.EXPECT, HeaderElements.CONTINUE);
final InputStream instream = Mockito.mock(InputStream.class);
@@ -243,7 +229,7 @@ public class TestHttpService {
Assert.assertEquals(HttpStatus.SC_UNAUTHORIZED, response.getCode());
Mockito.verify(conn).sendResponseHeader(response);
- Mockito.verify(httprocessor).process(response, context);
+ Mockito.verify(httprocessor).process(response, response.getEntity(), context);
Mockito.verify(conn).sendResponseHeader(response);
Mockito.verify(conn).sendResponseEntity(response);
Mockito.verify(conn).flush();
@@ -252,12 +238,7 @@ public class TestHttpService {
@Test
public void testExecutionExceptionInCustomExpectationVerifier() throws Exception {
- final HttpProcessor httprocessor = Mockito.mock(HttpProcessor.class);
- final ConnectionReuseStrategy connReuseStrategy = Mockito.mock(ConnectionReuseStrategy.class);
- final HttpResponseFactory responseFactory = Mockito.mock(HttpResponseFactory.class);
final HttpExpectationVerifier expectationVerifier = Mockito.mock(HttpExpectationVerifier.class);
- final HttpRequestHandlerMapper handlerResolver = Mockito.mock(HttpRequestHandlerMapper.class);
-
final HttpService httpservice = new HttpService(
httprocessor,
connReuseStrategy,
@@ -265,7 +246,6 @@ public class TestHttpService {
handlerResolver,
expectationVerifier);
final HttpCoreContext context = HttpCoreContext.create();
- final HttpServerConnection conn = Mockito.mock(HttpServerConnection.class);
final ClassicHttpRequest request = new BasicClassicHttpRequest("POST", "/");
request.addHeader(HttpHeaders.EXPECT, "100-continue");
final InputStream instream = Mockito.mock(InputStream.class);
@@ -289,7 +269,7 @@ public class TestHttpService {
Assert.assertEquals(HttpStatus.SC_INTERNAL_SERVER_ERROR, response.getCode());
Mockito.verify(conn).sendResponseHeader(response);
- Mockito.verify(httprocessor).process(response, context);
+ Mockito.verify(httprocessor).process(response, response.getEntity(), context);
Mockito.verify(conn).sendResponseHeader(response);
Mockito.verify(conn).sendResponseEntity(response);
Mockito.verify(conn).flush();
@@ -298,19 +278,7 @@ public class TestHttpService {
@Test
public void testMethodNotSupported() throws Exception {
- final HttpProcessor httprocessor = Mockito.mock(HttpProcessor.class);
- final ConnectionReuseStrategy connReuseStrategy = Mockito.mock(ConnectionReuseStrategy.class);
- final HttpResponseFactory responseFactory = Mockito.mock(HttpResponseFactory.class);
- final HttpRequestHandlerMapper handlerResolver = Mockito.mock(HttpRequestHandlerMapper.class);
- final HttpRequestHandler requestHandler = Mockito.mock(HttpRequestHandler.class);
-
- final HttpService httpservice = new HttpService(
- httprocessor,
- connReuseStrategy,
- responseFactory,
- handlerResolver);
final HttpCoreContext context = HttpCoreContext.create();
- final HttpServerConnection conn = Mockito.mock(HttpServerConnection.class);
final ClassicHttpRequest request = new BasicClassicHttpRequest("whatever", "/");
Mockito.when(conn.receiveRequestHeader()).thenReturn(request);
@@ -332,7 +300,7 @@ public class TestHttpService {
Assert.assertEquals(HttpStatus.SC_NOT_IMPLEMENTED, error.getCode());
Mockito.verify(conn).sendResponseHeader(error);
- Mockito.verify(httprocessor).process(error, context);
+ Mockito.verify(httprocessor).process(error, error.getEntity(), context);
Mockito.verify(conn).sendResponseHeader(error);
Mockito.verify(conn).sendResponseEntity(error);
Mockito.verify(conn).flush();
@@ -341,19 +309,7 @@ public class TestHttpService {
@Test
public void testUnsupportedHttpVersionException() throws Exception {
- final HttpProcessor httprocessor = Mockito.mock(HttpProcessor.class);
- final ConnectionReuseStrategy connReuseStrategy = Mockito.mock(ConnectionReuseStrategy.class);
- final HttpResponseFactory responseFactory = Mockito.mock(HttpResponseFactory.class);
- final HttpRequestHandlerMapper handlerResolver = Mockito.mock(HttpRequestHandlerMapper.class);
- final HttpRequestHandler requestHandler = Mockito.mock(HttpRequestHandler.class);
-
- final HttpService httpservice = new HttpService(
- httprocessor,
- connReuseStrategy,
- responseFactory,
- handlerResolver);
final HttpCoreContext context = HttpCoreContext.create();
- final HttpServerConnection conn = Mockito.mock(HttpServerConnection.class);
final ClassicHttpRequest request = new BasicClassicHttpRequest("whatever", "/");
Mockito.when(conn.receiveRequestHeader()).thenReturn(request);
@@ -375,7 +331,7 @@ public class TestHttpService {
Assert.assertEquals(HttpStatus.SC_HTTP_VERSION_NOT_SUPPORTED, error.getCode());
Mockito.verify(conn).sendResponseHeader(error);
- Mockito.verify(httprocessor).process(error, context);
+ Mockito.verify(httprocessor).process(error, error.getEntity(), context);
Mockito.verify(conn).sendResponseHeader(error);
Mockito.verify(conn).sendResponseEntity(error);
Mockito.verify(conn).flush();
@@ -384,19 +340,7 @@ public class TestHttpService {
@Test
public void testProtocolException() throws Exception {
- final HttpProcessor httprocessor = Mockito.mock(HttpProcessor.class);
- final ConnectionReuseStrategy connReuseStrategy = Mockito.mock(ConnectionReuseStrategy.class);
- final HttpResponseFactory responseFactory = Mockito.mock(HttpResponseFactory.class);
- final HttpRequestHandlerMapper handlerResolver = Mockito.mock(HttpRequestHandlerMapper.class);
- final HttpRequestHandler requestHandler = Mockito.mock(HttpRequestHandler.class);
-
- final HttpService httpservice = new HttpService(
- httprocessor,
- connReuseStrategy,
- responseFactory,
- handlerResolver);
final HttpCoreContext context = HttpCoreContext.create();
- final HttpServerConnection conn = Mockito.mock(HttpServerConnection.class);
final ClassicHttpRequest request = new BasicClassicHttpRequest("whatever", "/");
Mockito.when(conn.receiveRequestHeader()).thenReturn(request);
@@ -418,7 +362,7 @@ public class TestHttpService {
Assert.assertEquals(HttpStatus.SC_BAD_REQUEST, error.getCode());
Mockito.verify(conn).sendResponseHeader(error);
- Mockito.verify(httprocessor).process(error, context);
+ Mockito.verify(httprocessor).process(error, error.getEntity(), context);
Mockito.verify(conn).sendResponseHeader(error);
Mockito.verify(conn).sendResponseEntity(error);
Mockito.verify(conn).flush();
@@ -427,19 +371,7 @@ public class TestHttpService {
@Test
public void testConnectionKeepAlive() throws Exception {
- final HttpProcessor httprocessor = Mockito.mock(HttpProcessor.class);
- final ConnectionReuseStrategy connReuseStrategy = Mockito.mock(ConnectionReuseStrategy.class);
- final HttpResponseFactory responseFactory = Mockito.mock(HttpResponseFactory.class);
- final HttpRequestHandlerMapper handlerResolver = Mockito.mock(HttpRequestHandlerMapper.class);
- final HttpRequestHandler requestHandler = Mockito.mock(HttpRequestHandler.class);
-
- final HttpService httpservice = new HttpService(
- httprocessor,
- connReuseStrategy,
- responseFactory,
- handlerResolver);
final HttpCoreContext context = HttpCoreContext.create();
- final HttpServerConnection conn = Mockito.mock(HttpServerConnection.class);
final ClassicHttpRequest request = new BasicClassicHttpRequest("GET", "/");
Mockito.when(conn.receiveRequestHeader()).thenReturn(request);
final ClassicHttpResponse response = new BasicClassicHttpResponse(200, "OK");
@@ -455,8 +387,8 @@ public class TestHttpService {
Assert.assertSame(request, context.getRequest());
Assert.assertSame(response, context.getResponse());
- Mockito.verify(httprocessor).process(request, context);
- Mockito.verify(httprocessor).process(response, context);
+ Mockito.verify(httprocessor).process(request, request.getEntity(), context);
+ Mockito.verify(httprocessor).process(response, response.getEntity(), context);
Mockito.verify(conn).sendResponseHeader(response);
Mockito.verify(conn).sendResponseEntity(response);
Mockito.verify(conn).flush();
@@ -465,19 +397,7 @@ public class TestHttpService {
@Test
public void testNoContentResponse() throws Exception {
- final HttpProcessor httprocessor = Mockito.mock(HttpProcessor.class);
- final ConnectionReuseStrategy connReuseStrategy = Mockito.mock(ConnectionReuseStrategy.class);
- final HttpResponseFactory responseFactory = Mockito.mock(HttpResponseFactory.class);
- final HttpRequestHandlerMapper handlerResolver = Mockito.mock(HttpRequestHandlerMapper.class);
- final HttpRequestHandler requestHandler = Mockito.mock(HttpRequestHandler.class);
-
- final HttpService httpservice = new HttpService(
- httprocessor,
- connReuseStrategy,
- responseFactory,
- handlerResolver);
final HttpCoreContext context = HttpCoreContext.create();
- final HttpServerConnection conn = Mockito.mock(HttpServerConnection.class);
final ClassicHttpRequest request = new BasicClassicHttpRequest("GET", "/");
Mockito.when(conn.receiveRequestHeader()).thenReturn(request);
@@ -491,7 +411,7 @@ public class TestHttpService {
Assert.assertSame(conn, context.getConnection());
Assert.assertSame(request, context.getRequest());
- Mockito.verify(httprocessor).process(response, context);
+ Mockito.verify(httprocessor).process(response, response.getEntity(), context);
Mockito.verify(requestHandler).handle(request, response, context);
Mockito.verify(conn).sendResponseHeader(response);
@@ -502,19 +422,7 @@ public class TestHttpService {
@Test
public void testResponseToHead() throws Exception {
- final HttpProcessor httprocessor = Mockito.mock(HttpProcessor.class);
- final ConnectionReuseStrategy connReuseStrategy = Mockito.mock(ConnectionReuseStrategy.class);
- final HttpResponseFactory responseFactory = Mockito.mock(HttpResponseFactory.class);
- final HttpRequestHandlerMapper handlerResolver = Mockito.mock(HttpRequestHandlerMapper.class);
- final HttpRequestHandler requestHandler = Mockito.mock(HttpRequestHandler.class);
-
- final HttpService httpservice = new HttpService(
- httprocessor,
- connReuseStrategy,
- responseFactory,
- handlerResolver);
final HttpCoreContext context = HttpCoreContext.create();
- final HttpServerConnection conn = Mockito.mock(HttpServerConnection.class);
final ClassicHttpRequest request = new BasicClassicHttpRequest("HEAD", "/");
Mockito.when(conn.receiveRequestHeader()).thenReturn(request);
@@ -528,7 +436,7 @@ public class TestHttpService {
Assert.assertSame(conn, context.getConnection());
Assert.assertSame(request, context.getRequest());
- Mockito.verify(httprocessor).process(response, context);
+ Mockito.verify(httprocessor).process(response, response.getEntity(), context);
Mockito.verify(requestHandler).handle(request, response, context);
Mockito.verify(conn).sendResponseHeader(response);
Modified: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/nio/TestBasicAsyncClientExchangeHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/nio/TestBasicAsyncClientExchangeHandler.java?rev=1762526&r1=1762525&r2=1762526&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/nio/TestBasicAsyncClientExchangeHandler.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/nio/TestBasicAsyncClientExchangeHandler.java Tue Sep 27 17:49:09 2016
@@ -163,7 +163,7 @@ public class TestBasicAsyncClientExchang
Mockito.verify(this.requestProducer).generateRequest();
Assert.assertSame(request, this.context.getAttribute(HttpCoreContext.HTTP_REQUEST));
Assert.assertSame(this.conn, this.context.getAttribute(HttpCoreContext.HTTP_CONNECTION));
- Mockito.verify(this.httpProcessor).process(request, this.context);
+ Mockito.verify(this.httpProcessor).process(request, null, this.context);
}
@Test
@@ -199,7 +199,7 @@ public class TestBasicAsyncClientExchang
Mockito.verify(this.responseConsumer).responseReceived(response);
Assert.assertSame(response, this.context.getAttribute(HttpCoreContext.HTTP_RESPONSE));
- Mockito.verify(this.httpProcessor).process(response, this.context);
+ Mockito.verify(this.httpProcessor).process(response, null, this.context);
}
@Test
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=1762526&r1=1762525&r2=1762526&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 Tue Sep 27 17:49:09 2016
@@ -33,12 +33,14 @@ import java.nio.ByteBuffer;
import java.util.Queue;
import org.apache.hc.core5.concurrent.Cancellable;
+import org.apache.hc.core5.http.ClassicHttpRequest;
+import org.apache.hc.core5.http.ClassicHttpResponse;
import org.apache.hc.core5.http.ConnectionReuseStrategy;
+import org.apache.hc.core5.http.EntityDetails;
import org.apache.hc.core5.http.HeaderElements;
+import org.apache.hc.core5.http.HttpEntity;
import org.apache.hc.core5.http.HttpException;
import org.apache.hc.core5.http.HttpHeaders;
-import org.apache.hc.core5.http.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;
@@ -78,7 +80,7 @@ public class TestHttpAsyncService {
private HttpAsyncService protocolHandler;
private HttpProcessor httpProcessor;
private ConnectionReuseStrategy reuseStrategy;
- private HttpResponseFactory responseFactory;
+ private HttpResponseFactory<ClassicHttpResponse> responseFactory;
private HttpContext connContext;
private NHttpServerConnection conn;
private HttpAsyncRequestHandler<Object> requestHandler;
@@ -212,7 +214,7 @@ public class TestHttpAsyncService {
this.connContext.setAttribute(HttpAsyncService.HTTP_EXCHANGE_STATE, state);
Mockito.doThrow(new RuntimeException()).when(this.httpProcessor).process(
- Matchers.any(ClassicHttpResponse.class), Matchers.any(HttpContext.class));
+ Matchers.any(ClassicHttpResponse.class), Matchers.any(EntityDetails.class), Matchers.any(HttpContext.class));
final HttpException httpex = new HttpException();
try {
this.protocolHandler.exception(this.conn, httpex);
@@ -243,7 +245,7 @@ public class TestHttpAsyncService {
this.connContext.setAttribute(HttpAsyncService.HTTP_EXCHANGE_STATE, state);
Mockito.doThrow(new IOException()).when(this.httpProcessor).process(
- Matchers.any(ClassicHttpResponse.class), Matchers.any(HttpContext.class));
+ Matchers.any(ClassicHttpResponse.class), Matchers.any(EntityDetails.class), Matchers.any(HttpContext.class));
final HttpException httpex = new HttpException();
this.protocolHandler.exception(this.conn, httpex);
@@ -305,7 +307,7 @@ public class TestHttpAsyncService {
Assert.assertNull(incoming);
final ArgumentCaptor<HttpContext> argumentCaptor = ArgumentCaptor.forClass(HttpContext.class);
- Mockito.verify(this.httpProcessor).process(Matchers.eq(request), argumentCaptor.capture());
+ Mockito.verify(this.httpProcessor).process(Matchers.eq(request), Matchers.isNull(EntityDetails.class), argumentCaptor.capture());
final HttpContext exchangeContext = argumentCaptor.getValue();
Assert.assertNotNull(exchangeContext);
@@ -461,7 +463,7 @@ public class TestHttpAsyncService {
Assert.assertSame(request, exchangeContext.getAttribute(HttpCoreContext.HTTP_REQUEST));
Assert.assertSame(this.conn, exchangeContext.getAttribute(HttpCoreContext.HTTP_CONNECTION));
- Mockito.verify(this.httpProcessor).process(request, exchangeContext);
+ Mockito.verify(this.httpProcessor).process(request, entity, exchangeContext);
Mockito.verify(this.requestConsumer).requestReceived(request);
Mockito.verify(this.conn, Mockito.never()).suspendInput();
}
@@ -497,7 +499,7 @@ public class TestHttpAsyncService {
Assert.assertSame(request, exchangeContext.getAttribute(HttpCoreContext.HTTP_REQUEST));
Assert.assertSame(this.conn, exchangeContext.getAttribute(HttpCoreContext.HTTP_CONNECTION));
- Mockito.verify(this.httpProcessor).process(request, exchangeContext);
+ Mockito.verify(this.httpProcessor).process(request, entity, exchangeContext);
Mockito.verify(this.requestConsumer).requestReceived(request);
Mockito.verify(this.conn, Mockito.never()).suspendInput();
Mockito.verify(this.conn).submitResponse(Matchers.argThat(new ArgumentMatcher<ClassicHttpResponse>() {
@@ -547,7 +549,7 @@ public class TestHttpAsyncService {
Assert.assertSame(request, exchangeContext.getAttribute(HttpCoreContext.HTTP_REQUEST));
Assert.assertSame(this.conn, exchangeContext.getAttribute(HttpCoreContext.HTTP_CONNECTION));
- Mockito.verify(this.httpProcessor).process(request, exchangeContext);
+ Mockito.verify(this.httpProcessor).process(request, entity, exchangeContext);
Mockito.verify(this.requestConsumer).requestReceived(request);
Mockito.verify(expectationVerifier).verify(
Matchers.any(HttpAsyncExchange.class),
@@ -902,7 +904,7 @@ public class TestHttpAsyncService {
Assert.assertEquals(MessageState.READY, state.getResponseState());
- Mockito.verify(this.httpProcessor).process(response, exchangeContext);
+ Mockito.verify(this.httpProcessor).process(response, null, exchangeContext);
Mockito.verify(this.conn).submitResponse(response);
Mockito.verify(this.responseProducer).responseCompleted(exchangeContext);
Mockito.verify(this.conn, Mockito.never()).close();
@@ -918,7 +920,8 @@ public class TestHttpAsyncService {
state.setRequestState(MessageState.COMPLETED);
final ClassicHttpResponse response = new BasicClassicHttpResponse(200, "OK");
final Outgoing outgoing = new Outgoing(request, response, this.responseProducer, exchangeContext);
- response.setEntity(new NStringEntity("stuff"));
+ final NStringEntity entity = new NStringEntity("stuff");
+ response.setEntity(entity);
state.setOutgoing(outgoing);
final Queue<PipelineEntry> pipeline = state.getRequestQueue();
@@ -938,7 +941,7 @@ public class TestHttpAsyncService {
Assert.assertEquals(MessageState.BODY_STREAM, state.getResponseState());
- Mockito.verify(this.httpProcessor).process(response, exchangeContext);
+ Mockito.verify(this.httpProcessor).process(response, entity, exchangeContext);
Mockito.verify(this.conn).suspendOutput();
Mockito.verify(this.conn).submitResponse(response);
Mockito.verify(this.conn, Mockito.never()).close();
@@ -965,7 +968,7 @@ public class TestHttpAsyncService {
Assert.assertEquals(MessageState.READY, state.getResponseState());
- Mockito.verify(this.httpProcessor).process(response, exchangeContext);
+ Mockito.verify(this.httpProcessor).process(response, null, exchangeContext);
Mockito.verify(this.conn).submitResponse(response);
Mockito.verify(this.responseProducer).responseCompleted(exchangeContext);
Mockito.verify(this.conn).close();
@@ -985,7 +988,8 @@ public class TestHttpAsyncService {
state.setResponseState(MessageState.INIT);
this.connContext.setAttribute(HttpAsyncService.HTTP_EXCHANGE_STATE, state);
- response.setEntity(new NStringEntity("stuff"));
+ final NStringEntity entity = new NStringEntity("stuff");
+ response.setEntity(entity);
Mockito.when(this.responseProducer.generateResponse()).thenReturn(response);
this.protocolHandler.responseReady(this.conn);
@@ -995,7 +999,7 @@ public class TestHttpAsyncService {
Assert.assertEquals("[incoming COMPLETED GET /; outgoing BODY_STREAM 200]",
state.toString());
- Mockito.verify(this.httpProcessor).process(response, exchangeContext);
+ Mockito.verify(this.httpProcessor).process(response, entity, exchangeContext);
Mockito.verify(this.conn).submitResponse(response);
Mockito.verify(this.responseProducer, Mockito.never()).responseCompleted(exchangeContext);
}
@@ -1014,7 +1018,8 @@ public class TestHttpAsyncService {
state.setResponseState(MessageState.INIT);
this.connContext.setAttribute(HttpAsyncService.HTTP_EXCHANGE_STATE, state);
- response.setEntity(new NStringEntity("stuff"));
+ final NStringEntity entity = new NStringEntity("stuff");
+ response.setEntity(entity);
Mockito.when(this.responseProducer.generateResponse()).thenReturn(response);
Mockito.when(this.reuseStrategy.keepAlive(request, response, exchangeContext)).thenReturn(Boolean.TRUE);
@@ -1022,7 +1027,7 @@ public class TestHttpAsyncService {
Assert.assertEquals(MessageState.READY, state.getResponseState());
- Mockito.verify(this.httpProcessor).process(response, exchangeContext);
+ Mockito.verify(this.httpProcessor).process(response, entity, exchangeContext);
Mockito.verify(this.conn).submitResponse(response);
Mockito.verify(this.responseProducer).responseCompleted(exchangeContext);
Mockito.verify(this.conn, Mockito.never()).close();
@@ -1042,7 +1047,8 @@ public class TestHttpAsyncService {
state.setResponseState(MessageState.INIT);
this.connContext.setAttribute(HttpAsyncService.HTTP_EXCHANGE_STATE, state);
- response.setEntity(new NStringEntity("stuff"));
+ final NStringEntity entity = new NStringEntity("stuff");
+ response.setEntity(entity);
Mockito.when(this.responseProducer.generateResponse()).thenReturn(response);
Mockito.when(this.reuseStrategy.keepAlive(request, response, exchangeContext)).thenReturn(Boolean.TRUE);
@@ -1050,7 +1056,7 @@ public class TestHttpAsyncService {
Assert.assertEquals(MessageState.READY, state.getResponseState());
- Mockito.verify(this.httpProcessor).process(response, exchangeContext);
+ Mockito.verify(this.httpProcessor).process(response, entity, exchangeContext);
Mockito.verify(this.conn).submitResponse(response);
Mockito.verify(this.responseProducer).responseCompleted(exchangeContext);
Mockito.verify(this.conn, Mockito.never()).close();
@@ -1098,8 +1104,8 @@ public class TestHttpAsyncService {
final HttpContext exchangeContext = new BasicHttpContext();
final ClassicHttpRequest request = new BasicClassicHttpRequest("POST", "/");
request.setHeader(HttpHeaders.CONTENT_LENGTH, "5");
- final NStringEntity entity = new NStringEntity("stuff");
- request.setEntity(entity);
+ final NStringEntity requestEntity = new NStringEntity("stuff");
+ request.setEntity(requestEntity);
final Incoming incoming = new Incoming(request, this.requestHandler, this.requestConsumer, exchangeContext);
state.setIncoming(incoming);
state.setRequestState(MessageState.ACK_EXPECTED);
@@ -1109,7 +1115,8 @@ public class TestHttpAsyncService {
state.setResponseState(MessageState.INIT);
this.connContext.setAttribute(HttpAsyncService.HTTP_EXCHANGE_STATE, state);
- response.setEntity(new NStringEntity("stuff"));
+ final HttpEntity responseEntity = new NStringEntity("stuff");
+ response.setEntity(responseEntity);
Mockito.when(this.responseProducer.generateResponse()).thenReturn(response);
this.protocolHandler.responseReady(this.conn);
@@ -1118,7 +1125,7 @@ public class TestHttpAsyncService {
Assert.assertEquals(MessageState.BODY_STREAM, state.getResponseState());
Assert.assertSame(outgoing, state.getOutgoing());
- Mockito.verify(this.httpProcessor).process(response, exchangeContext);
+ Mockito.verify(this.httpProcessor).process(response, responseEntity, exchangeContext);
Mockito.verify(this.conn).submitResponse(response);
Mockito.verify(this.responseProducer, Mockito.never()).responseCompleted(exchangeContext);
}
Modified: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/integration/TestAsyncHttp.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/integration/TestAsyncHttp.java?rev=1762526&r1=1762525&r2=1762526&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/integration/TestAsyncHttp.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/integration/TestAsyncHttp.java Tue Sep 27 17:49:09 2016
@@ -37,14 +37,16 @@ import java.util.concurrent.ConcurrentLi
import java.util.concurrent.Future;
import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.hc.core5.http.ClassicHttpRequest;
+import org.apache.hc.core5.http.ClassicHttpResponse;
+import org.apache.hc.core5.http.EntityDetails;
import org.apache.hc.core5.http.Header;
import org.apache.hc.core5.http.HttpEntity;
import org.apache.hc.core5.http.HttpException;
import org.apache.hc.core5.http.HttpHeaders;
import org.apache.hc.core5.http.HttpHost;
-import org.apache.hc.core5.http.ClassicHttpRequest;
+import org.apache.hc.core5.http.HttpRequest;
import org.apache.hc.core5.http.HttpRequestInterceptor;
-import org.apache.hc.core5.http.ClassicHttpResponse;
import org.apache.hc.core5.http.HttpStatus;
import org.apache.hc.core5.http.HttpVersion;
import org.apache.hc.core5.http.entity.ByteArrayEntity;
@@ -65,7 +67,7 @@ import org.apache.hc.core5.http.nio.IOCo
import org.apache.hc.core5.http.nio.entity.NStringEntity;
import org.apache.hc.core5.http.protocol.BasicHttpContext;
import org.apache.hc.core5.http.protocol.HttpContext;
-import org.apache.hc.core5.http.protocol.ImmutableHttpProcessor;
+import org.apache.hc.core5.http.protocol.DefaultHttpProcessor;
import org.apache.hc.core5.http.protocol.RequestConnControl;
import org.apache.hc.core5.http.protocol.RequestContent;
import org.apache.hc.core5.http.protocol.RequestExpectContinue;
@@ -341,7 +343,7 @@ public class TestAsyncHttp extends HttpC
// Rewire client
this.client = new HttpClientNio(
- new ImmutableHttpProcessor(
+ new DefaultHttpProcessor(
new RequestTargetHost(),
new RequestConnControl(),
new RequestUserAgent(),
@@ -375,12 +377,13 @@ public class TestAsyncHttp extends HttpC
// Rewire client
this.client = new HttpClientNio(
- new ImmutableHttpProcessor(
+ new DefaultHttpProcessor(
new HttpRequestInterceptor() {
@Override
public void process(
- final ClassicHttpRequest request,
+ final HttpRequest request,
+ final EntityDetails entity,
final HttpContext context) throws HttpException, IOException {
request.addHeader(HttpHeaders.TRANSFER_ENCODING, "identity");
}
@@ -966,7 +969,7 @@ public class TestAsyncHttp extends HttpC
// Rewire client
this.client = new HttpClientNio(
- new ImmutableHttpProcessor(new RequestContent(), new RequestConnControl()),
+ new DefaultHttpProcessor(new RequestContent(), new RequestConnControl()),
createHttpAsyncRequestExecutor(),
createClientConnectionFactory(),
createClientIOReactorConfig());
Modified: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/integration/TestClientOutOfSequenceResponse.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/integration/TestClientOutOfSequenceResponse.java?rev=1762526&r1=1762525&r2=1762526&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/integration/TestClientOutOfSequenceResponse.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/integration/TestClientOutOfSequenceResponse.java Tue Sep 27 17:49:09 2016
@@ -41,7 +41,7 @@ import org.apache.hc.core5.http.impl.nio
import org.apache.hc.core5.http.impl.nio.HttpAsyncRequestExecutor;
import org.apache.hc.core5.http.message.BasicClassicHttpRequest;
import org.apache.hc.core5.http.protocol.HttpProcessor;
-import org.apache.hc.core5.http.protocol.ImmutableHttpProcessor;
+import org.apache.hc.core5.http.protocol.DefaultHttpProcessor;
import org.apache.hc.core5.http.protocol.RequestConnControl;
import org.apache.hc.core5.http.protocol.RequestContent;
import org.apache.hc.core5.http.protocol.RequestTargetHost;
@@ -64,7 +64,7 @@ public class TestClientOutOfSequenceResp
@Before
public void setup() throws Exception {
server = new ServerSocket(0, 1);
- final HttpProcessor httpProcessor = new ImmutableHttpProcessor(
+ final HttpProcessor httpProcessor = new DefaultHttpProcessor(
new RequestContent(),
new RequestTargetHost(),
new RequestConnControl(),
Modified: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/integration/TestDefaultListeningIOReactor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/integration/TestDefaultListeningIOReactor.java?rev=1762526&r1=1762525&r2=1762526&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/integration/TestDefaultListeningIOReactor.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/integration/TestDefaultListeningIOReactor.java Tue Sep 27 17:49:09 2016
@@ -39,7 +39,7 @@ import org.apache.hc.core5.http.impl.nio
import org.apache.hc.core5.http.impl.nio.HttpAsyncService;
import org.apache.hc.core5.http.impl.nio.UriHttpAsyncRequestHandlerMapper;
import org.apache.hc.core5.http.protocol.HttpProcessor;
-import org.apache.hc.core5.http.protocol.ImmutableHttpProcessor;
+import org.apache.hc.core5.http.protocol.DefaultHttpProcessor;
import org.apache.hc.core5.http.protocol.ResponseConnControl;
import org.apache.hc.core5.http.protocol.ResponseContent;
import org.apache.hc.core5.http.protocol.ResponseDate;
@@ -64,7 +64,7 @@ public class TestDefaultListeningIOReact
@Before
public void setup() throws Exception {
- final HttpProcessor httpproc = new ImmutableHttpProcessor(new ResponseDate(),
+ final HttpProcessor httpproc = new DefaultHttpProcessor(new ResponseDate(),
new ResponseServer(),
new ResponseContent(),
new ResponseConnControl());
Modified: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/integration/TestServerSidePipelining.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/integration/TestServerSidePipelining.java?rev=1762526&r1=1762525&r2=1762526&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/integration/TestServerSidePipelining.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/integration/TestServerSidePipelining.java Tue Sep 27 17:49:09 2016
@@ -50,7 +50,7 @@ import org.apache.hc.core5.http.nio.enti
import org.apache.hc.core5.http.nio.entity.NStringEntity;
import org.apache.hc.core5.http.protocol.HttpContext;
import org.apache.hc.core5.http.protocol.HttpProcessor;
-import org.apache.hc.core5.http.protocol.ImmutableHttpProcessor;
+import org.apache.hc.core5.http.protocol.DefaultHttpProcessor;
import org.apache.hc.core5.http.protocol.ResponseConnControl;
import org.apache.hc.core5.http.protocol.ResponseContent;
import org.apache.hc.core5.http.protocol.ResponseServer;
@@ -68,7 +68,7 @@ public class TestServerSidePipelining ex
@Override
protected HttpProcessor createServerHttpProcessor() {
- return new ImmutableHttpProcessor(
+ return new DefaultHttpProcessor(
new ResponseServer("TEST-SERVER/1.1"),
new ResponseContent(),
new ResponseConnControl());
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=1762526&r1=1762525&r2=1762526&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 Tue Sep 27 17:49:09 2016
@@ -38,15 +38,17 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Random;
+import org.apache.hc.core5.http.ClassicHttpRequest;
+import org.apache.hc.core5.http.ClassicHttpResponse;
+import org.apache.hc.core5.http.EntityDetails;
import org.apache.hc.core5.http.Header;
import org.apache.hc.core5.http.HttpConnectionMetrics;
import org.apache.hc.core5.http.HttpEntity;
import org.apache.hc.core5.http.HttpException;
import org.apache.hc.core5.http.HttpHeaders;
import org.apache.hc.core5.http.HttpHost;
-import org.apache.hc.core5.http.ClassicHttpRequest;
+import org.apache.hc.core5.http.HttpRequest;
import org.apache.hc.core5.http.HttpRequestInterceptor;
-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;
@@ -58,8 +60,8 @@ import org.apache.hc.core5.http.impl.io.
import org.apache.hc.core5.http.io.HttpRequestHandler;
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;
+import org.apache.hc.core5.http.io.HttpExpectationVerifier;
+import org.apache.hc.core5.http.protocol.DefaultHttpProcessor;
import org.apache.hc.core5.http.protocol.RequestConnControl;
import org.apache.hc.core5.http.protocol.RequestContent;
import org.apache.hc.core5.http.protocol.RequestExpectContinue;
@@ -834,7 +836,7 @@ public class TestSyncHttp {
final BasicClassicHttpRequest post = new BasicClassicHttpRequest("POST", "/");
post.setEntity(null);
- this.client = new HttpClient(new ImmutableHttpProcessor(
+ this.client = new HttpClient(new DefaultHttpProcessor(
new RequestTargetHost(),
new RequestConnControl(),
new RequestUserAgent(),
@@ -883,12 +885,13 @@ public class TestSyncHttp {
final BasicClassicHttpRequest post = new BasicClassicHttpRequest("POST", "/");
post.setEntity(null);
- this.client = new HttpClient(new ImmutableHttpProcessor(
+ this.client = new HttpClient(new DefaultHttpProcessor(
new HttpRequestInterceptor() {
@Override
public void process(
- final ClassicHttpRequest request,
+ final HttpRequest request,
+ final EntityDetails entity,
final HttpContext context) throws HttpException, IOException {
request.addHeader(HttpHeaders.TRANSFER_ENCODING, "identity");
}
@@ -972,7 +975,7 @@ public class TestSyncHttp {
});
- this.client = new HttpClient(new ImmutableHttpProcessor(new RequestContent(), new RequestConnControl()));
+ this.client = new HttpClient(new DefaultHttpProcessor(new RequestContent(), new RequestConnControl()));
this.server.start();
final DefaultBHttpClientConnection conn = client.createConnection();
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=1762526&r1=1762525&r2=1762526&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 Tue Sep 27 17:49:09 2016
@@ -27,8 +27,8 @@
package org.apache.hc.core5.http.io;
-import org.apache.hc.core5.http.ClassicHttpRequest;
-import org.apache.hc.core5.http.message.BasicClassicHttpRequest;
+import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.message.BasicHttpRequest;
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 ClassicHttpRequest request = new BasicClassicHttpRequest("GET", "/");
+ final HttpRequest request = new BasicHttpRequest("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 BasicClassicHttpRequest("GET", "/that.view?param=value"), context);
+ h = registry.lookup(new BasicHttpRequest("GET", "/that.view?param=value"), context);
Assert.assertNotNull(h);
Assert.assertTrue(h1 == h);
- h = registry.lookup(new BasicClassicHttpRequest("GET", "/that.form?whatever"), context);
+ h = registry.lookup(new BasicHttpRequest("GET", "/that.form?whatever"), context);
Assert.assertNotNull(h);
Assert.assertTrue(h2 == h);
- h = registry.lookup(new BasicClassicHttpRequest("GET", "/whatever"), context);
+ h = registry.lookup(new BasicHttpRequest("GET", "/whatever"), context);
Assert.assertNotNull(h);
Assert.assertTrue(def == h);
}