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 [3/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/nio/DefaultNHttpClientConnectionFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultNHttpClientConnectionFactory.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultNHttpClientConnectionFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultNHttpClientConnectionFactory.java Sun Aug 28 19:04:49 2016
@@ -29,8 +29,8 @@ 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.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.nio.NHttpConnectionFactory;
@@ -53,8 +53,8 @@ public class DefaultNHttpClientConnectio
private final ContentLengthStrategy incomingContentStrategy;
private final ContentLengthStrategy outgoingContentStrategy;
- private final NHttpMessageParserFactory<HttpResponse> responseParserFactory;
- private final NHttpMessageWriterFactory<HttpRequest> requestWriterFactory;
+ private final NHttpMessageParserFactory<ClassicHttpResponse> responseParserFactory;
+ private final NHttpMessageWriterFactory<ClassicHttpRequest> requestWriterFactory;
private final ByteBufferAllocator allocator;
private final ConnectionConfig cconfig;
@@ -64,8 +64,8 @@ public class DefaultNHttpClientConnectio
public DefaultNHttpClientConnectionFactory(
final ContentLengthStrategy incomingContentStrategy,
final ContentLengthStrategy outgoingContentStrategy,
- final NHttpMessageParserFactory<HttpResponse> responseParserFactory,
- final NHttpMessageWriterFactory<HttpRequest> requestWriterFactory,
+ final NHttpMessageParserFactory<ClassicHttpResponse> responseParserFactory,
+ final NHttpMessageWriterFactory<ClassicHttpRequest> requestWriterFactory,
final ByteBufferAllocator allocator,
final ConnectionConfig cconfig) {
super();
@@ -81,8 +81,8 @@ public class DefaultNHttpClientConnectio
* @since 4.3
*/
public DefaultNHttpClientConnectionFactory(
- final NHttpMessageParserFactory<HttpResponse> responseParserFactory,
- final NHttpMessageWriterFactory<HttpRequest> requestWriterFactory,
+ final NHttpMessageParserFactory<ClassicHttpResponse> responseParserFactory,
+ final NHttpMessageWriterFactory<ClassicHttpRequest> requestWriterFactory,
final ByteBufferAllocator allocator,
final ConnectionConfig cconfig) {
this(null, null, responseParserFactory, requestWriterFactory, allocator, cconfig);
@@ -92,8 +92,8 @@ public class DefaultNHttpClientConnectio
* @since 4.3
*/
public DefaultNHttpClientConnectionFactory(
- final NHttpMessageParserFactory<HttpResponse> responseParserFactory,
- final NHttpMessageWriterFactory<HttpRequest> requestWriterFactory,
+ final NHttpMessageParserFactory<ClassicHttpResponse> responseParserFactory,
+ final NHttpMessageWriterFactory<ClassicHttpRequest> requestWriterFactory,
final ConnectionConfig cconfig) {
this(null, null, responseParserFactory, requestWriterFactory, null, cconfig);
}
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultNHttpServerConnection.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultNHttpServerConnection.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultNHttpServerConnection.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultNHttpServerConnection.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.config.MessageConstraints;
import org.apache.hc.core5.http.impl.DefaultContentLengthStrategy;
@@ -62,8 +62,8 @@ public class DefaultNHttpServerConnectio
private final ContentLengthStrategy incomingContentStrategy;
private final ContentLengthStrategy outgoingContentStrategy;
- private final NHttpMessageParser<HttpRequest> requestParser;
- private final NHttpMessageWriter<HttpResponse> responseWriter;
+ private final NHttpMessageParser<ClassicHttpRequest> requestParser;
+ private final NHttpMessageWriter<ClassicHttpResponse> responseWriter;
/**
* Creates new instance DefaultNHttpServerConnection given the underlying I/O session.
@@ -101,8 +101,8 @@ public class DefaultNHttpServerConnectio
final MessageConstraints constraints,
final ContentLengthStrategy incomingContentStrategy,
final ContentLengthStrategy outgoingContentStrategy,
- final NHttpMessageParserFactory<HttpRequest> requestParserFactory,
- final NHttpMessageWriterFactory<HttpResponse> responseWriterFactory) {
+ final NHttpMessageParserFactory<ClassicHttpRequest> requestParserFactory,
+ final NHttpMessageWriterFactory<ClassicHttpResponse> responseWriterFactory) {
super(session, buffersize, fragmentSizeHint, allocator, chardecoder, charencoder, constraints);
this.requestParser = (requestParserFactory != null ? requestParserFactory :
DefaultHttpRequestParserFactory.INSTANCE).create(constraints);
@@ -137,13 +137,13 @@ public class DefaultNHttpServerConnectio
/**
* @since 4.2
*/
- protected void onRequestReceived(final HttpRequest request) {
+ protected void onRequestReceived(final ClassicHttpRequest request) {
}
/**
* @since 4.2
*/
- protected void onResponseSubmitted(final HttpResponse response) {
+ protected void onResponseSubmitted(final ClassicHttpResponse response) {
}
@Override
@@ -253,7 +253,7 @@ public class DefaultNHttpServerConnectio
}
@Override
- public void submitResponse(final HttpResponse response) throws IOException, HttpException {
+ public void submitResponse(final ClassicHttpResponse response) throws IOException, HttpException {
Args.notNull(response, "HTTP response");
assertNotClosed();
if (this.response != null) {
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultNHttpServerConnectionFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultNHttpServerConnectionFactory.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultNHttpServerConnectionFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultNHttpServerConnectionFactory.java Sun Aug 28 19:04:49 2016
@@ -29,8 +29,8 @@ 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.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.nio.NHttpConnectionFactory;
@@ -51,8 +51,8 @@ public class DefaultNHttpServerConnectio
private final ContentLengthStrategy incomingContentStrategy;
private final ContentLengthStrategy outgoingContentStrategy;
- private final NHttpMessageParserFactory<HttpRequest> requestParserFactory;
- private final NHttpMessageWriterFactory<HttpResponse> responseWriterFactory;
+ private final NHttpMessageParserFactory<ClassicHttpRequest> requestParserFactory;
+ private final NHttpMessageWriterFactory<ClassicHttpResponse> responseWriterFactory;
private final ByteBufferAllocator allocator;
private final ConnectionConfig cconfig;
@@ -62,8 +62,8 @@ public class DefaultNHttpServerConnectio
public DefaultNHttpServerConnectionFactory(
final ContentLengthStrategy incomingContentStrategy,
final ContentLengthStrategy outgoingContentStrategy,
- final NHttpMessageParserFactory<HttpRequest> requestParserFactory,
- final NHttpMessageWriterFactory<HttpResponse> responseWriterFactory,
+ final NHttpMessageParserFactory<ClassicHttpRequest> requestParserFactory,
+ final NHttpMessageWriterFactory<ClassicHttpResponse> responseWriterFactory,
final ByteBufferAllocator allocator,
final ConnectionConfig cconfig) {
super();
@@ -80,8 +80,8 @@ public class DefaultNHttpServerConnectio
*/
public DefaultNHttpServerConnectionFactory(
final ByteBufferAllocator allocator,
- final NHttpMessageParserFactory<HttpRequest> requestParserFactory,
- final NHttpMessageWriterFactory<HttpResponse> responseWriterFactory,
+ final NHttpMessageParserFactory<ClassicHttpRequest> requestParserFactory,
+ final NHttpMessageWriterFactory<ClassicHttpResponse> responseWriterFactory,
final ConnectionConfig cconfig) {
this(null, null, requestParserFactory, responseWriterFactory, allocator, cconfig);
}
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ErrorResponseProducer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ErrorResponseProducer.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ErrorResponseProducer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ErrorResponseProducer.java Sun Aug 28 19:04:49 2016
@@ -32,7 +32,7 @@ import java.io.IOException;
import org.apache.hc.core5.http.HeaderElements;
import org.apache.hc.core5.http.HttpEntity;
import org.apache.hc.core5.http.HttpHeaders;
-import org.apache.hc.core5.http.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;
@@ -42,13 +42,13 @@ import org.apache.hc.core5.http.protocol
class ErrorResponseProducer implements HttpAsyncResponseProducer {
- private final HttpResponse response;
+ private final ClassicHttpResponse response;
private final HttpEntity entity;
private final HttpAsyncContentProducer contentProducer;
private final boolean keepAlive;
ErrorResponseProducer(
- final HttpResponse response,
+ final ClassicHttpResponse response,
final HttpEntity entity,
final boolean keepAlive) {
super();
@@ -63,7 +63,7 @@ class ErrorResponseProducer implements H
}
@Override
- public HttpResponse generateResponse() {
+ public ClassicHttpResponse generateResponse() {
if (this.keepAlive) {
response.addHeader(HttpHeaders.CONNECTION, HeaderElements.KEEP_ALIVE);
} else {
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/HttpAsyncRequestExecutor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/HttpAsyncRequestExecutor.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/HttpAsyncRequestExecutor.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/HttpAsyncRequestExecutor.java Sun Aug 28 19:04:49 2016
@@ -42,8 +42,8 @@ import org.apache.hc.core5.http.HeaderEl
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.HttpVersion;
import org.apache.hc.core5.http.ProtocolException;
@@ -194,7 +194,7 @@ public class HttpAsyncRequestExecutor im
}
final boolean pipelined = handler.getClass().getAnnotation(Pipelined.class) != null;
- final HttpRequest request = handler.generateRequest();
+ final ClassicHttpRequest request = handler.generateRequest();
if (request == null) {
return;
}
@@ -252,7 +252,7 @@ public class HttpAsyncRequestExecutor im
if (state.isEarlyResponse()) {
// Attempt to salvage the underlying connection
- final HttpRequest request = state.getRequest();
+ final ClassicHttpRequest request = state.getRequest();
final Header header = request.getFirstHeader(HttpHeaders.TRANSFER_ENCODING);
final boolean chunked = header != null && HeaderElements.CHUNKED_ENCODING.equalsIgnoreCase(header.getValue());
if (chunked) {
@@ -295,7 +295,7 @@ public class HttpAsyncRequestExecutor im
final HttpAsyncClientExchangeHandler handler = getHandler(conn);
Asserts.notNull(handler, "Client exchange handler");
- final HttpResponse response = conn.getHttpResponse();
+ final ClassicHttpResponse response = conn.getHttpResponse();
final int statusCode = response.getCode();
if (statusCode < HttpStatus.SC_OK) {
@@ -325,7 +325,7 @@ public class HttpAsyncRequestExecutor im
}
final boolean pipelined = handler.getClass().getAnnotation(Pipelined.class) != null;
- final HttpRequest request;
+ final ClassicHttpRequest request;
if (pipelined) {
request = state.getRequestQueue().peek();
Asserts.notNull(request, "HTTP request");
@@ -482,11 +482,11 @@ public class HttpAsyncRequestExecutor im
final State state,
final HttpAsyncClientExchangeHandler handler) throws IOException, HttpException {
- final HttpResponse response = state.getResponse();
+ final ClassicHttpResponse response = state.getResponse();
final HttpContext context = handler.getContext();
final boolean pipelined = handler.getClass().getAnnotation(Pipelined.class) != null;
- final HttpRequest request;
+ final ClassicHttpRequest request;
if (pipelined) {
request = state.getRequestQueue().poll();
} else {
@@ -516,7 +516,7 @@ public class HttpAsyncRequestExecutor im
}
}
- private boolean canResponseHaveBody(final HttpRequest request, final HttpResponse response) {
+ private boolean canResponseHaveBody(final ClassicHttpRequest request, final ClassicHttpResponse response) {
final String method = request.getMethod();
final int status = response.getCode();
@@ -537,11 +537,11 @@ public class HttpAsyncRequestExecutor im
static class State {
- private final Queue<HttpRequest> requestQueue;
+ private final Queue<ClassicHttpRequest> requestQueue;
private volatile MessageState requestState;
private volatile MessageState responseState;
- private volatile HttpRequest request;
- private volatile HttpResponse response;
+ private volatile ClassicHttpRequest request;
+ private volatile ClassicHttpResponse response;
private volatile boolean earlyResponse;
private volatile int timeout;
private volatile boolean valid;
@@ -570,23 +570,23 @@ public class HttpAsyncRequestExecutor im
this.responseState = state;
}
- 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;
}
- public Queue<HttpRequest> getRequestQueue() {
+ public Queue<ClassicHttpRequest> getRequestQueue() {
return this.requestQueue;
}
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/HttpAsyncService.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/HttpAsyncService.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/HttpAsyncService.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/HttpAsyncService.java Sun Aug 28 19:04:49 2016
@@ -43,8 +43,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;
@@ -112,7 +112,7 @@ public class HttpAsyncService implements
private final HttpProcessor httpProcessor;
private final ConnectionReuseStrategy connStrategy;
- private final HttpResponseFactory responseFactory;
+ private final HttpResponseFactory<ClassicHttpResponse> responseFactory;
private final HttpAsyncRequestHandlerMapper handlerMapper;
private final HttpAsyncExpectationVerifier expectationVerifier;
private final ExceptionLogger exceptionLogger;
@@ -133,7 +133,7 @@ public class HttpAsyncService implements
public HttpAsyncService(
final HttpProcessor httpProcessor,
final ConnectionReuseStrategy connStrategy,
- final HttpResponseFactory responseFactory,
+ final HttpResponseFactory<ClassicHttpResponse> responseFactory,
final HttpAsyncRequestHandlerMapper handlerMapper,
final HttpAsyncExpectationVerifier expectationVerifier) {
this(httpProcessor, connStrategy, responseFactory, handlerMapper, expectationVerifier, null);
@@ -159,7 +159,7 @@ public class HttpAsyncService implements
public HttpAsyncService(
final HttpProcessor httpProcessor,
final ConnectionReuseStrategy connStrategy,
- final HttpResponseFactory responseFactory,
+ final HttpResponseFactory<ClassicHttpResponse> responseFactory,
final HttpAsyncRequestHandlerMapper handlerMapper,
final HttpAsyncExpectationVerifier expectationVerifier,
final ExceptionLogger exceptionLogger) {
@@ -251,10 +251,10 @@ public class HttpAsyncService implements
} else {
try {
final Incoming incoming = state.getIncoming();
- final HttpRequest request = incoming != null ? incoming.getRequest() : null;
+ final ClassicHttpRequest request = incoming != null ? incoming.getRequest() : null;
final HttpContext context = incoming != null ? incoming.getContext() : new BasicHttpContext();
final HttpAsyncResponseProducer responseProducer = handleException(cause, context);
- final HttpResponse response = responseProducer.generateResponse();
+ final ClassicHttpResponse response = responseProducer.generateResponse();
final Outgoing outgoing = new Outgoing(request, response, responseProducer, context);
state.setResponseState(MessageState.INIT);
state.setOutgoing(outgoing);
@@ -278,7 +278,7 @@ public class HttpAsyncService implements
Asserts.check(state.getRequestState() == MessageState.READY,
"Unexpected request state %s", state.getRequestState());
- final HttpRequest request = conn.getHttpRequest();
+ final ClassicHttpRequest request = conn.getHttpRequest();
final HttpContext context = new BasicHttpContext();
context.setAttribute(HttpCoreContext.HTTP_REQUEST, request);
@@ -306,7 +306,7 @@ public class HttpAsyncService implements
&& state.getRequestQueue().isEmpty()
&& !conn.isDataAvailable()) {
- final HttpResponse ack = this.responseFactory.newHttpResponse(HttpStatus.SC_CONTINUE);
+ final ClassicHttpResponse ack = this.responseFactory.newHttpResponse(HttpStatus.SC_CONTINUE);
if (this.expectationVerifier != null) {
final HttpAsyncExchange httpAsyncExchange = new HttpAsyncExchangeImpl(
incoming, request, ack, state, conn, context);
@@ -381,14 +381,14 @@ public class HttpAsyncService implements
conn.suspendOutput();
return;
}
- final HttpRequest request = pipelineEntry.getRequest();
+ final ClassicHttpRequest request = pipelineEntry.getRequest();
final HttpContext context = pipelineEntry.getContext();
final Object requestResult = pipelineEntry.getResult();
state.setResponseState(MessageState.INIT);
if (requestResult != null) {
final HttpAsyncRequestHandler<Object> handler = pipelineEntry.getHandler();
- final HttpResponse response = this.responseFactory.newHttpResponse(HttpStatus.SC_OK);
+ final ClassicHttpResponse response = this.responseFactory.newHttpResponse(HttpStatus.SC_OK);
final HttpAsyncExchangeImpl httpExchange = new HttpAsyncExchangeImpl(
null, request, response, state, conn, context);
conn.suspendOutput();
@@ -398,7 +398,7 @@ public class HttpAsyncService implements
throw ex;
} catch (final Exception ex) {
final HttpAsyncResponseProducer responseProducer = handleException(ex, context);
- final HttpResponse error = responseProducer.generateResponse();
+ final ClassicHttpResponse error = responseProducer.generateResponse();
state.setOutgoing(new Outgoing(request, error, responseProducer, context));
}
} else {
@@ -406,7 +406,7 @@ public class HttpAsyncService implements
final HttpAsyncResponseProducer responseProducer = handleException(
exception != null ? exception : new HttpException("Internal error processing request"),
context);
- final HttpResponse error = responseProducer.generateResponse();
+ final ClassicHttpResponse error = responseProducer.generateResponse();
state.setOutgoing(new Outgoing(request, error, responseProducer, context));
}
}
@@ -419,7 +419,7 @@ public class HttpAsyncService implements
return;
}
}
- final HttpResponse response = outgoing.getResponse();
+ final ClassicHttpResponse response = outgoing.getResponse();
final int status = response.getCode();
if (status >= HttpStatus.SC_OK) {
commitFinalResponse(conn, state);
@@ -572,7 +572,7 @@ public class HttpAsyncService implements
if (message == null) {
message = ex.toString();
}
- final HttpResponse response = this.responseFactory.newHttpResponse(code);
+ final ClassicHttpResponse response = this.responseFactory.newHttpResponse(code);
return new ErrorResponseProducer(response,
new NStringEntity(message, ContentType.DEFAULT_TEXT), false);
}
@@ -605,7 +605,7 @@ public class HttpAsyncService implements
throw new IllegalStateException("Response already submitted");
}
- 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;
}
@@ -638,8 +638,8 @@ public class HttpAsyncService implements
final State state) throws IOException, HttpException {
final Outgoing outgoing = state.getOutgoing();
Asserts.notNull(outgoing, "Outgoing response");
- final HttpRequest request = outgoing.getRequest();
- final HttpResponse response = outgoing.getResponse();
+ final ClassicHttpRequest request = outgoing.getRequest();
+ final ClassicHttpResponse response = outgoing.getResponse();
final HttpContext context = outgoing.getContext();
context.setAttribute(HttpCoreContext.HTTP_RESPONSE, response);
@@ -665,8 +665,8 @@ public class HttpAsyncService implements
final NHttpServerConnection conn,
final State state) throws IOException {
final HttpContext context = outgoing.getContext();
- final HttpRequest request = outgoing.getRequest();
- final HttpResponse response = outgoing.getResponse();
+ final ClassicHttpRequest request = outgoing.getRequest();
+ final ClassicHttpResponse response = outgoing.getResponse();
try (final HttpAsyncResponseProducer responseProducer = outgoing.getProducer()) {
responseProducer.responseCompleted(context);
}
@@ -681,7 +681,7 @@ public class HttpAsyncService implements
}
@SuppressWarnings("unchecked")
- private HttpAsyncRequestHandler<Object> getRequestHandler(final HttpRequest request, final HttpContext context) {
+ private HttpAsyncRequestHandler<Object> getRequestHandler(final ClassicHttpRequest request, final HttpContext context) {
HttpAsyncRequestHandler<Object> handler = null;
if (this.handlerMapper != null) {
handler = (HttpAsyncRequestHandler<Object>) this.handlerMapper.lookup(request, context);
@@ -694,14 +694,14 @@ public class HttpAsyncService implements
static class Incoming {
- private final HttpRequest request;
+ private final ClassicHttpRequest request;
private final HttpAsyncRequestHandler<Object> handler;
private final HttpAsyncRequestConsumer<Object> consumer;
private final HttpContext context;
private volatile boolean earlyResponse;
Incoming(
- final HttpRequest request,
+ final ClassicHttpRequest request,
final HttpAsyncRequestHandler<Object> handler,
final HttpAsyncRequestConsumer<Object> consumer,
final HttpContext context) {
@@ -711,7 +711,7 @@ public class HttpAsyncService implements
this.context = context;
}
- public HttpRequest getRequest() {
+ public ClassicHttpRequest getRequest() {
return this.request;
}
@@ -739,14 +739,14 @@ public class HttpAsyncService implements
static class Outgoing {
- private final HttpRequest request;
- private final HttpResponse response;
+ private final ClassicHttpRequest request;
+ private final ClassicHttpResponse response;
private final HttpAsyncResponseProducer producer;
private final HttpContext context;
Outgoing(
- final HttpRequest request,
- final HttpResponse response,
+ final ClassicHttpRequest request,
+ final ClassicHttpResponse response,
final HttpAsyncResponseProducer producer,
final HttpContext context) {
this.request = request;
@@ -755,11 +755,11 @@ public class HttpAsyncService implements
this.context = context;
}
- public HttpRequest getRequest() {
+ public ClassicHttpRequest getRequest() {
return this.request;
}
- public HttpResponse getResponse() {
+ public ClassicHttpResponse getResponse() {
return this.response;
}
@@ -774,14 +774,14 @@ public class HttpAsyncService implements
static class PipelineEntry {
- private final HttpRequest request;
+ private final ClassicHttpRequest request;
private final Object result;
private final Exception exception;
private final HttpAsyncRequestHandler<Object> handler;
private final HttpContext context;
PipelineEntry(
- final HttpRequest request,
+ final ClassicHttpRequest request,
final Object result,
final Exception exception,
final HttpAsyncRequestHandler<Object> handler,
@@ -793,7 +793,7 @@ public class HttpAsyncService implements
this.context = context;
}
- public HttpRequest getRequest() {
+ public ClassicHttpRequest getRequest() {
return this.request;
}
@@ -911,16 +911,16 @@ public class HttpAsyncService implements
private final AtomicBoolean completed = new AtomicBoolean();
private final Incoming incoming;
- private final HttpRequest request;
- private final HttpResponse response;
+ private final ClassicHttpRequest request;
+ private final ClassicHttpResponse response;
private final State state;
private final NHttpServerConnection conn;
private final HttpContext context;
public HttpAsyncExchangeImpl(
final Incoming incoming,
- final HttpRequest request,
- final HttpResponse response,
+ final ClassicHttpRequest request,
+ final ClassicHttpResponse response,
final State state,
final NHttpServerConnection conn,
final HttpContext context) {
@@ -934,8 +934,8 @@ public class HttpAsyncService implements
}
public HttpAsyncExchangeImpl(
- final HttpRequest request,
- final HttpResponse response,
+ final ClassicHttpRequest request,
+ final ClassicHttpResponse response,
final State state,
final NHttpServerConnection conn,
final HttpContext context) {
@@ -943,12 +943,12 @@ public class HttpAsyncService implements
}
@Override
- public HttpRequest getRequest() {
+ public ClassicHttpRequest getRequest() {
return this.request;
}
@Override
- public HttpResponse getResponse() {
+ public ClassicHttpResponse getResponse() {
return this.response;
}
@@ -969,7 +969,7 @@ public class HttpAsyncService implements
if (this.completed.getAndSet(true)) {
handleAlreadySubmittedResponse(responseProducer, this.context);
} else if (!this.state.isTerminated()) {
- final HttpResponse response = responseProducer.generateResponse();
+ final ClassicHttpResponse response = responseProducer.generateResponse();
final Outgoing outgoing = new Outgoing(this.request, response, responseProducer, this.context);
// If there is an incoming request associated with the exchange
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/NHttpConnectionBase.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/NHttpConnectionBase.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/NHttpConnectionBase.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/NHttpConnectionBase.java Sun Aug 28 19:04:49 2016
@@ -41,8 +41,8 @@ import org.apache.hc.core5.http.HttpConn
import org.apache.hc.core5.http.HttpEntity;
import org.apache.hc.core5.http.HttpHeaders;
import org.apache.hc.core5.http.HttpMessage;
-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.TrailerSupplier;
import org.apache.hc.core5.http.config.MessageConstraints;
@@ -80,8 +80,8 @@ class NHttpConnectionBase implements NHt
volatile boolean hasBufferedInput;
volatile ContentEncoder contentEncoder;
volatile boolean hasBufferedOutput;
- volatile HttpRequest request;
- volatile HttpResponse response;
+ volatile ClassicHttpRequest request;
+ volatile ClassicHttpResponse response;
volatile int status;
volatile ProtocolVersion version;
@@ -158,12 +158,12 @@ class NHttpConnectionBase implements NHt
}
@Override
- public HttpRequest getHttpRequest() {
+ public ClassicHttpRequest getHttpRequest() {
return this.request;
}
@Override
- public HttpResponse getHttpResponse() {
+ public ClassicHttpResponse getHttpResponse() {
return this.response;
}
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/NullRequestConsumer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/NullRequestConsumer.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/NullRequestConsumer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/NullRequestConsumer.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 java.nio.ByteBuffer;
-import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.ClassicHttpRequest;
import org.apache.hc.core5.http.nio.ContentDecoder;
import org.apache.hc.core5.http.nio.HttpAsyncRequestConsumer;
import org.apache.hc.core5.http.nio.IOControl;
@@ -47,7 +47,7 @@ class NullRequestConsumer implements Htt
}
@Override
- public void requestReceived(final HttpRequest request) {
+ public void requestReceived(final ClassicHttpRequest request) {
}
@Override
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/NullRequestHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/NullRequestHandler.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/NullRequestHandler.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/NullRequestHandler.java Sun Aug 28 19:04:49 2016
@@ -27,8 +27,8 @@
package org.apache.hc.core5.http.impl.nio;
-import org.apache.hc.core5.http.HttpRequest;
-import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.ClassicHttpRequest;
+import org.apache.hc.core5.http.ClassicHttpResponse;
import org.apache.hc.core5.http.HttpStatus;
import org.apache.hc.core5.http.entity.ContentType;
import org.apache.hc.core5.http.nio.HttpAsyncExchange;
@@ -45,7 +45,7 @@ class NullRequestHandler implements Http
@Override
public HttpAsyncRequestConsumer<Object> processRequest(
- final HttpRequest request, final HttpContext context) {
+ final ClassicHttpRequest request, final HttpContext context) {
return new NullRequestConsumer();
}
@@ -54,7 +54,7 @@ class NullRequestHandler implements Http
final Object obj,
final HttpAsyncExchange httpexchange,
final HttpContext context) {
- final HttpResponse response = httpexchange.getResponse();
+ final ClassicHttpResponse response = httpexchange.getResponse();
response.setCode(HttpStatus.SC_NOT_IMPLEMENTED);
httpexchange.submitResponse(new ErrorResponseProducer(
response, new NStringEntity("Service not implemented", ContentType.TEXT_PLAIN), true));
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/PipeliningClientExchangeHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/PipeliningClientExchangeHandler.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/PipeliningClientExchangeHandler.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/PipeliningClientExchangeHandler.java Sun Aug 28 19:04:49 2016
@@ -41,8 +41,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;
@@ -69,7 +69,7 @@ public class PipeliningClientExchangeHan
private final Queue<HttpAsyncRequestProducer> requestProducerQueue;
private final Queue<HttpAsyncResponseConsumer<T>> responseConsumerQueue;
- private final Queue<HttpRequest> requestQueue;
+ private final Queue<ClassicHttpRequest> requestQueue;
private final Queue<T> resultQueue;
private final BasicFuture<List<T>> future;
private final HttpContext localContext;
@@ -176,14 +176,14 @@ public class PipeliningClientExchangeHan
}
@Override
- public HttpRequest generateRequest() throws IOException, HttpException {
+ public ClassicHttpRequest generateRequest() throws IOException, HttpException {
Asserts.check(this.requestProducerRef.get() == null, "Inconsistent state: request producer is not null");
final HttpAsyncRequestProducer requestProducer = this.requestProducerQueue.poll();
if (requestProducer == null) {
return null;
}
this.requestProducerRef.set(requestProducer);
- final HttpRequest request = requestProducer.generateRequest();
+ final ClassicHttpRequest request = requestProducer.generateRequest();
this.httppocessor.process(request, this.localContext);
this.requestQueue.add(request);
return request;
@@ -205,14 +205,14 @@ public class PipeliningClientExchangeHan
}
@Override
- public void responseReceived(final HttpResponse response) throws IOException, HttpException {
+ public void responseReceived(final ClassicHttpResponse response) throws IOException, HttpException {
Asserts.check(this.responseConsumerRef.get() == null, "Inconsistent state: response consumer is not null");
final HttpAsyncResponseConsumer<T> responseConsumer = this.responseConsumerQueue.poll();
Asserts.check(responseConsumer != null, "Inconsistent state: response consumer queue is empty");
this.responseConsumerRef.set(responseConsumer);
- final HttpRequest request = this.requestQueue.poll();
+ final ClassicHttpRequest request = this.requestQueue.poll();
Asserts.check(request != null, "Inconsistent state: request queue is empty");
this.localContext.setAttribute(HttpCoreContext.HTTP_REQUEST, request);
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/SSLNHttpClientConnectionFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/SSLNHttpClientConnectionFactory.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/SSLNHttpClientConnectionFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/SSLNHttpClientConnectionFactory.java Sun Aug 28 19:04:49 2016
@@ -31,8 +31,8 @@ import javax.net.ssl.SSLContext;
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.nio.NHttpConnectionFactory;
@@ -59,8 +59,8 @@ public class SSLNHttpClientConnectionFac
private final ContentLengthStrategy incomingContentStrategy;
private final ContentLengthStrategy outgoingContentStrategy;
- private final NHttpMessageParserFactory<HttpResponse> responseParserFactory;
- private final NHttpMessageWriterFactory<HttpRequest> requestWriterFactory;
+ private final NHttpMessageParserFactory<ClassicHttpResponse> responseParserFactory;
+ private final NHttpMessageWriterFactory<ClassicHttpRequest> requestWriterFactory;
private final ByteBufferAllocator allocator;
private final SSLContext sslcontext;
private final SSLSetupHandler sslHandler;
@@ -74,8 +74,8 @@ public class SSLNHttpClientConnectionFac
final SSLSetupHandler sslHandler,
final ContentLengthStrategy incomingContentStrategy,
final ContentLengthStrategy outgoingContentStrategy,
- final NHttpMessageParserFactory<HttpResponse> responseParserFactory,
- final NHttpMessageWriterFactory<HttpRequest> requestWriterFactory,
+ final NHttpMessageParserFactory<ClassicHttpResponse> responseParserFactory,
+ final NHttpMessageWriterFactory<ClassicHttpRequest> requestWriterFactory,
final ByteBufferAllocator allocator,
final ConnectionConfig cconfig) {
super();
@@ -95,8 +95,8 @@ public class SSLNHttpClientConnectionFac
public SSLNHttpClientConnectionFactory(
final SSLContext sslcontext,
final SSLSetupHandler sslHandler,
- final NHttpMessageParserFactory<HttpResponse> responseParserFactory,
- final NHttpMessageWriterFactory<HttpRequest> requestWriterFactory,
+ final NHttpMessageParserFactory<ClassicHttpResponse> responseParserFactory,
+ final NHttpMessageWriterFactory<ClassicHttpRequest> requestWriterFactory,
final ByteBufferAllocator allocator,
final ConnectionConfig cconfig) {
this(sslcontext, sslHandler,
@@ -109,8 +109,8 @@ public class SSLNHttpClientConnectionFac
public SSLNHttpClientConnectionFactory(
final SSLContext sslcontext,
final SSLSetupHandler sslHandler,
- final NHttpMessageParserFactory<HttpResponse> responseParserFactory,
- final NHttpMessageWriterFactory<HttpRequest> requestWriterFactory,
+ final NHttpMessageParserFactory<ClassicHttpResponse> responseParserFactory,
+ final NHttpMessageWriterFactory<ClassicHttpRequest> requestWriterFactory,
final ConnectionConfig cconfig) {
this(sslcontext, sslHandler,
null, null, responseParserFactory, requestWriterFactory, null, cconfig);
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/SSLNHttpServerConnectionFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/SSLNHttpServerConnectionFactory.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/SSLNHttpServerConnectionFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/SSLNHttpServerConnectionFactory.java Sun Aug 28 19:04:49 2016
@@ -31,8 +31,8 @@ import javax.net.ssl.SSLContext;
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.nio.NHttpConnectionFactory;
@@ -59,8 +59,8 @@ public class SSLNHttpServerConnectionFac
private final SSLSetupHandler sslHandler;
private final ContentLengthStrategy incomingContentStrategy;
private final ContentLengthStrategy outgoingContentStrategy;
- private final NHttpMessageParserFactory<HttpRequest> requestParserFactory;
- private final NHttpMessageWriterFactory<HttpResponse> responseWriterFactory;
+ private final NHttpMessageParserFactory<ClassicHttpRequest> requestParserFactory;
+ private final NHttpMessageWriterFactory<ClassicHttpResponse> responseWriterFactory;
private final ByteBufferAllocator allocator;
private final ConnectionConfig cconfig;
@@ -72,8 +72,8 @@ public class SSLNHttpServerConnectionFac
final SSLSetupHandler sslHandler,
final ContentLengthStrategy incomingContentStrategy,
final ContentLengthStrategy outgoingContentStrategy,
- final NHttpMessageParserFactory<HttpRequest> requestParserFactory,
- final NHttpMessageWriterFactory<HttpResponse> responseWriterFactory,
+ final NHttpMessageParserFactory<ClassicHttpRequest> requestParserFactory,
+ final NHttpMessageWriterFactory<ClassicHttpResponse> responseWriterFactory,
final ByteBufferAllocator allocator,
final ConnectionConfig cconfig) {
super();
@@ -93,8 +93,8 @@ public class SSLNHttpServerConnectionFac
public SSLNHttpServerConnectionFactory(
final SSLContext sslcontext,
final SSLSetupHandler sslHandler,
- final NHttpMessageParserFactory<HttpRequest> requestParserFactory,
- final NHttpMessageWriterFactory<HttpResponse> responseWriterFactory,
+ final NHttpMessageParserFactory<ClassicHttpRequest> requestParserFactory,
+ final NHttpMessageWriterFactory<ClassicHttpResponse> responseWriterFactory,
final ByteBufferAllocator allocator,
final ConnectionConfig cconfig) {
this(sslcontext, sslHandler,
@@ -107,8 +107,8 @@ public class SSLNHttpServerConnectionFac
public SSLNHttpServerConnectionFactory(
final SSLContext sslcontext,
final SSLSetupHandler sslHandler,
- final NHttpMessageParserFactory<HttpRequest> requestParserFactory,
- final NHttpMessageWriterFactory<HttpResponse> responseWriterFactory,
+ final NHttpMessageParserFactory<ClassicHttpRequest> requestParserFactory,
+ final NHttpMessageWriterFactory<ClassicHttpResponse> responseWriterFactory,
final ConnectionConfig cconfig) {
this(sslcontext, sslHandler,
null, null, requestParserFactory, responseWriterFactory, null, cconfig);
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/UriHttpAsyncRequestHandlerMapper.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/UriHttpAsyncRequestHandlerMapper.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/UriHttpAsyncRequestHandlerMapper.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/UriHttpAsyncRequestHandlerMapper.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.nio.HttpAsyncRequestHandler;
import org.apache.hc.core5.http.nio.HttpAsyncRequestHandlerMapper;
import org.apache.hc.core5.http.protocol.HttpContext;
@@ -87,9 +87,9 @@ public class UriHttpAsyncRequestHandlerM
}
/**
- * Extracts request path from the given {@link HttpRequest}
+ * Extracts request path from the given {@link ClassicHttpRequest}
*/
- protected String getRequestPath(final HttpRequest request) {
+ protected String getRequestPath(final ClassicHttpRequest request) {
String uriPath = request.getPath();
int index = uriPath.indexOf("?");
if (index != -1) {
@@ -110,7 +110,7 @@ public class UriHttpAsyncRequestHandlerM
* @return handler or {@code null} if no match is found.
*/
@Override
- public HttpAsyncRequestHandler<?> lookup(final HttpRequest request, final HttpContext context) {
+ public HttpAsyncRequestHandler<?> lookup(final ClassicHttpRequest request, final HttpContext context) {
return matcher.lookup(getRequestPath(request));
}
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/io/HttpClientConnection.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/io/HttpClientConnection.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/io/HttpClientConnection.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/io/HttpClientConnection.java Sun Aug 28 19:04:49 2016
@@ -30,8 +30,8 @@ package org.apache.hc.core5.http.io;
import java.io.IOException;
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;
/**
* A client-side HTTP connection, which can be used for sending
@@ -47,7 +47,7 @@ public interface HttpClientConnection ex
* @return {@code true} if the connection is known to be
* in a inconsistent state and cannot be re-used.
*
- * @see #terminateRequest(HttpRequest)
+ * @see #terminateRequest(ClassicHttpRequest)
*
* @since 5.0
*/
@@ -59,7 +59,7 @@ public interface HttpClientConnection ex
* @throws HttpException in case of HTTP protocol violation
* @throws IOException in case of an I/O error
*/
- void sendRequestHeader(HttpRequest request)
+ void sendRequestHeader(ClassicHttpRequest request)
throws HttpException, IOException;
/**
@@ -74,7 +74,7 @@ public interface HttpClientConnection ex
*
* @since 5.0
*/
- void terminateRequest(HttpRequest request)
+ void terminateRequest(ClassicHttpRequest request)
throws HttpException, IOException;
/**
@@ -83,7 +83,7 @@ public interface HttpClientConnection ex
* @throws HttpException in case of HTTP protocol violation
* @throws IOException in case of an I/O error
*/
- void sendRequestEntity(HttpRequest request)
+ void sendRequestEntity(ClassicHttpRequest request)
throws HttpException, IOException;
/**
@@ -96,7 +96,7 @@ public interface HttpClientConnection ex
* @throws HttpException in case of HTTP protocol violation
* @throws IOException in case of an I/O error
*/
- HttpResponse receiveResponseHeader()
+ ClassicHttpResponse receiveResponseHeader()
throws HttpException, IOException;
/**
@@ -107,7 +107,7 @@ public interface HttpClientConnection ex
* @throws HttpException in case of HTTP protocol violation
* @throws IOException in case of an I/O error
*/
- void receiveResponseEntity(HttpResponse response)
+ void receiveResponseEntity(ClassicHttpResponse response)
throws HttpException, IOException;
}
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/io/HttpMessageParser.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/io/HttpMessageParser.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/io/HttpMessageParser.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/io/HttpMessageParser.java Sun Aug 28 19:04:49 2016
@@ -31,20 +31,20 @@ import java.io.IOException;
import java.io.InputStream;
import org.apache.hc.core5.http.HttpException;
-import org.apache.hc.core5.http.MessageHead;
+import org.apache.hc.core5.http.MessageHeaders;
/**
* Message parser intended to build HTTP message head from an input stream..
*
* @param <T>
- * {@link MessageHead} or a subclass
+ * {@link MessageHeaders} or a subclass
*
* @since 4.0
*/
-public interface HttpMessageParser<T extends MessageHead> {
+public interface HttpMessageParser<T extends MessageHeaders> {
/**
- * Generates an instance of {@link MessageHead} from the given input stream..
+ * Generates an instance of {@link MessageHeaders} from the given input stream..
*
* @param buffer Session input buffer
* @param inputStream Input stream
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/io/HttpMessageParserFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/io/HttpMessageParserFactory.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/io/HttpMessageParserFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/io/HttpMessageParserFactory.java Sun Aug 28 19:04:49 2016
@@ -27,7 +27,7 @@
package org.apache.hc.core5.http.io;
-import org.apache.hc.core5.http.MessageHead;
+import org.apache.hc.core5.http.MessageHeaders;
import org.apache.hc.core5.http.config.MessageConstraints;
/**
@@ -35,7 +35,7 @@ import org.apache.hc.core5.http.config.M
*
* @since 4.3
*/
-public interface HttpMessageParserFactory<T extends MessageHead> {
+public interface HttpMessageParserFactory<T extends MessageHeaders> {
HttpMessageParser<T> create(MessageConstraints constraints);
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/io/HttpMessageWriter.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/io/HttpMessageWriter.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/io/HttpMessageWriter.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/io/HttpMessageWriter.java Sun Aug 28 19:04:49 2016
@@ -31,17 +31,17 @@ import java.io.IOException;
import java.io.OutputStream;
import org.apache.hc.core5.http.HttpException;
-import org.apache.hc.core5.http.MessageHead;
+import org.apache.hc.core5.http.MessageHeaders;
/**
* Message writer intended to serialize HTTP message head to an output stream.
*
* @since 4.0
*/
-public interface HttpMessageWriter<T extends MessageHead> {
+public interface HttpMessageWriter<T extends MessageHeaders> {
/**
- * Serializes an instance of {@link MessageHead} to the given output stream.
+ * Serializes an instance of {@link MessageHeaders} to the given output stream.
*
* @param message HTTP message head
* @param buffer session output buffer
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/io/HttpMessageWriterFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/io/HttpMessageWriterFactory.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/io/HttpMessageWriterFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/io/HttpMessageWriterFactory.java Sun Aug 28 19:04:49 2016
@@ -27,14 +27,14 @@
package org.apache.hc.core5.http.io;
-import org.apache.hc.core5.http.MessageHead;
+import org.apache.hc.core5.http.MessageHeaders;
/**
* Factory for {@link HttpMessageWriter} instances.
*
* @since 4.3
*/
-public interface HttpMessageWriterFactory<T extends MessageHead> {
+public interface HttpMessageWriterFactory<T extends MessageHeaders> {
HttpMessageWriter<T> create();
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/io/HttpRequestHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/io/HttpRequestHandler.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/io/HttpRequestHandler.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/io/HttpRequestHandler.java Sun Aug 28 19:04:49 2016
@@ -30,8 +30,8 @@ package org.apache.hc.core5.http.io;
import java.io.IOException;
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.protocol.HttpContext;
/**
@@ -57,7 +57,7 @@ public interface HttpRequestHandler {
* @throws HttpException in case of HTTP protocol violation or a processing
* problem.
*/
- void handle(HttpRequest request, HttpResponse response, HttpContext context)
+ void handle(ClassicHttpRequest request, ClassicHttpResponse response, HttpContext context)
throws HttpException, IOException;
}
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/io/HttpRequestHandlerMapper.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/io/HttpRequestHandlerMapper.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/io/HttpRequestHandlerMapper.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/io/HttpRequestHandlerMapper.java Sun Aug 28 19:04:49 2016
@@ -27,12 +27,12 @@
package org.apache.hc.core5.http.io;
-import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.ClassicHttpRequest;
import org.apache.hc.core5.http.protocol.HttpContext;
/**
* HttpRequestHandlerMapper can be used to resolve an instance of
- * {@link HttpRequestHandler} matching a particular {@link HttpRequest}. Usually the
+ * {@link HttpRequestHandler} matching a particular {@link ClassicHttpRequest}. Usually the
* mapped request handler will be used to process the request.
*
* @since 4.3
@@ -48,6 +48,6 @@ public interface HttpRequestHandlerMappe
*
* @since 5.0
*/
- HttpRequestHandler lookup(HttpRequest request, HttpContext context);
+ HttpRequestHandler lookup(ClassicHttpRequest request, HttpContext context);
}
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/io/HttpServerConnection.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/io/HttpServerConnection.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/io/HttpServerConnection.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/io/HttpServerConnection.java Sun Aug 28 19:04:49 2016
@@ -30,8 +30,8 @@ package org.apache.hc.core5.http.io;
import java.io.IOException;
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;
/**
* A server-side HTTP connection, which can be used for receiving
@@ -51,7 +51,7 @@ public interface HttpServerConnection ex
* @throws HttpException in case of HTTP protocol violation
* @throws IOException in case of an I/O error
*/
- HttpRequest receiveRequestHeader()
+ ClassicHttpRequest receiveRequestHeader()
throws HttpException, IOException;
/**
@@ -61,7 +61,7 @@ public interface HttpServerConnection ex
* @throws HttpException in case of HTTP protocol violation
* @throws IOException in case of an I/O error
*/
- void receiveRequestEntity(HttpRequest request)
+ void receiveRequestEntity(ClassicHttpRequest request)
throws HttpException, IOException;
/**
@@ -70,7 +70,7 @@ public interface HttpServerConnection ex
* @throws HttpException in case of HTTP protocol violation
* @throws IOException in case of an I/O error
*/
- void sendResponseHeader(HttpResponse response)
+ void sendResponseHeader(ClassicHttpResponse response)
throws HttpException, IOException;
/**
@@ -79,7 +79,7 @@ public interface HttpServerConnection ex
* @throws HttpException in case of HTTP protocol violation
* @throws IOException in case of an I/O error
*/
- void sendResponseEntity(HttpResponse response)
+ void sendResponseEntity(ClassicHttpResponse response)
throws HttpException, IOException;
}
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/io/UriHttpRequestHandlerMapper.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/io/UriHttpRequestHandlerMapper.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/io/UriHttpRequestHandlerMapper.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/io/UriHttpRequestHandlerMapper.java Sun Aug 28 19:04:49 2016
@@ -29,7 +29,7 @@ package org.apache.hc.core5.http.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.protocol.HttpContext;
import org.apache.hc.core5.http.protocol.UriPatternMatcher;
import org.apache.hc.core5.util.Args;
@@ -88,9 +88,9 @@ public class UriHttpRequestHandlerMapper
}
/**
- * Extracts request path from the given {@link HttpRequest}
+ * Extracts request path from the given {@link ClassicHttpRequest}
*/
- protected String getRequestPath(final HttpRequest request) {
+ protected String getRequestPath(final ClassicHttpRequest request) {
String uriPath = request.getPath();
int index = uriPath.indexOf("?");
if (index != -1) {
@@ -111,7 +111,7 @@ public class UriHttpRequestHandlerMapper
* @return handler or {@code null} if no match is found.
*/
@Override
- public HttpRequestHandler lookup(final HttpRequest request, final HttpContext context) {
+ public HttpRequestHandler lookup(final ClassicHttpRequest request, final HttpContext context) {
Args.notNull(request, "HTTP request");
return matcher.lookup(getRequestPath(request));
}
Copied: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/message/BasicClassicHttpRequest.java (from r1758066, httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/message/AbstractHttpMessage.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/message/BasicClassicHttpRequest.java?p2=httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/message/BasicClassicHttpRequest.java&p1=httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/message/AbstractHttpMessage.java&r1=1758066&r2=1758141&rev=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/message/AbstractHttpMessage.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/message/BasicClassicHttpRequest.java Sun Aug 28 19:04:49 2016
@@ -27,30 +27,54 @@
package org.apache.hc.core5.http.message;
+import java.net.URI;
+
+import org.apache.hc.core5.http.ClassicHttpRequest;
import org.apache.hc.core5.http.HttpEntity;
-import org.apache.hc.core5.http.HttpMessage;
-import org.apache.hc.core5.util.Args;
+import org.apache.hc.core5.http.HttpHost;
/**
- * Basic implementation of {@link HttpMessage}.
+ * Basic implementation of {@link ClassicHttpRequest}.
*
- * @since 4.0
+ * @since 5.0
*/
-public abstract class AbstractHttpMessage extends HeaderGroup implements HttpMessage<HttpEntity> {
+public class BasicClassicHttpRequest extends BasicHttpRequest implements ClassicHttpRequest {
- private static final long serialVersionUID = 1L;
private HttpEntity entity;
- @Override
- public void addHeader(final String name, final Object value) {
- Args.notNull(name, "Header name");
- addHeader(new BasicHeader(name, value));
+ /**
+ * Creates request message with the given method and request path.
+ *
+ * @param method request method.
+ * @param path request path.
+ */
+ public BasicClassicHttpRequest(final String method, final String path) {
+ super(method, path);
}
- @Override
- public void setHeader(final String name, final Object value) {
- Args.notNull(name, "Header name");
- setHeader(new BasicHeader(name, value));
+ /**
+ * Creates request message with the given method, host and request path.
+ *
+ * @param method request method.
+ * @param host request host.
+ * @param path request path.
+ *
+ * @since 5.0
+ */
+ public BasicClassicHttpRequest(final String method, final HttpHost host, final String path) {
+ super(method, host, path);
+ }
+
+ /**
+ * Creates request message with the given method, request URI.
+ *
+ * @param method request method.
+ * @param requestUri request URI.
+ *
+ * @since 5.0
+ */
+ public BasicClassicHttpRequest(final String method, final URI requestUri) {
+ super(method, requestUri);
}
@Override
Copied: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/message/BasicClassicHttpResponse.java (from r1758066, httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/message/AbstractHttpMessage.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/message/BasicClassicHttpResponse.java?p2=httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/message/BasicClassicHttpResponse.java&p1=httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/message/AbstractHttpMessage.java&r1=1758066&r2=1758141&rev=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/message/AbstractHttpMessage.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/message/BasicClassicHttpResponse.java Sun Aug 28 19:04:49 2016
@@ -27,30 +27,52 @@
package org.apache.hc.core5.http.message;
+import java.util.Locale;
+
+import org.apache.hc.core5.http.ClassicHttpResponse;
import org.apache.hc.core5.http.HttpEntity;
-import org.apache.hc.core5.http.HttpMessage;
-import org.apache.hc.core5.util.Args;
+import org.apache.hc.core5.http.ReasonPhraseCatalog;
/**
- * Basic implementation of {@link HttpMessage}.
+ * Basic implementation of {@link ClassicHttpResponse}.
*
- * @since 4.0
+ * @since 5.0
*/
-public abstract class AbstractHttpMessage extends HeaderGroup implements HttpMessage<HttpEntity> {
+public class BasicClassicHttpResponse extends BasicHttpResponse implements ClassicHttpResponse {
- private static final long serialVersionUID = 1L;
private HttpEntity entity;
- @Override
- public void addHeader(final String name, final Object value) {
- Args.notNull(name, "Header name");
- addHeader(new BasicHeader(name, value));
+ /**
+ * Creates a new response.
+ *
+ * @param code the status code
+ * @param catalog the reason phrase catalog, or
+ * {@code null} to disable automatic
+ * reason phrase lookup
+ * @param locale the locale for looking up reason phrases, or
+ * {@code null} for the system locale
+ */
+ public BasicClassicHttpResponse(final int code, final ReasonPhraseCatalog catalog, final Locale locale) {
+ super(code, catalog, locale);
}
- @Override
- public void setHeader(final String name, final Object value) {
- Args.notNull(name, "Header name");
- setHeader(new BasicHeader(name, value));
+ /**
+ * Creates a new response.
+ *
+ * @param code the status code of the response
+ * @param reasonPhrase the reason phrase to the status code, or {@code null}
+ */
+ public BasicClassicHttpResponse(final int code, final String reasonPhrase) {
+ super(code, reasonPhrase);
+ }
+
+ /**
+ * Creates a new response.
+ *
+ * @param code the status code of the response
+ */
+ public BasicClassicHttpResponse(final int code) {
+ super(code);
}
@Override
Propchange: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/message/BasicClassicHttpResponse.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/message/BasicClassicHttpResponse.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/message/BasicClassicHttpResponse.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/message/BasicHttpRequest.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/message/BasicHttpRequest.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/message/BasicHttpRequest.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/message/BasicHttpRequest.java Sun Aug 28 19:04:49 2016
@@ -30,6 +30,7 @@ package org.apache.hc.core5.http.message
import java.net.URI;
import java.net.URISyntaxException;
+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.ProtocolVersion;
@@ -41,7 +42,7 @@ import org.apache.hc.core5.util.TextUtil
*
* @since 4.0
*/
-public class BasicHttpRequest extends AbstractHttpMessage implements HttpRequest {
+public class BasicHttpRequest extends HeaderGroup implements HttpRequest {
private static final long serialVersionUID = 1L;
@@ -50,6 +51,7 @@ public class BasicHttpRequest extends Ab
private String scheme;
private String authority;
private ProtocolVersion version;
+ private HttpEntity entity;
/**
* Creates request message with the given method and request path.
@@ -107,6 +109,18 @@ public class BasicHttpRequest extends Ab
}
@Override
+ public void addHeader(final String name, final Object value) {
+ Args.notNull(name, "Header name");
+ addHeader(new BasicHeader(name, value));
+ }
+
+ @Override
+ public void setHeader(final String name, final Object value) {
+ Args.notNull(name, "Header name");
+ setHeader(new BasicHeader(name, value));
+ }
+
+ @Override
public void setVersion(final ProtocolVersion version) {
this.version = version;
}
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/message/BasicHttpResponse.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/message/BasicHttpResponse.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/message/BasicHttpResponse.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/message/BasicHttpResponse.java Sun Aug 28 19:04:49 2016
@@ -29,6 +29,7 @@ package org.apache.hc.core5.http.message
import java.util.Locale;
+import org.apache.hc.core5.http.HttpEntity;
import org.apache.hc.core5.http.HttpResponse;
import org.apache.hc.core5.http.ProtocolVersion;
import org.apache.hc.core5.http.ReasonPhraseCatalog;
@@ -38,11 +39,9 @@ import org.apache.hc.core5.util.Args;
/**
* Basic implementation of {@link HttpResponse}.
*
- * @see org.apache.hc.core5.http.impl.DefaultHttpResponseFactory
- *
* @since 4.0
*/
-public class BasicHttpResponse extends AbstractHttpMessage implements HttpResponse {
+public class BasicHttpResponse extends HeaderGroup implements HttpResponse {
private static final long serialVersionUID = 1L;
@@ -52,6 +51,7 @@ public class BasicHttpResponse extends A
private Locale locale;
private int code;
private String reasonPhrase;
+ private HttpEntity entity;
/**
* Creates a new response.
@@ -97,6 +97,18 @@ public class BasicHttpResponse extends A
}
@Override
+ public void addHeader(final String name, final Object value) {
+ Args.notNull(name, "Header name");
+ addHeader(new BasicHeader(name, value));
+ }
+
+ @Override
+ public void setHeader(final String name, final Object value) {
+ Args.notNull(name, "Header name");
+ setHeader(new BasicHeader(name, value));
+ }
+
+ @Override
public void setVersion(final ProtocolVersion version) {
this.version = version;
}
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/nio/HttpAsyncClientExchangeHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/nio/HttpAsyncClientExchangeHandler.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/nio/HttpAsyncClientExchangeHandler.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/nio/HttpAsyncClientExchangeHandler.java Sun Aug 28 19:04:49 2016
@@ -32,8 +32,8 @@ import java.io.IOException;
import org.apache.hc.core5.concurrent.Cancellable;
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.protocol.HttpContext;
/**
@@ -67,7 +67,7 @@ public interface HttpAsyncClientExchange
* @throws HttpException in case of HTTP protocol violation
* @throws IOException in case of an I/O error
*/
- HttpRequest generateRequest() throws IOException, HttpException;
+ ClassicHttpRequest generateRequest() throws IOException, HttpException;
/**
* Invoked to write out a chunk of content to the {@link ContentEncoder}.
@@ -104,7 +104,7 @@ public interface HttpAsyncClientExchange
* @throws HttpException in case of HTTP protocol violation
* @throws IOException in case of an I/O error
*/
- void responseReceived(HttpResponse response) throws IOException, HttpException;
+ void responseReceived(ClassicHttpResponse response) throws IOException, HttpException;
/**
* Invoked to process a chunk of content from the {@link ContentDecoder}.
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/nio/HttpAsyncExchange.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/nio/HttpAsyncExchange.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/nio/HttpAsyncExchange.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/nio/HttpAsyncExchange.java Sun Aug 28 19:04:49 2016
@@ -28,8 +28,8 @@
package org.apache.hc.core5.http.nio;
import org.apache.hc.core5.concurrent.Cancellable;
-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;
/**
* {@code HttpAsyncExchange} represents a server-side HTTP message exchange
@@ -45,7 +45,7 @@ public interface HttpAsyncExchange {
*
* @return received HTTP request message.
*/
- HttpRequest getRequest();
+ ClassicHttpRequest getRequest();
/**
* Returns the default HTTP response message. Once ready the response
@@ -53,7 +53,7 @@ public interface HttpAsyncExchange {
*
* @return default HTTP response message.
*/
- HttpResponse getResponse();
+ ClassicHttpResponse getResponse();
/**
* Submits the default HTTP response and completed the message exchange.
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/nio/HttpAsyncRequestConsumer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/nio/HttpAsyncRequestConsumer.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/nio/HttpAsyncRequestConsumer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/nio/HttpAsyncRequestConsumer.java Sun Aug 28 19:04:49 2016
@@ -30,7 +30,7 @@ import java.io.Closeable;
import java.io.IOException;
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.protocol.HttpContext;
/**
@@ -50,7 +50,7 @@ public interface HttpAsyncRequestConsume
* @throws HttpException in case of HTTP protocol violation
* @throws IOException in case of an I/O error
*/
- void requestReceived(HttpRequest request) throws HttpException, IOException;
+ void requestReceived(ClassicHttpRequest request) throws HttpException, IOException;
/**
* Invoked to process a chunk of content from the {@link ContentDecoder}.
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/nio/HttpAsyncRequestHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/nio/HttpAsyncRequestHandler.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/nio/HttpAsyncRequestHandler.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/nio/HttpAsyncRequestHandler.java Sun Aug 28 19:04:49 2016
@@ -30,7 +30,7 @@ package org.apache.hc.core5.http.nio;
import java.io.IOException;
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.protocol.HttpContext;
/**
@@ -63,7 +63,7 @@ public interface HttpAsyncRequestHandler
* problem.
*/
HttpAsyncRequestConsumer<T> processRequest(
- HttpRequest request,
+ ClassicHttpRequest request,
HttpContext context) throws HttpException, IOException;
/**
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/nio/HttpAsyncRequestHandlerMapper.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/nio/HttpAsyncRequestHandlerMapper.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/nio/HttpAsyncRequestHandlerMapper.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/nio/HttpAsyncRequestHandlerMapper.java Sun Aug 28 19:04:49 2016
@@ -27,12 +27,12 @@
package org.apache.hc.core5.http.nio;
-import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.ClassicHttpRequest;
import org.apache.hc.core5.http.protocol.HttpContext;
/**
* {@code HttpAsyncRequestHandlerMapper} can be used to resolve an instance
- * of {@link HttpAsyncRequestHandler} matching a particular {@link HttpRequest}.
+ * of {@link HttpAsyncRequestHandler} matching a particular {@link ClassicHttpRequest}.
* Usually the resolved request handler will be used to process the request.
*
* @since 4.3
@@ -48,6 +48,6 @@ public interface HttpAsyncRequestHandler
*
* @since 5.0
*/
- HttpAsyncRequestHandler<?> lookup(HttpRequest request, HttpContext context);
+ HttpAsyncRequestHandler<?> lookup(ClassicHttpRequest request, HttpContext context);
}
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/nio/HttpAsyncRequestProducer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/nio/HttpAsyncRequestProducer.java?rev=1758141&r1=1758140&r2=1758141&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/nio/HttpAsyncRequestProducer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/nio/HttpAsyncRequestProducer.java Sun Aug 28 19:04:49 2016
@@ -31,7 +31,7 @@ import java.io.IOException;
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.ClassicHttpRequest;
import org.apache.hc.core5.http.protocol.HttpContext;
/**
@@ -61,7 +61,7 @@ public interface HttpAsyncRequestProduce
* @throws HttpException in case of HTTP protocol violation
* @throws IOException in case of an I/O error
*/
- HttpRequest generateRequest() throws IOException, HttpException;
+ ClassicHttpRequest generateRequest() throws IOException, HttpException;
/**
* Invoked to write out a chunk of content to the {@link ContentEncoder}.