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 [2/9] - in /httpcomponents/httpcore/trunk:
httpcore5-ab/src/main/java/org/apache/hc/core5/http/benchmark/
httpcore5-ab/src/test/java/org/apache/hc/core5/http/benchmark/
httpcore5-h2/src/main/java/org/apache/hc/core5/http2/ httpcore...
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/DefaultHttpRequestFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/DefaultHttpRequestFactory.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/DefaultHttpRequestFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/DefaultHttpRequestFactory.java Sun Aug 28 19:04:49 2016
@@ -29,19 +29,19 @@ package org.apache.hc.core5.http.impl;
import org.apache.hc.core5.annotation.Contract;
import org.apache.hc.core5.annotation.ThreadingBehavior;
-import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.ClassicHttpRequest;
import org.apache.hc.core5.http.HttpRequestFactory;
import org.apache.hc.core5.http.MethodNotSupportedException;
import org.apache.hc.core5.http.ProtocolVersion;
-import org.apache.hc.core5.http.message.BasicHttpRequest;
+import org.apache.hc.core5.http.message.BasicClassicHttpRequest;
/**
- * Default factory for creating {@link HttpRequest} objects.
+ * Default factory for creating {@link ClassicHttpRequest} objects.
*
* @since 4.0
*/
@Contract(threading = ThreadingBehavior.IMMUTABLE)
-public class DefaultHttpRequestFactory implements HttpRequestFactory {
+public class DefaultHttpRequestFactory implements HttpRequestFactory<ClassicHttpRequest> {
public static final DefaultHttpRequestFactory INSTANCE = new DefaultHttpRequestFactory();
@@ -67,9 +67,9 @@ public class DefaultHttpRequestFactory i
}
@Override
- public HttpRequest newHttpRequest(final ProtocolVersion transportVersion, final String method, final String uri) throws MethodNotSupportedException {
+ public ClassicHttpRequest newHttpRequest(final ProtocolVersion transportVersion, final String method, final String uri) throws MethodNotSupportedException {
if (isOneOf(SUPPORTED_METHODS, method)) {
- final HttpRequest request = new BasicHttpRequest(method, uri);
+ final ClassicHttpRequest request = new BasicClassicHttpRequest(method, uri);
request.setVersion(transportVersion);
return request;
}
@@ -77,8 +77,8 @@ public class DefaultHttpRequestFactory i
}
@Override
- public HttpRequest newHttpRequest(final String method, final String uri) throws MethodNotSupportedException {
- return new BasicHttpRequest(method, uri);
+ public ClassicHttpRequest newHttpRequest(final String method, final String uri) throws MethodNotSupportedException {
+ return new BasicClassicHttpRequest(method, uri);
}
}
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/DefaultHttpResponseFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/DefaultHttpResponseFactory.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/DefaultHttpResponseFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/DefaultHttpResponseFactory.java Sun Aug 28 19:04:49 2016
@@ -29,20 +29,20 @@ package org.apache.hc.core5.http.impl;
import org.apache.hc.core5.annotation.Contract;
import org.apache.hc.core5.annotation.ThreadingBehavior;
-import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.ClassicHttpResponse;
import org.apache.hc.core5.http.HttpResponseFactory;
import org.apache.hc.core5.http.ProtocolVersion;
import org.apache.hc.core5.http.ReasonPhraseCatalog;
-import org.apache.hc.core5.http.message.BasicHttpResponse;
+import org.apache.hc.core5.http.message.BasicClassicHttpResponse;
import org.apache.hc.core5.util.Args;
/**
- * Default factory for creating {@link HttpResponse} objects.
+ * Default factory for creating {@link ClassicHttpResponse} objects.
*
* @since 4.0
*/
@Contract(threading = ThreadingBehavior.IMMUTABLE_CONDITIONAL)
-public class DefaultHttpResponseFactory implements HttpResponseFactory {
+public class DefaultHttpResponseFactory implements HttpResponseFactory<ClassicHttpResponse> {
public static final DefaultHttpResponseFactory INSTANCE = new DefaultHttpResponseFactory();
@@ -66,8 +66,8 @@ public class DefaultHttpResponseFactory
}
@Override
- public HttpResponse newHttpResponse(final ProtocolVersion transportVersion, final int status, final String reasonPhrase) {
- final HttpResponse response = new BasicHttpResponse(status, reasonPhrase);
+ public ClassicHttpResponse newHttpResponse(final ProtocolVersion transportVersion, final int status, final String reasonPhrase) {
+ final ClassicHttpResponse response = new BasicClassicHttpResponse(status, reasonPhrase);
response.setVersion(transportVersion);
if (reasonPhrase != null) {
response.setReasonPhrase(reasonPhrase);
@@ -76,8 +76,8 @@ public class DefaultHttpResponseFactory
}
@Override
- public HttpResponse newHttpResponse(final int status) {
- return new BasicHttpResponse(status, this.reasonCatalog, null);
+ public ClassicHttpResponse newHttpResponse(final int status) {
+ return new BasicClassicHttpResponse(status, this.reasonCatalog, null);
}
}
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultBHttpClientConnection.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultBHttpClientConnection.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultBHttpClientConnection.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultBHttpClientConnection.java Sun Aug 28 19:04:49 2016
@@ -36,8 +36,8 @@ import java.nio.charset.CharsetEncoder;
import org.apache.hc.core5.http.ContentLengthStrategy;
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.LengthRequiredException;
import org.apache.hc.core5.http.config.MessageConstraints;
@@ -57,8 +57,8 @@ import org.apache.hc.core5.util.Args;
public class DefaultBHttpClientConnection extends BHttpConnectionBase
implements HttpClientConnection {
- private final HttpMessageParser<HttpResponse> responseParser;
- private final HttpMessageWriter<HttpRequest> requestWriter;
+ private final HttpMessageParser<ClassicHttpResponse> responseParser;
+ private final HttpMessageWriter<ClassicHttpRequest> requestWriter;
private final ContentLengthStrategy incomingContentStrategy;
private final ContentLengthStrategy outgoingContentStrategy;
private volatile boolean consistent;
@@ -91,8 +91,8 @@ public class DefaultBHttpClientConnectio
final MessageConstraints constraints,
final ContentLengthStrategy incomingContentStrategy,
final ContentLengthStrategy outgoingContentStrategy,
- final HttpMessageWriterFactory<HttpRequest> requestWriterFactory,
- final HttpMessageParserFactory<HttpResponse> responseParserFactory) {
+ final HttpMessageWriterFactory<ClassicHttpRequest> requestWriterFactory,
+ final HttpMessageParserFactory<ClassicHttpResponse> responseParserFactory) {
super(buffersize, fragmentSizeHint, chardecoder, charencoder, constraints);
this.requestWriter = (requestWriterFactory != null ? requestWriterFactory :
DefaultHttpRequestWriterFactory.INSTANCE).create();
@@ -117,10 +117,10 @@ public class DefaultBHttpClientConnectio
this(buffersize, buffersize, null, null, null, null, null, null, null);
}
- protected void onResponseReceived(final HttpResponse response) {
+ protected void onResponseReceived(final ClassicHttpResponse response) {
}
- protected void onRequestSubmitted(final HttpRequest request) {
+ protected void onRequestSubmitted(final ClassicHttpRequest request) {
}
@Override
@@ -129,7 +129,7 @@ public class DefaultBHttpClientConnectio
}
@Override
- public void sendRequestHeader(final HttpRequest request)
+ public void sendRequestHeader(final ClassicHttpRequest request)
throws HttpException, IOException {
Args.notNull(request, "HTTP request");
final SocketHolder socketHolder = ensureOpen();
@@ -139,7 +139,7 @@ public class DefaultBHttpClientConnectio
}
@Override
- public void sendRequestEntity(final HttpRequest request) throws HttpException, IOException {
+ public void sendRequestEntity(final ClassicHttpRequest request) throws HttpException, IOException {
Args.notNull(request, "HTTP request");
final SocketHolder socketHolder = ensureOpen();
final HttpEntity entity = request.getEntity();
@@ -161,7 +161,7 @@ public class DefaultBHttpClientConnectio
}
@Override
- public void terminateRequest(final HttpRequest request) throws HttpException, IOException {
+ public void terminateRequest(final ClassicHttpRequest request) throws HttpException, IOException {
Args.notNull(request, "HTTP request");
final SocketHolder socketHolder = ensureOpen();
final HttpEntity entity = request.getEntity();
@@ -182,9 +182,9 @@ public class DefaultBHttpClientConnectio
}
@Override
- public HttpResponse receiveResponseHeader() throws HttpException, IOException {
+ public ClassicHttpResponse receiveResponseHeader() throws HttpException, IOException {
final SocketHolder socketHolder = ensureOpen();
- final HttpResponse response = this.responseParser.parse(this.inbuffer, socketHolder.getInputStream());
+ final ClassicHttpResponse response = this.responseParser.parse(this.inbuffer, socketHolder.getInputStream());
this.version = response.getVersion();
onResponseReceived(response);
if (response.getCode() >= HttpStatus.SC_SUCCESS) {
@@ -194,7 +194,7 @@ public class DefaultBHttpClientConnectio
}
@Override
- public void receiveResponseEntity( final HttpResponse response) throws HttpException, IOException {
+ public void receiveResponseEntity( final ClassicHttpResponse response) throws HttpException, IOException {
Args.notNull(response, "HTTP response");
final SocketHolder socketHolder = ensureOpen();
final long len = this.incomingContentStrategy.determineLength(response);
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultBHttpClientConnectionFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultBHttpClientConnectionFactory.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultBHttpClientConnectionFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultBHttpClientConnectionFactory.java Sun Aug 28 19:04:49 2016
@@ -33,8 +33,8 @@ import java.net.Socket;
import org.apache.hc.core5.annotation.Contract;
import org.apache.hc.core5.annotation.ThreadingBehavior;
import org.apache.hc.core5.http.ContentLengthStrategy;
-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.config.ConnectionConfig;
import org.apache.hc.core5.http.impl.ConnSupport;
import org.apache.hc.core5.http.io.HttpConnectionFactory;
@@ -55,15 +55,15 @@ public class DefaultBHttpClientConnectio
private final ConnectionConfig cconfig;
private final ContentLengthStrategy incomingContentStrategy;
private final ContentLengthStrategy outgoingContentStrategy;
- private final HttpMessageWriterFactory<HttpRequest> requestWriterFactory;
- private final HttpMessageParserFactory<HttpResponse> responseParserFactory;
+ private final HttpMessageWriterFactory<ClassicHttpRequest> requestWriterFactory;
+ private final HttpMessageParserFactory<ClassicHttpResponse> responseParserFactory;
public DefaultBHttpClientConnectionFactory(
final ConnectionConfig cconfig,
final ContentLengthStrategy incomingContentStrategy,
final ContentLengthStrategy outgoingContentStrategy,
- final HttpMessageWriterFactory<HttpRequest> requestWriterFactory,
- final HttpMessageParserFactory<HttpResponse> responseParserFactory) {
+ final HttpMessageWriterFactory<ClassicHttpRequest> requestWriterFactory,
+ final HttpMessageParserFactory<ClassicHttpResponse> responseParserFactory) {
super();
this.cconfig = cconfig != null ? cconfig : ConnectionConfig.DEFAULT;
this.incomingContentStrategy = incomingContentStrategy;
@@ -74,8 +74,8 @@ public class DefaultBHttpClientConnectio
public DefaultBHttpClientConnectionFactory(
final ConnectionConfig cconfig,
- final HttpMessageWriterFactory<HttpRequest> requestWriterFactory,
- final HttpMessageParserFactory<HttpResponse> responseParserFactory) {
+ final HttpMessageWriterFactory<ClassicHttpRequest> requestWriterFactory,
+ final HttpMessageParserFactory<ClassicHttpResponse> responseParserFactory) {
this(cconfig, null, null, requestWriterFactory, responseParserFactory);
}
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultBHttpServerConnection.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultBHttpServerConnection.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultBHttpServerConnection.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultBHttpServerConnection.java Sun Aug 28 19:04:49 2016
@@ -36,8 +36,8 @@ import java.nio.charset.CharsetEncoder;
import org.apache.hc.core5.http.ContentLengthStrategy;
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.config.MessageConstraints;
import org.apache.hc.core5.http.impl.DefaultContentLengthStrategy;
@@ -57,8 +57,8 @@ public class DefaultBHttpServerConnectio
private final ContentLengthStrategy incomingContentStrategy;
private final ContentLengthStrategy outgoingContentStrategy;
- private final HttpMessageParser<HttpRequest> requestParser;
- private final HttpMessageWriter<HttpResponse> responseWriter;
+ private final HttpMessageParser<ClassicHttpRequest> requestParser;
+ private final HttpMessageWriter<ClassicHttpResponse> responseWriter;
/**
* Creates new instance of DefaultBHttpServerConnection.
@@ -88,8 +88,8 @@ public class DefaultBHttpServerConnectio
final MessageConstraints constraints,
final ContentLengthStrategy incomingContentStrategy,
final ContentLengthStrategy outgoingContentStrategy,
- final HttpMessageParserFactory<HttpRequest> requestParserFactory,
- final HttpMessageWriterFactory<HttpResponse> responseWriterFactory) {
+ final HttpMessageParserFactory<ClassicHttpRequest> requestParserFactory,
+ final HttpMessageWriterFactory<ClassicHttpResponse> responseWriterFactory) {
super(buffersize, fragmentSizeHint, chardecoder, charencoder, constraints);
this.requestParser = (requestParserFactory != null ? requestParserFactory :
DefaultHttpRequestParserFactory.INSTANCE).create(constraints);
@@ -113,10 +113,10 @@ public class DefaultBHttpServerConnectio
this(buffersize, buffersize, null, null, null, null, null, null, null);
}
- protected void onRequestReceived(final HttpRequest request) {
+ protected void onRequestReceived(final ClassicHttpRequest request) {
}
- protected void onResponseSubmitted(final HttpResponse response) {
+ protected void onResponseSubmitted(final ClassicHttpResponse response) {
}
@Override
@@ -125,9 +125,9 @@ public class DefaultBHttpServerConnectio
}
@Override
- public HttpRequest receiveRequestHeader() throws HttpException, IOException {
+ public ClassicHttpRequest receiveRequestHeader() throws HttpException, IOException {
final SocketHolder socketHolder = ensureOpen();
- final HttpRequest request = this.requestParser.parse(this.inbuffer, socketHolder.getInputStream());
+ final ClassicHttpRequest request = this.requestParser.parse(this.inbuffer, socketHolder.getInputStream());
this.version = request.getVersion();
onRequestReceived(request);
incrementRequestCount();
@@ -135,7 +135,7 @@ public class DefaultBHttpServerConnectio
}
@Override
- public void receiveRequestEntity(final HttpRequest request)
+ public void receiveRequestEntity(final ClassicHttpRequest request)
throws HttpException, IOException {
Args.notNull(request, "HTTP request");
final SocketHolder socketHolder = ensureOpen();
@@ -149,7 +149,7 @@ public class DefaultBHttpServerConnectio
}
@Override
- public void sendResponseHeader(final HttpResponse response)
+ public void sendResponseHeader(final ClassicHttpResponse response)
throws HttpException, IOException {
Args.notNull(response, "HTTP response");
final SocketHolder socketHolder = ensureOpen();
@@ -161,7 +161,7 @@ public class DefaultBHttpServerConnectio
}
@Override
- public void sendResponseEntity(final HttpResponse response)
+ public void sendResponseEntity(final ClassicHttpResponse response)
throws HttpException, IOException {
Args.notNull(response, "HTTP response");
final SocketHolder socketHolder = ensureOpen();
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultBHttpServerConnectionFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultBHttpServerConnectionFactory.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultBHttpServerConnectionFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultBHttpServerConnectionFactory.java Sun Aug 28 19:04:49 2016
@@ -33,8 +33,8 @@ import java.net.Socket;
import org.apache.hc.core5.annotation.Contract;
import org.apache.hc.core5.annotation.ThreadingBehavior;
import org.apache.hc.core5.http.ContentLengthStrategy;
-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.config.ConnectionConfig;
import org.apache.hc.core5.http.impl.ConnSupport;
import org.apache.hc.core5.http.io.HttpConnectionFactory;
@@ -55,15 +55,15 @@ public class DefaultBHttpServerConnectio
private final ConnectionConfig cconfig;
private final ContentLengthStrategy incomingContentStrategy;
private final ContentLengthStrategy outgoingContentStrategy;
- private final HttpMessageParserFactory<HttpRequest> requestParserFactory;
- private final HttpMessageWriterFactory<HttpResponse> responseWriterFactory;
+ private final HttpMessageParserFactory<ClassicHttpRequest> requestParserFactory;
+ private final HttpMessageWriterFactory<ClassicHttpResponse> responseWriterFactory;
public DefaultBHttpServerConnectionFactory(
final ConnectionConfig cconfig,
final ContentLengthStrategy incomingContentStrategy,
final ContentLengthStrategy outgoingContentStrategy,
- final HttpMessageParserFactory<HttpRequest> requestParserFactory,
- final HttpMessageWriterFactory<HttpResponse> responseWriterFactory) {
+ final HttpMessageParserFactory<ClassicHttpRequest> requestParserFactory,
+ final HttpMessageWriterFactory<ClassicHttpResponse> responseWriterFactory) {
super();
this.cconfig = cconfig != null ? cconfig : ConnectionConfig.DEFAULT;
this.incomingContentStrategy = incomingContentStrategy;
@@ -74,8 +74,8 @@ public class DefaultBHttpServerConnectio
public DefaultBHttpServerConnectionFactory(
final ConnectionConfig cconfig,
- final HttpMessageParserFactory<HttpRequest> requestParserFactory,
- final HttpMessageWriterFactory<HttpResponse> responseWriterFactory) {
+ final HttpMessageParserFactory<ClassicHttpRequest> requestParserFactory,
+ final HttpMessageWriterFactory<ClassicHttpResponse> responseWriterFactory) {
this(cconfig, null, null, requestParserFactory, responseWriterFactory);
}
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpRequestParser.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpRequestParser.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpRequestParser.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpRequestParser.java Sun Aug 28 19:04:49 2016
@@ -29,9 +29,9 @@ package org.apache.hc.core5.http.impl.io
import java.io.IOException;
+import org.apache.hc.core5.http.ClassicHttpRequest;
import org.apache.hc.core5.http.ConnectionClosedException;
import org.apache.hc.core5.http.HttpException;
-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.ProtocolVersion;
@@ -48,9 +48,9 @@ import org.apache.hc.core5.util.CharArra
*
* @since 4.2
*/
-public class DefaultHttpRequestParser extends AbstractMessageParser<HttpRequest> {
+public class DefaultHttpRequestParser extends AbstractMessageParser<ClassicHttpRequest> {
- private final HttpRequestFactory requestFactory;
+ private final HttpRequestFactory<ClassicHttpRequest> requestFactory;
/**
* Creates new instance of DefaultHttpRequestParser.
@@ -66,7 +66,7 @@ public class DefaultHttpRequestParser ex
*/
public DefaultHttpRequestParser(
final LineParser lineParser,
- final HttpRequestFactory requestFactory,
+ final HttpRequestFactory<ClassicHttpRequest> requestFactory,
final MessageConstraints constraints) {
super(lineParser, constraints);
this.requestFactory = requestFactory != null ? requestFactory : DefaultHttpRequestFactory.INSTANCE;
@@ -92,7 +92,7 @@ public class DefaultHttpRequestParser ex
}
@Override
- protected HttpRequest createMessage(final CharArrayBuffer buffer) throws IOException, HttpException {
+ protected ClassicHttpRequest createMessage(final CharArrayBuffer buffer) throws IOException, HttpException {
final RequestLine requestLine = getLineParser().parseRequestLine(buffer);
final ProtocolVersion transportVersion = requestLine.getProtocolVersion();
if (transportVersion.greaterEquals(HttpVersion.HTTP_2)) {
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpRequestParserFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpRequestParserFactory.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpRequestParserFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpRequestParserFactory.java Sun Aug 28 19:04:49 2016
@@ -29,7 +29,7 @@ package org.apache.hc.core5.http.impl.io
import org.apache.hc.core5.annotation.Contract;
import org.apache.hc.core5.annotation.ThreadingBehavior;
-import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.ClassicHttpRequest;
import org.apache.hc.core5.http.HttpRequestFactory;
import org.apache.hc.core5.http.config.MessageConstraints;
import org.apache.hc.core5.http.impl.DefaultHttpRequestFactory;
@@ -44,7 +44,7 @@ import org.apache.hc.core5.http.message.
* @since 4.3
*/
@Contract(threading = ThreadingBehavior.IMMUTABLE_CONDITIONAL)
-public class DefaultHttpRequestParserFactory implements HttpMessageParserFactory<HttpRequest> {
+public class DefaultHttpRequestParserFactory implements HttpMessageParserFactory<ClassicHttpRequest> {
public static final DefaultHttpRequestParserFactory INSTANCE = new DefaultHttpRequestParserFactory();
@@ -63,7 +63,7 @@ public class DefaultHttpRequestParserFac
}
@Override
- public HttpMessageParser<HttpRequest> create(final MessageConstraints constraints) {
+ public HttpMessageParser<ClassicHttpRequest> create(final MessageConstraints constraints) {
return new DefaultHttpRequestParser(this.lineParser, this.requestFactory, constraints);
}
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpRequestWriter.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpRequestWriter.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpRequestWriter.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpRequestWriter.java Sun Aug 28 19:04:49 2016
@@ -29,7 +29,7 @@ package org.apache.hc.core5.http.impl.io
import java.io.IOException;
-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.ProtocolVersion;
import org.apache.hc.core5.http.message.LineFormatter;
@@ -42,7 +42,7 @@ import org.apache.hc.core5.util.CharArra
*
* @since 4.3
*/
-public class DefaultHttpRequestWriter extends AbstractMessageWriter<HttpRequest> {
+public class DefaultHttpRequestWriter extends AbstractMessageWriter<ClassicHttpRequest> {
/**
* Creates an instance of DefaultHttpRequestWriter.
@@ -61,7 +61,7 @@ public class DefaultHttpRequestWriter ex
@Override
protected void writeHeadLine(
- final HttpRequest message, final CharArrayBuffer lineBuf) throws IOException {
+ final ClassicHttpRequest message, final CharArrayBuffer lineBuf) throws IOException {
ProtocolVersion transportVersion = message.getVersion();
if (transportVersion == null || transportVersion.greaterEquals(HttpVersion.HTTP_2_0)) {
transportVersion = HttpVersion.HTTP_1_1;
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpRequestWriterFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpRequestWriterFactory.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpRequestWriterFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpRequestWriterFactory.java Sun Aug 28 19:04:49 2016
@@ -29,7 +29,7 @@ package org.apache.hc.core5.http.impl.io
import org.apache.hc.core5.annotation.Contract;
import org.apache.hc.core5.annotation.ThreadingBehavior;
-import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.ClassicHttpRequest;
import org.apache.hc.core5.http.io.HttpMessageWriter;
import org.apache.hc.core5.http.io.HttpMessageWriterFactory;
import org.apache.hc.core5.http.message.BasicLineFormatter;
@@ -41,7 +41,7 @@ import org.apache.hc.core5.http.message.
* @since 4.3
*/
@Contract(threading = ThreadingBehavior.IMMUTABLE_CONDITIONAL)
-public class DefaultHttpRequestWriterFactory implements HttpMessageWriterFactory<HttpRequest> {
+public class DefaultHttpRequestWriterFactory implements HttpMessageWriterFactory<ClassicHttpRequest> {
public static final DefaultHttpRequestWriterFactory INSTANCE = new DefaultHttpRequestWriterFactory();
@@ -57,7 +57,7 @@ public class DefaultHttpRequestWriterFac
}
@Override
- public HttpMessageWriter<HttpRequest> create() {
+ public HttpMessageWriter<ClassicHttpRequest> create() {
return new DefaultHttpRequestWriter(this.lineFormatter);
}
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpResponseParser.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpResponseParser.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpResponseParser.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpResponseParser.java Sun Aug 28 19:04:49 2016
@@ -30,7 +30,7 @@ package org.apache.hc.core5.http.impl.io
import java.io.IOException;
import org.apache.hc.core5.http.HttpException;
-import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.ClassicHttpResponse;
import org.apache.hc.core5.http.HttpResponseFactory;
import org.apache.hc.core5.http.HttpVersion;
import org.apache.hc.core5.http.NoHttpResponseException;
@@ -48,9 +48,9 @@ import org.apache.hc.core5.util.CharArra
*
* @since 4.2
*/
-public class DefaultHttpResponseParser extends AbstractMessageParser<HttpResponse> {
+public class DefaultHttpResponseParser extends AbstractMessageParser<ClassicHttpResponse> {
- private final HttpResponseFactory responseFactory;
+ private final HttpResponseFactory<ClassicHttpResponse> responseFactory;
/**
* Creates new instance of DefaultHttpResponseParser.
@@ -66,7 +66,7 @@ public class DefaultHttpResponseParser e
*/
public DefaultHttpResponseParser(
final LineParser lineParser,
- final HttpResponseFactory responseFactory,
+ final HttpResponseFactory<ClassicHttpResponse> responseFactory,
final MessageConstraints constraints) {
super(lineParser, constraints);
this.responseFactory = responseFactory != null ? responseFactory : DefaultHttpResponseFactory.INSTANCE;
@@ -92,7 +92,7 @@ public class DefaultHttpResponseParser e
}
@Override
- protected HttpResponse createMessage(final CharArrayBuffer buffer) throws IOException, HttpException {
+ protected ClassicHttpResponse createMessage(final CharArrayBuffer buffer) throws IOException, HttpException {
final StatusLine statusline = getLineParser().parseStatusLine(buffer);
final ProtocolVersion transportVersion = statusline.getProtocolVersion();
if (transportVersion.greaterEquals(HttpVersion.HTTP_2)) {
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpResponseParserFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpResponseParserFactory.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpResponseParserFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpResponseParserFactory.java Sun Aug 28 19:04:49 2016
@@ -29,7 +29,7 @@ package org.apache.hc.core5.http.impl.io
import org.apache.hc.core5.annotation.Contract;
import org.apache.hc.core5.annotation.ThreadingBehavior;
-import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.ClassicHttpResponse;
import org.apache.hc.core5.http.HttpResponseFactory;
import org.apache.hc.core5.http.config.MessageConstraints;
import org.apache.hc.core5.http.impl.DefaultHttpResponseFactory;
@@ -44,7 +44,7 @@ import org.apache.hc.core5.http.message.
* @since 4.3
*/
@Contract(threading = ThreadingBehavior.IMMUTABLE_CONDITIONAL)
-public class DefaultHttpResponseParserFactory implements HttpMessageParserFactory<HttpResponse> {
+public class DefaultHttpResponseParserFactory implements HttpMessageParserFactory<ClassicHttpResponse> {
public static final DefaultHttpResponseParserFactory INSTANCE = new DefaultHttpResponseParserFactory();
@@ -63,7 +63,7 @@ public class DefaultHttpResponseParserFa
}
@Override
- public HttpMessageParser<HttpResponse> create(final MessageConstraints constraints) {
+ public HttpMessageParser<ClassicHttpResponse> create(final MessageConstraints constraints) {
return new DefaultHttpResponseParser(this.lineParser, this.responseFactory, constraints);
}
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpResponseWriter.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpResponseWriter.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpResponseWriter.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpResponseWriter.java Sun Aug 28 19:04:49 2016
@@ -29,7 +29,7 @@ package org.apache.hc.core5.http.impl.io
import java.io.IOException;
-import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.ClassicHttpResponse;
import org.apache.hc.core5.http.HttpVersion;
import org.apache.hc.core5.http.ProtocolVersion;
import org.apache.hc.core5.http.message.LineFormatter;
@@ -42,7 +42,7 @@ import org.apache.hc.core5.util.CharArra
*
* @since 4.3
*/
-public class DefaultHttpResponseWriter extends AbstractMessageWriter<HttpResponse> {
+public class DefaultHttpResponseWriter extends AbstractMessageWriter<ClassicHttpResponse> {
/**
* Creates an instance of DefaultHttpResponseWriter.
@@ -61,7 +61,7 @@ public class DefaultHttpResponseWriter e
@Override
protected void writeHeadLine(
- final HttpResponse message, final CharArrayBuffer lineBuf) throws IOException {
+ final ClassicHttpResponse message, final CharArrayBuffer lineBuf) throws IOException {
ProtocolVersion transportVersion = message.getVersion();
if (transportVersion == null || transportVersion.greaterEquals(HttpVersion.HTTP_2_0)) {
transportVersion = HttpVersion.HTTP_1_1;
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpResponseWriterFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpResponseWriterFactory.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpResponseWriterFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpResponseWriterFactory.java Sun Aug 28 19:04:49 2016
@@ -29,7 +29,7 @@ package org.apache.hc.core5.http.impl.io
import org.apache.hc.core5.annotation.Contract;
import org.apache.hc.core5.annotation.ThreadingBehavior;
-import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.ClassicHttpResponse;
import org.apache.hc.core5.http.io.HttpMessageWriter;
import org.apache.hc.core5.http.io.HttpMessageWriterFactory;
import org.apache.hc.core5.http.message.BasicLineFormatter;
@@ -41,7 +41,7 @@ import org.apache.hc.core5.http.message.
* @since 4.3
*/
@Contract(threading = ThreadingBehavior.IMMUTABLE_CONDITIONAL)
-public class DefaultHttpResponseWriterFactory implements HttpMessageWriterFactory<HttpResponse> {
+public class DefaultHttpResponseWriterFactory implements HttpMessageWriterFactory<ClassicHttpResponse> {
public static final DefaultHttpResponseWriterFactory INSTANCE = new DefaultHttpResponseWriterFactory();
@@ -57,7 +57,7 @@ public class DefaultHttpResponseWriterFa
}
@Override
- public HttpMessageWriter<HttpResponse> create() {
+ public HttpMessageWriter<ClassicHttpResponse> create() {
return new DefaultHttpResponseWriter(this.lineFormatter);
}
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/HttpRequestExecutor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/HttpRequestExecutor.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/HttpRequestExecutor.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/HttpRequestExecutor.java Sun Aug 28 19:04:49 2016
@@ -35,8 +35,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.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.ProtocolException;
import org.apache.hc.core5.http.ProtocolVersion;
@@ -91,8 +91,8 @@ public class HttpRequestExecutor {
* @param request the request, to obtain the executed method
* @param response the response, to obtain the status code
*/
- protected boolean canResponseHaveBody(final HttpRequest request,
- final HttpResponse response) {
+ protected boolean canResponseHaveBody(final ClassicHttpRequest request,
+ final ClassicHttpResponse response) {
if ("HEAD".equalsIgnoreCase(request.getMethod())) {
return false;
@@ -116,8 +116,8 @@ public class HttpRequestExecutor {
* @throws HttpException in case of HTTP protocol violation or a processing
* problem.
*/
- public HttpResponse execute(
- final HttpRequest request,
+ public ClassicHttpResponse execute(
+ final ClassicHttpRequest request,
final HttpClientConnection conn,
final HttpContext context) throws IOException, HttpException {
Args.notNull(request, "HTTP request");
@@ -129,7 +129,7 @@ public class HttpRequestExecutor {
Args.notNull(conn, "Client connection");
Args.notNull(context, "HTTP context");
- HttpResponse response = null;
+ ClassicHttpResponse response = null;
context.setAttribute(HttpCoreContext.HTTP_CONNECTION, conn);
@@ -201,7 +201,7 @@ public class HttpRequestExecutor {
* problem.
*/
public void preProcess(
- final HttpRequest request,
+ final ClassicHttpRequest request,
final HttpProcessor processor,
final HttpContext context) throws HttpException, IOException {
Args.notNull(request, "HTTP request");
@@ -229,7 +229,7 @@ public class HttpRequestExecutor {
* problem.
*/
public void postProcess(
- final HttpResponse response,
+ final ClassicHttpResponse response,
final HttpProcessor processor,
final HttpContext context) throws HttpException, IOException {
Args.notNull(response, "HTTP response");
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/HttpService.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/HttpService.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/HttpService.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/HttpService.java Sun Aug 28 19:04:49 2016
@@ -36,8 +36,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.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;
@@ -84,7 +84,7 @@ public class HttpService {
private final HttpProcessor processor;
private final HttpRequestHandlerMapper handlerMapper;
private final ConnectionReuseStrategy connStrategy;
- private final HttpResponseFactory responseFactory;
+ private final HttpResponseFactory<ClassicHttpResponse> responseFactory;
private final HttpExpectationVerifier expectationVerifier;
/**
@@ -103,7 +103,7 @@ public class HttpService {
public HttpService(
final HttpProcessor processor,
final ConnectionReuseStrategy connStrategy,
- final HttpResponseFactory responseFactory,
+ final HttpResponseFactory<ClassicHttpResponse> responseFactory,
final HttpRequestHandlerMapper handlerMapper,
final HttpExpectationVerifier expectationVerifier) {
super();
@@ -131,7 +131,7 @@ public class HttpService {
public HttpService(
final HttpProcessor processor,
final ConnectionReuseStrategy connStrategy,
- final HttpResponseFactory responseFactory,
+ final HttpResponseFactory<ClassicHttpResponse> responseFactory,
final HttpRequestHandlerMapper handlerMapper) {
this(processor, connStrategy, responseFactory, handlerMapper, null);
}
@@ -165,7 +165,7 @@ public class HttpService {
context.setAttribute(HttpCoreContext.HTTP_CONNECTION, conn);
- final HttpRequest request = conn.receiveRequestHeader();
+ final ClassicHttpRequest request = conn.receiveRequestHeader();
final ProtocolVersion transportVersion = request.getVersion();
if (transportVersion != null) {
context.setProtocolVersion(transportVersion);
@@ -174,7 +174,7 @@ public class HttpService {
final Header expect = request.getFirstHeader(HttpHeaders.EXPECT);
final boolean expectContinue = expect != null && "100-continue".equalsIgnoreCase(expect.getValue());
- HttpResponse response;
+ ClassicHttpResponse response;
if (expectContinue) {
response = this.responseFactory.newHttpResponse(HttpStatus.SC_CONTINUE);
if (this.expectationVerifier != null) {
@@ -238,7 +238,7 @@ public class HttpService {
}
}
- private boolean canResponseHaveBody(final HttpRequest request, final HttpResponse response) {
+ private boolean canResponseHaveBody(final ClassicHttpRequest request, final ClassicHttpResponse response) {
if (request != null && "HEAD".equalsIgnoreCase(request.getMethod())) {
return false;
}
@@ -257,7 +257,7 @@ public class HttpService {
* @param ex the exception.
* @param response the HTTP response.
*/
- protected void handleException(final HttpException ex, final HttpResponse response) {
+ protected void handleException(final HttpException ex, final ClassicHttpResponse response) {
if (ex instanceof MethodNotSupportedException) {
response.setCode(HttpStatus.SC_NOT_IMPLEMENTED);
} else if (ex instanceof UnsupportedHttpVersionException) {
@@ -281,7 +281,7 @@ public class HttpService {
* The default implementation of this method attempts to resolve an
* {@link HttpRequestHandler} for the request URI of the given request
* and, if found, executes its
- * {@link HttpRequestHandler#handle(HttpRequest, HttpResponse, HttpContext)}
+ * {@link HttpRequestHandler#handle(ClassicHttpRequest, ClassicHttpResponse, HttpContext)}
* method.
* <p>
* Super-classes can override this method in order to provide a custom
@@ -295,8 +295,8 @@ public class HttpService {
* problem.
*/
protected void doService(
- final HttpRequest request,
- final HttpResponse response,
+ final ClassicHttpRequest request,
+ final ClassicHttpResponse response,
final HttpContext context) throws HttpException, IOException {
HttpRequestHandler handler = null;
if (this.handlerMapper != null) {
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractAsyncRequestConsumer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractAsyncRequestConsumer.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractAsyncRequestConsumer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractAsyncRequestConsumer.java Sun Aug 28 19:04:49 2016
@@ -31,7 +31,7 @@ import java.util.concurrent.atomic.Atomi
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.ClassicHttpRequest;
import org.apache.hc.core5.http.entity.ContentType;
import org.apache.hc.core5.http.nio.ContentDecoder;
import org.apache.hc.core5.http.nio.HttpAsyncRequestConsumer;
@@ -68,7 +68,7 @@ public abstract class AbstractAsyncReque
* @throws IOException in case of an I/O error
*/
protected abstract void onRequestReceived(
- HttpRequest request) throws HttpException, IOException;
+ ClassicHttpRequest request) throws HttpException, IOException;
/**
* Invoked if the request message encloses a content entity.
@@ -120,11 +120,11 @@ public abstract class AbstractAsyncReque
}
/**
- * Use {@link #onRequestReceived(HttpRequest)} instead.
+ * Use {@link #onRequestReceived(ClassicHttpRequest)} instead.
*/
@Override
public final void requestReceived(
- final HttpRequest request) throws HttpException, IOException {
+ final ClassicHttpRequest request) throws HttpException, IOException {
onRequestReceived(request);
final HttpEntity entity = request.getEntity();
if (entity != null) {
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractAsyncResponseConsumer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractAsyncResponseConsumer.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractAsyncResponseConsumer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractAsyncResponseConsumer.java Sun Aug 28 19:04:49 2016
@@ -31,7 +31,7 @@ import java.util.concurrent.atomic.Atomi
import org.apache.hc.core5.http.HttpEntity;
import org.apache.hc.core5.http.HttpException;
-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.nio.ContentDecoder;
import org.apache.hc.core5.http.nio.HttpAsyncResponseConsumer;
@@ -68,7 +68,7 @@ public abstract class AbstractAsyncRespo
* @throws IOException in case of an I/O error
*/
protected abstract void onResponseReceived(
- HttpResponse response) throws HttpException, IOException;
+ ClassicHttpResponse response) throws HttpException, IOException;
/**
* Invoked to process a chunk of content from the {@link ContentDecoder}.
@@ -120,11 +120,11 @@ public abstract class AbstractAsyncRespo
}
/**
- * Use {@link #onResponseReceived(HttpResponse)} instead.
+ * Use {@link #onResponseReceived(ClassicHttpResponse)} instead.
*/
@Override
public final void responseReceived(
- final HttpResponse response) throws IOException, HttpException {
+ final ClassicHttpResponse response) throws IOException, HttpException {
onResponseReceived(response);
final HttpEntity entity = response.getEntity();
if (entity != null) {
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractMessageParser.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractMessageParser.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractMessageParser.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractMessageParser.java Sun Aug 28 19:04:49 2016
@@ -48,7 +48,7 @@ import org.apache.hc.core5.util.CharArra
*
* @since 4.0
*/
-public abstract class AbstractMessageParser<T extends HttpMessage<?>> implements NHttpMessageParser<T> {
+public abstract class AbstractMessageParser<T extends HttpMessage> implements NHttpMessageParser<T> {
private static final int READ_HEAD_LINE = 0;
private static final int READ_HEADERS = 1;
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractMessageWriter.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractMessageWriter.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractMessageWriter.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractMessageWriter.java Sun Aug 28 19:04:49 2016
@@ -47,7 +47,7 @@ import org.apache.hc.core5.util.CharArra
*
* @since 4.0
*/
-public abstract class AbstractMessageWriter<T extends HttpMessage<?>> implements NHttpMessageWriter<T> {
+public abstract class AbstractMessageWriter<T extends HttpMessage> implements NHttpMessageWriter<T> {
private final CharArrayBuffer lineBuf;
private final LineFormatter lineFormatter;
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/BasicAsyncClientExchangeHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/BasicAsyncClientExchangeHandler.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/BasicAsyncClientExchangeHandler.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/BasicAsyncClientExchangeHandler.java Sun Aug 28 19:04:49 2016
@@ -35,8 +35,8 @@ import org.apache.hc.core5.concurrent.Ba
import org.apache.hc.core5.concurrent.FutureCallback;
import org.apache.hc.core5.http.ConnectionClosedException;
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.ProtocolVersion;
import org.apache.hc.core5.http.nio.ContentDecoder;
import org.apache.hc.core5.http.nio.ContentEncoder;
@@ -145,11 +145,11 @@ public class BasicAsyncClientExchangeHan
}
@Override
- public HttpRequest generateRequest() throws IOException, HttpException {
+ public ClassicHttpRequest generateRequest() throws IOException, HttpException {
if (isDone()) {
return null;
}
- final HttpRequest request = this.requestProducer.generateRequest();
+ final ClassicHttpRequest request = this.requestProducer.generateRequest();
this.localContext.setAttribute(HttpCoreContext.HTTP_REQUEST, request);
this.localContext.setAttribute(HttpCoreContext.HTTP_CONNECTION, this.conn);
this.httppocessor.process(request, this.localContext);
@@ -169,7 +169,7 @@ public class BasicAsyncClientExchangeHan
}
@Override
- public void responseReceived(final HttpResponse response) throws IOException, HttpException {
+ public void responseReceived(final ClassicHttpResponse response) throws IOException, HttpException {
this.localContext.setAttribute(HttpCoreContext.HTTP_RESPONSE, response);
final ProtocolVersion transportVersion = response.getVersion();
if (transportVersion != null) {
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/BasicAsyncRequestConsumer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/BasicAsyncRequestConsumer.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/BasicAsyncRequestConsumer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/BasicAsyncRequestConsumer.java Sun Aug 28 19:04:49 2016
@@ -30,7 +30,7 @@ import java.io.IOException;
import org.apache.hc.core5.http.ContentTooLongException;
import org.apache.hc.core5.http.HttpEntity;
-import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.ClassicHttpRequest;
import org.apache.hc.core5.http.entity.ContentType;
import org.apache.hc.core5.http.nio.ContentDecoder;
import org.apache.hc.core5.http.nio.IOControl;
@@ -46,9 +46,9 @@ import org.apache.hc.core5.util.HeapByte
*
* @since 4.2
*/
-public class BasicAsyncRequestConsumer extends AbstractAsyncRequestConsumer<HttpRequest> {
+public class BasicAsyncRequestConsumer extends AbstractAsyncRequestConsumer<ClassicHttpRequest> {
- private volatile HttpRequest request;
+ private volatile ClassicHttpRequest request;
private volatile SimpleInputBuffer buf;
public BasicAsyncRequestConsumer() {
@@ -56,7 +56,7 @@ public class BasicAsyncRequestConsumer e
}
@Override
- protected void onRequestReceived(final HttpRequest request) throws IOException {
+ protected void onRequestReceived(final ClassicHttpRequest request) throws IOException {
this.request = request;
}
@@ -88,7 +88,7 @@ public class BasicAsyncRequestConsumer e
}
@Override
- protected HttpRequest buildResult(final HttpContext context) {
+ protected ClassicHttpRequest buildResult(final HttpContext context) {
return this.request;
}
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/BasicAsyncRequestHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/BasicAsyncRequestHandler.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/BasicAsyncRequestHandler.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/BasicAsyncRequestHandler.java Sun Aug 28 19:04:49 2016
@@ -32,7 +32,7 @@ import java.io.IOException;
import org.apache.hc.core5.annotation.Contract;
import org.apache.hc.core5.annotation.ThreadingBehavior;
import org.apache.hc.core5.http.HttpException;
-import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.ClassicHttpRequest;
import org.apache.hc.core5.http.io.HttpRequestHandler;
import org.apache.hc.core5.http.nio.HttpAsyncExchange;
import org.apache.hc.core5.http.nio.HttpAsyncRequestConsumer;
@@ -49,7 +49,7 @@ import org.apache.hc.core5.util.Args;
* @since 4.2
*/
@Contract(threading = ThreadingBehavior.IMMUTABLE_CONDITIONAL)
-public class BasicAsyncRequestHandler implements HttpAsyncRequestHandler<HttpRequest> {
+public class BasicAsyncRequestHandler implements HttpAsyncRequestHandler<ClassicHttpRequest> {
private final HttpRequestHandler handler;
@@ -60,14 +60,14 @@ public class BasicAsyncRequestHandler im
}
@Override
- public HttpAsyncRequestConsumer<HttpRequest> processRequest(final HttpRequest request,
- final HttpContext context) {
+ public HttpAsyncRequestConsumer<ClassicHttpRequest> processRequest(final ClassicHttpRequest request,
+ final HttpContext context) {
return new BasicAsyncRequestConsumer();
}
@Override
public void handle(
- final HttpRequest request,
+ final ClassicHttpRequest request,
final HttpAsyncExchange httpexchange,
final HttpContext context) throws HttpException, IOException {
this.handler.handle(request, httpexchange.getResponse(), context);
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/BasicAsyncRequestProducer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/BasicAsyncRequestProducer.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/BasicAsyncRequestProducer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/BasicAsyncRequestProducer.java Sun Aug 28 19:04:49 2016
@@ -30,7 +30,7 @@ import java.io.IOException;
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.ClassicHttpRequest;
import org.apache.hc.core5.http.nio.ContentEncoder;
import org.apache.hc.core5.http.nio.HttpAsyncRequestProducer;
import org.apache.hc.core5.http.nio.IOControl;
@@ -52,7 +52,7 @@ import org.apache.hc.core5.util.Args;
public class BasicAsyncRequestProducer implements HttpAsyncRequestProducer {
private final HttpHost target;
- private final HttpRequest request;
+ private final ClassicHttpRequest request;
private final HttpAsyncContentProducer producer;
/**
@@ -68,7 +68,7 @@ public class BasicAsyncRequestProducer i
*/
protected BasicAsyncRequestProducer(
final HttpHost target,
- final HttpRequest request,
+ final ClassicHttpRequest request,
final HttpAsyncContentProducer producer) {
super();
Args.notNull(target, "HTTP host");
@@ -87,7 +87,7 @@ public class BasicAsyncRequestProducer i
* @param target target host.
* @param request request message.
*/
- public BasicAsyncRequestProducer(final HttpHost target, final HttpRequest request) {
+ public BasicAsyncRequestProducer(final HttpHost target, final ClassicHttpRequest request) {
Args.notNull(target, "HTTP host");
Args.notNull(request, "HTTP request");
this.target = target;
@@ -105,7 +105,7 @@ public class BasicAsyncRequestProducer i
}
@Override
- public HttpRequest generateRequest() {
+ public ClassicHttpRequest generateRequest() {
return this.request;
}
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/BasicAsyncResponseConsumer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/BasicAsyncResponseConsumer.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/BasicAsyncResponseConsumer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/BasicAsyncResponseConsumer.java Sun Aug 28 19:04:49 2016
@@ -30,7 +30,7 @@ import java.io.IOException;
import org.apache.hc.core5.http.ContentTooLongException;
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.entity.ContentType;
import org.apache.hc.core5.http.nio.ContentDecoder;
import org.apache.hc.core5.http.nio.IOControl;
@@ -46,9 +46,9 @@ import org.apache.hc.core5.util.HeapByte
*
* @since 4.2
*/
-public class BasicAsyncResponseConsumer extends AbstractAsyncResponseConsumer<HttpResponse> {
+public class BasicAsyncResponseConsumer extends AbstractAsyncResponseConsumer<ClassicHttpResponse> {
- private volatile HttpResponse response;
+ private volatile ClassicHttpResponse response;
private volatile SimpleInputBuffer buf;
public BasicAsyncResponseConsumer() {
@@ -56,7 +56,7 @@ public class BasicAsyncResponseConsumer
}
@Override
- protected void onResponseReceived(final HttpResponse response) throws IOException {
+ protected void onResponseReceived(final ClassicHttpResponse response) throws IOException {
this.response = response;
}
@@ -88,7 +88,7 @@ public class BasicAsyncResponseConsumer
}
@Override
- protected HttpResponse buildResult(final HttpContext context) {
+ protected ClassicHttpResponse buildResult(final HttpContext context) {
return this.response;
}
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/BasicAsyncResponseProducer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/BasicAsyncResponseProducer.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/BasicAsyncResponseProducer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/BasicAsyncResponseProducer.java Sun Aug 28 19:04:49 2016
@@ -30,7 +30,7 @@ package org.apache.hc.core5.http.impl.ni
import java.io.IOException;
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.nio.ContentEncoder;
import org.apache.hc.core5.http.nio.HttpAsyncResponseProducer;
import org.apache.hc.core5.http.nio.IOControl;
@@ -52,7 +52,7 @@ import org.apache.hc.core5.util.Args;
*/
public class BasicAsyncResponseProducer implements HttpAsyncResponseProducer {
- private final HttpResponse response;
+ private final ClassicHttpResponse response;
private final HttpAsyncContentProducer producer;
/**
@@ -66,7 +66,7 @@ public class BasicAsyncResponseProducer
* @param producer response content producer.
*/
protected BasicAsyncResponseProducer(
- final HttpResponse response,
+ final ClassicHttpResponse response,
final HttpAsyncContentProducer producer) {
super();
Args.notNull(response, "HTTP response");
@@ -82,7 +82,7 @@ public class BasicAsyncResponseProducer
*
* @param response response message.
*/
- public BasicAsyncResponseProducer(final HttpResponse response) {
+ public BasicAsyncResponseProducer(final ClassicHttpResponse response) {
super();
Args.notNull(response, "HTTP response");
this.response = response;
@@ -99,7 +99,7 @@ public class BasicAsyncResponseProducer
}
@Override
- public HttpResponse generateResponse() {
+ public ClassicHttpResponse generateResponse() {
return this.response;
}
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpRequestParser.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpRequestParser.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpRequestParser.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpRequestParser.java Sun Aug 28 19:04:49 2016
@@ -28,7 +28,7 @@
package org.apache.hc.core5.http.impl.nio;
import org.apache.hc.core5.http.HttpException;
-import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.ClassicHttpRequest;
import org.apache.hc.core5.http.HttpRequestFactory;
import org.apache.hc.core5.http.HttpVersion;
import org.apache.hc.core5.http.ProtocolVersion;
@@ -41,13 +41,13 @@ import org.apache.hc.core5.util.CharArra
/**
* Default {@link org.apache.hc.core5.http.nio.NHttpMessageParser} implementation
- * for {@link HttpRequest}s.
+ * for {@link ClassicHttpRequest}s.
*
* @since 4.1
*/
-public class DefaultHttpRequestParser extends AbstractMessageParser<HttpRequest> {
+public class DefaultHttpRequestParser extends AbstractMessageParser<ClassicHttpRequest> {
- private final HttpRequestFactory requestFactory;
+ private final HttpRequestFactory<ClassicHttpRequest> requestFactory;
/**
* Creates an instance of DefaultHttpRequestParser.
@@ -63,7 +63,7 @@ public class DefaultHttpRequestParser ex
*/
public DefaultHttpRequestParser(
final LineParser parser,
- final HttpRequestFactory requestFactory,
+ final HttpRequestFactory<ClassicHttpRequest> requestFactory,
final MessageConstraints constraints) {
super(parser, constraints);
this.requestFactory = requestFactory != null ? requestFactory : DefaultHttpRequestFactory.INSTANCE;
@@ -84,7 +84,7 @@ public class DefaultHttpRequestParser ex
}
@Override
- protected HttpRequest createMessage(final CharArrayBuffer buffer) throws HttpException {
+ protected ClassicHttpRequest createMessage(final CharArrayBuffer buffer) throws HttpException {
final RequestLine requestLine = getLineParser().parseRequestLine(buffer);
final ProtocolVersion transportVersion = requestLine.getProtocolVersion();
if (transportVersion.greaterEquals(HttpVersion.HTTP_2)) {
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpRequestParserFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpRequestParserFactory.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpRequestParserFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpRequestParserFactory.java Sun Aug 28 19:04:49 2016
@@ -29,7 +29,7 @@ package org.apache.hc.core5.http.impl.ni
import org.apache.hc.core5.annotation.Contract;
import org.apache.hc.core5.annotation.ThreadingBehavior;
-import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.ClassicHttpRequest;
import org.apache.hc.core5.http.HttpRequestFactory;
import org.apache.hc.core5.http.config.MessageConstraints;
import org.apache.hc.core5.http.impl.DefaultHttpRequestFactory;
@@ -44,7 +44,7 @@ import org.apache.hc.core5.http.nio.NHtt
* @since 4.3
*/
@Contract(threading = ThreadingBehavior.IMMUTABLE_CONDITIONAL)
-public class DefaultHttpRequestParserFactory implements NHttpMessageParserFactory<HttpRequest> {
+public class DefaultHttpRequestParserFactory implements NHttpMessageParserFactory<ClassicHttpRequest> {
public static final DefaultHttpRequestParserFactory INSTANCE = new DefaultHttpRequestParserFactory();
@@ -63,7 +63,7 @@ public class DefaultHttpRequestParserFac
}
@Override
- public NHttpMessageParser<HttpRequest> create(final MessageConstraints constraints) {
+ public NHttpMessageParser<ClassicHttpRequest> create(final MessageConstraints constraints) {
return new DefaultHttpRequestParser(lineParser, requestFactory, constraints);
}
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpRequestWriter.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpRequestWriter.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpRequestWriter.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpRequestWriter.java Sun Aug 28 19:04:49 2016
@@ -29,7 +29,7 @@ package org.apache.hc.core5.http.impl.ni
import java.io.IOException;
-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.ProtocolVersion;
import org.apache.hc.core5.http.message.LineFormatter;
@@ -38,11 +38,11 @@ import org.apache.hc.core5.util.CharArra
/**
* Default {@link org.apache.hc.core5.http.nio.NHttpMessageWriter} implementation
- * for {@link HttpRequest}s.
+ * for {@link ClassicHttpRequest}s.
*
* @since 4.1
*/
-public class DefaultHttpRequestWriter extends AbstractMessageWriter<HttpRequest> {
+public class DefaultHttpRequestWriter extends AbstractMessageWriter<ClassicHttpRequest> {
/**
* Creates an instance of DefaultHttpRequestWriter.
@@ -64,7 +64,7 @@ public class DefaultHttpRequestWriter ex
}
@Override
- protected void writeHeadLine(final HttpRequest message, final CharArrayBuffer lineBuf) throws IOException {
+ protected void writeHeadLine(final ClassicHttpRequest message, final CharArrayBuffer lineBuf) throws IOException {
lineBuf.clear();
ProtocolVersion transportVersion = message.getVersion();
if (transportVersion == null || transportVersion.greaterEquals(HttpVersion.HTTP_2_0)) {
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpRequestWriterFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpRequestWriterFactory.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpRequestWriterFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpRequestWriterFactory.java Sun Aug 28 19:04:49 2016
@@ -29,7 +29,7 @@ package org.apache.hc.core5.http.impl.ni
import org.apache.hc.core5.annotation.Contract;
import org.apache.hc.core5.annotation.ThreadingBehavior;
-import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.ClassicHttpRequest;
import org.apache.hc.core5.http.message.BasicLineFormatter;
import org.apache.hc.core5.http.message.LineFormatter;
import org.apache.hc.core5.http.nio.NHttpMessageWriter;
@@ -41,7 +41,7 @@ import org.apache.hc.core5.http.nio.NHtt
* @since 4.3
*/
@Contract(threading = ThreadingBehavior.IMMUTABLE_CONDITIONAL)
-public class DefaultHttpRequestWriterFactory implements NHttpMessageWriterFactory<HttpRequest> {
+public class DefaultHttpRequestWriterFactory implements NHttpMessageWriterFactory<ClassicHttpRequest> {
public static final DefaultHttpRequestWriterFactory INSTANCE = new DefaultHttpRequestWriterFactory();
@@ -57,7 +57,7 @@ public class DefaultHttpRequestWriterFac
}
@Override
- public NHttpMessageWriter<HttpRequest> create() {
+ public NHttpMessageWriter<ClassicHttpRequest> create() {
return new DefaultHttpRequestWriter(this.lineFormatter);
}
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpResponseParser.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpResponseParser.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpResponseParser.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpResponseParser.java Sun Aug 28 19:04:49 2016
@@ -28,7 +28,7 @@
package org.apache.hc.core5.http.impl.nio;
import org.apache.hc.core5.http.HttpException;
-import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.ClassicHttpResponse;
import org.apache.hc.core5.http.HttpResponseFactory;
import org.apache.hc.core5.http.HttpVersion;
import org.apache.hc.core5.http.ProtocolVersion;
@@ -41,13 +41,13 @@ import org.apache.hc.core5.util.CharArra
/**
* Default {@link org.apache.hc.core5.http.nio.NHttpMessageParser} implementation
- * for {@link HttpResponse}s.
+ * for {@link ClassicHttpResponse}s.
*
* @since 4.1
*/
-public class DefaultHttpResponseParser extends AbstractMessageParser<HttpResponse> {
+public class DefaultHttpResponseParser extends AbstractMessageParser<ClassicHttpResponse> {
- private final HttpResponseFactory responseFactory;
+ private final HttpResponseFactory<ClassicHttpResponse> responseFactory;
/**
* Creates an instance of DefaultHttpResponseParser.
@@ -63,7 +63,7 @@ public class DefaultHttpResponseParser e
*/
public DefaultHttpResponseParser(
final LineParser parser,
- final HttpResponseFactory responseFactory,
+ final HttpResponseFactory<ClassicHttpResponse> responseFactory,
final MessageConstraints constraints) {
super(parser, constraints);
this.responseFactory = responseFactory != null ? responseFactory :
@@ -85,7 +85,7 @@ public class DefaultHttpResponseParser e
}
@Override
- protected HttpResponse createMessage(final CharArrayBuffer buffer) throws HttpException {
+ protected ClassicHttpResponse createMessage(final CharArrayBuffer buffer) throws HttpException {
final StatusLine statusLine = getLineParser().parseStatusLine(buffer);
final ProtocolVersion transportVersion = statusLine.getProtocolVersion();
if (transportVersion.greaterEquals(HttpVersion.HTTP_2)) {
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpResponseParserFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpResponseParserFactory.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpResponseParserFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpResponseParserFactory.java Sun Aug 28 19:04:49 2016
@@ -29,7 +29,7 @@ package org.apache.hc.core5.http.impl.ni
import org.apache.hc.core5.annotation.Contract;
import org.apache.hc.core5.annotation.ThreadingBehavior;
-import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.ClassicHttpResponse;
import org.apache.hc.core5.http.HttpResponseFactory;
import org.apache.hc.core5.http.config.MessageConstraints;
import org.apache.hc.core5.http.impl.DefaultHttpResponseFactory;
@@ -44,7 +44,7 @@ import org.apache.hc.core5.http.nio.NHtt
* @since 4.3
*/
@Contract(threading = ThreadingBehavior.IMMUTABLE_CONDITIONAL)
-public class DefaultHttpResponseParserFactory implements NHttpMessageParserFactory<HttpResponse> {
+public class DefaultHttpResponseParserFactory implements NHttpMessageParserFactory<ClassicHttpResponse> {
public static final DefaultHttpResponseParserFactory INSTANCE = new DefaultHttpResponseParserFactory();
@@ -63,7 +63,7 @@ public class DefaultHttpResponseParserFa
}
@Override
- public NHttpMessageParser<HttpResponse> create(final MessageConstraints constraints) {
+ public NHttpMessageParser<ClassicHttpResponse> create(final MessageConstraints constraints) {
return new DefaultHttpResponseParser(this.lineParser, this.responseFactory, constraints);
}
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpResponseWriter.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpResponseWriter.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpResponseWriter.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpResponseWriter.java Sun Aug 28 19:04:49 2016
@@ -29,7 +29,7 @@ package org.apache.hc.core5.http.impl.ni
import java.io.IOException;
-import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.ClassicHttpResponse;
import org.apache.hc.core5.http.HttpVersion;
import org.apache.hc.core5.http.ProtocolVersion;
import org.apache.hc.core5.http.message.LineFormatter;
@@ -38,11 +38,11 @@ import org.apache.hc.core5.util.CharArra
/**
* Default {@link org.apache.hc.core5.http.nio.NHttpMessageWriter} implementation
- * for {@link HttpResponse}s.
+ * for {@link ClassicHttpResponse}s.
*
* @since 4.1
*/
-public class DefaultHttpResponseWriter extends AbstractMessageWriter<HttpResponse> {
+public class DefaultHttpResponseWriter extends AbstractMessageWriter<ClassicHttpResponse> {
/**
* Creates an instance of DefaultHttpResponseWriter.
@@ -64,7 +64,7 @@ public class DefaultHttpResponseWriter e
}
@Override
- protected void writeHeadLine(final HttpResponse message, final CharArrayBuffer lineBuf) throws IOException {
+ protected void writeHeadLine(final ClassicHttpResponse message, final CharArrayBuffer lineBuf) throws IOException {
lineBuf.clear();
ProtocolVersion transportVersion = message.getVersion();
if (transportVersion == null || transportVersion.greaterEquals(HttpVersion.HTTP_2_0)) {
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpResponseWriterFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpResponseWriterFactory.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpResponseWriterFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpResponseWriterFactory.java Sun Aug 28 19:04:49 2016
@@ -29,7 +29,7 @@ package org.apache.hc.core5.http.impl.ni
import org.apache.hc.core5.annotation.Contract;
import org.apache.hc.core5.annotation.ThreadingBehavior;
-import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.ClassicHttpResponse;
import org.apache.hc.core5.http.message.BasicLineFormatter;
import org.apache.hc.core5.http.message.LineFormatter;
import org.apache.hc.core5.http.nio.NHttpMessageWriter;
@@ -41,7 +41,7 @@ import org.apache.hc.core5.http.nio.NHtt
* @since 4.3
*/
@Contract(threading = ThreadingBehavior.IMMUTABLE_CONDITIONAL)
-public class DefaultHttpResponseWriterFactory implements NHttpMessageWriterFactory<HttpResponse> {
+public class DefaultHttpResponseWriterFactory implements NHttpMessageWriterFactory<ClassicHttpResponse> {
public static final DefaultHttpResponseWriterFactory INSTANCE = new DefaultHttpResponseWriterFactory();
@@ -57,7 +57,7 @@ public class DefaultHttpResponseWriterFa
}
@Override
- public NHttpMessageWriter<HttpResponse> create() {
+ public NHttpMessageWriter<ClassicHttpResponse> create() {
return new DefaultHttpResponseWriter(this.lineFormatter);
}
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultNHttpClientConnection.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultNHttpClientConnection.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultNHttpClientConnection.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultNHttpClientConnection.java Sun Aug 28 19:04:49 2016
@@ -35,8 +35,8 @@ import java.nio.charset.CharsetEncoder;
import org.apache.hc.core5.http.ContentLengthStrategy;
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.LengthRequiredException;
import org.apache.hc.core5.http.config.MessageConstraints;
@@ -64,8 +64,8 @@ public class DefaultNHttpClientConnectio
private final ContentLengthStrategy incomingContentStrategy;
private final ContentLengthStrategy outgoingContentStrategy;
- private final NHttpMessageParser<HttpResponse> responseParser;
- private final NHttpMessageWriter<HttpRequest> requestWriter;
+ private final NHttpMessageParser<ClassicHttpResponse> responseParser;
+ private final NHttpMessageWriter<ClassicHttpRequest> requestWriter;
/**
* Creates new instance DefaultNHttpClientConnection given the underlying I/O session.
@@ -99,8 +99,8 @@ public class DefaultNHttpClientConnectio
final MessageConstraints constraints,
final ContentLengthStrategy incomingContentStrategy,
final ContentLengthStrategy outgoingContentStrategy,
- final NHttpMessageWriterFactory<HttpRequest> requestWriterFactory,
- final NHttpMessageParserFactory<HttpResponse> responseParserFactory) {
+ final NHttpMessageWriterFactory<ClassicHttpRequest> requestWriterFactory,
+ final NHttpMessageParserFactory<ClassicHttpResponse> responseParserFactory) {
super(session, buffersize, fragmentSizeHint, allocator, chardecoder, charencoder, constraints);
this.requestWriter = (requestWriterFactory != null ? requestWriterFactory :
DefaultHttpRequestWriterFactory.INSTANCE).create();
@@ -135,13 +135,13 @@ public class DefaultNHttpClientConnectio
/**
* @since 4.2
*/
- protected void onResponseReceived(final HttpResponse response) {
+ protected void onResponseReceived(final ClassicHttpResponse response) {
}
/**
* @since 4.2
*/
- protected void onRequestSubmitted(final HttpRequest request) {
+ protected void onRequestSubmitted(final ClassicHttpRequest request) {
}
@Override
@@ -252,7 +252,7 @@ public class DefaultNHttpClientConnectio
}
@Override
- public void submitRequest(final HttpRequest request) throws IOException, HttpException {
+ public void submitRequest(final ClassicHttpRequest request) throws IOException, HttpException {
Args.notNull(request, "HTTP request");
assertNotClosed();
if (this.request != null) {