hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1758141 [5/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...
Date Sun, 28 Aug 2016 19:04:51 GMT
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=1758141&r1=1758140&r2=1758141&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 Sun Aug 28 19:04:49 2016
@@ -33,8 +33,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.MethodNotSupportedException;
@@ -44,8 +44,8 @@ import org.apache.hc.core5.http.entity.I
 import org.apache.hc.core5.http.io.HttpRequestHandler;
 import org.apache.hc.core5.http.io.HttpRequestHandlerMapper;
 import org.apache.hc.core5.http.io.HttpServerConnection;
-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.protocol.HttpContext;
 import org.apache.hc.core5.http.protocol.HttpCoreContext;
 import org.apache.hc.core5.http.protocol.HttpExpectationVerifier;
@@ -86,9 +86,9 @@ public class TestHttpService {
                 handlerResolver);
         final HttpCoreContext context = HttpCoreContext.create();
         final HttpServerConnection conn = Mockito.mock(HttpServerConnection.class);
-        final HttpRequest request = new BasicHttpRequest("GET", "/");
+        final ClassicHttpRequest request = new BasicClassicHttpRequest("GET", "/");
         Mockito.when(conn.receiveRequestHeader()).thenReturn(request);
-        final HttpResponse response = new BasicHttpResponse(200, "OK");
+        final ClassicHttpResponse response = new BasicClassicHttpResponse(200, "OK");
         Mockito.when(responseFactory.newHttpResponse(200)).thenReturn(response);
         Mockito.when(connReuseStrategy.keepAlive(request, response, context)).thenReturn(Boolean.FALSE);
 
@@ -122,13 +122,13 @@ public class TestHttpService {
                 handlerResolver);
         final HttpCoreContext context = HttpCoreContext.create();
         final HttpServerConnection conn = Mockito.mock(HttpServerConnection.class);
-        final HttpRequest request = new BasicHttpRequest("POST", "/");
+        final ClassicHttpRequest request = new BasicClassicHttpRequest("POST", "/");
         final InputStream instream = Mockito.mock(InputStream.class);
         final InputStreamEntity entity = new InputStreamEntity(instream, -1);
         request.setEntity(entity);
 
         Mockito.when(conn.receiveRequestHeader()).thenReturn(request);
-        final HttpResponse response = new BasicHttpResponse(200, "OK");
+        final ClassicHttpResponse response = new BasicClassicHttpResponse(200, "OK");
         Mockito.when(responseFactory.newHttpResponse(200)).thenReturn(response);
         Mockito.when(connReuseStrategy.keepAlive(request, response, context)).thenReturn(Boolean.FALSE);
 
@@ -164,16 +164,16 @@ public class TestHttpService {
                 handlerResolver);
         final HttpCoreContext context = HttpCoreContext.create();
         final HttpServerConnection conn = Mockito.mock(HttpServerConnection.class);
-        final HttpRequest request = new BasicHttpRequest("POST", "/");
+        final ClassicHttpRequest request = new BasicClassicHttpRequest("POST", "/");
         request.addHeader(HttpHeaders.EXPECT, HeaderElements.CONTINUE);
         final InputStream instream = Mockito.mock(InputStream.class);
         final InputStreamEntity entity = new InputStreamEntity(instream, -1);
         request.setEntity(entity);
 
         Mockito.when(conn.receiveRequestHeader()).thenReturn(request);
-        final HttpResponse resp100 = new BasicHttpResponse(100, "Continue");
+        final ClassicHttpResponse resp100 = new BasicClassicHttpResponse(100, "Continue");
         Mockito.when(responseFactory.newHttpResponse(100)).thenReturn(resp100);
-        final HttpResponse response = new BasicHttpResponse(200, "OK");
+        final ClassicHttpResponse response = new BasicClassicHttpResponse(200, "OK");
         Mockito.when(responseFactory.newHttpResponse(200)).thenReturn(response);
         Mockito.when(connReuseStrategy.keepAlive(request, response, context)).thenReturn(Boolean.FALSE);
 
@@ -207,8 +207,8 @@ public class TestHttpService {
 
             @Override
             public void verify(
-                    final HttpRequest request,
-                    final HttpResponse response,
+                    final ClassicHttpRequest request,
+                    final ClassicHttpResponse response,
                     final HttpContext context) throws HttpException {
                 response.setCode(HttpStatus.SC_UNAUTHORIZED);
             }
@@ -223,14 +223,14 @@ public class TestHttpService {
                 expectationVerifier);
         final HttpCoreContext context = HttpCoreContext.create();
         final HttpServerConnection conn = Mockito.mock(HttpServerConnection.class);
-        final HttpRequest request = new BasicHttpRequest("POST", "/");
+        final ClassicHttpRequest request = new BasicClassicHttpRequest("POST", "/");
         request.addHeader(HttpHeaders.EXPECT, HeaderElements.CONTINUE);
         final InputStream instream = Mockito.mock(InputStream.class);
         final InputStreamEntity entity = new InputStreamEntity(instream, -1);
         request.setEntity(entity);
 
         Mockito.when(conn.receiveRequestHeader()).thenReturn(request);
-        final HttpResponse response = new BasicHttpResponse(100, "Continue");
+        final ClassicHttpResponse response = new BasicClassicHttpResponse(100, "Continue");
         Mockito.when(responseFactory.newHttpResponse(100)).thenReturn(response);
         Mockito.when(connReuseStrategy.keepAlive(request, response, context)).thenReturn(Boolean.FALSE);
 
@@ -266,16 +266,16 @@ public class TestHttpService {
                 expectationVerifier);
         final HttpCoreContext context = HttpCoreContext.create();
         final HttpServerConnection conn = Mockito.mock(HttpServerConnection.class);
-        final HttpRequest request = new BasicHttpRequest("POST", "/");
+        final ClassicHttpRequest request = new BasicClassicHttpRequest("POST", "/");
         request.addHeader(HttpHeaders.EXPECT, "100-continue");
         final InputStream instream = Mockito.mock(InputStream.class);
         final InputStreamEntity entity = new InputStreamEntity(instream, -1);
         request.setEntity(entity);
 
         Mockito.when(conn.receiveRequestHeader()).thenReturn(request);
-        final HttpResponse resp100 = new BasicHttpResponse(100, "Continue");
+        final ClassicHttpResponse resp100 = new BasicClassicHttpResponse(100, "Continue");
         Mockito.when(responseFactory.newHttpResponse(100)).thenReturn(resp100);
-        final HttpResponse response = new BasicHttpResponse(500, "Oppsie");
+        final ClassicHttpResponse response = new BasicClassicHttpResponse(500, "Oppsie");
         Mockito.when(responseFactory.newHttpResponse(500)).thenReturn(response);
         Mockito.doThrow(new HttpException("Oopsie")).when(expectationVerifier).verify(request, resp100, context);
         Mockito.when(connReuseStrategy.keepAlive(request, response, context)).thenReturn(Boolean.FALSE);
@@ -311,12 +311,12 @@ public class TestHttpService {
                 handlerResolver);
         final HttpCoreContext context = HttpCoreContext.create();
         final HttpServerConnection conn = Mockito.mock(HttpServerConnection.class);
-        final HttpRequest request = new BasicHttpRequest("whatever", "/");
+        final ClassicHttpRequest request = new BasicClassicHttpRequest("whatever", "/");
 
         Mockito.when(conn.receiveRequestHeader()).thenReturn(request);
-        final HttpResponse response = new BasicHttpResponse(200, "OK");
+        final ClassicHttpResponse response = new BasicClassicHttpResponse(200, "OK");
         Mockito.when(responseFactory.newHttpResponse(200)).thenReturn(response);
-        final HttpResponse error = new BasicHttpResponse(500, "Oppsie");
+        final ClassicHttpResponse error = new BasicClassicHttpResponse(500, "Oppsie");
         Mockito.when(responseFactory.newHttpResponse(500)).thenReturn(error);
         Mockito.when(handlerResolver.lookup(request, context)).thenReturn(requestHandler);
         Mockito.doThrow(new MethodNotSupportedException("whatever")).when(
@@ -354,12 +354,12 @@ public class TestHttpService {
                 handlerResolver);
         final HttpCoreContext context = HttpCoreContext.create();
         final HttpServerConnection conn = Mockito.mock(HttpServerConnection.class);
-        final HttpRequest request = new BasicHttpRequest("whatever", "/");
+        final ClassicHttpRequest request = new BasicClassicHttpRequest("whatever", "/");
 
         Mockito.when(conn.receiveRequestHeader()).thenReturn(request);
-        final HttpResponse response = new BasicHttpResponse(200, "OK");
+        final ClassicHttpResponse response = new BasicClassicHttpResponse(200, "OK");
         Mockito.when(responseFactory.newHttpResponse(200)).thenReturn(response);
-        final HttpResponse error = new BasicHttpResponse(500, "Oppsie");
+        final ClassicHttpResponse error = new BasicClassicHttpResponse(500, "Oppsie");
         Mockito.when(responseFactory.newHttpResponse(500)).thenReturn(error);
         Mockito.when(handlerResolver.lookup(request, context)).thenReturn(requestHandler);
         Mockito.doThrow(new UnsupportedHttpVersionException()).when(
@@ -397,12 +397,12 @@ public class TestHttpService {
                 handlerResolver);
         final HttpCoreContext context = HttpCoreContext.create();
         final HttpServerConnection conn = Mockito.mock(HttpServerConnection.class);
-        final HttpRequest request = new BasicHttpRequest("whatever", "/");
+        final ClassicHttpRequest request = new BasicClassicHttpRequest("whatever", "/");
 
         Mockito.when(conn.receiveRequestHeader()).thenReturn(request);
-        final HttpResponse response = new BasicHttpResponse(200, "OK");
+        final ClassicHttpResponse response = new BasicClassicHttpResponse(200, "OK");
         Mockito.when(responseFactory.newHttpResponse(200)).thenReturn(response);
-        final HttpResponse error = new BasicHttpResponse(500, "Oppsie");
+        final ClassicHttpResponse error = new BasicClassicHttpResponse(500, "Oppsie");
         Mockito.when(responseFactory.newHttpResponse(500)).thenReturn(error);
         Mockito.when(handlerResolver.lookup(request, context)).thenReturn(requestHandler);
         Mockito.doThrow(new ProtocolException("oh, this world is wrong")).when(
@@ -440,9 +440,9 @@ public class TestHttpService {
                 handlerResolver);
         final HttpCoreContext context = HttpCoreContext.create();
         final HttpServerConnection conn = Mockito.mock(HttpServerConnection.class);
-        final HttpRequest request = new BasicHttpRequest("GET", "/");
+        final ClassicHttpRequest request = new BasicClassicHttpRequest("GET", "/");
         Mockito.when(conn.receiveRequestHeader()).thenReturn(request);
-        final HttpResponse response = new BasicHttpResponse(200, "OK");
+        final ClassicHttpResponse response = new BasicClassicHttpResponse(200, "OK");
         Mockito.when(responseFactory.newHttpResponse(200)).thenReturn(response);
         Mockito.when(handlerResolver.lookup(request, context)).thenReturn(requestHandler);
         Mockito.when(connReuseStrategy.keepAlive(request, response, context)).thenReturn(Boolean.TRUE);
@@ -478,10 +478,10 @@ public class TestHttpService {
                 handlerResolver);
         final HttpCoreContext context = HttpCoreContext.create();
         final HttpServerConnection conn = Mockito.mock(HttpServerConnection.class);
-        final HttpRequest request = new BasicHttpRequest("GET", "/");
+        final ClassicHttpRequest request = new BasicClassicHttpRequest("GET", "/");
 
         Mockito.when(conn.receiveRequestHeader()).thenReturn(request);
-        final HttpResponse response = new BasicHttpResponse(HttpStatus.SC_NO_CONTENT, "No Content");
+        final ClassicHttpResponse response = new BasicClassicHttpResponse(HttpStatus.SC_NO_CONTENT, "No Content");
         Mockito.when(responseFactory.newHttpResponse(200)).thenReturn(response);
         Mockito.when(handlerResolver.lookup(request, context)).thenReturn(requestHandler);
         Mockito.when(connReuseStrategy.keepAlive(request, response, context)).thenReturn(Boolean.TRUE);
@@ -495,7 +495,7 @@ public class TestHttpService {
         Mockito.verify(requestHandler).handle(request, response, context);
 
         Mockito.verify(conn).sendResponseHeader(response);
-        Mockito.verify(conn, Mockito.never()).sendResponseEntity(Mockito.<HttpResponse>any());
+        Mockito.verify(conn, Mockito.never()).sendResponseEntity(Mockito.<ClassicHttpResponse>any());
         Mockito.verify(conn).flush();
         Mockito.verify(conn, Mockito.never()).close();
     }
@@ -515,10 +515,10 @@ public class TestHttpService {
                 handlerResolver);
         final HttpCoreContext context = HttpCoreContext.create();
         final HttpServerConnection conn = Mockito.mock(HttpServerConnection.class);
-        final HttpRequest request = new BasicHttpRequest("HEAD", "/");
+        final ClassicHttpRequest request = new BasicClassicHttpRequest("HEAD", "/");
 
         Mockito.when(conn.receiveRequestHeader()).thenReturn(request);
-        final HttpResponse response = new BasicHttpResponse(200, "OK");
+        final ClassicHttpResponse response = new BasicClassicHttpResponse(200, "OK");
         Mockito.when(responseFactory.newHttpResponse(200)).thenReturn(response);
         Mockito.when(handlerResolver.lookup(request, context)).thenReturn(requestHandler);
         Mockito.when(connReuseStrategy.keepAlive(request, response, context)).thenReturn(Boolean.TRUE);
@@ -532,7 +532,7 @@ public class TestHttpService {
         Mockito.verify(requestHandler).handle(request, response, context);
 
         Mockito.verify(conn).sendResponseHeader(response);
-        Mockito.verify(conn, Mockito.never()).sendResponseEntity(Mockito.<HttpResponse>any());
+        Mockito.verify(conn, Mockito.never()).sendResponseEntity(Mockito.<ClassicHttpResponse>any());
         Mockito.verify(conn).flush();
         Mockito.verify(conn, Mockito.never()).close();
     }

Modified: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestRequestParser.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestRequestParser.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestRequestParser.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestRequestParser.java Sun Aug 28 19:04:49 2016
@@ -32,7 +32,7 @@ import java.nio.charset.StandardCharsets
 
 import org.apache.hc.core5.http.ConnectionClosedException;
 import org.apache.hc.core5.http.Header;
-import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.ClassicHttpRequest;
 import org.apache.hc.core5.http.MessageConstraintException;
 import org.apache.hc.core5.http.UnsupportedHttpVersionException;
 import org.apache.hc.core5.http.config.MessageConstraints;
@@ -57,7 +57,7 @@ public class TestRequestParser {
         final SessionInputBuffer inbuffer = new SessionInputBufferImpl(16, StandardCharsets.US_ASCII.newDecoder());
 
         final DefaultHttpRequestParser parser = new DefaultHttpRequestParser();
-        final HttpRequest httprequest = parser.parse(inbuffer, inputStream);
+        final ClassicHttpRequest httprequest = parser.parse(inbuffer, inputStream);
 
         Assert.assertEquals("GET", httprequest.getMethod());
         Assert.assertEquals("/", httprequest.getPath());
@@ -87,7 +87,7 @@ public class TestRequestParser {
 
         final DefaultHttpRequestParser parser = new DefaultHttpRequestParser(
                 MessageConstraints.custom().setMaxEmptyLineCount(3).build());
-        final HttpRequest httprequest = parser.parse(inbuffer, inputStream);
+        final ClassicHttpRequest httprequest = parser.parse(inbuffer, inputStream);
 
         Assert.assertEquals("GET", httprequest.getMethod());
         Assert.assertEquals("/", httprequest.getPath());
@@ -127,7 +127,7 @@ public class TestRequestParser {
 
         int timeoutCount = 0;
 
-        HttpRequest httprequest = null;
+        ClassicHttpRequest httprequest = null;
         for (int i = 0; i < 10; i++) {
             try {
                 httprequest = parser.parse(inbuffer, inputStream);

Modified: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestResponseParser.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestResponseParser.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestResponseParser.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestResponseParser.java Sun Aug 28 19:04:49 2016
@@ -32,7 +32,7 @@ import java.io.InterruptedIOException;
 import java.nio.charset.StandardCharsets;
 
 import org.apache.hc.core5.http.Header;
-import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.ClassicHttpResponse;
 import org.apache.hc.core5.http.MessageConstraintException;
 import org.apache.hc.core5.http.NoHttpResponseException;
 import org.apache.hc.core5.http.UnsupportedHttpVersionException;
@@ -58,7 +58,7 @@ public class TestResponseParser {
         final SessionInputBuffer inbuffer = new SessionInputBufferImpl(16, StandardCharsets.US_ASCII.newDecoder());
 
         final DefaultHttpResponseParser parser = new DefaultHttpResponseParser();
-        final HttpResponse httpresponse = parser.parse(inbuffer, inputStream);
+        final ClassicHttpResponse httpresponse = parser.parse(inbuffer, inputStream);
 
         Assert.assertEquals(200, httpresponse.getCode());
         Assert.assertEquals("OK", httpresponse.getReasonPhrase());
@@ -88,7 +88,7 @@ public class TestResponseParser {
 
         final DefaultHttpResponseParser parser = new DefaultHttpResponseParser(
                 MessageConstraints.custom().setMaxEmptyLineCount(3).build());
-        final HttpResponse httpresponse = parser.parse(inbuffer, inputStream);
+        final ClassicHttpResponse httpresponse = parser.parse(inbuffer, inputStream);
 
         Assert.assertEquals(200, httpresponse.getCode());
         Assert.assertEquals("OK", httpresponse.getReasonPhrase());
@@ -128,7 +128,7 @@ public class TestResponseParser {
 
         int timeoutCount = 0;
 
-        HttpResponse httpresponse = null;
+        ClassicHttpResponse httpresponse = null;
         for (int i = 0; i < 10; i++) {
             try {
                 httpresponse = parser.parse(inbuffer, inputStream);

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=1758141&r1=1758140&r2=1758141&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 Sun Aug 28 19:04:49 2016
@@ -30,9 +30,9 @@ package org.apache.hc.core5.http.impl.ni
 import java.util.concurrent.ExecutionException;
 
 import org.apache.hc.core5.http.ConnectionClosedException;
-import org.apache.hc.core5.http.HttpRequest;
-import org.apache.hc.core5.http.message.BasicHttpRequest;
-import org.apache.hc.core5.http.message.BasicHttpResponse;
+import org.apache.hc.core5.http.ClassicHttpRequest;
+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.HttpAsyncRequestProducer;
@@ -153,10 +153,10 @@ public class TestBasicAsyncClientExchang
 
     @Test
     public void testGenerateRequest() throws Exception {
-        final BasicHttpRequest request = new BasicHttpRequest("GET", "/");
+        final BasicClassicHttpRequest request = new BasicClassicHttpRequest("GET", "/");
         Mockito.when(this.requestProducer.generateRequest()).thenReturn(request);
 
-        final HttpRequest result = this.exchangeHandler.generateRequest();
+        final ClassicHttpRequest result = this.exchangeHandler.generateRequest();
 
         Assert.assertSame(request, result);
 
@@ -193,7 +193,7 @@ public class TestBasicAsyncClientExchang
 
     @Test
     public void testResponseReceived() throws Exception {
-        final BasicHttpResponse response = new BasicHttpResponse(200, "OK");
+        final BasicClassicHttpResponse response = new BasicClassicHttpResponse(200, "OK");
 
         this.exchangeHandler.responseReceived(response);
 

Modified: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/nio/TestBasicAsyncRequestConsumer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/nio/TestBasicAsyncRequestConsumer.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/nio/TestBasicAsyncRequestConsumer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/nio/TestBasicAsyncRequestConsumer.java Sun Aug 28 19:04:49 2016
@@ -31,7 +31,7 @@ import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.ClassicHttpRequest;
 import org.apache.hc.core5.http.entity.StringEntity;
 import org.apache.hc.core5.http.nio.ContentDecoder;
 import org.apache.hc.core5.http.nio.IOControl;
@@ -47,7 +47,7 @@ import org.mockito.MockitoAnnotations;
 public class TestBasicAsyncRequestConsumer {
 
     private BasicAsyncRequestConsumer consumer;
-    @Mock private HttpRequest request;
+    @Mock private ClassicHttpRequest request;
     @Mock private HttpContext context;
     @Mock private ContentDecoder decoder;
     @Mock private IOControl ioctrl;

Modified: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/nio/TestBasicAsyncRequestHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/nio/TestBasicAsyncRequestHandler.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/nio/TestBasicAsyncRequestHandler.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/nio/TestBasicAsyncRequestHandler.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.HttpResponse;
+import org.apache.hc.core5.http.ClassicHttpRequest;
+import org.apache.hc.core5.http.ClassicHttpResponse;
 import org.apache.hc.core5.http.io.HttpRequestHandler;
 import org.apache.hc.core5.http.nio.HttpAsyncExchange;
 import org.apache.hc.core5.http.nio.HttpAsyncRequestConsumer;
@@ -46,8 +46,8 @@ public class TestBasicAsyncRequestHandle
     private HttpRequestHandler requestHandler;
     private BasicAsyncRequestHandler asyncRequestHandler;
     private HttpContext context;
-    private HttpRequest request;
-    private HttpResponse response;
+    private ClassicHttpRequest request;
+    private ClassicHttpResponse response;
     private HttpAsyncExchange httpexchange;
 
     @Before
@@ -55,8 +55,8 @@ public class TestBasicAsyncRequestHandle
         this.requestHandler = Mockito.mock(HttpRequestHandler.class);
         this.asyncRequestHandler = new BasicAsyncRequestHandler(this.requestHandler);
         this.context = new BasicHttpContext();
-        this.request = Mockito.mock(HttpRequest.class);
-        this.response = Mockito.mock(HttpResponse.class);
+        this.request = Mockito.mock(ClassicHttpRequest.class);
+        this.response = Mockito.mock(ClassicHttpResponse.class);
         this.httpexchange = Mockito.mock(HttpAsyncExchange.class);
         Mockito.when(this.httpexchange.getRequest()).thenReturn(this.request);
         Mockito.when(this.httpexchange.getResponse()).thenReturn(this.response);
@@ -78,7 +78,7 @@ public class TestBasicAsyncRequestHandle
 
     @Test
     public void testProcessRequest() throws Exception {
-        final HttpAsyncRequestConsumer<HttpRequest> requestConsumer = this.asyncRequestHandler.processRequest(
+        final HttpAsyncRequestConsumer<ClassicHttpRequest> requestConsumer = this.asyncRequestHandler.processRequest(
                 this.request, this.context);
         Assert.assertTrue(requestConsumer instanceof BasicAsyncRequestConsumer);
     }

Modified: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/nio/TestBasicAsyncRequestProducer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/nio/TestBasicAsyncRequestProducer.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/nio/TestBasicAsyncRequestProducer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/nio/TestBasicAsyncRequestProducer.java Sun Aug 28 19:04:49 2016
@@ -32,7 +32,7 @@ import static org.mockito.Mockito.verify
 import static org.mockito.Mockito.when;
 
 import org.apache.hc.core5.http.HttpHost;
-import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.ClassicHttpRequest;
 import org.apache.hc.core5.http.nio.ContentEncoder;
 import org.apache.hc.core5.http.nio.entity.HttpAsyncContentProducer;
 import org.junit.After;
@@ -47,7 +47,7 @@ public class TestBasicAsyncRequestProduc
     private BasicAsyncRequestProducer producer;
     private HttpHost target;
     @Mock private HttpAsyncContentProducer contentProducer;
-    @Mock private HttpRequest request;
+    @Mock private ClassicHttpRequest request;
     @Mock private ContentEncoder encoder;
 
     @Before
@@ -83,7 +83,7 @@ public class TestBasicAsyncRequestProduc
 
     @Test
     public void testGenerateRequest() {
-        final HttpRequest res = producer.generateRequest();
+        final ClassicHttpRequest res = producer.generateRequest();
 
         Assert.assertSame(request, res);
     }

Modified: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/nio/TestBasicAsyncResponseConsumer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/nio/TestBasicAsyncResponseConsumer.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/nio/TestBasicAsyncResponseConsumer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/nio/TestBasicAsyncResponseConsumer.java Sun Aug 28 19:04:49 2016
@@ -31,7 +31,7 @@ import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.ClassicHttpResponse;
 import org.apache.hc.core5.http.entity.StringEntity;
 import org.apache.hc.core5.http.nio.ContentDecoder;
 import org.apache.hc.core5.http.nio.IOControl;
@@ -47,7 +47,7 @@ import org.mockito.MockitoAnnotations;
 public class TestBasicAsyncResponseConsumer {
 
     private BasicAsyncResponseConsumer consumer;
-    @Mock private HttpResponse response;
+    @Mock private ClassicHttpResponse response;
     @Mock private HttpContext context;
     @Mock private ContentDecoder decoder;
     @Mock private IOControl ioctrl;

Modified: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/nio/TestBasicAsyncResponseProducer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/nio/TestBasicAsyncResponseProducer.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/nio/TestBasicAsyncResponseProducer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/nio/TestBasicAsyncResponseProducer.java Sun Aug 28 19:04:49 2016
@@ -32,7 +32,7 @@ import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.ClassicHttpResponse;
 import org.apache.hc.core5.http.nio.ContentEncoder;
 import org.apache.hc.core5.http.nio.entity.HttpAsyncContentProducer;
 import org.junit.After;
@@ -46,7 +46,7 @@ public class TestBasicAsyncResponseProdu
 
     private BasicAsyncResponseProducer producer;
     @Mock private HttpAsyncContentProducer contentProducer;
-    @Mock private HttpResponse response;
+    @Mock private ClassicHttpResponse response;
     @Mock private ContentEncoder encoder;
 
     @Before
@@ -66,7 +66,7 @@ public class TestBasicAsyncResponseProdu
 
     @Test
     public void testGenerateRequest() {
-        final HttpResponse res = producer.generateResponse();
+        final ClassicHttpResponse res = producer.generateResponse();
 
         Assert.assertSame(response, res);
     }

Modified: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/nio/TestDefaultNHttpClientConnection.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/nio/TestDefaultNHttpClientConnection.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/nio/TestDefaultNHttpClientConnection.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/nio/TestDefaultNHttpClientConnection.java Sun Aug 28 19:04:49 2016
@@ -35,10 +35,10 @@ import java.util.LinkedList;
 import org.apache.hc.core5.http.HeaderElements;
 import org.apache.hc.core5.http.HttpEntity;
 import org.apache.hc.core5.http.HttpHeaders;
-import org.apache.hc.core5.http.HttpRequest;
-import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.ClassicHttpRequest;
+import org.apache.hc.core5.http.ClassicHttpResponse;
 import org.apache.hc.core5.http.entity.StringEntity;
-import org.apache.hc.core5.http.message.BasicHttpRequest;
+import org.apache.hc.core5.http.message.BasicClassicHttpRequest;
 import org.apache.hc.core5.http.nio.ContentDecoder;
 import org.apache.hc.core5.http.nio.ContentEncoder;
 import org.apache.hc.core5.http.nio.IOControl;
@@ -77,7 +77,7 @@ public class TestDefaultNHttpClientConne
 
     @Test
     public void testSubmitRequest() throws Exception {
-        final BasicHttpRequest request = new BasicHttpRequest("GET", "/");
+        final BasicClassicHttpRequest request = new BasicClassicHttpRequest("GET", "/");
         conn.submitRequest(request);
 
         Assert.assertNull(conn.getHttpRequest());
@@ -88,7 +88,7 @@ public class TestDefaultNHttpClientConne
 
     @Test
     public void testSubmitEntityEnclosingRequest() throws Exception {
-        final BasicHttpRequest request = new BasicHttpRequest("POST", "/");
+        final BasicClassicHttpRequest request = new BasicClassicHttpRequest("POST", "/");
         request.setHeader(HttpHeaders.CONTENT_LENGTH, "5");
         request.setEntity(new StringEntity("stuff"));
 
@@ -108,7 +108,7 @@ public class TestDefaultNHttpClientConne
 
     @Test
     public void testOutputReset() throws Exception {
-        final BasicHttpRequest request = new BasicHttpRequest("POST", "/");
+        final BasicClassicHttpRequest request = new BasicClassicHttpRequest("POST", "/");
         request.setHeader(HttpHeaders.CONTENT_LENGTH, "5");
         request.setEntity(new StringEntity("stuff"));
 
@@ -127,9 +127,9 @@ public class TestDefaultNHttpClientConne
 
     static class RequestReadyAnswer implements Answer<Void> {
 
-        private final HttpRequest request;
+        private final ClassicHttpRequest request;
 
-        RequestReadyAnswer(final HttpRequest request) {
+        RequestReadyAnswer(final ClassicHttpRequest request) {
             super();
             this.request = request;
         }
@@ -164,7 +164,7 @@ public class TestDefaultNHttpClientConne
 
     @Test
     public void testProduceOutputShortMessageAfterSubmit() throws Exception {
-        final BasicHttpRequest request = new BasicHttpRequest("POST", "/");
+        final BasicClassicHttpRequest request = new BasicClassicHttpRequest("POST", "/");
         request.setHeader(HttpHeaders.CONTENT_LENGTH, "5");
         final NStringEntity entity = new NStringEntity("stuff");
         request.setEntity(entity);
@@ -190,7 +190,7 @@ public class TestDefaultNHttpClientConne
 
     @Test
     public void testProduceOutputLongMessageAfterSubmit() throws Exception {
-        final BasicHttpRequest request = new BasicHttpRequest("POST", "/");
+        final BasicClassicHttpRequest request = new BasicClassicHttpRequest("POST", "/");
         request.setHeader(HttpHeaders.CONTENT_LENGTH, "22");
         final NStringEntity entity = new NStringEntity("a lot of various stuff");
         request.setEntity(entity);
@@ -216,7 +216,7 @@ public class TestDefaultNHttpClientConne
 
     @Test
     public void testProduceOutputShortMessage() throws Exception {
-        final BasicHttpRequest request = new BasicHttpRequest("POST", "/");
+        final BasicClassicHttpRequest request = new BasicClassicHttpRequest("POST", "/");
         request.setHeader(HttpHeaders.CONTENT_LENGTH, "5");
         final NStringEntity entity = new NStringEntity("stuff");
         request.setEntity(entity);
@@ -242,7 +242,7 @@ public class TestDefaultNHttpClientConne
 
     @Test
     public void testProduceOutputLongMessage() throws Exception {
-        final BasicHttpRequest request = new BasicHttpRequest("POST", "/");
+        final BasicClassicHttpRequest request = new BasicClassicHttpRequest("POST", "/");
         request.setHeader(HttpHeaders.CONTENT_LENGTH, "22");
         final NStringEntity entity = new NStringEntity("a lot of various stuff");
         request.setEntity(entity);
@@ -269,7 +269,7 @@ public class TestDefaultNHttpClientConne
 
     @Test
     public void testProduceOutputLongMessageSaturatedChannel() throws Exception {
-        final BasicHttpRequest request = new BasicHttpRequest("POST", "/");
+        final BasicClassicHttpRequest request = new BasicClassicHttpRequest("POST", "/");
         request.setHeader(HttpHeaders.CONTENT_LENGTH, "22");
         final NStringEntity entity = new NStringEntity("a lot of various stuff");
         request.setEntity(entity);
@@ -297,7 +297,7 @@ public class TestDefaultNHttpClientConne
     @Test
     public void testProduceOutputLongMessageSaturatedChannel2() throws Exception {
         conn = new DefaultNHttpClientConnection(session, 24);
-        final BasicHttpRequest request = new BasicHttpRequest("POST", "/");
+        final BasicClassicHttpRequest request = new BasicClassicHttpRequest("POST", "/");
         request.setHeader(HttpHeaders.CONTENT_LENGTH, "45");
         final NStringEntity entity = new NStringEntity("a loooooooooooooooooooooooot of various stuff");
         request.setEntity(entity);
@@ -326,7 +326,7 @@ public class TestDefaultNHttpClientConne
     public void testProduceOutputLongChunkedMessage() throws Exception {
         conn = new DefaultNHttpClientConnection(session, 64);
 
-        final BasicHttpRequest request = new BasicHttpRequest("POST", "/");
+        final BasicClassicHttpRequest request = new BasicClassicHttpRequest("POST", "/");
         request.setHeader(HttpHeaders.TRANSFER_ENCODING, HeaderElements.CHUNKED_ENCODING);
         final NStringEntity entity = new NStringEntity("a lot of various stuff");
         entity.setChunked(true);
@@ -356,7 +356,7 @@ public class TestDefaultNHttpClientConne
     public void testProduceOutputLongChunkedMessageSaturatedChannel() throws Exception {
         conn = new DefaultNHttpClientConnection(session, 64);
 
-        final BasicHttpRequest request = new BasicHttpRequest("POST", "/");
+        final BasicClassicHttpRequest request = new BasicClassicHttpRequest("POST", "/");
         request.setHeader(HttpHeaders.TRANSFER_ENCODING, HeaderElements.CHUNKED_ENCODING);
         final NStringEntity entity = new NStringEntity("a lot of various stuff");
         entity.setChunked(true);
@@ -386,7 +386,7 @@ public class TestDefaultNHttpClientConne
 
     @Test
     public void testProduceOutputClosingConnection() throws Exception {
-        final BasicHttpRequest request = new BasicHttpRequest("GET", "/");
+        final BasicClassicHttpRequest request = new BasicClassicHttpRequest("GET", "/");
 
         final WritableByteChannelMock wchannel = Mockito.spy(new WritableByteChannelMock(64));
         final ByteChannelMock channel = new ByteChannelMock(null, wchannel);
@@ -412,9 +412,9 @@ public class TestDefaultNHttpClientConne
 
     static class ResponseCapturingAnswer implements Answer<Void> {
 
-        private final LinkedList<HttpResponse> responses;
+        private final LinkedList<ClassicHttpResponse> responses;
 
-        ResponseCapturingAnswer(final LinkedList<HttpResponse> responses) {
+        ResponseCapturingAnswer(final LinkedList<ClassicHttpResponse> responses) {
             super();
             this.responses = responses;
         }
@@ -424,7 +424,7 @@ public class TestDefaultNHttpClientConne
             final Object[] args = invocation.getArguments();
             final NHttpClientConnection conn = (NHttpClientConnection) args[0];
             if (conn != null) {
-                final HttpResponse response = conn.getHttpResponse();
+                final ClassicHttpResponse response = conn.getHttpResponse();
                 if (response != null) {
                     responses.add(response);
                 }
@@ -461,7 +461,7 @@ public class TestDefaultNHttpClientConne
         Mockito.when(session.channel()).thenReturn(channel);
         Mockito.when(session.getEventMask()).thenReturn(SelectionKey.OP_READ);
 
-        final LinkedList<HttpResponse> responses = new LinkedList<>();
+        final LinkedList<ClassicHttpResponse> responses = new LinkedList<>();
 
         Mockito.doAnswer(new ResponseCapturingAnswer(responses)).when(
             handler).responseReceived(Matchers.<NHttpClientConnection>any());
@@ -486,7 +486,7 @@ public class TestDefaultNHttpClientConne
             Matchers.<NHttpClientConnection>any(), Matchers.<Exception>any());
 
         Assert.assertFalse(responses.isEmpty());
-        final HttpResponse response = responses.getFirst();
+        final ClassicHttpResponse response = responses.getFirst();
         Assert.assertNotNull(response);
         Assert.assertEquals(200, response.getCode());
         Assert.assertEquals("OK", response.getReasonPhrase());
@@ -505,7 +505,7 @@ public class TestDefaultNHttpClientConne
         Mockito.when(session.channel()).thenReturn(channel);
         Mockito.when(session.getEventMask()).thenReturn(SelectionKey.OP_READ);
 
-        final LinkedList<HttpResponse> responses = new LinkedList<>();
+        final LinkedList<ClassicHttpResponse> responses = new LinkedList<>();
 
         Mockito.doAnswer(new ResponseCapturingAnswer(responses)).when(
             handler).responseReceived(Matchers.<NHttpClientConnection>any());
@@ -530,7 +530,7 @@ public class TestDefaultNHttpClientConne
             Matchers.<NHttpClientConnection>any(), Matchers.<Exception>any());
 
         Assert.assertFalse(responses.isEmpty());
-        final HttpResponse response = responses.getFirst();
+        final ClassicHttpResponse response = responses.getFirst();
         Assert.assertNotNull(response);
         Assert.assertEquals(200, response.getCode());
         Assert.assertEquals("OK", response.getReasonPhrase());
@@ -556,7 +556,7 @@ public class TestDefaultNHttpClientConne
         Mockito.when(session.channel()).thenReturn(channel);
         Mockito.when(session.getEventMask()).thenReturn(SelectionKey.OP_READ);
 
-        final LinkedList<HttpResponse> responses = new LinkedList<>();
+        final LinkedList<ClassicHttpResponse> responses = new LinkedList<>();
 
         Mockito.doAnswer(new ResponseCapturingAnswer(responses)).when(
             handler).responseReceived(Matchers.<NHttpClientConnection>any());
@@ -577,7 +577,7 @@ public class TestDefaultNHttpClientConne
             Matchers.<NHttpClientConnection>any(), Matchers.<Exception>any());
 
         Assert.assertFalse(responses.isEmpty());
-        final HttpResponse response = responses.getFirst();
+        final ClassicHttpResponse response = responses.getFirst();
         Assert.assertNotNull(response);
         Assert.assertEquals(100, response.getCode());
         final HttpEntity entity = response.getEntity();
@@ -593,7 +593,7 @@ public class TestDefaultNHttpClientConne
         Mockito.when(session.channel()).thenReturn(channel);
         Mockito.when(session.getEventMask()).thenReturn(SelectionKey.OP_READ);
 
-        final LinkedList<HttpResponse> responses = new LinkedList<>();
+        final LinkedList<ClassicHttpResponse> responses = new LinkedList<>();
 
         Mockito.doAnswer(new ResponseCapturingAnswer(responses)).when(
             handler).responseReceived(Matchers.<NHttpClientConnection>any());

Modified: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/nio/TestDefaultNHttpServerConnection.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/nio/TestDefaultNHttpServerConnection.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/nio/TestDefaultNHttpServerConnection.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/nio/TestDefaultNHttpServerConnection.java Sun Aug 28 19:04:49 2016
@@ -34,10 +34,10 @@ import java.util.LinkedList;
 
 import org.apache.hc.core5.http.HttpEntity;
 import org.apache.hc.core5.http.HttpHeaders;
-import org.apache.hc.core5.http.HttpRequest;
-import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.ClassicHttpRequest;
+import org.apache.hc.core5.http.ClassicHttpResponse;
 import org.apache.hc.core5.http.entity.StringEntity;
-import org.apache.hc.core5.http.message.BasicHttpResponse;
+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.IOControl;
@@ -76,7 +76,7 @@ public class TestDefaultNHttpServerConne
 
     @Test
     public void testSubmitRequest() throws Exception {
-        final BasicHttpResponse response = new BasicHttpResponse(200, "OK");
+        final BasicClassicHttpResponse response = new BasicClassicHttpResponse(200, "OK");
         conn.submitResponse(response);
 
         Assert.assertNull(conn.getHttpResponse());
@@ -87,7 +87,7 @@ public class TestDefaultNHttpServerConne
 
     @Test
     public void testSubmitEntityEnclosingRequest() throws Exception {
-        final BasicHttpResponse response = new BasicHttpResponse(200, "OK");
+        final BasicClassicHttpResponse response = new BasicClassicHttpResponse(200, "OK");
         response.setEntity(new StringEntity("stuff"));
 
         Mockito.when(session.channel()).thenReturn(byteChan);
@@ -106,7 +106,7 @@ public class TestDefaultNHttpServerConne
 
     @Test
     public void testOutputReset() throws Exception {
-        final BasicHttpResponse response = new BasicHttpResponse(200, "OK");
+        final BasicClassicHttpResponse response = new BasicClassicHttpResponse(200, "OK");
         response.setEntity(new StringEntity("stuff"));
 
         Mockito.when(session.channel()).thenReturn(byteChan);
@@ -124,9 +124,9 @@ public class TestDefaultNHttpServerConne
 
     static class ResponseReadyAnswer implements Answer<Void> {
 
-        private final HttpResponse response;
+        private final ClassicHttpResponse response;
 
-        ResponseReadyAnswer(final HttpResponse response) {
+        ResponseReadyAnswer(final ClassicHttpResponse response) {
             super();
             this.response = response;
         }
@@ -161,7 +161,7 @@ public class TestDefaultNHttpServerConne
 
     @Test
     public void testProduceOutputShortMessageAfterSubmit() throws Exception {
-        final BasicHttpResponse response = new BasicHttpResponse(200, "OK");
+        final BasicClassicHttpResponse response = new BasicClassicHttpResponse(200, "OK");
         final NStringEntity entity = new NStringEntity("stuff");
         response.setEntity(entity);
 
@@ -186,7 +186,7 @@ public class TestDefaultNHttpServerConne
 
     @Test
     public void testProduceOutputLongMessageAfterSubmit() throws Exception {
-        final BasicHttpResponse response = new BasicHttpResponse(200, "OK");
+        final BasicClassicHttpResponse response = new BasicClassicHttpResponse(200, "OK");
         final NStringEntity entity = new NStringEntity("a lot of various stuff");
         response.setEntity(entity);
 
@@ -211,7 +211,7 @@ public class TestDefaultNHttpServerConne
 
     @Test
     public void testProduceOutputShortMessage() throws Exception {
-        final BasicHttpResponse response = new BasicHttpResponse(200, "OK");
+        final BasicClassicHttpResponse response = new BasicClassicHttpResponse(200, "OK");
         final NStringEntity entity = new NStringEntity("stuff");
         response.setEntity(entity);
 
@@ -236,7 +236,7 @@ public class TestDefaultNHttpServerConne
 
     @Test
     public void testProduceOutputLongMessage() throws Exception {
-        final BasicHttpResponse response = new BasicHttpResponse(200, "OK");
+        final BasicClassicHttpResponse response = new BasicClassicHttpResponse(200, "OK");
         final NStringEntity entity = new NStringEntity("a lot of various stuff");
         response.setEntity(entity);
 
@@ -261,7 +261,7 @@ public class TestDefaultNHttpServerConne
 
     @Test
     public void testProduceOutputLongMessageSaturatedChannel() throws Exception {
-        final BasicHttpResponse response = new BasicHttpResponse(200, "OK");
+        final BasicClassicHttpResponse response = new BasicClassicHttpResponse(200, "OK");
         final NStringEntity entity = new NStringEntity("a lot of various stuff");
         response.setEntity(entity);
 
@@ -289,7 +289,7 @@ public class TestDefaultNHttpServerConne
     @Test
     public void testProduceOutputLongMessageSaturatedChannel2() throws Exception {
         conn = new DefaultNHttpServerConnection(session, 24);
-        final BasicHttpResponse response = new BasicHttpResponse(200, "OK");
+        final BasicClassicHttpResponse response = new BasicClassicHttpResponse(200, "OK");
         final NStringEntity entity = new NStringEntity("a loooooooooooooooooooooooot of various stuff");
         response.setEntity(entity);
 
@@ -317,7 +317,7 @@ public class TestDefaultNHttpServerConne
     public void testProduceOutputLongChunkedMessage() throws Exception {
         conn = new DefaultNHttpServerConnection(session, 64);
 
-        final BasicHttpResponse response = new BasicHttpResponse(200, "OK");
+        final BasicClassicHttpResponse response = new BasicClassicHttpResponse(200, "OK");
         response.setHeader(HttpHeaders.TRANSFER_ENCODING, "chunked");
         final NStringEntity entity = new NStringEntity("a lot of various stuff");
         entity.setChunked(true);
@@ -347,7 +347,7 @@ public class TestDefaultNHttpServerConne
     public void testProduceOutputLongChunkedMessageSaturatedChannel() throws Exception {
         conn = new DefaultNHttpServerConnection(session, 64);
 
-        final BasicHttpResponse response = new BasicHttpResponse(200, "OK");
+        final BasicClassicHttpResponse response = new BasicClassicHttpResponse(200, "OK");
         response.setHeader(HttpHeaders.TRANSFER_ENCODING, "chunked");
         final NStringEntity entity = new NStringEntity("a lot of various stuff");
         entity.setChunked(true);
@@ -377,7 +377,7 @@ public class TestDefaultNHttpServerConne
 
     @Test
     public void testProduceOutputClosingConnection() throws Exception {
-        final BasicHttpResponse response = new BasicHttpResponse(200, "OK");
+        final BasicClassicHttpResponse response = new BasicClassicHttpResponse(200, "OK");
 
         final WritableByteChannelMock wchannel = Mockito.spy(new WritableByteChannelMock(64));
         final ByteChannelMock channel = new ByteChannelMock(null, wchannel);
@@ -403,9 +403,9 @@ public class TestDefaultNHttpServerConne
 
     static class RequestCapturingAnswer implements Answer<Void> {
 
-        private final LinkedList<HttpRequest> requests;
+        private final LinkedList<ClassicHttpRequest> requests;
 
-        RequestCapturingAnswer(final LinkedList<HttpRequest> requests) {
+        RequestCapturingAnswer(final LinkedList<ClassicHttpRequest> requests) {
             super();
             this.requests = requests;
         }
@@ -415,7 +415,7 @@ public class TestDefaultNHttpServerConne
             final Object[] args = invocation.getArguments();
             final NHttpServerConnection conn = (NHttpServerConnection) args[0];
             if (conn != null) {
-                final HttpRequest request = conn.getHttpRequest();
+                final ClassicHttpRequest request = conn.getHttpRequest();
                 if (request != null) {
                     requests.add(request);
                 }
@@ -452,7 +452,7 @@ public class TestDefaultNHttpServerConne
         Mockito.when(session.channel()).thenReturn(channel);
         Mockito.when(session.getEventMask()).thenReturn(SelectionKey.OP_READ);
 
-        final LinkedList<HttpRequest> requests = new LinkedList<>();
+        final LinkedList<ClassicHttpRequest> requests = new LinkedList<>();
 
         Mockito.doAnswer(new RequestCapturingAnswer(requests)).when(
             handler).requestReceived(Matchers.<NHttpServerConnection>any());
@@ -477,11 +477,11 @@ public class TestDefaultNHttpServerConne
             Matchers.<NHttpServerConnection>any(), Matchers.<Exception>any());
 
         Assert.assertFalse(requests.isEmpty());
-        final HttpRequest request = requests.getFirst();
+        final ClassicHttpRequest request = requests.getFirst();
         Assert.assertNotNull(request);
         Assert.assertEquals("POST", request.getMethod());
         Assert.assertEquals("/", request.getPath());
-        Assert.assertTrue(request instanceof HttpRequest);
+        Assert.assertTrue(request instanceof ClassicHttpRequest);
         final HttpEntity entity = request.getEntity();
         Assert.assertNotNull(entity);
         Assert.assertEquals(5, entity.getContentLength());
@@ -497,7 +497,7 @@ public class TestDefaultNHttpServerConne
         Mockito.when(session.channel()).thenReturn(channel);
         Mockito.when(session.getEventMask()).thenReturn(SelectionKey.OP_READ);
 
-        final LinkedList<HttpRequest> requests = new LinkedList<>();
+        final LinkedList<ClassicHttpRequest> requests = new LinkedList<>();
 
         Mockito.doAnswer(new RequestCapturingAnswer(requests)).when(
             handler).requestReceived(Matchers.<NHttpServerConnection>any());
@@ -522,11 +522,11 @@ public class TestDefaultNHttpServerConne
             Matchers.<NHttpServerConnection>any(), Matchers.<Exception>any());
 
         Assert.assertFalse(requests.isEmpty());
-        final HttpRequest request = requests.getFirst();
+        final ClassicHttpRequest request = requests.getFirst();
         Assert.assertNotNull(request);
         Assert.assertEquals("POST", request.getMethod());
         Assert.assertEquals("/", request.getPath());
-        Assert.assertTrue(request instanceof HttpRequest);
+        Assert.assertTrue(request instanceof ClassicHttpRequest);
         final HttpEntity entity = request.getEntity();
         Assert.assertNotNull(entity);
         Assert.assertEquals(100, entity.getContentLength());
@@ -549,7 +549,7 @@ public class TestDefaultNHttpServerConne
         Mockito.when(session.channel()).thenReturn(channel);
         Mockito.when(session.getEventMask()).thenReturn(SelectionKey.OP_READ);
 
-        final LinkedList<HttpRequest> requests = new LinkedList<>();
+        final LinkedList<ClassicHttpRequest> requests = new LinkedList<>();
 
         Mockito.doAnswer(new RequestCapturingAnswer(requests)).when(
             handler).requestReceived(Matchers.<NHttpServerConnection>any());
@@ -570,7 +570,7 @@ public class TestDefaultNHttpServerConne
             Matchers.<NHttpServerConnection>any(), Matchers.<Exception>any());
 
         Assert.assertFalse(requests.isEmpty());
-        final HttpRequest request = requests.getFirst();
+        final ClassicHttpRequest request = requests.getFirst();
         Assert.assertNotNull(request);
         Assert.assertEquals("GET", request.getMethod());
         Assert.assertEquals("/", request.getPath());
@@ -585,7 +585,7 @@ public class TestDefaultNHttpServerConne
         Mockito.when(session.channel()).thenReturn(channel);
         Mockito.when(session.getEventMask()).thenReturn(SelectionKey.OP_READ);
 
-        final LinkedList<HttpRequest> requests = new LinkedList<>();
+        final LinkedList<ClassicHttpRequest> requests = new LinkedList<>();
 
         Mockito.doAnswer(new RequestCapturingAnswer(requests)).when(
             handler).requestReceived(Matchers.<NHttpServerConnection>any());

Modified: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/nio/TestErrorResponseProducer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/nio/TestErrorResponseProducer.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/nio/TestErrorResponseProducer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/nio/TestErrorResponseProducer.java Sun Aug 28 19:04:49 2016
@@ -29,9 +29,9 @@ package org.apache.hc.core5.http.impl.ni
 
 import org.apache.hc.core5.http.HttpEntity;
 import org.apache.hc.core5.http.HttpHeaders;
-import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.ClassicHttpResponse;
 import org.apache.hc.core5.http.entity.StringEntity;
-import org.apache.hc.core5.http.message.BasicHttpResponse;
+import org.apache.hc.core5.http.message.BasicClassicHttpResponse;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -40,12 +40,12 @@ import org.junit.Test;
 public class TestErrorResponseProducer {
 
     private ErrorResponseProducer erp;
-    private HttpResponse response;
+    private ClassicHttpResponse response;
     private HttpEntity entity;
 
     @Before
     public void setUp() throws Exception {
-        response = new BasicHttpResponse(200, "OK");
+        response = new BasicClassicHttpResponse(200, "OK");
         entity = new StringEntity("stuff");
     }
 
@@ -56,7 +56,7 @@ public class TestErrorResponseProducer {
     @Test
     public void testGenerateResponseKeepAlive() {
         erp = new ErrorResponseProducer(response, entity, true);
-        final HttpResponse res = erp.generateResponse();
+        final ClassicHttpResponse res = erp.generateResponse();
 
         Assert.assertEquals("keep-alive", res.getFirstHeader(HttpHeaders.CONNECTION).getValue());
         Assert.assertEquals(entity, res.getEntity());
@@ -66,7 +66,7 @@ public class TestErrorResponseProducer {
     @Test
     public void testGenerateResponseClose() {
         erp = new ErrorResponseProducer(response, entity, false);
-        final HttpResponse res = erp.generateResponse();
+        final ClassicHttpResponse res = erp.generateResponse();
 
         Assert.assertEquals("close", res.getFirstHeader(HttpHeaders.CONNECTION).getValue());
         Assert.assertEquals(entity, res.getEntity());

Modified: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/nio/TestHttpAsyncRequestExecutor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/nio/TestHttpAsyncRequestExecutor.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/nio/TestHttpAsyncRequestExecutor.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/nio/TestHttpAsyncRequestExecutor.java Sun Aug 28 19:04:49 2016
@@ -35,11 +35,11 @@ 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.ClassicHttpRequest;
 import org.apache.hc.core5.http.HttpStatus;
 import org.apache.hc.core5.http.impl.nio.HttpAsyncRequestExecutor.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.HttpAsyncClientExchangeHandler;
@@ -83,7 +83,7 @@ public class TestHttpAsyncRequestExecuto
 
     @Test
     public void testConnected() throws Exception {
-        final HttpRequest request = new BasicHttpRequest("GET", "/");
+        final ClassicHttpRequest request = new BasicClassicHttpRequest("GET", "/");
         Mockito.when(this.exchangeHandler.generateRequest()).thenReturn(request);
         this.connContext.setAttribute(HttpAsyncRequestExecutor.HTTP_HANDLER, this.exchangeHandler);
 
@@ -170,7 +170,7 @@ public class TestHttpAsyncRequestExecuto
         final State state = new HttpAsyncRequestExecutor.State();
         this.connContext.setAttribute(HttpAsyncRequestExecutor.HTTP_EXCHANGE_STATE, state);
         this.connContext.setAttribute(HttpAsyncRequestExecutor.HTTP_HANDLER, this.exchangeHandler);
-        final HttpRequest request = new BasicHttpRequest("GET", "/");
+        final ClassicHttpRequest request = new BasicClassicHttpRequest("GET", "/");
         Mockito.when(this.exchangeHandler.generateRequest()).thenReturn(request);
 
         this.protocolHandler.requestReady(this.conn);
@@ -195,7 +195,7 @@ public class TestHttpAsyncRequestExecuto
         Mockito.verify(this.exchangeHandler).generateRequest();
         Assert.assertNull(state.getRequest());
 
-        Mockito.verify(this.conn, Mockito.never()).submitRequest(Matchers.<HttpRequest>any());
+        Mockito.verify(this.conn, Mockito.never()).submitRequest(Matchers.<ClassicHttpRequest>any());
     }
 
     @Test
@@ -203,7 +203,7 @@ public class TestHttpAsyncRequestExecuto
         final State state = new HttpAsyncRequestExecutor.State();
         this.connContext.setAttribute(HttpAsyncRequestExecutor.HTTP_EXCHANGE_STATE, state);
         this.connContext.setAttribute(HttpAsyncRequestExecutor.HTTP_HANDLER, this.exchangeHandler);
-        final BasicHttpRequest request = new BasicHttpRequest("POST", "/");
+        final BasicClassicHttpRequest request = new BasicClassicHttpRequest("POST", "/");
         request.setHeader(HttpHeaders.CONTENT_LENGTH, "5");
         final NStringEntity entity = new NStringEntity("stuff");
         request.setEntity(entity);
@@ -223,7 +223,7 @@ public class TestHttpAsyncRequestExecuto
         final State state = new HttpAsyncRequestExecutor.State();
         this.connContext.setAttribute(HttpAsyncRequestExecutor.HTTP_EXCHANGE_STATE, state);
         this.connContext.setAttribute(HttpAsyncRequestExecutor.HTTP_HANDLER, this.exchangeHandler);
-        final BasicHttpRequest request = new BasicHttpRequest("POST", "/");
+        final BasicClassicHttpRequest request = new BasicClassicHttpRequest("POST", "/");
         request.setHeader(HttpHeaders.CONTENT_LENGTH, "5");
         final NStringEntity entity = new NStringEntity("stuff");
         request.setEntity(entity);
@@ -289,7 +289,7 @@ public class TestHttpAsyncRequestExecuto
     public void testRequestChunkCodedContentEarlyResponse() throws Exception {
         final State state = new HttpAsyncRequestExecutor.State();
 
-        final BasicHttpRequest request = new BasicHttpRequest("POST", "/");
+        final BasicClassicHttpRequest request = new BasicClassicHttpRequest("POST", "/");
         request.addHeader(HttpHeaders.TRANSFER_ENCODING, HeaderElements.CHUNKED_ENCODING);
         final NStringEntity entity = new NStringEntity("stuff");
         request.setEntity(entity);
@@ -315,7 +315,7 @@ public class TestHttpAsyncRequestExecuto
     public void testRequestContentLengthEarlyResponse() throws Exception {
         final State state = new HttpAsyncRequestExecutor.State();
 
-        final BasicHttpRequest request = new BasicHttpRequest("POST", "/");
+        final BasicClassicHttpRequest request = new BasicClassicHttpRequest("POST", "/");
         request.setHeader(HttpHeaders.CONTENT_LENGTH, "5");
         final NStringEntity entity = new NStringEntity("stuff");
         request.setEntity(entity);
@@ -342,7 +342,7 @@ public class TestHttpAsyncRequestExecuto
     public void testRequestContentLengthCompletedEarlyResponse() throws Exception {
         final State state = new HttpAsyncRequestExecutor.State();
 
-        final BasicHttpRequest request = new BasicHttpRequest("POST", "/");
+        final BasicClassicHttpRequest request = new BasicClassicHttpRequest("POST", "/");
         request.setHeader(HttpHeaders.CONTENT_LENGTH, "5");
         final NStringEntity entity = new NStringEntity("stuff");
         request.setEntity(entity);
@@ -368,13 +368,13 @@ public class TestHttpAsyncRequestExecuto
     public void testRequestChunkCodedContentEarlyResponseCompletedHandlerDone() throws Exception {
         final State state = new HttpAsyncRequestExecutor.State();
 
-        final BasicHttpRequest request = new BasicHttpRequest("POST", "/");
+        final BasicClassicHttpRequest request = new BasicClassicHttpRequest("POST", "/");
         request.addHeader(HttpHeaders.TRANSFER_ENCODING, HeaderElements.CHUNKED_ENCODING);
         final NStringEntity entity = new NStringEntity("stuff");
         request.setEntity(entity);
         state.setRequest(request);
         state.setRequestState(MessageState.BODY_STREAM);
-        final BasicHttpResponse response = new BasicHttpResponse(200, "OK");
+        final BasicClassicHttpResponse response = new BasicClassicHttpResponse(200, "OK");
         state.setResponse(response);
         state.setResponseState(MessageState.COMPLETED);
         state.setEarlyResponse(true);
@@ -403,13 +403,13 @@ public class TestHttpAsyncRequestExecuto
     public void testRequestContentLengthEarlyResponseCompletedHandlerDone() throws Exception {
         final State state = new HttpAsyncRequestExecutor.State();
 
-        final BasicHttpRequest request = new BasicHttpRequest("POST", "/");
+        final BasicClassicHttpRequest request = new BasicClassicHttpRequest("POST", "/");
         request.setHeader(HttpHeaders.CONTENT_LENGTH, "5");
         final NStringEntity entity = new NStringEntity("stuff");
         request.setEntity(entity);
         state.setRequest(request);
         state.setRequestState(MessageState.BODY_STREAM);
-        final BasicHttpResponse response = new BasicHttpResponse(200, "OK");
+        final BasicClassicHttpResponse response = new BasicClassicHttpResponse(200, "OK");
         state.setResponse(response);
         state.setResponseState(MessageState.COMPLETED);
         state.setEarlyResponse(true);
@@ -438,13 +438,13 @@ public class TestHttpAsyncRequestExecuto
     public void testRequestChunkCodedContentEarlyResponseCompletedHandlerNotDone() throws Exception {
         final State state = new HttpAsyncRequestExecutor.State();
 
-        final BasicHttpRequest request = new BasicHttpRequest("POST", "/");
+        final BasicClassicHttpRequest request = new BasicClassicHttpRequest("POST", "/");
         request.addHeader(HttpHeaders.TRANSFER_ENCODING, HeaderElements.CHUNKED_ENCODING);
         final NStringEntity entity = new NStringEntity("stuff");
         request.setEntity(entity);
         state.setRequest(request);
         state.setRequestState(MessageState.BODY_STREAM);
-        final BasicHttpResponse response = new BasicHttpResponse(200, "OK");
+        final BasicClassicHttpResponse response = new BasicClassicHttpResponse(200, "OK");
         state.setResponse(response);
         state.setResponseState(MessageState.COMPLETED);
         state.setEarlyResponse(true);
@@ -474,11 +474,11 @@ public class TestHttpAsyncRequestExecuto
     @Test
     public void testBasicResponse() throws Exception {
         final State state = new HttpAsyncRequestExecutor.State();
-        final HttpRequest request = new BasicHttpRequest("GET", "/");
+        final ClassicHttpRequest request = new BasicClassicHttpRequest("GET", "/");
         state.setRequest(request);
         this.connContext.setAttribute(HttpAsyncRequestExecutor.HTTP_EXCHANGE_STATE, state);
         this.connContext.setAttribute(HttpAsyncRequestExecutor.HTTP_HANDLER, this.exchangeHandler);
-        final BasicHttpResponse response = new BasicHttpResponse(200, "OK");
+        final BasicClassicHttpResponse response = new BasicClassicHttpResponse(200, "OK");
         Mockito.when(this.conn.getHttpResponse()).thenReturn(response);
 
         this.protocolHandler.responseReceived(this.conn);
@@ -492,14 +492,14 @@ public class TestHttpAsyncRequestExecuto
         final State state = new HttpAsyncRequestExecutor.State();
         state.setRequestState(MessageState.ACK_EXPECTED);
         state.setTimeout(1000);
-        final BasicHttpRequest request = new BasicHttpRequest("POST", "/");
+        final BasicClassicHttpRequest request = new BasicClassicHttpRequest("POST", "/");
         request.setHeader(HttpHeaders.CONTENT_LENGTH, "5");
         final NStringEntity entity = new NStringEntity("stuff");
         request.setEntity(entity);
         state.setRequest(request);
         this.connContext.setAttribute(HttpAsyncRequestExecutor.HTTP_EXCHANGE_STATE, state);
         this.connContext.setAttribute(HttpAsyncRequestExecutor.HTTP_HANDLER, this.exchangeHandler);
-        final BasicHttpResponse response = new BasicHttpResponse(100, "Continue");
+        final BasicClassicHttpResponse response = new BasicClassicHttpResponse(100, "Continue");
         Mockito.when(this.conn.getHttpResponse()).thenReturn(response);
 
         this.protocolHandler.responseReceived(this.conn);
@@ -515,14 +515,14 @@ public class TestHttpAsyncRequestExecuto
     public void testResponseContinueOutOfSequence() throws Exception {
         final State state = new HttpAsyncRequestExecutor.State();
         state.setRequestState(MessageState.COMPLETED);
-        final BasicHttpRequest request = new BasicHttpRequest("POST", "/");
+        final BasicClassicHttpRequest request = new BasicClassicHttpRequest("POST", "/");
         request.setHeader(HttpHeaders.CONTENT_LENGTH, "5");
         final NStringEntity entity = new NStringEntity("stuff");
         request.setEntity(entity);
         state.setRequest(request);
         this.connContext.setAttribute(HttpAsyncRequestExecutor.HTTP_EXCHANGE_STATE, state);
         this.connContext.setAttribute(HttpAsyncRequestExecutor.HTTP_HANDLER, this.exchangeHandler);
-        final BasicHttpResponse response = new BasicHttpResponse(100, "Continue");
+        final BasicClassicHttpResponse response = new BasicClassicHttpResponse(100, "Continue");
         Mockito.when(this.conn.getHttpResponse()).thenReturn(response);
 
         this.protocolHandler.responseReceived(this.conn);
@@ -537,14 +537,14 @@ public class TestHttpAsyncRequestExecuto
         final State state = new HttpAsyncRequestExecutor.State();
         state.setRequestState(MessageState.ACK_EXPECTED);
         state.setTimeout(1000);
-        final BasicHttpRequest request = new BasicHttpRequest("POST", "/");
+        final BasicClassicHttpRequest request = new BasicClassicHttpRequest("POST", "/");
         request.setHeader(HttpHeaders.CONTENT_LENGTH, "5");
         final NStringEntity entity = new NStringEntity("stuff");
         request.setEntity(entity);
         state.setRequest(request);
         this.connContext.setAttribute(HttpAsyncRequestExecutor.HTTP_EXCHANGE_STATE, state);
         this.connContext.setAttribute(HttpAsyncRequestExecutor.HTTP_HANDLER, this.exchangeHandler);
-        final BasicHttpResponse response = new BasicHttpResponse(111, "WTF?");
+        final BasicClassicHttpResponse response = new BasicClassicHttpResponse(111, "WTF?");
         Mockito.when(this.conn.getHttpResponse()).thenReturn(response);
 
         this.protocolHandler.responseReceived(this.conn);
@@ -555,14 +555,14 @@ public class TestHttpAsyncRequestExecuto
         final State state = new HttpAsyncRequestExecutor.State();
         state.setRequestState(MessageState.ACK_EXPECTED);
         state.setTimeout(1000);
-        final BasicHttpRequest request = new BasicHttpRequest("POST", "/");
+        final BasicClassicHttpRequest request = new BasicClassicHttpRequest("POST", "/");
         request.setHeader(HttpHeaders.CONTENT_LENGTH, "5");
         final NStringEntity entity = new NStringEntity("stuff");
         request.setEntity(entity);
         state.setRequest(request);
         this.connContext.setAttribute(HttpAsyncRequestExecutor.HTTP_EXCHANGE_STATE, state);
         this.connContext.setAttribute(HttpAsyncRequestExecutor.HTTP_HANDLER, this.exchangeHandler);
-        final BasicHttpResponse response = new BasicHttpResponse(403, "Unauthorized");
+        final BasicClassicHttpResponse response = new BasicClassicHttpResponse(403, "Unauthorized");
         Mockito.when(this.conn.getHttpResponse()).thenReturn(response);
 
         this.protocolHandler.responseReceived(this.conn);
@@ -578,14 +578,14 @@ public class TestHttpAsyncRequestExecuto
         final State state = new HttpAsyncRequestExecutor.State();
         state.setRequestState(MessageState.BODY_STREAM);
         state.setTimeout(1000);
-        final BasicHttpRequest request = new BasicHttpRequest("POST", "/");
+        final BasicClassicHttpRequest request = new BasicClassicHttpRequest("POST", "/");
         request.setHeader(HttpHeaders.CONTENT_LENGTH, "5");
         final NStringEntity entity = new NStringEntity("stuff");
         request.setEntity(entity);
         state.setRequest(request);
         this.connContext.setAttribute(HttpAsyncRequestExecutor.HTTP_EXCHANGE_STATE, state);
         this.connContext.setAttribute(HttpAsyncRequestExecutor.HTTP_HANDLER, this.exchangeHandler);
-        final BasicHttpResponse response = new BasicHttpResponse(403, "Unauthorized");
+        final BasicClassicHttpResponse response = new BasicClassicHttpResponse(403, "Unauthorized");
         Mockito.when(this.conn.getHttpResponse()).thenReturn(response);
 
         this.protocolHandler.responseReceived(this.conn);
@@ -601,11 +601,11 @@ public class TestHttpAsyncRequestExecuto
     @Test
     public void testResponseToHead() throws Exception {
         final State state = new HttpAsyncRequestExecutor.State();
-        final HttpRequest request = new BasicHttpRequest("HEAD", "/");
+        final ClassicHttpRequest request = new BasicClassicHttpRequest("HEAD", "/");
         state.setRequest(request);
         this.connContext.setAttribute(HttpAsyncRequestExecutor.HTTP_EXCHANGE_STATE, state);
         this.connContext.setAttribute(HttpAsyncRequestExecutor.HTTP_HANDLER, this.exchangeHandler);
-        final BasicHttpResponse response = new BasicHttpResponse(200, "OK");
+        final BasicClassicHttpResponse response = new BasicClassicHttpResponse(200, "OK");
         Mockito.when(this.conn.getHttpResponse()).thenReturn(response);
         Mockito.when(this.connectionReuseStrategy.keepAlive(Mockito.same(request), Mockito.same(response),
                 Mockito.<HttpContext>any())).thenReturn(Boolean.TRUE);
@@ -624,11 +624,11 @@ public class TestHttpAsyncRequestExecuto
     @Test
     public void testResponseToConnect() throws Exception {
         final State state = new HttpAsyncRequestExecutor.State();
-        final HttpRequest request = new BasicHttpRequest("Connect", "/");
+        final ClassicHttpRequest request = new BasicClassicHttpRequest("Connect", "/");
         state.setRequest(request);
         this.connContext.setAttribute(HttpAsyncRequestExecutor.HTTP_EXCHANGE_STATE, state);
         this.connContext.setAttribute(HttpAsyncRequestExecutor.HTTP_HANDLER, this.exchangeHandler);
-        final BasicHttpResponse response = new BasicHttpResponse(200, "OK");
+        final BasicClassicHttpResponse response = new BasicClassicHttpResponse(200, "OK");
         Mockito.when(this.conn.getHttpResponse()).thenReturn(response);
         Mockito.when(this.connectionReuseStrategy.keepAlive(Mockito.same(request), Mockito.same(response),
                 Mockito.<HttpContext>any())).thenReturn(Boolean.TRUE);
@@ -647,11 +647,11 @@ public class TestHttpAsyncRequestExecuto
     @Test
     public void testResponseNotModified() throws Exception {
         final State state = new HttpAsyncRequestExecutor.State();
-        final HttpRequest request = new BasicHttpRequest("GET", "/");
+        final ClassicHttpRequest request = new BasicClassicHttpRequest("GET", "/");
         state.setRequest(request);
         this.connContext.setAttribute(HttpAsyncRequestExecutor.HTTP_EXCHANGE_STATE, state);
         this.connContext.setAttribute(HttpAsyncRequestExecutor.HTTP_HANDLER, this.exchangeHandler);
-        final BasicHttpResponse response = new BasicHttpResponse(HttpStatus.SC_NOT_MODIFIED, "Not modified");
+        final BasicClassicHttpResponse response = new BasicClassicHttpResponse(HttpStatus.SC_NOT_MODIFIED, "Not modified");
         Mockito.when(this.conn.getHttpResponse()).thenReturn(response);
         Mockito.when(this.connectionReuseStrategy.keepAlive(Mockito.same(request), Mockito.same(response),
                 Mockito.<HttpContext>any())).thenReturn(Boolean.TRUE);
@@ -670,14 +670,14 @@ public class TestHttpAsyncRequestExecuto
     @Test
     public void testResponseNotModifiedEarlyResponseRequestNotCompleted() throws Exception {
         final State state = new HttpAsyncRequestExecutor.State();
-        final BasicHttpRequest request = new BasicHttpRequest("POST", "/");
+        final BasicClassicHttpRequest request = new BasicClassicHttpRequest("POST", "/");
         request.addHeader(HttpHeaders.TRANSFER_ENCODING, HeaderElements.CHUNKED_ENCODING);
         final NStringEntity entity = new NStringEntity("stuff");
         request.setEntity(entity);
         state.setRequest(request);
         state.setRequestState(MessageState.BODY_STREAM);
         state.setEarlyResponse(true);
-        final BasicHttpResponse response = new BasicHttpResponse(HttpStatus.SC_NOT_MODIFIED, "Not modified");
+        final BasicClassicHttpResponse response = new BasicClassicHttpResponse(HttpStatus.SC_NOT_MODIFIED, "Not modified");
         state.setResponse(response);
 
         this.connContext.setAttribute(HttpAsyncRequestExecutor.HTTP_EXCHANGE_STATE, state);
@@ -700,14 +700,14 @@ public class TestHttpAsyncRequestExecuto
     @Test
     public void testResponseNotModifiedEarlyResponseRequestCompleted() throws Exception {
         final State state = new HttpAsyncRequestExecutor.State();
-        final BasicHttpRequest request = new BasicHttpRequest("POST", "/");
+        final BasicClassicHttpRequest request = new BasicClassicHttpRequest("POST", "/");
         request.addHeader(HttpHeaders.TRANSFER_ENCODING, HeaderElements.CHUNKED_ENCODING);
         final NStringEntity entity = new NStringEntity("stuff");
         request.setEntity(entity);
         state.setRequest(request);
         state.setRequestState(MessageState.COMPLETED);
         state.setEarlyResponse(true);
-        final BasicHttpResponse response = new BasicHttpResponse(HttpStatus.SC_NOT_MODIFIED, "Not modified");
+        final BasicClassicHttpResponse response = new BasicClassicHttpResponse(HttpStatus.SC_NOT_MODIFIED, "Not modified");
         state.setResponse(response);
 
         this.connContext.setAttribute(HttpAsyncRequestExecutor.HTTP_EXCHANGE_STATE, state);
@@ -746,10 +746,10 @@ public class TestHttpAsyncRequestExecuto
     @Test
     public void testResponseContentOutputCompleted() throws Exception {
         final State state = new HttpAsyncRequestExecutor.State();
-        final HttpRequest request = new BasicHttpRequest("GET", "/");
+        final ClassicHttpRequest request = new BasicClassicHttpRequest("GET", "/");
         state.setRequest(request);
         state.setResponseState(MessageState.BODY_STREAM);
-        final BasicHttpResponse response = new BasicHttpResponse(200, "OK");
+        final BasicClassicHttpResponse response = new BasicClassicHttpResponse(200, "OK");
         state.setResponse(response);
         Mockito.when(this.exchangeHandler.isDone()).thenReturn(Boolean.TRUE);
         this.connContext.setAttribute(HttpAsyncRequestExecutor.HTTP_EXCHANGE_STATE, state);
@@ -771,9 +771,9 @@ public class TestHttpAsyncRequestExecuto
     public void testResponseContentOutputCompletedHandlerNotDone() throws Exception {
         final State state = new HttpAsyncRequestExecutor.State();
         state.setResponseState(MessageState.BODY_STREAM);
-        final HttpRequest request = new BasicHttpRequest("GET", "/");
+        final ClassicHttpRequest request = new BasicClassicHttpRequest("GET", "/");
         state.setRequest(request);
-        final BasicHttpResponse response = new BasicHttpResponse(200, "OK");
+        final BasicClassicHttpResponse response = new BasicClassicHttpResponse(200, "OK");
         state.setResponse(response);
         Mockito.when(this.exchangeHandler.isDone()).thenReturn(Boolean.FALSE);
         this.connContext.setAttribute(HttpAsyncRequestExecutor.HTTP_EXCHANGE_STATE, state);
@@ -793,10 +793,10 @@ public class TestHttpAsyncRequestExecuto
     @Test
     public void testResponseContentOutputCompletedHandlerNotDoneConnClosed() throws Exception {
         final State state = new HttpAsyncRequestExecutor.State();
-        final HttpRequest request = new BasicHttpRequest("GET", "/");
+        final ClassicHttpRequest request = new BasicClassicHttpRequest("GET", "/");
         state.setRequest(request);
         state.setResponseState(MessageState.BODY_STREAM);
-        final BasicHttpResponse response = new BasicHttpResponse(200, "OK");
+        final BasicClassicHttpResponse response = new BasicClassicHttpResponse(200, "OK");
         state.setResponse(response);
         Mockito.when(this.exchangeHandler.isDone()).thenReturn(Boolean.FALSE);
         this.connContext.setAttribute(HttpAsyncRequestExecutor.HTTP_EXCHANGE_STATE, state);
@@ -816,10 +816,10 @@ public class TestHttpAsyncRequestExecuto
     @Test
     public void testResponseInvalidState() throws Exception {
         final State state = new HttpAsyncRequestExecutor.State();
-        final HttpRequest request = new BasicHttpRequest("GET", "/");
+        final ClassicHttpRequest request = new BasicClassicHttpRequest("GET", "/");
         state.setRequest(request);
         state.setResponseState(MessageState.BODY_STREAM);
-        final BasicHttpResponse response = new BasicHttpResponse(200, "OK");
+        final BasicClassicHttpResponse response = new BasicClassicHttpResponse(200, "OK");
         state.setResponse(response);
         state.invalidate();
         this.connContext.setAttribute(HttpAsyncRequestExecutor.HTTP_EXCHANGE_STATE, state);
@@ -837,14 +837,14 @@ public class TestHttpAsyncRequestExecuto
     @Test
     public void testResponseContentOutputCompletedEarlyResponseRequestCompleted() throws Exception {
         final State state = new HttpAsyncRequestExecutor.State();
-        final BasicHttpRequest request = new BasicHttpRequest("POST", "/");
+        final BasicClassicHttpRequest request = new BasicClassicHttpRequest("POST", "/");
         request.addHeader(HttpHeaders.TRANSFER_ENCODING, HeaderElements.CHUNKED_ENCODING);
         final NStringEntity entity = new NStringEntity("stuff");
         request.setEntity(entity);
         state.setRequest(request);
         state.setRequestState(MessageState.COMPLETED);
         state.setEarlyResponse(true);
-        final BasicHttpResponse response = new BasicHttpResponse(407, "Expectation failed");
+        final BasicClassicHttpResponse response = new BasicClassicHttpResponse(407, "Expectation failed");
         state.setResponse(response);
         state.setResponseState(MessageState.BODY_STREAM);
 
@@ -870,14 +870,14 @@ public class TestHttpAsyncRequestExecuto
     @Test
     public void testResponseContentOutputCompletedEarlyResponseRequestNotCompleted() throws Exception {
         final State state = new HttpAsyncRequestExecutor.State();
-        final BasicHttpRequest request = new BasicHttpRequest("POST", "/");
+        final BasicClassicHttpRequest request = new BasicClassicHttpRequest("POST", "/");
         request.addHeader(HttpHeaders.TRANSFER_ENCODING, HeaderElements.CHUNKED_ENCODING);
         final NStringEntity entity = new NStringEntity("stuff");
         request.setEntity(entity);
         state.setRequest(request);
         state.setRequestState(MessageState.BODY_STREAM);
         state.setEarlyResponse(true);
-        final BasicHttpResponse response = new BasicHttpResponse(407, "Expectation failed");
+        final BasicClassicHttpResponse response = new BasicClassicHttpResponse(407, "Expectation failed");
         state.setResponse(response);
         state.setResponseState(MessageState.BODY_STREAM);
 
@@ -1024,9 +1024,9 @@ public class TestHttpAsyncRequestExecuto
     @Test
     public void testExchangeDone() throws Exception {
         final State state = new HttpAsyncRequestExecutor.State();
-        final HttpRequest request = new BasicHttpRequest("GET", "/");
+        final ClassicHttpRequest request = new BasicClassicHttpRequest("GET", "/");
         state.setRequest(request);
-        final BasicHttpResponse response = new BasicHttpResponse(200, "OK");
+        final BasicClassicHttpResponse response = new BasicClassicHttpResponse(200, "OK");
         state.setResponse(response);
         this.connContext.setAttribute(HttpAsyncRequestExecutor.HTTP_EXCHANGE_STATE, state);
         this.connContext.setAttribute(HttpAsyncRequestExecutor.HTTP_HANDLER, this.exchangeHandler);



Mime
View raw message