You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by gg...@apache.org on 2018/11/20 20:02:18 UTC
httpcomponents-core git commit: Rename dumpState() methods to
appendState().
Repository: httpcomponents-core
Updated Branches:
refs/heads/master 67c6ede6c -> 0cb64a537
Rename dumpState() methods to appendState().
Project: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/commit/0cb64a53
Tree: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/tree/0cb64a53
Diff: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/diff/0cb64a53
Branch: refs/heads/master
Commit: 0cb64a5371d2c833c3e0b8a1ff4265dc6a1c03f3
Parents: 67c6ede
Author: Gary Gregory <ga...@gmail.com>
Authored: Tue Nov 20 13:02:15 2018 -0700
Committer: Gary Gregory <ga...@gmail.com>
Committed: Tue Nov 20 13:02:15 2018 -0700
----------------------------------------------------------------------
.../http2/impl/nio/AbstractHttp2StreamMultiplexer.java | 12 ++++++------
.../core5/http2/impl/nio/ClientHttp2IOEventHandler.java | 2 +-
.../http2/impl/nio/ClientHttp2StreamMultiplexer.java | 2 +-
.../core5/http2/impl/nio/ServerHttp2IOEventHandler.java | 2 +-
.../http2/impl/nio/ServerHttp2StreamMultiplexer.java | 2 +-
.../http/impl/nio/AbstractHttp1StreamDuplexer.java | 2 +-
.../core5/http/impl/nio/ClientHttp1IOEventHandler.java | 2 +-
.../core5/http/impl/nio/ClientHttp1StreamDuplexer.java | 12 ++++++------
.../core5/http/impl/nio/ClientHttp1StreamHandler.java | 4 ++--
.../core5/http/impl/nio/ServerHttp1IOEventHandler.java | 2 +-
.../core5/http/impl/nio/ServerHttp1StreamDuplexer.java | 10 +++++-----
.../core5/http/impl/nio/ServerHttp1StreamHandler.java | 4 ++--
12 files changed, 28 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/0cb64a53/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/AbstractHttp2StreamMultiplexer.java
----------------------------------------------------------------------
diff --git a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/AbstractHttp2StreamMultiplexer.java b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/AbstractHttp2StreamMultiplexer.java
index 0615a83..320c322 100644
--- a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/AbstractHttp2StreamMultiplexer.java
+++ b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/AbstractHttp2StreamMultiplexer.java
@@ -1242,7 +1242,7 @@ abstract class AbstractHttp2StreamMultiplexer implements Identifiable, HttpConne
return ioSession.getLocalAddress();
}
- void dumpState(final StringBuilder buf) {
+ void appendState(final StringBuilder buf) {
buf.append("connState=").append(connState)
.append(", connInputWindow=").append(connInputWindow)
.append(", connOutputWindow=").append(connOutputWindow)
@@ -1467,7 +1467,7 @@ abstract class AbstractHttp2StreamMultiplexer implements Identifiable, HttpConne
}
}
- void dumpState(final StringBuilder buf) {
+ void appendState(final StringBuilder buf) {
buf.append("id=").append(id)
.append(", connState=").append(connState)
.append(", inputWindow=").append(inputWindow)
@@ -1480,7 +1480,7 @@ abstract class AbstractHttp2StreamMultiplexer implements Identifiable, HttpConne
public String toString() {
final StringBuilder buf = new StringBuilder();
buf.append("[");
- dumpState(buf);
+ appendState(buf);
buf.append("]");
return buf.toString();
}
@@ -1619,9 +1619,9 @@ abstract class AbstractHttp2StreamMultiplexer implements Identifiable, HttpConne
channel.requestOutput();
}
- void dumpState(final StringBuilder buf) {
+ void appendState(final StringBuilder buf) {
buf.append("channel=[");
- channel.dumpState(buf);
+ channel.appendState(buf);
buf.append("]");
}
@@ -1629,7 +1629,7 @@ abstract class AbstractHttp2StreamMultiplexer implements Identifiable, HttpConne
public String toString() {
final StringBuilder buf = new StringBuilder();
buf.append("[");
- dumpState(buf);
+ appendState(buf);
buf.append("]");
return buf.toString();
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/0cb64a53/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ClientHttp2IOEventHandler.java
----------------------------------------------------------------------
diff --git a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ClientHttp2IOEventHandler.java b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ClientHttp2IOEventHandler.java
index f8632ae..1ca31c7 100644
--- a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ClientHttp2IOEventHandler.java
+++ b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ClientHttp2IOEventHandler.java
@@ -49,7 +49,7 @@ public class ClientHttp2IOEventHandler extends AbstractHttp2IOEventHandler {
buf.append("->");
InetAddressUtils.formatAddress(buf, getRemoteAddress());
buf.append(" [");
- streamMultiplexer.dumpState(buf);
+ streamMultiplexer.appendState(buf);
buf.append("]");
return buf.toString();
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/0cb64a53/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ClientHttp2StreamMultiplexer.java
----------------------------------------------------------------------
diff --git a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ClientHttp2StreamMultiplexer.java b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ClientHttp2StreamMultiplexer.java
index 997a709..e2261a0 100644
--- a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ClientHttp2StreamMultiplexer.java
+++ b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ClientHttp2StreamMultiplexer.java
@@ -139,7 +139,7 @@ public class ClientHttp2StreamMultiplexer extends AbstractHttp2StreamMultiplexer
public String toString() {
final StringBuilder buf = new StringBuilder();
buf.append("[");
- dumpState(buf);
+ appendState(buf);
buf.append("]");
return buf.toString();
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/0cb64a53/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ServerHttp2IOEventHandler.java
----------------------------------------------------------------------
diff --git a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ServerHttp2IOEventHandler.java b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ServerHttp2IOEventHandler.java
index 73a0507..4afb73c 100644
--- a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ServerHttp2IOEventHandler.java
+++ b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ServerHttp2IOEventHandler.java
@@ -49,7 +49,7 @@ public class ServerHttp2IOEventHandler extends AbstractHttp2IOEventHandler{
buf.append("->");
InetAddressUtils.formatAddress(buf, getLocalAddress());
buf.append(" [");
- streamMultiplexer.dumpState(buf);
+ streamMultiplexer.appendState(buf);
buf.append("]");
return buf.toString();
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/0cb64a53/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ServerHttp2StreamMultiplexer.java
----------------------------------------------------------------------
diff --git a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ServerHttp2StreamMultiplexer.java b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ServerHttp2StreamMultiplexer.java
index 336080c..69b3279 100644
--- a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ServerHttp2StreamMultiplexer.java
+++ b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ServerHttp2StreamMultiplexer.java
@@ -117,7 +117,7 @@ public class ServerHttp2StreamMultiplexer extends AbstractHttp2StreamMultiplexer
public String toString() {
final StringBuilder buf = new StringBuilder();
buf.append("[");
- dumpState(buf);
+ appendState(buf);
buf.append("]");
return buf.toString();
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/0cb64a53/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractHttp1StreamDuplexer.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractHttp1StreamDuplexer.java b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractHttp1StreamDuplexer.java
index 4fc661c..30cf650 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractHttp1StreamDuplexer.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractHttp1StreamDuplexer.java
@@ -623,7 +623,7 @@ abstract class AbstractHttp1StreamDuplexer<IncomingMessage extends HttpMessage,
return tlsDetails != null ? tlsDetails.getSSLSession() : null;
}
- void dumpState(final StringBuilder buf) {
+ void appendState(final StringBuilder buf) {
buf.append("connState=").append(connState)
.append(", inbuf=").append(inbuf)
.append(", outbuf=").append(outbuf)
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/0cb64a53/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ClientHttp1IOEventHandler.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ClientHttp1IOEventHandler.java b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ClientHttp1IOEventHandler.java
index de7fa16..0ed0a6e 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ClientHttp1IOEventHandler.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ClientHttp1IOEventHandler.java
@@ -49,7 +49,7 @@ public class ClientHttp1IOEventHandler extends AbstractHttp1IOEventHandler {
buf.append("->");
InetAddressUtils.formatAddress(buf, getRemoteAddress());
buf.append(" [");
- streamDuplexer.dumpState(buf);
+ streamDuplexer.appendState(buf);
buf.append("]");
return buf.toString();
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/0cb64a53/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ClientHttp1StreamDuplexer.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ClientHttp1StreamDuplexer.java b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ClientHttp1StreamDuplexer.java
index a2661c1..3dcc3f1 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ClientHttp1StreamDuplexer.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ClientHttp1StreamDuplexer.java
@@ -387,16 +387,16 @@ public class ClientHttp1StreamDuplexer extends AbstractHttp1StreamDuplexer<HttpR
}
@Override
- void dumpState(final StringBuilder buf) {
- super.dumpState(buf);
- super.dumpState(buf);
+ void appendState(final StringBuilder buf) {
+ super.appendState(buf);
+ super.appendState(buf);
buf.append(", incoming=[");
if (incoming != null) {
- incoming.dumpState(buf);
+ incoming.appendState(buf);
}
buf.append("], outgoing=[");
if (outgoing != null) {
- outgoing.dumpState(buf);
+ outgoing.appendState(buf);
}
buf.append("], pipeline=");
buf.append(pipeline.size());
@@ -406,7 +406,7 @@ public class ClientHttp1StreamDuplexer extends AbstractHttp1StreamDuplexer<HttpR
public String toString() {
final StringBuilder buf = new StringBuilder();
buf.append("[");
- dumpState(buf);
+ appendState(buf);
buf.append("]");
return buf.toString();
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/0cb64a53/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ClientHttp1StreamHandler.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ClientHttp1StreamHandler.java b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ClientHttp1StreamHandler.java
index 58f7d1d..9342e3c 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ClientHttp1StreamHandler.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ClientHttp1StreamHandler.java
@@ -304,7 +304,7 @@ class ClientHttp1StreamHandler implements ResourceHolder {
}
}
- void dumpState(final StringBuilder buf) {
+ void appendState(final StringBuilder buf) {
buf.append("requestState=").append(requestState)
.append(", responseState=").append(responseState)
.append(", responseCommitted=").append(requestCommitted)
@@ -316,7 +316,7 @@ class ClientHttp1StreamHandler implements ResourceHolder {
public String toString() {
final StringBuilder buf = new StringBuilder();
buf.append("[");
- dumpState(buf);
+ appendState(buf);
buf.append("]");
return buf.toString();
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/0cb64a53/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ServerHttp1IOEventHandler.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ServerHttp1IOEventHandler.java b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ServerHttp1IOEventHandler.java
index 2e74a99..e2e0d97 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ServerHttp1IOEventHandler.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ServerHttp1IOEventHandler.java
@@ -52,7 +52,7 @@ public class ServerHttp1IOEventHandler extends AbstractHttp1IOEventHandler {
buf.append("->");
InetAddressUtils.formatAddress(buf, getLocalAddress());
buf.append(" [");
- streamDuplexer.dumpState(buf);
+ streamDuplexer.appendState(buf);
buf.append("]");
return buf.toString();
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/0cb64a53/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ServerHttp1StreamDuplexer.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ServerHttp1StreamDuplexer.java b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ServerHttp1StreamDuplexer.java
index 9b249a2..407791f 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ServerHttp1StreamDuplexer.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ServerHttp1StreamDuplexer.java
@@ -401,15 +401,15 @@ public class ServerHttp1StreamDuplexer extends AbstractHttp1StreamDuplexer<HttpR
}
@Override
- void dumpState(final StringBuilder buf) {
- super.dumpState(buf);
+ void appendState(final StringBuilder buf) {
+ super.appendState(buf);
buf.append(", incoming=[");
if (incoming != null) {
- incoming.dumpState(buf);
+ incoming.appendState(buf);
}
buf.append("], outgoing=[");
if (outgoing != null) {
- outgoing.dumpState(buf);
+ outgoing.appendState(buf);
}
buf.append("], pipeline=");
buf.append(pipeline.size());
@@ -419,7 +419,7 @@ public class ServerHttp1StreamDuplexer extends AbstractHttp1StreamDuplexer<HttpR
public String toString() {
final StringBuilder buf = new StringBuilder();
buf.append("[");
- dumpState(buf);
+ appendState(buf);
buf.append("]");
return buf.toString();
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/0cb64a53/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ServerHttp1StreamHandler.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ServerHttp1StreamHandler.java b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ServerHttp1StreamHandler.java
index 8478069..c3f770a 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ServerHttp1StreamHandler.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ServerHttp1StreamHandler.java
@@ -315,7 +315,7 @@ class ServerHttp1StreamHandler implements ResourceHolder {
}
}
- void dumpState(final StringBuilder buf) {
+ void appendState(final StringBuilder buf) {
buf.append("requestState=").append(requestState)
.append(", responseState=").append(responseState)
.append(", responseCommitted=").append(responseCommitted)
@@ -327,7 +327,7 @@ class ServerHttp1StreamHandler implements ResourceHolder {
public String toString() {
final StringBuilder buf = new StringBuilder();
buf.append("[");
- dumpState(buf);
+ appendState(buf);
buf.append("]");
return buf.toString();
}