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/11/13 14:08:56 UTC
svn commit: r1769499 - in /httpcomponents/httpcore/trunk:
httpcore5-testing/src/main/java/org/apache/hc/core5/testing/classic/
httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/http/
httpcore5/src/main/java/org/apache/hc/core5/http/message/
Author: olegk
Date: Sun Nov 13 14:08:56 2016
New Revision: 1769499
URL: http://svn.apache.org/viewvc?rev=1769499&view=rev
Log:
Convenience constructors
Modified:
httpcomponents/httpcore/trunk/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/classic/LoggingBHttpClientConnection.java
httpcomponents/httpcore/trunk/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/classic/LoggingBHttpServerConnection.java
httpcomponents/httpcore/trunk/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/http/InternalClientHttp1EventHandlerFactory.java
httpcomponents/httpcore/trunk/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/http/InternalServerHttp1EventHandlerFactory.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/message/RequestLine.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/message/StatusLine.java
Modified: httpcomponents/httpcore/trunk/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/classic/LoggingBHttpClientConnection.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/classic/LoggingBHttpClientConnection.java?rev=1769499&r1=1769498&r2=1769499&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/classic/LoggingBHttpClientConnection.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/classic/LoggingBHttpClientConnection.java Sun Nov 13 14:08:56 2016
@@ -40,7 +40,6 @@ import org.apache.hc.core5.http.ClassicH
import org.apache.hc.core5.http.ClassicHttpResponse;
import org.apache.hc.core5.http.ContentLengthStrategy;
import org.apache.hc.core5.http.Header;
-import org.apache.hc.core5.http.HttpVersion;
import org.apache.hc.core5.http.config.H1Config;
import org.apache.hc.core5.http.impl.io.DefaultBHttpClientConnection;
import org.apache.hc.core5.http.io.HttpMessageParserFactory;
@@ -107,9 +106,7 @@ public class LoggingBHttpClientConnectio
@Override
protected void onResponseReceived(final ClassicHttpResponse response) {
if (response != null && this.headerlog.isDebugEnabled()) {
- this.headerlog.debug(this.id + " << " + new StatusLine(
- response.getVersion() != null ? response.getVersion() : HttpVersion.HTTP_1_1,
- response.getCode(), response.getReasonPhrase()));
+ this.headerlog.debug(this.id + " << " + new StatusLine(response));
final Header[] headers = response.getAllHeaders();
for (final Header header : headers) {
this.headerlog.debug(this.id + " << " + header.toString());
@@ -120,8 +117,7 @@ public class LoggingBHttpClientConnectio
@Override
protected void onRequestSubmitted(final ClassicHttpRequest request) {
if (request != null && this.headerlog.isDebugEnabled()) {
- this.headerlog.debug(id + " >> " + new RequestLine(request.getMethod(), request.getPath(),
- request.getVersion() != null ? request.getVersion() : HttpVersion.HTTP_1_1));
+ this.headerlog.debug(id + " >> " + new RequestLine(request));
final Header[] headers = request.getAllHeaders();
for (final Header header : headers) {
this.headerlog.debug(this.id + " >> " + header.toString());
Modified: httpcomponents/httpcore/trunk/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/classic/LoggingBHttpServerConnection.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/classic/LoggingBHttpServerConnection.java?rev=1769499&r1=1769498&r2=1769499&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/classic/LoggingBHttpServerConnection.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/classic/LoggingBHttpServerConnection.java Sun Nov 13 14:08:56 2016
@@ -40,7 +40,6 @@ import org.apache.hc.core5.http.ClassicH
import org.apache.hc.core5.http.ClassicHttpResponse;
import org.apache.hc.core5.http.ContentLengthStrategy;
import org.apache.hc.core5.http.Header;
-import org.apache.hc.core5.http.HttpVersion;
import org.apache.hc.core5.http.config.H1Config;
import org.apache.hc.core5.http.impl.io.DefaultBHttpServerConnection;
import org.apache.hc.core5.http.io.HttpMessageParserFactory;
@@ -107,8 +106,7 @@ public class LoggingBHttpServerConnectio
@Override
protected void onRequestReceived(final ClassicHttpRequest request) {
if (request != null && this.headerlog.isDebugEnabled()) {
- this.headerlog.debug(id + " >> " + new RequestLine(request.getMethod(), request.getPath(),
- request.getVersion() != null ? request.getVersion() : HttpVersion.HTTP_1_1));
+ this.headerlog.debug(id + " >> " + new RequestLine(request));
final Header[] headers = request.getAllHeaders();
for (final Header header : headers) {
this.headerlog.debug(this.id + " >> " + header.toString());
@@ -119,9 +117,7 @@ public class LoggingBHttpServerConnectio
@Override
protected void onResponseSubmitted(final ClassicHttpResponse response) {
if (response != null && this.headerlog.isDebugEnabled()) {
- this.headerlog.debug(this.id + " << " + new StatusLine(
- response.getVersion() != null ? response.getVersion() : HttpVersion.HTTP_1_1,
- response.getCode(), response.getReasonPhrase()));
+ this.headerlog.debug(this.id + " << " + new StatusLine(response));
final Header[] headers = response.getAllHeaders();
for (final Header header : headers) {
this.headerlog.debug(this.id + " << " + header.toString());
Modified: httpcomponents/httpcore/trunk/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/http/InternalClientHttp1EventHandlerFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/http/InternalClientHttp1EventHandlerFactory.java?rev=1769499&r1=1769498&r2=1769499&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/http/InternalClientHttp1EventHandlerFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/http/InternalClientHttp1EventHandlerFactory.java Sun Nov 13 14:08:56 2016
@@ -41,7 +41,6 @@ import org.apache.hc.core5.http.Header;
import org.apache.hc.core5.http.HttpConnection;
import org.apache.hc.core5.http.HttpRequest;
import org.apache.hc.core5.http.HttpResponse;
-import org.apache.hc.core5.http.HttpVersion;
import org.apache.hc.core5.http.config.ConnectionConfig;
import org.apache.hc.core5.http.config.H1Config;
import org.apache.hc.core5.http.impl.DefaultConnectionReuseStrategy;
@@ -162,8 +161,7 @@ class InternalClientHttp1EventHandlerFac
@Override
public void onRequestHead(final HttpConnection connection, final HttpRequest request) {
if (headerLog.isDebugEnabled()) {
- headerLog.debug(id + " >> " + new RequestLine(request.getMethod(), request.getPath(),
- request.getVersion() != null ? request.getVersion() : HttpVersion.HTTP_1_1));
+ headerLog.debug(id + " >> " + new RequestLine(request));
for (final Iterator<Header> it = request.headerIterator(); it.hasNext(); ) {
headerLog.debug(id + " >> " + it.next());
}
@@ -173,9 +171,7 @@ class InternalClientHttp1EventHandlerFac
@Override
public void onResponseHead(final HttpConnection connection, final HttpResponse response) {
if (headerLog.isDebugEnabled()) {
- headerLog.debug(id + " << " + new StatusLine(
- response.getVersion() != null ? response.getVersion() : HttpVersion.HTTP_1_1,
- response.getCode(), response.getReasonPhrase()));
+ headerLog.debug(id + " << " + new StatusLine(response));
for (final Iterator<Header> it = response.headerIterator(); it.hasNext(); ) {
headerLog.debug(id + " << " + it.next());
}
Modified: httpcomponents/httpcore/trunk/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/http/InternalServerHttp1EventHandlerFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/http/InternalServerHttp1EventHandlerFactory.java?rev=1769499&r1=1769498&r2=1769499&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/http/InternalServerHttp1EventHandlerFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/http/InternalServerHttp1EventHandlerFactory.java Sun Nov 13 14:08:56 2016
@@ -41,7 +41,6 @@ import org.apache.hc.core5.http.Header;
import org.apache.hc.core5.http.HttpConnection;
import org.apache.hc.core5.http.HttpRequest;
import org.apache.hc.core5.http.HttpResponse;
-import org.apache.hc.core5.http.HttpVersion;
import org.apache.hc.core5.http.config.ConnectionConfig;
import org.apache.hc.core5.http.config.H1Config;
import org.apache.hc.core5.http.impl.DefaultConnectionReuseStrategy;
@@ -67,7 +66,9 @@ import org.apache.hc.core5.testing.nio.L
import org.apache.hc.core5.testing.nio.LoggingIOSession;
import org.apache.hc.core5.util.Args;
import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger; @Contract(threading = ThreadingBehavior.IMMUTABLE)
+import org.apache.logging.log4j.Logger;
+
+@Contract(threading = ThreadingBehavior.IMMUTABLE)
/**
* @since 5.0
@@ -168,8 +169,7 @@ class InternalServerHttp1EventHandlerFac
@Override
public void onRequestHead(final HttpConnection connection, final HttpRequest request) {
if (headerLog.isDebugEnabled()) {
- headerLog.debug(id + " << " + new RequestLine(request.getMethod(), request.getPath(),
- request.getVersion() != null ? request.getVersion() : HttpVersion.HTTP_1_1));
+ headerLog.debug(id + " << " + new RequestLine(request));
for (final Iterator<Header> it = request.headerIterator(); it.hasNext(); ) {
headerLog.debug(id + " << " + it.next());
}
@@ -179,9 +179,7 @@ class InternalServerHttp1EventHandlerFac
@Override
public void onResponseHead(final HttpConnection connection, final HttpResponse response) {
if (headerLog.isDebugEnabled()) {
- headerLog.debug(id + " >> " + new StatusLine(
- response.getVersion() != null ? response.getVersion() : HttpVersion.HTTP_1_1,
- response.getCode(), response.getReasonPhrase()));
+ headerLog.debug(id + " >> " + new StatusLine(response));
for (final Iterator<Header> it = response.headerIterator(); it.hasNext(); ) {
headerLog.debug(id + " >> " + it.next());
}
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/message/RequestLine.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/message/RequestLine.java?rev=1769499&r1=1769498&r2=1769499&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/message/RequestLine.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/message/RequestLine.java Sun Nov 13 14:08:56 2016
@@ -31,6 +31,8 @@ import java.io.Serializable;
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.HttpVersion;
import org.apache.hc.core5.http.ProtocolVersion;
import org.apache.hc.core5.util.Args;
@@ -48,13 +50,21 @@ public final class RequestLine implement
private final String method;
private final String uri;
+ public RequestLine(final HttpRequest request) {
+ super();
+ Args.notNull(request, "Request");
+ this.method = request.getMethod();
+ this.uri = request.getPath();
+ this.protoversion = request.getVersion() != null ? request.getVersion() : HttpVersion.HTTP_1_1;
+ }
+
public RequestLine(final String method,
final String uri,
final ProtocolVersion version) {
super();
this.method = Args.notNull(method, "Method");
this.uri = Args.notNull(uri, "URI");
- this.protoversion = Args.notNull(version, "Version");
+ this.protoversion = version != null ? version : HttpVersion.HTTP_1_1;
}
public String getMethod() {
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/message/StatusLine.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/message/StatusLine.java?rev=1769499&r1=1769498&r2=1769499&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/message/StatusLine.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/message/StatusLine.java Sun Nov 13 14:08:56 2016
@@ -31,6 +31,8 @@ import java.io.Serializable;
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.HttpVersion;
import org.apache.hc.core5.http.ProtocolVersion;
import org.apache.hc.core5.util.Args;
@@ -53,6 +55,13 @@ public final class StatusLine implements
/** The reason phrase. */
private final String reasonPhrase;
+ public StatusLine(final HttpResponse response) {
+ super();
+ Args.notNull(response, "Response");
+ this.protoVersion = response.getVersion() != null ? response.getVersion() : HttpVersion.HTTP_1_1;
+ this.statusCode = response.getCode();
+ this.reasonPhrase = response.getReasonPhrase();
+ }
/**
* Creates a new status line with the given version, status, and reason.
*
@@ -64,8 +73,8 @@ public final class StatusLine implements
public StatusLine(final ProtocolVersion version, final int statusCode,
final String reasonPhrase) {
super();
- this.protoVersion = Args.notNull(version, "Version");
this.statusCode = Args.notNegative(statusCode, "Status code");
+ this.protoVersion = version != null ? version : HttpVersion.HTTP_1_1;
this.reasonPhrase = reasonPhrase;
}