From e3658d8a4384df8fd747e805c506f7b5f501409a Mon Sep 17 00:00:00 2001 From: "kaiyi.lk" Date: Wed, 1 Jun 2022 11:23:51 +0800 Subject: [PATCH] [ISSUE #3949] change toString to toStringHelper --- .../acl/common/AuthenticationHeader.java | 29 ++++++++++--------- .../acl/common/AuthorizationHeader.java | 13 +++++---- .../broker/client/ProducerChangeListener.java | 5 ++++ .../common/thread/ThreadPoolWrapper.java | 16 ++++------ .../proxy/service/route/MessageQueueView.java | 14 ++++----- 5 files changed, 40 insertions(+), 37 deletions(-) diff --git a/acl/src/main/java/org/apache/rocketmq/acl/common/AuthenticationHeader.java b/acl/src/main/java/org/apache/rocketmq/acl/common/AuthenticationHeader.java index 52289d55df..00112d7374 100644 --- a/acl/src/main/java/org/apache/rocketmq/acl/common/AuthenticationHeader.java +++ b/acl/src/main/java/org/apache/rocketmq/acl/common/AuthenticationHeader.java @@ -17,6 +17,8 @@ package org.apache.rocketmq.acl.common; +import com.google.common.base.MoreObjects; + public class AuthenticationHeader { private String remoteAddress; private String tenantId; @@ -217,19 +219,18 @@ public class AuthenticationHeader { } @Override public String toString() { - final StringBuilder sb = new StringBuilder("MetadataHeader{"); - sb.append("remoteAddress='").append(remoteAddress).append('\''); - sb.append(", tenantId='").append(tenantId).append('\''); - sb.append(", namespace='").append(namespace).append('\''); - sb.append(", authorization='").append(authorization).append('\''); - sb.append(", datetime='").append(datetime).append('\''); - sb.append(", sessionToken='").append(sessionToken).append('\''); - sb.append(", requestId='").append(requestId).append('\''); - sb.append(", language='").append(language).append('\''); - sb.append(", clientVersion='").append(clientVersion).append('\''); - sb.append(", protocol='").append(protocol).append('\''); - sb.append(", requestCode=").append(requestCode); - sb.append('}'); - return sb.toString(); + return MoreObjects.toStringHelper(this) + .add("remoteAddress", remoteAddress) + .add("tenantId", tenantId) + .add("namespace", namespace) + .add("authorization", authorization) + .add("datetime", datetime) + .add("sessionToken", sessionToken) + .add("requestId", requestId) + .add("language", language) + .add("clientVersion", clientVersion) + .add("protocol", protocol) + .add("requestCode", requestCode) + .toString(); } } diff --git a/acl/src/main/java/org/apache/rocketmq/acl/common/AuthorizationHeader.java b/acl/src/main/java/org/apache/rocketmq/acl/common/AuthorizationHeader.java index 7e0406d8d0..24eb6de8db 100644 --- a/acl/src/main/java/org/apache/rocketmq/acl/common/AuthorizationHeader.java +++ b/acl/src/main/java/org/apache/rocketmq/acl/common/AuthorizationHeader.java @@ -17,6 +17,7 @@ package org.apache.rocketmq.acl.common; +import com.google.common.base.MoreObjects; import java.util.Arrays; import org.apache.commons.codec.DecoderException; import org.apache.commons.codec.binary.Base64; @@ -111,11 +112,11 @@ public class AuthorizationHeader { } @Override public String toString() { - return "AuthorizationHeader{" + - "method='" + method + '\'' + - ", accessKey='" + accessKey + '\'' + - ", signedHeaders=" + Arrays.toString(signedHeaders) + - ", signature='" + signature + '\'' + - '}'; + return MoreObjects.toStringHelper(this) + .add("method", method) + .add("accessKey", accessKey) + .add("signedHeaders", signedHeaders) + .add("signature", signature) + .toString(); } } diff --git a/broker/src/main/java/org/apache/rocketmq/broker/client/ProducerChangeListener.java b/broker/src/main/java/org/apache/rocketmq/broker/client/ProducerChangeListener.java index 576faf8a81..f8183d33fa 100644 --- a/broker/src/main/java/org/apache/rocketmq/broker/client/ProducerChangeListener.java +++ b/broker/src/main/java/org/apache/rocketmq/broker/client/ProducerChangeListener.java @@ -16,6 +16,11 @@ */ package org.apache.rocketmq.broker.client; +/** + * producer manager will call this listener when something happen + *

+ * event type: {@link ProducerGroupEvent} + */ public interface ProducerChangeListener { void handle(ProducerGroupEvent event, String group, ClientChannelInfo clientChannelInfo); diff --git a/common/src/main/java/org/apache/rocketmq/common/thread/ThreadPoolWrapper.java b/common/src/main/java/org/apache/rocketmq/common/thread/ThreadPoolWrapper.java index 653fa1d833..3e5bbfe574 100644 --- a/common/src/main/java/org/apache/rocketmq/common/thread/ThreadPoolWrapper.java +++ b/common/src/main/java/org/apache/rocketmq/common/thread/ThreadPoolWrapper.java @@ -17,6 +17,7 @@ package org.apache.rocketmq.common.thread; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import java.util.List; import java.util.concurrent.ThreadPoolExecutor; @@ -110,15 +111,10 @@ public class ThreadPoolWrapper { } @Override public String toString() { - final StringBuilder sb = new StringBuilder("ThreadPoolWrapper{"); - sb.append("name='") - .append(name) - .append('\''); - sb.append(", threadPoolExecutor=") - .append(threadPoolExecutor); - sb.append(", statusPrinters=") - .append(statusPrinters); - sb.append('}'); - return sb.toString(); + return MoreObjects.toStringHelper(this) + .add("name", name) + .add("threadPoolExecutor", threadPoolExecutor) + .add("statusPrinters", statusPrinters) + .toString(); } } diff --git a/proxy/src/main/java/org/apache/rocketmq/proxy/service/route/MessageQueueView.java b/proxy/src/main/java/org/apache/rocketmq/proxy/service/route/MessageQueueView.java index 303dfe2a77..06c9d14569 100644 --- a/proxy/src/main/java/org/apache/rocketmq/proxy/service/route/MessageQueueView.java +++ b/proxy/src/main/java/org/apache/rocketmq/proxy/service/route/MessageQueueView.java @@ -16,6 +16,7 @@ */ package org.apache.rocketmq.proxy.service.route; +import com.google.common.base.MoreObjects; import org.apache.rocketmq.common.protocol.route.TopicRouteData; public class MessageQueueView { @@ -52,12 +53,11 @@ public class MessageQueueView { return writeSelector; } - @Override - public String toString() { - return "MessageQueueView{" + - "readSelector=" + readSelector + - ", writeSelector=" + writeSelector + - ", topicRouteWrapper=" + topicRouteWrapper + - '}'; + @Override public String toString() { + return MoreObjects.toStringHelper(this) + .add("readSelector", readSelector) + .add("writeSelector", writeSelector) + .add("topicRouteWrapper", topicRouteWrapper) + .toString(); } } \ No newline at end of file