You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2016/08/28 19:04:51 UTC
svn commit: r1758141 [1/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...
Author: olegk
Date: Sun Aug 28 19:04:49 2016
New Revision: 1758141
URL: http://svn.apache.org/viewvc?rev=1758141&view=rev
Log:
Redesigned HTTP message APIs; interfaces and classes dependent on inherently blocking HttpEntity renamed as 'classic'
Added:
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/ClassicHttpRequest.java
- copied, changed from r1758066, httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/HttpResponseFactory.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/ClassicHttpResponse.java
- copied, changed from r1758066, httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/HttpResponseFactory.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/MessageHeaders.java (contents, props changed)
- copied, changed from r1758066, httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/MessageHead.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/message/BasicClassicHttpRequest.java
- copied, changed from r1758066, httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/message/AbstractHttpMessage.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/message/BasicClassicHttpResponse.java (contents, props changed)
- copied, changed from r1758066, httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/message/AbstractHttpMessage.java
Removed:
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/MessageHead.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/message/AbstractHttpMessage.java
httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/message/TestAbstractMessage.java
httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/message/TestBasicHttpResponse.java
Modified:
httpcomponents/httpcore/trunk/httpcore5-ab/src/main/java/org/apache/hc/core5/http/benchmark/BenchmarkWorker.java
httpcomponents/httpcore/trunk/httpcore5-ab/src/main/java/org/apache/hc/core5/http/benchmark/HttpBenchmark.java
httpcomponents/httpcore/trunk/httpcore5-ab/src/test/java/org/apache/hc/core5/http/benchmark/SmokeTest.java
httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/H2MessageConverter.java
httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/DefaultH2RequestConverter.java
httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/DefaultH2ResponseConverter.java
httpcomponents/httpcore/trunk/httpcore5/src/examples/org/apache/hc/core5/http/examples/ElementalHttpGet.java
httpcomponents/httpcore/trunk/httpcore5/src/examples/org/apache/hc/core5/http/examples/ElementalHttpPost.java
httpcomponents/httpcore/trunk/httpcore5/src/examples/org/apache/hc/core5/http/examples/ElementalHttpPostTrailers.java
httpcomponents/httpcore/trunk/httpcore5/src/examples/org/apache/hc/core5/http/examples/ElementalPoolingHttpGet.java
httpcomponents/httpcore/trunk/httpcore5/src/examples/org/apache/hc/core5/http/examples/ElementalReverseProxy.java
httpcomponents/httpcore/trunk/httpcore5/src/examples/org/apache/hc/core5/http/examples/HttpFileServer.java
httpcomponents/httpcore/trunk/httpcore5/src/examples/org/apache/hc/core5/http/examples/NHttpClient.java
httpcomponents/httpcore/trunk/httpcore5/src/examples/org/apache/hc/core5/http/examples/NHttpFileServer.java
httpcomponents/httpcore/trunk/httpcore5/src/examples/org/apache/hc/core5/http/examples/NHttpReverseProxy.java
httpcomponents/httpcore/trunk/httpcore5/src/examples/org/apache/hc/core5/http/examples/PipeliningHttpClient.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/ConnectionReuseStrategy.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/HttpMessage.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/HttpRequest.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/HttpRequestFactory.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/HttpRequestInterceptor.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/HttpResponse.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/HttpResponseFactory.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/HttpResponseInterceptor.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/entity/EntityUtils.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/DefaultConnectionReuseStrategy.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/DefaultHttpRequestFactory.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/DefaultHttpResponseFactory.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultBHttpClientConnection.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultBHttpClientConnectionFactory.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultBHttpServerConnection.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultBHttpServerConnectionFactory.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpRequestParser.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpRequestParserFactory.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpRequestWriter.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpRequestWriterFactory.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpResponseParser.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpResponseParserFactory.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpResponseWriter.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpResponseWriterFactory.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/HttpRequestExecutor.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/HttpService.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractAsyncRequestConsumer.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractAsyncResponseConsumer.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractMessageParser.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractMessageWriter.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/BasicAsyncClientExchangeHandler.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/BasicAsyncRequestConsumer.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/BasicAsyncRequestHandler.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/BasicAsyncRequestProducer.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/BasicAsyncResponseConsumer.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/BasicAsyncResponseProducer.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpRequestParser.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpRequestParserFactory.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpRequestWriter.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpRequestWriterFactory.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpResponseParser.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpResponseParserFactory.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpResponseWriter.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpResponseWriterFactory.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultNHttpClientConnection.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultNHttpClientConnectionFactory.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultNHttpServerConnection.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultNHttpServerConnectionFactory.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ErrorResponseProducer.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/HttpAsyncRequestExecutor.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/HttpAsyncService.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/NHttpConnectionBase.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/NullRequestConsumer.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/NullRequestHandler.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/PipeliningClientExchangeHandler.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/SSLNHttpClientConnectionFactory.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/SSLNHttpServerConnectionFactory.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/UriHttpAsyncRequestHandlerMapper.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/io/HttpClientConnection.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/io/HttpMessageParser.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/io/HttpMessageParserFactory.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/io/HttpMessageWriter.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/io/HttpMessageWriterFactory.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/io/HttpRequestHandler.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/io/HttpRequestHandlerMapper.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/io/HttpServerConnection.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/io/UriHttpRequestHandlerMapper.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/message/BasicHttpRequest.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/message/BasicHttpResponse.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/nio/HttpAsyncClientExchangeHandler.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/nio/HttpAsyncExchange.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/nio/HttpAsyncRequestConsumer.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/nio/HttpAsyncRequestHandler.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/nio/HttpAsyncRequestHandlerMapper.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/nio/HttpAsyncRequestProducer.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/nio/HttpAsyncResponseConsumer.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/nio/HttpAsyncResponseProducer.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/nio/NHttpClientConnection.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/nio/NHttpConnection.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/nio/NHttpMessageParser.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/nio/NHttpMessageParserFactory.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/nio/NHttpMessageWriter.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/nio/NHttpMessageWriterFactory.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/nio/NHttpServerConnection.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/protocol/HttpCoreContext.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/protocol/HttpExpectationVerifier.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/protocol/ImmutableHttpProcessor.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/protocol/RequestConnControl.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/protocol/RequestContent.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/protocol/RequestDate.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/protocol/RequestExpectContinue.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/protocol/RequestTargetHost.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/protocol/RequestUserAgent.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/protocol/RequestValidateHost.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/protocol/ResponseConnControl.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/protocol/ResponseContent.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/protocol/ResponseDate.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/protocol/ResponseServer.java
httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/TestDefaultConnectionReuseStrategy.java
httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/TestDefaultContentLengthStrategy.java
httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestBHttpConnectionBase.java
httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestDefaultBHttpClientConnection.java
httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestDefaultBHttpServerConnection.java
httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestHttpRequestExecutor.java
httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestHttpService.java
httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestRequestParser.java
httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestResponseParser.java
httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/nio/TestBasicAsyncClientExchangeHandler.java
httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/nio/TestBasicAsyncRequestConsumer.java
httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/nio/TestBasicAsyncRequestHandler.java
httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/nio/TestBasicAsyncRequestProducer.java
httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/nio/TestBasicAsyncResponseConsumer.java
httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/nio/TestBasicAsyncResponseProducer.java
httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/nio/TestDefaultNHttpClientConnection.java
httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/nio/TestDefaultNHttpServerConnection.java
httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/nio/TestErrorResponseProducer.java
httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/nio/TestHttpAsyncRequestExecutor.java
httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/nio/TestHttpAsyncService.java
httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/nio/TestHttpMessageParser.java
httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/nio/TestNHttpConnectionBase.java
httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/nio/TestUriHttpAsyncRequestHandlerMapper.java
httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/integration/SimpleRequestHandler.java
httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/integration/TestAsyncHttp.java
httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/integration/TestClientOutOfSequenceResponse.java
httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/integration/TestCustomSSL.java
httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/integration/TestHttpAsyncHandlerCancellable.java
httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/integration/TestHttpAsyncHandlersBrokenExpectContinue.java
httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/integration/TestHttpAsyncHandlersPipelining.java
httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/integration/TestHttpAsyncPrematureTermination.java
httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/integration/TestHttpAsyncTimeout.java
httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/integration/TestServerSidePipelining.java
httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/integration/TestSyncHttp.java
httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/integration/TestTruncatedChunks.java
httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/io/TestUriHttpRequestHandlerMapper.java
httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/message/TestBasicMessages.java
httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/protocol/TestStandardInterceptors.java
httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/testserver/io/HttpClient.java
httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/testserver/io/LoggingBHttpClientConnection.java
httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/testserver/io/LoggingBHttpServerConnection.java
httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/testserver/nio/HttpClientNio.java
httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/testserver/nio/LoggingNHttpClientConnection.java
httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/testserver/nio/LoggingNHttpServerConnection.java
Modified: httpcomponents/httpcore/trunk/httpcore5-ab/src/main/java/org/apache/hc/core5/http/benchmark/BenchmarkWorker.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5-ab/src/main/java/org/apache/hc/core5/http/benchmark/BenchmarkWorker.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5-ab/src/main/java/org/apache/hc/core5/http/benchmark/BenchmarkWorker.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5-ab/src/main/java/org/apache/hc/core5/http/benchmark/BenchmarkWorker.java Sun Aug 28 19:04:49 2016
@@ -41,8 +41,8 @@ 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.HttpHost;
-import org.apache.hc.core5.http.HttpRequest;
-import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.ClassicHttpRequest;
+import org.apache.hc.core5.http.ClassicHttpResponse;
import org.apache.hc.core5.http.HttpStatus;
import org.apache.hc.core5.http.HttpVersion;
import org.apache.hc.core5.http.entity.ContentType;
@@ -71,14 +71,14 @@ class BenchmarkWorker implements Runnabl
private final HttpRequestExecutor httpexecutor;
private final ConnectionReuseStrategy connstrategy;
private final HttpHost host;
- private final HttpRequest request;
+ private final ClassicHttpRequest request;
private final Config config;
private final SocketFactory socketFactory;
private final Stats stats = new Stats();
public BenchmarkWorker(
final HttpHost host,
- final HttpRequest request,
+ final ClassicHttpRequest request,
final SocketFactory socketFactory,
final Config config) {
super();
@@ -104,7 +104,7 @@ class BenchmarkWorker implements Runnabl
@Override
public void run() {
- HttpResponse response = null;
+ ClassicHttpResponse response = null;
final HttpVersion version = config.isUseHttp1_0() ? HttpVersion.HTTP_1_0 : HttpVersion.HTTP_1_1;
final BenchmarkConnection conn = new BenchmarkConnection(8 * 1024, stats);
@@ -233,7 +233,7 @@ class BenchmarkWorker implements Runnabl
}
}
- private void verboseOutput(final HttpResponse response) {
+ private void verboseOutput(final ClassicHttpResponse response) {
if (config.getVerbosity() >= 3) {
System.out.println(">> " + request.getMethod() + " " + request.getPath());
final Header[] headers = request.getAllHeaders();
@@ -255,7 +255,7 @@ class BenchmarkWorker implements Runnabl
}
}
- private static void resetHeader(final HttpRequest request) {
+ private static void resetHeader(final ClassicHttpRequest request) {
for (final Iterator<Header> it = request.headerIterator(); it.hasNext();) {
final Header header = it.next();
if (!(header instanceof DefaultHeader)) {
Modified: httpcomponents/httpcore/trunk/httpcore5-ab/src/main/java/org/apache/hc/core5/http/benchmark/HttpBenchmark.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5-ab/src/main/java/org/apache/hc/core5/http/benchmark/HttpBenchmark.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5-ab/src/main/java/org/apache/hc/core5/http/benchmark/HttpBenchmark.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5-ab/src/main/java/org/apache/hc/core5/http/benchmark/HttpBenchmark.java Sun Aug 28 19:04:49 2016
@@ -47,12 +47,12 @@ import org.apache.hc.core5.http.HeaderEl
import org.apache.hc.core5.http.HttpEntity;
import org.apache.hc.core5.http.HttpHeaders;
import org.apache.hc.core5.http.HttpHost;
-import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.ClassicHttpRequest;
import org.apache.hc.core5.http.HttpVersion;
import org.apache.hc.core5.http.entity.ContentType;
import org.apache.hc.core5.http.entity.FileEntity;
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.ssl.SSLContextBuilder;
import org.apache.hc.core5.ssl.TrustStrategy;
@@ -94,7 +94,7 @@ public class HttpBenchmark {
this.config = config != null ? config : new Config();
}
- private HttpRequest createRequest(final HttpHost host) {
+ private ClassicHttpRequest createRequest(final HttpHost host) {
final URL url = config.getUrl();
HttpEntity entity = null;
@@ -110,13 +110,13 @@ public class HttpBenchmark {
se.setChunked(config.isUseChunking());
entity = se;
}
- final HttpRequest request;
+ final ClassicHttpRequest request;
if ("POST".equals(config.getMethod())) {
- final HttpRequest httppost = new BasicHttpRequest("POST", url.getPath());
+ final ClassicHttpRequest httppost = new BasicClassicHttpRequest("POST", url.getPath());
httppost.setEntity(entity);
request = httppost;
} else if ("PUT".equals(config.getMethod())) {
- final HttpRequest httpput = new BasicHttpRequest("PUT", url.getPath());
+ final ClassicHttpRequest httpput = new BasicClassicHttpRequest("PUT", url.getPath());
httpput.setEntity(entity);
request = httpput;
} else {
@@ -126,7 +126,7 @@ public class HttpBenchmark {
} else if (path.trim().length() == 0) {
path = "/";
}
- request = new BasicHttpRequest(config.getMethod(), path);
+ request = new BasicClassicHttpRequest(config.getMethod(), path);
}
request.setVersion(config.isUseHttp1_0() ? HttpVersion.HTTP_1_0 : HttpVersion.HTTP_1_1);
Modified: httpcomponents/httpcore/trunk/httpcore5-ab/src/test/java/org/apache/hc/core5/http/benchmark/SmokeTest.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5-ab/src/test/java/org/apache/hc/core5/http/benchmark/SmokeTest.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5-ab/src/test/java/org/apache/hc/core5/http/benchmark/SmokeTest.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5-ab/src/test/java/org/apache/hc/core5/http/benchmark/SmokeTest.java Sun Aug 28 19:04:49 2016
@@ -30,8 +30,8 @@ import java.io.IOException;
import java.net.URL;
import org.apache.hc.core5.http.HttpException;
-import org.apache.hc.core5.http.HttpRequest;
-import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.ClassicHttpRequest;
+import org.apache.hc.core5.http.ClassicHttpResponse;
import org.apache.hc.core5.http.HttpStatus;
import org.apache.hc.core5.http.entity.ContentType;
import org.apache.hc.core5.http.entity.StringEntity;
@@ -52,8 +52,8 @@ public class SmokeTest {
server.registerHandler("/", new HttpRequestHandler() {
@Override
public void handle(
- final HttpRequest request,
- final HttpResponse response,
+ final ClassicHttpRequest request,
+ final ClassicHttpResponse response,
final HttpContext context) throws HttpException, IOException {
response.setCode(HttpStatus.SC_OK);
response.setEntity(new StringEntity("0123456789ABCDEF", ContentType.TEXT_PLAIN));
Modified: httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/H2MessageConverter.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/H2MessageConverter.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/H2MessageConverter.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/H2MessageConverter.java Sun Aug 28 19:04:49 2016
@@ -31,7 +31,7 @@ import java.util.List;
import org.apache.hc.core5.http.Header;
import org.apache.hc.core5.http.HttpException;
-import org.apache.hc.core5.http.MessageHead;
+import org.apache.hc.core5.http.HttpMessage;
/**
* Abstract message converter intended to convert from a list of HTTP/2 headers to object
@@ -39,14 +39,14 @@ import org.apache.hc.core5.http.MessageH
* of HTTP/2 headers.
*
* @param <T>
- * {@link MessageHead} or a subclass
+ * {@link HttpMessage} or a subclass
*
* @since 5.0
*/
-public interface H2MessageConverter<T extends MessageHead> {
+public interface H2MessageConverter<T extends HttpMessage> {
/**
- * Converts given list of HTTP/2 headers to a {@link MessageHead}.
+ * Converts given list of HTTP/2 headers to a {@link HttpMessage}.
*
* @param headers list of HTTP/2 headers
* @return HTTP message
@@ -55,7 +55,7 @@ public interface H2MessageConverter<T ex
T convert(List<Header> headers) throws HttpException;
/**
- * Converts given {@link MessageHead} to a list of HTTP/2 headers.
+ * Converts given {@link HttpMessage} to a list of HTTP/2 headers.
*
* @param message HTTP message
* @return list of HTTP/2 headers
Modified: httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/DefaultH2RequestConverter.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/DefaultH2RequestConverter.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/DefaultH2RequestConverter.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/DefaultH2RequestConverter.java Sun Aug 28 19:04:49 2016
@@ -35,11 +35,10 @@ import org.apache.hc.core5.http.Header;
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.HttpRequestFactory;
import org.apache.hc.core5.http.HttpVersion;
import org.apache.hc.core5.http.ProtocolException;
-import org.apache.hc.core5.http.impl.DefaultHttpRequestFactory;
import org.apache.hc.core5.http.message.BasicHeader;
+import org.apache.hc.core5.http.message.BasicHttpRequest;
import org.apache.hc.core5.http2.H2MessageConverter;
import org.apache.hc.core5.http2.H2PseudoRequestHeaders;
import org.apache.hc.core5.util.TextUtils;
@@ -53,16 +52,6 @@ public final class DefaultH2RequestConve
public final static DefaultH2RequestConverter INSTANCE = new DefaultH2RequestConverter();
- private final HttpRequestFactory requestFactory;
-
- public DefaultH2RequestConverter() {
- this(null);
- }
-
- public DefaultH2RequestConverter(final HttpRequestFactory requestFactory) {
- this.requestFactory = requestFactory != null ? requestFactory : DefaultHttpRequestFactory.INSTANCE;
- }
-
@Override
public HttpRequest convert(final List<Header> headers) throws HttpException {
String method = null;
@@ -137,7 +126,8 @@ public final class DefaultH2RequestConve
}
}
- final HttpRequest httpRequest = this.requestFactory.newHttpRequest(HttpVersion.HTTP_2, method, path);
+ final HttpRequest httpRequest = new BasicHttpRequest(method, path);
+ httpRequest.setVersion(HttpVersion.HTTP_2);
httpRequest.setScheme(scheme);
httpRequest.setAuthority(authority);
httpRequest.setPath(path);
Modified: httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/DefaultH2ResponseConverter.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/DefaultH2ResponseConverter.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/DefaultH2ResponseConverter.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/DefaultH2ResponseConverter.java Sun Aug 28 19:04:49 2016
@@ -35,11 +35,10 @@ import org.apache.hc.core5.http.Header;
import org.apache.hc.core5.http.HttpException;
import org.apache.hc.core5.http.HttpHeaders;
import org.apache.hc.core5.http.HttpResponse;
-import org.apache.hc.core5.http.HttpResponseFactory;
import org.apache.hc.core5.http.HttpVersion;
import org.apache.hc.core5.http.ProtocolException;
-import org.apache.hc.core5.http.impl.DefaultHttpResponseFactory;
import org.apache.hc.core5.http.message.BasicHeader;
+import org.apache.hc.core5.http.message.BasicHttpResponse;
import org.apache.hc.core5.http2.H2MessageConverter;
import org.apache.hc.core5.http2.H2PseudoResponseHeaders;
@@ -52,16 +51,6 @@ public class DefaultH2ResponseConverter
public final static DefaultH2ResponseConverter INSTANCE = new DefaultH2ResponseConverter();
- private HttpResponseFactory responseFactory;
-
- public DefaultH2ResponseConverter() {
- this(null);
- }
-
- public DefaultH2ResponseConverter(final HttpResponseFactory responseFactory) {
- this.responseFactory = responseFactory != null ? responseFactory : DefaultHttpResponseFactory.INSTANCE;
- }
-
@Override
public HttpResponse convert(final List<Header> headers) throws HttpException {
String statusText = null;
@@ -109,7 +98,8 @@ public class DefaultH2ResponseConverter
} catch (NumberFormatException ex) {
throw new ProtocolException("Invalid response status: " + statusText);
}
- final HttpResponse response = this.responseFactory.newHttpResponse(HttpVersion.HTTP_2, statusCode, null);
+ final HttpResponse response = new BasicHttpResponse(statusCode, null);
+ response.setVersion(HttpVersion.HTTP_2);
for (int i = 0; i < messageHeaders.size(); i++) {
response.addHeader(messageHeaders.get(i));
}
Modified: httpcomponents/httpcore/trunk/httpcore5/src/examples/org/apache/hc/core5/http/examples/ElementalHttpGet.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/examples/org/apache/hc/core5/http/examples/ElementalHttpGet.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/examples/org/apache/hc/core5/http/examples/ElementalHttpGet.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/examples/org/apache/hc/core5/http/examples/ElementalHttpGet.java Sun Aug 28 19:04:49 2016
@@ -29,14 +29,15 @@ package org.apache.hc.core5.http.example
import java.net.Socket;
+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.HttpHost;
-import org.apache.hc.core5.http.HttpResponse;
import org.apache.hc.core5.http.entity.EntityUtils;
import org.apache.hc.core5.http.impl.DefaultConnectionReuseStrategy;
import org.apache.hc.core5.http.impl.io.DefaultBHttpClientConnection;
import org.apache.hc.core5.http.impl.io.HttpRequestExecutor;
-import org.apache.hc.core5.http.message.BasicHttpRequest;
+import org.apache.hc.core5.http.message.BasicClassicHttpRequest;
import org.apache.hc.core5.http.protocol.HttpCoreContext;
import org.apache.hc.core5.http.protocol.HttpProcessor;
import org.apache.hc.core5.http.protocol.HttpProcessorBuilder;
@@ -79,11 +80,11 @@ public class ElementalHttpGet {
Socket socket = new Socket(host.getHostName(), host.getPort());
conn.bind(socket);
}
- BasicHttpRequest request = new BasicHttpRequest("GET", host, targets[i]);
+ ClassicHttpRequest request = new BasicClassicHttpRequest("GET", host, targets[i]);
System.out.println(">> Request URI: " + request.getUri());
httpexecutor.preProcess(request, httpproc, coreContext);
- HttpResponse response = httpexecutor.execute(request, conn, coreContext);
+ ClassicHttpResponse response = httpexecutor.execute(request, conn, coreContext);
httpexecutor.postProcess(response, httpproc, coreContext);
System.out.println("<< Response: " + response.getCode());
Modified: httpcomponents/httpcore/trunk/httpcore5/src/examples/org/apache/hc/core5/http/examples/ElementalHttpPost.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/examples/org/apache/hc/core5/http/examples/ElementalHttpPost.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/examples/org/apache/hc/core5/http/examples/ElementalHttpPost.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/examples/org/apache/hc/core5/http/examples/ElementalHttpPost.java Sun Aug 28 19:04:49 2016
@@ -34,8 +34,8 @@ import java.nio.charset.StandardCharsets
import org.apache.hc.core5.http.ConnectionReuseStrategy;
import org.apache.hc.core5.http.HttpEntity;
import org.apache.hc.core5.http.HttpHost;
-import org.apache.hc.core5.http.HttpRequest;
-import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.ClassicHttpRequest;
+import org.apache.hc.core5.http.ClassicHttpResponse;
import org.apache.hc.core5.http.entity.ByteArrayEntity;
import org.apache.hc.core5.http.entity.ContentType;
import org.apache.hc.core5.http.entity.EntityUtils;
@@ -44,7 +44,7 @@ import org.apache.hc.core5.http.entity.S
import org.apache.hc.core5.http.impl.DefaultConnectionReuseStrategy;
import org.apache.hc.core5.http.impl.io.DefaultBHttpClientConnection;
import org.apache.hc.core5.http.impl.io.HttpRequestExecutor;
-import org.apache.hc.core5.http.message.BasicHttpRequest;
+import org.apache.hc.core5.http.message.BasicClassicHttpRequest;
import org.apache.hc.core5.http.protocol.HttpCoreContext;
import org.apache.hc.core5.http.protocol.HttpProcessor;
import org.apache.hc.core5.http.protocol.HttpProcessorBuilder;
@@ -96,13 +96,13 @@ public class ElementalHttpPost {
Socket socket = new Socket(host.getHostName(), host.getPort());
conn.bind(socket);
}
- HttpRequest request = new BasicHttpRequest("POST", host,
+ ClassicHttpRequest request = new BasicClassicHttpRequest("POST", host,
"/servlets-examples/servlet/RequestInfoExample");
request.setEntity(requestBodies[i]);
System.out.println(">> Request URI: " + request.getUri());
httpexecutor.preProcess(request, httpproc, coreContext);
- HttpResponse response = httpexecutor.execute(request, conn, coreContext);
+ ClassicHttpResponse response = httpexecutor.execute(request, conn, coreContext);
httpexecutor.postProcess(response, httpproc, coreContext);
System.out.println("<< Response: " + response.getCode());
Modified: httpcomponents/httpcore/trunk/httpcore5/src/examples/org/apache/hc/core5/http/examples/ElementalHttpPostTrailers.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/examples/org/apache/hc/core5/http/examples/ElementalHttpPostTrailers.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/examples/org/apache/hc/core5/http/examples/ElementalHttpPostTrailers.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/examples/org/apache/hc/core5/http/examples/ElementalHttpPostTrailers.java Sun Aug 28 19:04:49 2016
@@ -29,9 +29,10 @@ package org.apache.hc.core5.http.example
import java.net.Socket;
+import org.apache.hc.core5.http.ClassicHttpRequest;
import org.apache.hc.core5.http.HttpEntity;
import org.apache.hc.core5.http.HttpHost;
-import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.ClassicHttpResponse;
import org.apache.hc.core5.http.entity.ContentType;
import org.apache.hc.core5.http.entity.EntityUtils;
import org.apache.hc.core5.http.entity.HttpEntityWithTrailers;
@@ -39,7 +40,7 @@ import org.apache.hc.core5.http.entity.S
import org.apache.hc.core5.http.impl.io.DefaultBHttpClientConnection;
import org.apache.hc.core5.http.impl.io.HttpRequestExecutor;
import org.apache.hc.core5.http.message.BasicHeader;
-import org.apache.hc.core5.http.message.BasicHttpRequest;
+import org.apache.hc.core5.http.message.BasicClassicHttpRequest;
import org.apache.hc.core5.http.protocol.HttpCoreContext;
import org.apache.hc.core5.http.protocol.HttpProcessor;
import org.apache.hc.core5.http.protocol.HttpProcessorBuilder;
@@ -68,10 +69,10 @@ public class ElementalHttpPostTrailers {
new BasicHeader("t1","Hello world"));
Socket socket = new Socket(host.getHostName(), host.getPort());
conn.bind(socket);
- BasicHttpRequest request = new BasicHttpRequest("POST", host, "/");
+ ClassicHttpRequest request = new BasicClassicHttpRequest("POST", host, "/");
request.setEntity(requestBody);
httpexecutor.preProcess(request, httpproc, coreContext);
- HttpResponse response = httpexecutor.execute(request, conn, coreContext);
+ ClassicHttpResponse response = httpexecutor.execute(request, conn, coreContext);
httpexecutor.postProcess(response, httpproc, coreContext);
System.out.println("<< Response: " + response.getCode());
Modified: httpcomponents/httpcore/trunk/httpcore5/src/examples/org/apache/hc/core5/http/examples/ElementalPoolingHttpGet.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/examples/org/apache/hc/core5/http/examples/ElementalPoolingHttpGet.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/examples/org/apache/hc/core5/http/examples/ElementalPoolingHttpGet.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/examples/org/apache/hc/core5/http/examples/ElementalPoolingHttpGet.java Sun Aug 28 19:04:49 2016
@@ -30,15 +30,16 @@ package org.apache.hc.core5.http.example
import java.io.IOException;
import java.util.concurrent.Future;
+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.HttpException;
import org.apache.hc.core5.http.HttpHost;
-import org.apache.hc.core5.http.HttpResponse;
import org.apache.hc.core5.http.entity.EntityUtils;
import org.apache.hc.core5.http.impl.DefaultConnectionReuseStrategy;
import org.apache.hc.core5.http.impl.io.HttpRequestExecutor;
import org.apache.hc.core5.http.io.HttpClientConnection;
-import org.apache.hc.core5.http.message.BasicHttpRequest;
+import org.apache.hc.core5.http.message.BasicClassicHttpRequest;
import org.apache.hc.core5.http.pool.io.BasicConnFactory;
import org.apache.hc.core5.http.pool.io.BasicConnPool;
import org.apache.hc.core5.http.pool.io.BasicPoolEntry;
@@ -98,11 +99,11 @@ public class ElementalPoolingHttpGet {
HttpClientConnection conn = entry.getConnection();
HttpCoreContext coreContext = HttpCoreContext.create();
- BasicHttpRequest request = new BasicHttpRequest("GET", this.target, "/");
+ ClassicHttpRequest request = new BasicClassicHttpRequest("GET", this.target, "/");
System.out.println(">> Request URI: " + request.getUri());
httpexecutor.preProcess(request, httpproc, coreContext);
- HttpResponse response = httpexecutor.execute(request, conn, coreContext);
+ ClassicHttpResponse response = httpexecutor.execute(request, conn, coreContext);
httpexecutor.postProcess(response, httpproc, coreContext);
System.out.println("<< Response: " + response.getCode());
Modified: httpcomponents/httpcore/trunk/httpcore5/src/examples/org/apache/hc/core5/http/examples/ElementalReverseProxy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/examples/org/apache/hc/core5/http/examples/ElementalReverseProxy.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/examples/org/apache/hc/core5/http/examples/ElementalReverseProxy.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/examples/org/apache/hc/core5/http/examples/ElementalReverseProxy.java Sun Aug 28 19:04:49 2016
@@ -37,9 +37,9 @@ import org.apache.hc.core5.http.Connecti
import org.apache.hc.core5.http.HttpException;
import org.apache.hc.core5.http.HttpHeaders;
import org.apache.hc.core5.http.HttpHost;
-import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.ClassicHttpRequest;
import org.apache.hc.core5.http.HttpRequestInterceptor;
-import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.ClassicHttpResponse;
import org.apache.hc.core5.http.HttpResponseInterceptor;
import org.apache.hc.core5.http.impl.DefaultConnectionReuseStrategy;
import org.apache.hc.core5.http.impl.io.DefaultBHttpClientConnection;
@@ -111,8 +111,8 @@ public class ElementalReverseProxy {
@Override
public void handle(
- final HttpRequest request,
- final HttpResponse response,
+ final ClassicHttpRequest request,
+ final ClassicHttpResponse response,
final HttpContext context) throws HttpException, IOException {
final HttpClientConnection conn = (HttpClientConnection) context.getAttribute(
@@ -133,7 +133,7 @@ public class ElementalReverseProxy {
request.removeHeaders(HttpHeaders.UPGRADE);
this.httpexecutor.preProcess(request, this.httpproc, context);
- final HttpResponse targetResponse = this.httpexecutor.execute(request, conn, context);
+ final ClassicHttpResponse targetResponse = this.httpexecutor.execute(request, conn, context);
this.httpexecutor.postProcess(response, this.httpproc, context);
// Remove hop-by-hop headers
Modified: httpcomponents/httpcore/trunk/httpcore5/src/examples/org/apache/hc/core5/http/examples/HttpFileServer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/examples/org/apache/hc/core5/http/examples/HttpFileServer.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/examples/org/apache/hc/core5/http/examples/HttpFileServer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/examples/org/apache/hc/core5/http/examples/HttpFileServer.java Sun Aug 28 19:04:49 2016
@@ -43,8 +43,8 @@ import org.apache.hc.core5.http.Exceptio
import org.apache.hc.core5.http.HttpConnection;
import org.apache.hc.core5.http.HttpEntity;
import org.apache.hc.core5.http.HttpException;
-import org.apache.hc.core5.http.HttpRequest;
-import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.ClassicHttpRequest;
+import org.apache.hc.core5.http.ClassicHttpResponse;
import org.apache.hc.core5.http.HttpStatus;
import org.apache.hc.core5.http.MethodNotSupportedException;
import org.apache.hc.core5.http.bootstrap.io.HttpServer;
@@ -140,8 +140,8 @@ public class HttpFileServer {
@Override
public void handle(
- final HttpRequest request,
- final HttpResponse response,
+ final ClassicHttpRequest request,
+ final ClassicHttpResponse response,
final HttpContext context) throws HttpException, IOException {
String method = request.getMethod().toUpperCase(Locale.ROOT);
Modified: httpcomponents/httpcore/trunk/httpcore5/src/examples/org/apache/hc/core5/http/examples/NHttpClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/examples/org/apache/hc/core5/http/examples/NHttpClient.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/examples/org/apache/hc/core5/http/examples/NHttpClient.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/examples/org/apache/hc/core5/http/examples/NHttpClient.java Sun Aug 28 19:04:49 2016
@@ -31,15 +31,16 @@ import java.io.InterruptedIOException;
import java.util.concurrent.CountDownLatch;
import org.apache.hc.core5.concurrent.FutureCallback;
+import org.apache.hc.core5.http.ClassicHttpRequest;
+import org.apache.hc.core5.http.ClassicHttpResponse;
import org.apache.hc.core5.http.HttpHost;
-import org.apache.hc.core5.http.HttpResponse;
import org.apache.hc.core5.http.config.ConnectionConfig;
import org.apache.hc.core5.http.impl.nio.BasicAsyncRequestProducer;
import org.apache.hc.core5.http.impl.nio.BasicAsyncResponseConsumer;
import org.apache.hc.core5.http.impl.nio.DefaultHttpClientIOEventHandlerFactory;
import org.apache.hc.core5.http.impl.nio.HttpAsyncRequestExecutor;
import org.apache.hc.core5.http.impl.nio.HttpAsyncRequester;
-import org.apache.hc.core5.http.message.BasicHttpRequest;
+import org.apache.hc.core5.http.message.BasicClassicHttpRequest;
import org.apache.hc.core5.http.pool.nio.BasicNIOConnPool;
import org.apache.hc.core5.http.protocol.HttpCoreContext;
import org.apache.hc.core5.http.protocol.HttpProcessor;
@@ -117,7 +118,7 @@ public class NHttpClient {
};
final CountDownLatch latch = new CountDownLatch(targets.length);
for (final HttpHost target: targets) {
- BasicHttpRequest request = new BasicHttpRequest("GET", "/");
+ ClassicHttpRequest request = new BasicClassicHttpRequest("GET", "/");
HttpCoreContext coreContext = HttpCoreContext.create();
requester.execute(
new BasicAsyncRequestProducer(target, request),
@@ -125,10 +126,10 @@ public class NHttpClient {
pool,
coreContext,
// Handle HTTP response from a callback
- new FutureCallback<HttpResponse>() {
+ new FutureCallback<ClassicHttpResponse>() {
@Override
- public void completed(final HttpResponse response) {
+ public void completed(final ClassicHttpResponse response) {
latch.countDown();
System.out.println(target + "->" + response.getCode());
}
Modified: httpcomponents/httpcore/trunk/httpcore5/src/examples/org/apache/hc/core5/http/examples/NHttpFileServer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/examples/org/apache/hc/core5/http/examples/NHttpFileServer.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/examples/org/apache/hc/core5/http/examples/NHttpFileServer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/examples/org/apache/hc/core5/http/examples/NHttpFileServer.java Sun Aug 28 19:04:49 2016
@@ -38,8 +38,8 @@ import javax.net.ssl.SSLContext;
import org.apache.hc.core5.http.ExceptionLogger;
import org.apache.hc.core5.http.HttpConnection;
import org.apache.hc.core5.http.HttpException;
-import org.apache.hc.core5.http.HttpRequest;
-import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.ClassicHttpRequest;
+import org.apache.hc.core5.http.ClassicHttpResponse;
import org.apache.hc.core5.http.HttpStatus;
import org.apache.hc.core5.http.MethodNotSupportedException;
import org.apache.hc.core5.http.bootstrap.nio.HttpServer;
@@ -114,7 +114,7 @@ public class NHttpFileServer {
}
- static class HttpFileHandler implements HttpAsyncRequestHandler<HttpRequest> {
+ static class HttpFileHandler implements HttpAsyncRequestHandler<ClassicHttpRequest> {
private final File docRoot;
@@ -124,8 +124,8 @@ public class NHttpFileServer {
}
@Override
- public HttpAsyncRequestConsumer<HttpRequest> processRequest(
- final HttpRequest request,
+ public HttpAsyncRequestConsumer<ClassicHttpRequest> processRequest(
+ final ClassicHttpRequest request,
final HttpContext context) {
// Buffer request content in memory for simplicity
return new BasicAsyncRequestConsumer();
@@ -133,17 +133,17 @@ public class NHttpFileServer {
@Override
public void handle(
- final HttpRequest request,
+ final ClassicHttpRequest request,
final HttpAsyncExchange httpexchange,
final HttpContext context) throws HttpException, IOException {
- HttpResponse response = httpexchange.getResponse();
+ ClassicHttpResponse response = httpexchange.getResponse();
handleInternal(request, response, context);
httpexchange.submitResponse(new BasicAsyncResponseProducer(response));
}
private void handleInternal(
- final HttpRequest request,
- final HttpResponse response,
+ final ClassicHttpRequest request,
+ final ClassicHttpResponse response,
final HttpContext context) throws HttpException, IOException {
String method = request.getMethod().toUpperCase(Locale.ENGLISH);
Modified: httpcomponents/httpcore/trunk/httpcore5/src/examples/org/apache/hc/core5/http/examples/NHttpReverseProxy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/examples/org/apache/hc/core5/http/examples/NHttpReverseProxy.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/examples/org/apache/hc/core5/http/examples/NHttpReverseProxy.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/examples/org/apache/hc/core5/http/examples/NHttpReverseProxy.java Sun Aug 28 19:04:49 2016
@@ -36,8 +36,8 @@ import java.util.concurrent.atomic.Atomi
import org.apache.hc.core5.http.ConnectionReuseStrategy;
import org.apache.hc.core5.http.HttpException;
import org.apache.hc.core5.http.HttpHost;
-import org.apache.hc.core5.http.HttpRequest;
-import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.ClassicHttpRequest;
+import org.apache.hc.core5.http.ClassicHttpResponse;
import org.apache.hc.core5.http.HttpStatus;
import org.apache.hc.core5.http.config.ConnectionConfig;
import org.apache.hc.core5.http.entity.ContentType;
@@ -49,8 +49,8 @@ import org.apache.hc.core5.http.impl.nio
import org.apache.hc.core5.http.impl.nio.HttpAsyncRequester;
import org.apache.hc.core5.http.impl.nio.HttpAsyncService;
import org.apache.hc.core5.http.impl.nio.UriHttpAsyncRequestHandlerMapper;
-import org.apache.hc.core5.http.message.BasicHttpRequest;
-import org.apache.hc.core5.http.message.BasicHttpResponse;
+import org.apache.hc.core5.http.message.BasicClassicHttpRequest;
+import org.apache.hc.core5.http.message.BasicClassicHttpResponse;
import org.apache.hc.core5.http.nio.ContentDecoder;
import org.apache.hc.core5.http.nio.ContentEncoder;
import org.apache.hc.core5.http.nio.HttpAsyncExchange;
@@ -200,9 +200,9 @@ public class NHttpReverseProxy {
private volatile HttpAsyncExchange responseTrigger;
private volatile IOControl originIOControl;
private volatile IOControl clientIOControl;
- private volatile HttpRequest request;
+ private volatile ClassicHttpRequest request;
private volatile boolean requestReceived;
- private volatile HttpResponse response;
+ private volatile ClassicHttpResponse response;
private volatile boolean responseReceived;
private volatile Exception ex;
@@ -236,19 +236,19 @@ public class NHttpReverseProxy {
this.target = target;
}
- public HttpRequest getRequest() {
+ public ClassicHttpRequest getRequest() {
return this.request;
}
- public void setRequest(final HttpRequest request) {
+ public void setRequest(final ClassicHttpRequest request) {
this.request = request;
}
- public HttpResponse getResponse() {
+ public ClassicHttpResponse getResponse() {
return this.response;
}
- public void setResponse(final HttpResponse response) {
+ public void setResponse(final ClassicHttpResponse response) {
this.response = response;
}
@@ -337,7 +337,7 @@ public class NHttpReverseProxy {
@Override
public HttpAsyncRequestConsumer<ProxyHttpExchange> processRequest(
- final HttpRequest request,
+ final ClassicHttpRequest request,
final HttpContext context) {
ProxyHttpExchange httpExchange = (ProxyHttpExchange) context.getAttribute("http-exchange");
if (httpExchange == null) {
@@ -363,7 +363,7 @@ public class NHttpReverseProxy {
if (ex != null) {
System.out.println("[client<-proxy] " + httpExchange.getId() + " " + ex);
int status = HttpStatus.SC_INTERNAL_SERVER_ERROR;
- HttpResponse response = new BasicHttpResponse(status);
+ ClassicHttpResponse response = new BasicClassicHttpResponse(status);
String message = ex.getMessage();
if (message == null) {
message = "Unexpected error";
@@ -372,7 +372,7 @@ public class NHttpReverseProxy {
responseTrigger.submitResponse(new BasicAsyncResponseProducer(response));
System.out.println("[client<-proxy] " + httpExchange.getId() + " error response triggered");
}
- HttpResponse response = httpExchange.getResponse();
+ ClassicHttpResponse response = httpExchange.getResponse();
if (response != null) {
responseTrigger.submitResponse(new ProxyResponseProducer(httpExchange));
System.out.println("[client<-proxy] " + httpExchange.getId() + " response triggered");
@@ -407,7 +407,7 @@ public class NHttpReverseProxy {
}
@Override
- public void requestReceived(final HttpRequest request) {
+ public void requestReceived(final ClassicHttpRequest request) {
synchronized (this.httpExchange) {
System.out.println("[client->proxy] " + this.httpExchange.getId() + " " + request.getMethod() + " " + request.getPath());
this.httpExchange.setRequest(request);
@@ -503,12 +503,12 @@ public class NHttpReverseProxy {
}
@Override
- public HttpRequest generateRequest() {
+ public ClassicHttpRequest generateRequest() {
synchronized (this.httpExchange) {
- HttpRequest request = this.httpExchange.getRequest();
+ ClassicHttpRequest request = this.httpExchange.getRequest();
System.out.println("[proxy->origin] " + this.httpExchange.getId() + " " + request.getMethod() + " " + request.getPath());
// Rewrite request!!!!
- BasicHttpRequest newREquest = new BasicHttpRequest(request.getMethod(), request.getPath());
+ BasicClassicHttpRequest newREquest = new BasicClassicHttpRequest(request.getMethod(), request.getPath());
newREquest.setEntity(request.getEntity());
return newREquest;
}
@@ -586,7 +586,7 @@ public class NHttpReverseProxy {
}
@Override
- public void responseReceived(final HttpResponse response) {
+ public void responseReceived(final ClassicHttpResponse response) {
synchronized (this.httpExchange) {
System.out.println("[proxy<-origin] " + this.httpExchange.getId() + " " + response.getCode());
this.httpExchange.setResponse(response);
@@ -655,7 +655,7 @@ public class NHttpReverseProxy {
if (responseTrigger != null && !responseTrigger.isCompleted()) {
System.out.println("[client<-proxy] " + this.httpExchange.getId() + " " + ex);
int status = HttpStatus.SC_INTERNAL_SERVER_ERROR;
- HttpResponse response = new BasicHttpResponse(status);
+ ClassicHttpResponse response = new BasicClassicHttpResponse(status);
String message = ex.getMessage();
if (message == null) {
message = "Unexpected error";
@@ -709,12 +709,12 @@ public class NHttpReverseProxy {
}
@Override
- public HttpResponse generateResponse() {
+ public ClassicHttpResponse generateResponse() {
synchronized (this.httpExchange) {
- HttpResponse response = this.httpExchange.getResponse();
+ ClassicHttpResponse response = this.httpExchange.getResponse();
System.out.println("[client<-proxy] " + this.httpExchange.getId() + " " + response.getCode());
// Rewrite response!!!!
- BasicHttpResponse r = new BasicHttpResponse(response.getCode());
+ BasicClassicHttpResponse r = new BasicClassicHttpResponse(response.getCode());
r.setEntity(response.getEntity());
return r;
}
@@ -770,7 +770,7 @@ public class NHttpReverseProxy {
static class ProxyIncomingConnectionReuseStrategy extends DefaultConnectionReuseStrategy {
@Override
- public boolean keepAlive(final HttpRequest request, final HttpResponse response, final HttpContext context) {
+ public boolean keepAlive(final ClassicHttpRequest request, final ClassicHttpResponse response, final HttpContext context) {
NHttpConnection conn = (NHttpConnection) context.getAttribute(
HttpCoreContext.HTTP_CONNECTION);
boolean keepAlive = super.keepAlive(request, response, context);
@@ -785,7 +785,7 @@ public class NHttpReverseProxy {
static class ProxyOutgoingConnectionReuseStrategy extends DefaultConnectionReuseStrategy {
@Override
- public boolean keepAlive(final HttpRequest request, final HttpResponse response, final HttpContext context) {
+ public boolean keepAlive(final ClassicHttpRequest request, final ClassicHttpResponse response, final HttpContext context) {
NHttpConnection conn = (NHttpConnection) context.getAttribute(
HttpCoreContext.HTTP_CONNECTION);
boolean keepAlive = super.keepAlive(request, response, context);
Modified: httpcomponents/httpcore/trunk/httpcore5/src/examples/org/apache/hc/core5/http/examples/PipeliningHttpClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/examples/org/apache/hc/core5/http/examples/PipeliningHttpClient.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/examples/org/apache/hc/core5/http/examples/PipeliningHttpClient.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/examples/org/apache/hc/core5/http/examples/PipeliningHttpClient.java Sun Aug 28 19:04:49 2016
@@ -34,14 +34,14 @@ import java.util.concurrent.CountDownLat
import org.apache.hc.core5.concurrent.FutureCallback;
import org.apache.hc.core5.http.HttpHost;
-import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.ClassicHttpResponse;
import org.apache.hc.core5.http.config.ConnectionConfig;
import org.apache.hc.core5.http.impl.nio.BasicAsyncRequestProducer;
import org.apache.hc.core5.http.impl.nio.BasicAsyncResponseConsumer;
import org.apache.hc.core5.http.impl.nio.DefaultHttpClientIOEventHandlerFactory;
import org.apache.hc.core5.http.impl.nio.HttpAsyncRequestExecutor;
import org.apache.hc.core5.http.impl.nio.HttpAsyncRequester;
-import org.apache.hc.core5.http.message.BasicHttpRequest;
+import org.apache.hc.core5.http.message.BasicClassicHttpRequest;
import org.apache.hc.core5.http.pool.nio.BasicNIOConnPool;
import org.apache.hc.core5.http.protocol.HttpCoreContext;
import org.apache.hc.core5.http.protocol.HttpProcessor;
@@ -115,9 +115,9 @@ public class PipeliningHttpClient {
final HttpHost target = new HttpHost("www.apache.org");
List<BasicAsyncRequestProducer> requestProducers = Arrays.asList(
- new BasicAsyncRequestProducer(target, new BasicHttpRequest("GET", "/index.html")),
- new BasicAsyncRequestProducer(target, new BasicHttpRequest("GET", "/foundation/index.html")),
- new BasicAsyncRequestProducer(target, new BasicHttpRequest("GET", "/foundation/how-it-works.html"))
+ new BasicAsyncRequestProducer(target, new BasicClassicHttpRequest("GET", "/index.html")),
+ new BasicAsyncRequestProducer(target, new BasicClassicHttpRequest("GET", "/foundation/index.html")),
+ new BasicAsyncRequestProducer(target, new BasicClassicHttpRequest("GET", "/foundation/how-it-works.html"))
);
List<BasicAsyncResponseConsumer> responseConsumers = Arrays.asList(
new BasicAsyncResponseConsumer(),
@@ -130,12 +130,12 @@ public class PipeliningHttpClient {
HttpCoreContext context = HttpCoreContext.create();
requester.executePipelined(
target, requestProducers, responseConsumers, pool, context,
- new FutureCallback<List<HttpResponse>>() {
+ new FutureCallback<List<ClassicHttpResponse>>() {
@Override
- public void completed(final List<HttpResponse> result) {
+ public void completed(final List<ClassicHttpResponse> result) {
latch.countDown();
- for (HttpResponse response: result) {
+ for (ClassicHttpResponse response: result) {
System.out.println(target + "->" + response.getCode());
}
}
Copied: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/ClassicHttpRequest.java (from r1758066, httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/HttpResponseFactory.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/ClassicHttpRequest.java?p2=httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/ClassicHttpRequest.java&p1=httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/HttpResponseFactory.java&r1=1758066&r2=1758141&rev=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/HttpResponseFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/ClassicHttpRequest.java Sun Aug 28 19:04:49 2016
@@ -28,32 +28,27 @@
package org.apache.hc.core5.http;
/**
- * A factory for {@link HttpResponse HttpResponse} objects.
+ * 'Classic' {@link HttpRequest} message that can enclose {@link HttpEntity}.
*
- * @since 4.0
+ * @since 5.0
*/
-public interface HttpResponseFactory {
+public interface ClassicHttpRequest extends HttpRequest {
/**
- * Creates response message with the given code and reason phrase.
+ * Obtains the message entity, if available.
*
- * @param transportVersion protocol version this message was transmitted with.
- * @param status the status code
- * @param reasonPhrase the reason phrase
- *
- * @return response message
- *
- * @since 5.0
+ * @return the message entity, or {@code null} if not available
*/
- HttpResponse newHttpResponse(ProtocolVersion transportVersion, int status, String reasonPhrase);
+ HttpEntity getEntity();
/**
- * Creates a new response with the given code.
- *
- * @param status the status code
+ * Sets an entity for this message.
+ * <p>
+ * Please note that if an entity has already been set it is responsibility of the caller
+ * to ensure release of the resources that may be associated with that entity.
*
- * @return response message
+ * @param entity the entity to set of this message, or {@code null} to unset
*/
- HttpResponse newHttpResponse(int status);
+ void setEntity(HttpEntity entity);
}
Copied: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/ClassicHttpResponse.java (from r1758066, httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/HttpResponseFactory.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/ClassicHttpResponse.java?p2=httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/ClassicHttpResponse.java&p1=httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/HttpResponseFactory.java&r1=1758066&r2=1758141&rev=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/HttpResponseFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/ClassicHttpResponse.java Sun Aug 28 19:04:49 2016
@@ -28,32 +28,27 @@
package org.apache.hc.core5.http;
/**
- * A factory for {@link HttpResponse HttpResponse} objects.
+ * 'Classic' {@link HttpResponse} message that can enclose {@link HttpEntity}.
*
- * @since 4.0
+ * @since 5.0
*/
-public interface HttpResponseFactory {
+public interface ClassicHttpResponse extends HttpResponse {
/**
- * Creates response message with the given code and reason phrase.
+ * Obtains the message entity, if available.
*
- * @param transportVersion protocol version this message was transmitted with.
- * @param status the status code
- * @param reasonPhrase the reason phrase
- *
- * @return response message
- *
- * @since 5.0
+ * @return the message entity, or {@code null} if not available
*/
- HttpResponse newHttpResponse(ProtocolVersion transportVersion, int status, String reasonPhrase);
+ HttpEntity getEntity();
/**
- * Creates a new response with the given code.
- *
- * @param status the status code
+ * Sets an entity for this message.
+ * <p>
+ * Please note that if an entity has already been set it is responsibility of the caller
+ * to ensure release of the resources that may be associated with that entity.
*
- * @return response message
+ * @param entity the entity to set of this message, or {@code null} to unset
*/
- HttpResponse newHttpResponse(int status);
+ void setEntity(HttpEntity entity);
}
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/ConnectionReuseStrategy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/ConnectionReuseStrategy.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/ConnectionReuseStrategy.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/ConnectionReuseStrategy.java Sun Aug 28 19:04:49 2016
@@ -69,6 +69,6 @@ public interface ConnectionReuseStrategy
* @return {@code true} if the connection is allowed to be reused, or
* {@code false} if it MUST NOT be reused
*/
- boolean keepAlive(HttpRequest request, HttpResponse response, HttpContext context);
+ boolean keepAlive(ClassicHttpRequest request, ClassicHttpResponse response, HttpContext context);
}
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/HttpMessage.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/HttpMessage.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/HttpMessage.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/HttpMessage.java Sun Aug 28 19:04:49 2016
@@ -33,7 +33,7 @@ package org.apache.hc.core5.http;
*
* @since 4.0
*/
-public interface HttpMessage<T> extends MessageHead {
+public interface HttpMessage extends MessageHeaders {
/**
* Sets protocol version.
@@ -112,25 +112,4 @@ public interface HttpMessage<T> extends
*/
void removeHeaders(String name);
- /**
- * Obtains the message entity, if available.
- *
- * @return the message entity, or {@code null} if not available
- *
- * @since 5.0
- */
- T getEntity();
-
- /**
- * Sets an entity for this message.
- * <p>
- * Please note that if an entity has already been set it is responsibility of the caller
- * to ensure release of the resources that may be associated with that entity.
- *
- * @param entity the entity to set of this message, or {@code null} to unset
- *
- * @since 5.0
- */
- void setEntity(T entity);
-
}
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/HttpRequest.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/HttpRequest.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/HttpRequest.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/HttpRequest.java Sun Aug 28 19:04:49 2016
@@ -37,7 +37,7 @@ import java.net.URISyntaxException;
*
* @since 4.0
*/
-public interface HttpRequest extends HttpMessage<HttpEntity> {
+public interface HttpRequest extends HttpMessage {
/**
* Returns method of this request message.
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/HttpRequestFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/HttpRequestFactory.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/HttpRequestFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/HttpRequestFactory.java Sun Aug 28 19:04:49 2016
@@ -28,11 +28,11 @@
package org.apache.hc.core5.http;
/**
- * A factory for {@link HttpRequest HttpRequest} objects.
+ * A factory for {@link HttpRequest} objects.
*
* @since 4.0
*/
-public interface HttpRequestFactory {
+public interface HttpRequestFactory<T extends HttpRequest> {
/**
* Creates request message with the given request method and request URI.
@@ -45,7 +45,7 @@ public interface HttpRequestFactory {
*
* @since 5.0
*/
- HttpRequest newHttpRequest(ProtocolVersion transportVersion, String method, String uri) throws MethodNotSupportedException;
+ T newHttpRequest(ProtocolVersion transportVersion, String method, String uri) throws MethodNotSupportedException;
/**
* Creates request message with the given request method and request URI.
@@ -55,6 +55,6 @@ public interface HttpRequestFactory {
*
* @return request message
*/
- HttpRequest newHttpRequest(String method, String uri) throws MethodNotSupportedException;
+ T newHttpRequest(String method, String uri) throws MethodNotSupportedException;
}
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/HttpRequestInterceptor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/HttpRequestInterceptor.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/HttpRequestInterceptor.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/HttpRequestInterceptor.java Sun Aug 28 19:04:49 2016
@@ -62,7 +62,7 @@ public interface HttpRequestInterceptor
* @throws HttpException in case of an HTTP protocol violation
* @throws IOException in case of an I/O error
*/
- void process(HttpRequest request, HttpContext context)
+ void process(ClassicHttpRequest request, HttpContext context)
throws HttpException, IOException;
}
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/HttpResponse.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/HttpResponse.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/HttpResponse.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/HttpResponse.java Sun Aug 28 19:04:49 2016
@@ -35,7 +35,7 @@ import java.util.Locale;
*
* @since 4.0
*/
-public interface HttpResponse extends HttpMessage<HttpEntity> {
+public interface HttpResponse extends HttpMessage {
/**
* Obtains the code of this response message.
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/HttpResponseFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/HttpResponseFactory.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/HttpResponseFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/HttpResponseFactory.java Sun Aug 28 19:04:49 2016
@@ -28,11 +28,11 @@
package org.apache.hc.core5.http;
/**
- * A factory for {@link HttpResponse HttpResponse} objects.
+ * A factory for {@link HttpResponse} objects.
*
* @since 4.0
*/
-public interface HttpResponseFactory {
+public interface HttpResponseFactory<T extends HttpResponse> {
/**
* Creates response message with the given code and reason phrase.
@@ -45,7 +45,7 @@ public interface HttpResponseFactory {
*
* @since 5.0
*/
- HttpResponse newHttpResponse(ProtocolVersion transportVersion, int status, String reasonPhrase);
+ T newHttpResponse(ProtocolVersion transportVersion, int status, String reasonPhrase);
/**
* Creates a new response with the given code.
@@ -54,6 +54,6 @@ public interface HttpResponseFactory {
*
* @return response message
*/
- HttpResponse newHttpResponse(int status);
+ T newHttpResponse(int status);
}
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/HttpResponseInterceptor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/HttpResponseInterceptor.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/HttpResponseInterceptor.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/HttpResponseInterceptor.java Sun Aug 28 19:04:49 2016
@@ -62,7 +62,7 @@ public interface HttpResponseInterceptor
* @throws HttpException in case of an HTTP protocol violation
* @throws IOException in case of an I/O error
*/
- void process(HttpResponse response, HttpContext context)
+ void process(ClassicHttpResponse response, HttpContext context)
throws HttpException, IOException;
}
Copied: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/MessageHeaders.java (from r1758066, httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/MessageHead.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/MessageHeaders.java?p2=httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/MessageHeaders.java&p1=httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/MessageHead.java&r1=1758066&r2=1758141&rev=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/MessageHead.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/MessageHeaders.java Sun Aug 28 19:04:49 2016
@@ -30,11 +30,11 @@ package org.apache.hc.core5.http;
import java.util.Iterator;
/**
- * HTTP messages head consisting of multiple message headers.
+ * Messages head consisting of multiple message headers.
*
* @since 5.0
*/
-public interface MessageHead {
+public interface MessageHeaders {
/**
* Checks if a certain header is present in this message. Header values are
Propchange: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/MessageHeaders.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/MessageHeaders.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/MessageHeaders.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/entity/EntityUtils.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/entity/EntityUtils.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/entity/EntityUtils.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/entity/EntityUtils.java Sun Aug 28 19:04:49 2016
@@ -37,7 +37,7 @@ import java.nio.charset.StandardCharsets
import java.nio.charset.UnsupportedCharsetException;
import org.apache.hc.core5.http.HttpEntity;
-import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.ClassicHttpResponse;
import org.apache.hc.core5.http.ParseException;
import org.apache.hc.core5.util.Args;
import org.apache.hc.core5.util.ByteArrayBuffer;
@@ -102,7 +102,7 @@ public final class EntityUtils {
* @since 4.3
*/
public static void updateEntity(
- final HttpResponse response, final HttpEntity entity) throws IOException {
+ final ClassicHttpResponse response, final HttpEntity entity) throws IOException {
Args.notNull(response, "Response");
consume(response.getEntity());
response.setEntity(entity);
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/DefaultConnectionReuseStrategy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/DefaultConnectionReuseStrategy.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/DefaultConnectionReuseStrategy.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/DefaultConnectionReuseStrategy.java Sun Aug 28 19:04:49 2016
@@ -35,8 +35,8 @@ import org.apache.hc.core5.http.Connecti
import org.apache.hc.core5.http.Header;
import org.apache.hc.core5.http.HeaderElements;
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.HttpStatus;
import org.apache.hc.core5.http.HttpVersion;
import org.apache.hc.core5.http.ProtocolVersion;
@@ -77,7 +77,7 @@ public class DefaultConnectionReuseStrat
// see interface ConnectionReuseStrategy
@Override
public boolean keepAlive(
- final HttpRequest request, final HttpResponse response, final HttpContext context) {
+ final ClassicHttpRequest request, final ClassicHttpResponse response, final HttpContext context) {
Args.notNull(response, "HTTP response");
if (request != null) {
@@ -138,7 +138,7 @@ public class DefaultConnectionReuseStrat
return ver.greaterEquals(HttpVersion.HTTP_1_1);
}
- private boolean canResponseHaveBody(final HttpResponse response) {
+ private boolean canResponseHaveBody(final ClassicHttpResponse response) {
final int status = response.getCode();
return status >= HttpStatus.SC_SUCCESS
&& status != HttpStatus.SC_NO_CONTENT