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 2017/05/09 20:02:54 UTC
[25/34] httpcomponents-core git commit: HTTPCORE-386: Added
#toString() method Contributed by Dmitry Potapov
HTTPCORE-386: Added #toString() method
Contributed by Dmitry Potapov <potapov.d at gmail.com>
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpcore/branches/4.3.x@1610390 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/commit/fbe3861d
Tree: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/tree/fbe3861d
Diff: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/diff/fbe3861d
Branch: refs/heads/4.3.x
Commit: fbe3861daa80d34d93d75e92448036a8dda13f8c
Parents: 3424456
Author: Oleg Kalnichevski <ol...@apache.org>
Authored: Mon Jul 14 11:42:34 2014 +0000
Committer: Oleg Kalnichevski <ol...@apache.org>
Committed: Mon Jul 14 11:42:34 2014 +0000
----------------------------------------------------------------------
.../nio/entity/EntityAsyncContentProducer.java | 5 ++++
.../nio/protocol/BasicAsyncRequestProducer.java | 13 ++++++++++
.../protocol/BasicAsyncResponseProducer.java | 10 ++++++++
.../protocol/TestBasicAsyncRequestProducer.java | 5 ++++
.../apache/http/entity/AbstractHttpEntity.java | 26 ++++++++++++++++++++
.../apache/http/message/BasicHttpRequest.java | 2 +-
.../apache/http/message/BasicHttpResponse.java | 12 +++++++--
7 files changed, 70 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/fbe3861d/httpcore-nio/src/main/java/org/apache/http/nio/entity/EntityAsyncContentProducer.java
----------------------------------------------------------------------
diff --git a/httpcore-nio/src/main/java/org/apache/http/nio/entity/EntityAsyncContentProducer.java b/httpcore-nio/src/main/java/org/apache/http/nio/entity/EntityAsyncContentProducer.java
index f7e0624..78b7d5c 100644
--- a/httpcore-nio/src/main/java/org/apache/http/nio/entity/EntityAsyncContentProducer.java
+++ b/httpcore-nio/src/main/java/org/apache/http/nio/entity/EntityAsyncContentProducer.java
@@ -92,4 +92,9 @@ public class EntityAsyncContentProducer implements HttpAsyncContentProducer {
}
}
+ @Override
+ public String toString() {
+ return this.entity.toString();
+ }
+
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/fbe3861d/httpcore-nio/src/main/java/org/apache/http/nio/protocol/BasicAsyncRequestProducer.java
----------------------------------------------------------------------
diff --git a/httpcore-nio/src/main/java/org/apache/http/nio/protocol/BasicAsyncRequestProducer.java b/httpcore-nio/src/main/java/org/apache/http/nio/protocol/BasicAsyncRequestProducer.java
index 92880ce..72cb9a0 100644
--- a/httpcore-nio/src/main/java/org/apache/http/nio/protocol/BasicAsyncRequestProducer.java
+++ b/httpcore-nio/src/main/java/org/apache/http/nio/protocol/BasicAsyncRequestProducer.java
@@ -150,4 +150,17 @@ public class BasicAsyncRequestProducer implements HttpAsyncRequestProducer {
}
}
+ @Override
+ public String toString() {
+ final StringBuilder sb = new StringBuilder();
+ sb.append(this.target);
+ sb.append(' ');
+ sb.append(this.request);
+ if (this.producer != null) {
+ sb.append(' ');
+ sb.append(this.producer);
+ }
+ return sb.toString();
+ }
+
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/fbe3861d/httpcore-nio/src/main/java/org/apache/http/nio/protocol/BasicAsyncResponseProducer.java
----------------------------------------------------------------------
diff --git a/httpcore-nio/src/main/java/org/apache/http/nio/protocol/BasicAsyncResponseProducer.java b/httpcore-nio/src/main/java/org/apache/http/nio/protocol/BasicAsyncResponseProducer.java
index efb245f..d9e15f3 100644
--- a/httpcore-nio/src/main/java/org/apache/http/nio/protocol/BasicAsyncResponseProducer.java
+++ b/httpcore-nio/src/main/java/org/apache/http/nio/protocol/BasicAsyncResponseProducer.java
@@ -125,4 +125,14 @@ public class BasicAsyncResponseProducer implements HttpAsyncResponseProducer {
}
}
+ @Override
+ public String toString() {
+ final StringBuilder buf = new StringBuilder();
+ buf.append(this.response);
+ if (this.producer != null) {
+ buf.append(" ").append(this.producer);
+ }
+ return buf.toString();
+ }
+
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/fbe3861d/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestBasicAsyncRequestProducer.java
----------------------------------------------------------------------
diff --git a/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestBasicAsyncRequestProducer.java b/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestBasicAsyncRequestProducer.java
index a0359ed..213098a 100644
--- a/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestBasicAsyncRequestProducer.java
+++ b/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestBasicAsyncRequestProducer.java
@@ -128,4 +128,9 @@ public class TestBasicAsyncRequestProducer {
verify(contentProducer, times(1)).close();
}
+ @Test
+ public void testToString() {
+ Assert.assertEquals(target + " " + request + " " + contentProducer, producer.toString());
+ }
+
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/fbe3861d/httpcore/src/main/java/org/apache/http/entity/AbstractHttpEntity.java
----------------------------------------------------------------------
diff --git a/httpcore/src/main/java/org/apache/http/entity/AbstractHttpEntity.java b/httpcore/src/main/java/org/apache/http/entity/AbstractHttpEntity.java
index 82366b1..4197dd2 100644
--- a/httpcore/src/main/java/org/apache/http/entity/AbstractHttpEntity.java
+++ b/httpcore/src/main/java/org/apache/http/entity/AbstractHttpEntity.java
@@ -188,4 +188,30 @@ public abstract class AbstractHttpEntity implements HttpEntity {
public void consumeContent() throws IOException {
}
+ @Override
+ public String toString() {
+ final StringBuilder sb = new StringBuilder();
+ sb.append('[');
+ if (contentType != null) {
+ sb.append("Content-Type: ");
+ sb.append(contentType.getValue());
+ sb.append(',');
+ }
+ if (contentEncoding != null) {
+ sb.append("Content-Encoding: ");
+ sb.append(contentEncoding.getValue());
+ sb.append(',');
+ }
+ final long len = getContentLength();
+ if (len >= 0) {
+ sb.append("Content-Length: ");
+ sb.append(len);
+ sb.append(',');
+ }
+ sb.append("Chunked: ");
+ sb.append(chunked);
+ sb.append(']');
+ return sb.toString();
+ }
+
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/fbe3861d/httpcore/src/main/java/org/apache/http/message/BasicHttpRequest.java
----------------------------------------------------------------------
diff --git a/httpcore/src/main/java/org/apache/http/message/BasicHttpRequest.java b/httpcore/src/main/java/org/apache/http/message/BasicHttpRequest.java
index 22867dc..ec73dd6 100644
--- a/httpcore/src/main/java/org/apache/http/message/BasicHttpRequest.java
+++ b/httpcore/src/main/java/org/apache/http/message/BasicHttpRequest.java
@@ -108,7 +108,7 @@ public class BasicHttpRequest extends AbstractHttpMessage implements HttpRequest
@Override
public String toString() {
- return this.method + " " + this.uri + " " + this.headergroup;
+ return this.method + ' ' + this.uri + ' ' + this.headergroup;
}
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/fbe3861d/httpcore/src/main/java/org/apache/http/message/BasicHttpResponse.java
----------------------------------------------------------------------
diff --git a/httpcore/src/main/java/org/apache/http/message/BasicHttpResponse.java b/httpcore/src/main/java/org/apache/http/message/BasicHttpResponse.java
index 0fde464..ef4fe3e 100644
--- a/httpcore/src/main/java/org/apache/http/message/BasicHttpResponse.java
+++ b/httpcore/src/main/java/org/apache/http/message/BasicHttpResponse.java
@@ -192,7 +192,7 @@ public class BasicHttpResponse extends AbstractHttpMessage implements HttpRespon
}
public void setLocale(final Locale locale) {
- this.locale = Args.notNull(locale, "Locale");
+ this.locale = Args.notNull(locale, "Locale");
this.statusline = null;
}
@@ -212,7 +212,15 @@ public class BasicHttpResponse extends AbstractHttpMessage implements HttpRespon
@Override
public String toString() {
- return getStatusLine() + " " + this.headergroup;
+ final StringBuilder sb = new StringBuilder();
+ sb.append(getStatusLine());
+ sb.append(' ');
+ sb.append(this.headergroup);
+ if (this.entity != null) {
+ sb.append(' ');
+ sb.append(this.entity);
+ }
+ return sb.toString();
}
}