From 74b8084268654ae0c3bf48c39999a6c54e11dc24 Mon Sep 17 00:00:00 2001 From: "kaiyi.lk" Date: Tue, 31 May 2022 17:51:45 +0800 Subject: [PATCH] [ISSUE #3949] change toString to toStringHelper --- .../header/AckMessageRequestHeader.java | 15 ++++---- .../ChangeInvisibleTimeRequestHeader.java | 20 +++++------ .../CheckTransactionStateRequestHeader.java | 17 ++++----- .../header/CloneGroupOffsetRequestHeader.java | 13 +++---- ...umeMessageDirectlyResultRequestHeader.java | 19 +++++----- .../ConsumerSendMsgBackRequestHeader.java | 19 +++++----- .../CreateAccessConfigRequestHeader.java | 21 +++++------ .../header/CreateTopicRequestHeader.java | 25 ++++++------- .../header/EndTransactionRequestHeader.java | 19 +++++----- .../header/GetConsumeStatsRequestHeader.java | 9 ++--- .../GetConsumerListByGroupRequestHeader.java | 7 ++-- .../GetConsumerRunningInfoRequestHeader.java | 11 +++--- .../GetConsumerStatusRequestHeader.java | 11 +++--- .../header/GetMaxOffsetRequestHeader.java | 11 +++--- .../header/GetMinOffsetRequestHeader.java | 9 ++--- .../header/PopMessageRequestHeader.java | 27 +++++++------- .../header/PullMessageRequestHeader.java | 29 +++++++-------- .../header/SearchOffsetRequestHeader.java | 11 +++--- .../header/SendMessageRequestHeader.java | 31 ++++++++-------- .../header/SendMessageRequestHeaderV2.java | 20 +++++++++++ .../UpdateConsumerOffsetRequestHeader.java | 13 +++---- .../service/route/MessageQueueSelector.java | 16 +++++---- .../service/route/SelectableMessageQueue.java | 9 ++--- .../service/transaction/TransactionId.java | 35 +++++++++---------- 24 files changed, 229 insertions(+), 188 deletions(-) diff --git a/common/src/main/java/org/apache/rocketmq/common/protocol/header/AckMessageRequestHeader.java b/common/src/main/java/org/apache/rocketmq/common/protocol/header/AckMessageRequestHeader.java index 66721a4903..a8fea34d94 100644 --- a/common/src/main/java/org/apache/rocketmq/common/protocol/header/AckMessageRequestHeader.java +++ b/common/src/main/java/org/apache/rocketmq/common/protocol/header/AckMessageRequestHeader.java @@ -16,6 +16,7 @@ */ package org.apache.rocketmq.common.protocol.header; +import com.google.common.base.MoreObjects; import org.apache.rocketmq.remoting.CommandCustomHeader; import org.apache.rocketmq.remoting.annotation.CFNotNull; import org.apache.rocketmq.remoting.exception.RemotingCommandException; @@ -80,12 +81,12 @@ public class AckMessageRequestHeader implements CommandCustomHeader { @Override public String toString() { - return "AckMessageRequestHeader{" + - "consumerGroup='" + consumerGroup + '\'' + - ", topic='" + topic + '\'' + - ", queueId=" + queueId + - ", extraInfo='" + extraInfo + '\'' + - ", offset=" + offset + - '}'; + return MoreObjects.toStringHelper(this) + .add("consumerGroup", consumerGroup) + .add("topic", topic) + .add("queueId", queueId) + .add("extraInfo", extraInfo) + .add("offset", offset) + .toString(); } } diff --git a/common/src/main/java/org/apache/rocketmq/common/protocol/header/ChangeInvisibleTimeRequestHeader.java b/common/src/main/java/org/apache/rocketmq/common/protocol/header/ChangeInvisibleTimeRequestHeader.java index 6c6f5bad9f..918a2304b7 100644 --- a/common/src/main/java/org/apache/rocketmq/common/protocol/header/ChangeInvisibleTimeRequestHeader.java +++ b/common/src/main/java/org/apache/rocketmq/common/protocol/header/ChangeInvisibleTimeRequestHeader.java @@ -16,6 +16,7 @@ */ package org.apache.rocketmq.common.protocol.header; +import com.google.common.base.MoreObjects; import org.apache.rocketmq.remoting.CommandCustomHeader; import org.apache.rocketmq.remoting.annotation.CFNotNull; import org.apache.rocketmq.remoting.exception.RemotingCommandException; @@ -94,15 +95,14 @@ public class ChangeInvisibleTimeRequestHeader implements CommandCustomHeader { this.queueId = queueId; } - @Override - public String toString() { - return "ChangeInvisibleTimeRequestHeader{" + - "consumerGroup='" + consumerGroup + '\'' + - ", topic='" + topic + '\'' + - ", queueId=" + queueId + - ", extraInfo='" + extraInfo + '\'' + - ", offset=" + offset + - ", invisibleTime=" + invisibleTime + - '}'; + @Override public String toString() { + return MoreObjects.toStringHelper(this) + .add("consumerGroup", consumerGroup) + .add("topic", topic) + .add("queueId", queueId) + .add("extraInfo", extraInfo) + .add("offset", offset) + .add("invisibleTime", invisibleTime) + .toString(); } } diff --git a/common/src/main/java/org/apache/rocketmq/common/protocol/header/CheckTransactionStateRequestHeader.java b/common/src/main/java/org/apache/rocketmq/common/protocol/header/CheckTransactionStateRequestHeader.java index 6671a9d773..b04f7ef812 100644 --- a/common/src/main/java/org/apache/rocketmq/common/protocol/header/CheckTransactionStateRequestHeader.java +++ b/common/src/main/java/org/apache/rocketmq/common/protocol/header/CheckTransactionStateRequestHeader.java @@ -20,6 +20,7 @@ */ package org.apache.rocketmq.common.protocol.header; +import com.google.common.base.MoreObjects; import org.apache.rocketmq.remoting.CommandCustomHeader; import org.apache.rocketmq.remoting.annotation.CFNotNull; import org.apache.rocketmq.remoting.exception.RemotingCommandException; @@ -88,13 +89,13 @@ public class CheckTransactionStateRequestHeader implements CommandCustomHeader { @Override public String toString() { - return "CheckTransactionStateRequestHeader{" + - "brokerName='" + brokerName + '\'' + - ", tranStateTableOffset=" + tranStateTableOffset + - ", commitLogOffset=" + commitLogOffset + - ", msgId='" + msgId + '\'' + - ", transactionId='" + transactionId + '\'' + - ", offsetMsgId='" + offsetMsgId + '\'' + - '}'; + return MoreObjects.toStringHelper(this) + .add("brokerName", brokerName) + .add("tranStateTableOffset", tranStateTableOffset) + .add("commitLogOffset", commitLogOffset) + .add("msgId", msgId) + .add("transactionId", transactionId) + .add("offsetMsgId", offsetMsgId) + .toString(); } } diff --git a/common/src/main/java/org/apache/rocketmq/common/protocol/header/CloneGroupOffsetRequestHeader.java b/common/src/main/java/org/apache/rocketmq/common/protocol/header/CloneGroupOffsetRequestHeader.java index e010649a4b..3b478f8a11 100644 --- a/common/src/main/java/org/apache/rocketmq/common/protocol/header/CloneGroupOffsetRequestHeader.java +++ b/common/src/main/java/org/apache/rocketmq/common/protocol/header/CloneGroupOffsetRequestHeader.java @@ -20,6 +20,7 @@ */ package org.apache.rocketmq.common.protocol.header; +import com.google.common.base.MoreObjects; import org.apache.rocketmq.remoting.CommandCustomHeader; import org.apache.rocketmq.remoting.annotation.CFNotNull; import org.apache.rocketmq.remoting.exception.RemotingCommandException; @@ -71,11 +72,11 @@ public class CloneGroupOffsetRequestHeader implements CommandCustomHeader { @Override public String toString() { - return "CloneGroupOffsetRequestHeader{" + - "srcGroup='" + srcGroup + '\'' + - ", destGroup='" + destGroup + '\'' + - ", topic='" + topic + '\'' + - ", offline=" + offline + - '}'; + return MoreObjects.toStringHelper(this) + .add("srcGroup", srcGroup) + .add("destGroup", destGroup) + .add("topic", topic) + .add("offline", offline) + .toString(); } } diff --git a/common/src/main/java/org/apache/rocketmq/common/protocol/header/ConsumeMessageDirectlyResultRequestHeader.java b/common/src/main/java/org/apache/rocketmq/common/protocol/header/ConsumeMessageDirectlyResultRequestHeader.java index 18298a6ea5..a7dc28e256 100644 --- a/common/src/main/java/org/apache/rocketmq/common/protocol/header/ConsumeMessageDirectlyResultRequestHeader.java +++ b/common/src/main/java/org/apache/rocketmq/common/protocol/header/ConsumeMessageDirectlyResultRequestHeader.java @@ -17,6 +17,7 @@ package org.apache.rocketmq.common.protocol.header; +import com.google.common.base.MoreObjects; import org.apache.rocketmq.remoting.CommandCustomHeader; import org.apache.rocketmq.remoting.annotation.CFNotNull; import org.apache.rocketmq.remoting.annotation.CFNullable; @@ -100,14 +101,14 @@ public class ConsumeMessageDirectlyResultRequestHeader implements CommandCustomH @Override public String toString() { - return "ConsumeMessageDirectlyResultRequestHeader{" + - "consumerGroup='" + consumerGroup + '\'' + - ", clientId='" + clientId + '\'' + - ", msgId='" + msgId + '\'' + - ", brokerName='" + brokerName + '\'' + - ", topic='" + topic + '\'' + - ", topicSysFlag=" + topicSysFlag + - ", groupSysFlag=" + groupSysFlag + - '}'; + return MoreObjects.toStringHelper(this) + .add("consumerGroup", consumerGroup) + .add("clientId", clientId) + .add("msgId", msgId) + .add("brokerName", brokerName) + .add("topic", topic) + .add("topicSysFlag", topicSysFlag) + .add("groupSysFlag", groupSysFlag) + .toString(); } } diff --git a/common/src/main/java/org/apache/rocketmq/common/protocol/header/ConsumerSendMsgBackRequestHeader.java b/common/src/main/java/org/apache/rocketmq/common/protocol/header/ConsumerSendMsgBackRequestHeader.java index 2e0a120a15..3d65f23921 100644 --- a/common/src/main/java/org/apache/rocketmq/common/protocol/header/ConsumerSendMsgBackRequestHeader.java +++ b/common/src/main/java/org/apache/rocketmq/common/protocol/header/ConsumerSendMsgBackRequestHeader.java @@ -17,6 +17,7 @@ package org.apache.rocketmq.common.protocol.header; +import com.google.common.base.MoreObjects; import org.apache.rocketmq.remoting.CommandCustomHeader; import org.apache.rocketmq.remoting.annotation.CFNotNull; import org.apache.rocketmq.remoting.annotation.CFNullable; @@ -98,14 +99,14 @@ public class ConsumerSendMsgBackRequestHeader implements CommandCustomHeader { @Override public String toString() { - return "ConsumerSendMsgBackRequestHeader{" + - "offset=" + offset + - ", group='" + group + '\'' + - ", delayLevel=" + delayLevel + - ", originMsgId='" + originMsgId + '\'' + - ", originTopic='" + originTopic + '\'' + - ", unitMode=" + unitMode + - ", maxReconsumeTimes=" + maxReconsumeTimes + - '}'; + return MoreObjects.toStringHelper(this) + .add("offset", offset) + .add("group", group) + .add("delayLevel", delayLevel) + .add("originMsgId", originMsgId) + .add("originTopic", originTopic) + .add("unitMode", unitMode) + .add("maxReconsumeTimes", maxReconsumeTimes) + .toString(); } } diff --git a/common/src/main/java/org/apache/rocketmq/common/protocol/header/CreateAccessConfigRequestHeader.java b/common/src/main/java/org/apache/rocketmq/common/protocol/header/CreateAccessConfigRequestHeader.java index c91ab11101..09a2a0c667 100644 --- a/common/src/main/java/org/apache/rocketmq/common/protocol/header/CreateAccessConfigRequestHeader.java +++ b/common/src/main/java/org/apache/rocketmq/common/protocol/header/CreateAccessConfigRequestHeader.java @@ -17,6 +17,7 @@ package org.apache.rocketmq.common.protocol.header; +import com.google.common.base.MoreObjects; import org.apache.rocketmq.remoting.CommandCustomHeader; import org.apache.rocketmq.remoting.annotation.CFNotNull; import org.apache.rocketmq.remoting.exception.RemotingCommandException; @@ -113,15 +114,15 @@ public class CreateAccessConfigRequestHeader implements CommandCustomHeader { @Override public String toString() { - return "CreateAccessConfigRequestHeader{" + - "accessKey='" + accessKey + '\'' + - ", secretKey='" + secretKey + '\'' + - ", whiteRemoteAddress='" + whiteRemoteAddress + '\'' + - ", admin=" + admin + - ", defaultTopicPerm='" + defaultTopicPerm + '\'' + - ", defaultGroupPerm='" + defaultGroupPerm + '\'' + - ", topicPerms='" + topicPerms + '\'' + - ", groupPerms='" + groupPerms + '\'' + - '}'; + return MoreObjects.toStringHelper(this) + .add("accessKey", accessKey) + .add("secretKey", secretKey) + .add("whiteRemoteAddress", whiteRemoteAddress) + .add("admin", admin) + .add("defaultTopicPerm", defaultTopicPerm) + .add("defaultGroupPerm", defaultGroupPerm) + .add("topicPerms", topicPerms) + .add("groupPerms", groupPerms) + .toString(); } } diff --git a/common/src/main/java/org/apache/rocketmq/common/protocol/header/CreateTopicRequestHeader.java b/common/src/main/java/org/apache/rocketmq/common/protocol/header/CreateTopicRequestHeader.java index 05c7195ac0..43859410ae 100644 --- a/common/src/main/java/org/apache/rocketmq/common/protocol/header/CreateTopicRequestHeader.java +++ b/common/src/main/java/org/apache/rocketmq/common/protocol/header/CreateTopicRequestHeader.java @@ -20,6 +20,7 @@ */ package org.apache.rocketmq.common.protocol.header; +import com.google.common.base.MoreObjects; import org.apache.rocketmq.common.TopicFilterType; import org.apache.rocketmq.remoting.CommandCustomHeader; import org.apache.rocketmq.remoting.annotation.CFNotNull; @@ -142,17 +143,17 @@ public class CreateTopicRequestHeader implements CommandCustomHeader { @Override public String toString() { - return "CreateTopicRequestHeader{" + - "topic='" + topic + '\'' + - ", defaultTopic='" + defaultTopic + '\'' + - ", readQueueNums=" + readQueueNums + - ", writeQueueNums=" + writeQueueNums + - ", perm=" + perm + - ", topicFilterType='" + topicFilterType + '\'' + - ", topicSysFlag=" + topicSysFlag + - ", order=" + order + - ", attributes='" + attributes + '\'' + - ", force=" + force + - '}'; + return MoreObjects.toStringHelper(this) + .add("topic", topic) + .add("defaultTopic", defaultTopic) + .add("readQueueNums", readQueueNums) + .add("writeQueueNums", writeQueueNums) + .add("perm", perm) + .add("topicFilterType", topicFilterType) + .add("topicSysFlag", topicSysFlag) + .add("order", order) + .add("attributes", attributes) + .add("force", force) + .toString(); } } diff --git a/common/src/main/java/org/apache/rocketmq/common/protocol/header/EndTransactionRequestHeader.java b/common/src/main/java/org/apache/rocketmq/common/protocol/header/EndTransactionRequestHeader.java index 87661c320a..80fdc3d4a6 100644 --- a/common/src/main/java/org/apache/rocketmq/common/protocol/header/EndTransactionRequestHeader.java +++ b/common/src/main/java/org/apache/rocketmq/common/protocol/header/EndTransactionRequestHeader.java @@ -17,6 +17,7 @@ package org.apache.rocketmq.common.protocol.header; +import com.google.common.base.MoreObjects; import org.apache.rocketmq.common.sysflag.MessageSysFlag; import org.apache.rocketmq.remoting.CommandCustomHeader; import org.apache.rocketmq.remoting.annotation.CFNotNull; @@ -118,14 +119,14 @@ public class EndTransactionRequestHeader implements CommandCustomHeader { @Override public String toString() { - return "EndTransactionRequestHeader{" + - "producerGroup='" + producerGroup + '\'' + - ", tranStateTableOffset=" + tranStateTableOffset + - ", commitLogOffset=" + commitLogOffset + - ", commitOrRollback=" + commitOrRollback + - ", fromTransactionCheck=" + fromTransactionCheck + - ", msgId='" + msgId + '\'' + - ", transactionId='" + transactionId + '\'' + - '}'; + return MoreObjects.toStringHelper(this) + .add("producerGroup", producerGroup) + .add("tranStateTableOffset", tranStateTableOffset) + .add("commitLogOffset", commitLogOffset) + .add("commitOrRollback", commitOrRollback) + .add("fromTransactionCheck", fromTransactionCheck) + .add("msgId", msgId) + .add("transactionId", transactionId) + .toString(); } } diff --git a/common/src/main/java/org/apache/rocketmq/common/protocol/header/GetConsumeStatsRequestHeader.java b/common/src/main/java/org/apache/rocketmq/common/protocol/header/GetConsumeStatsRequestHeader.java index 7ce48bcee5..69a2fc60d0 100644 --- a/common/src/main/java/org/apache/rocketmq/common/protocol/header/GetConsumeStatsRequestHeader.java +++ b/common/src/main/java/org/apache/rocketmq/common/protocol/header/GetConsumeStatsRequestHeader.java @@ -16,6 +16,7 @@ */ package org.apache.rocketmq.common.protocol.header; +import com.google.common.base.MoreObjects; import org.apache.rocketmq.remoting.CommandCustomHeader; import org.apache.rocketmq.remoting.annotation.CFNotNull; import org.apache.rocketmq.remoting.exception.RemotingCommandException; @@ -47,9 +48,9 @@ public class GetConsumeStatsRequestHeader implements CommandCustomHeader { @Override public String toString() { - return "GetConsumeStatsRequestHeader{" + - "consumerGroup='" + consumerGroup + '\'' + - ", topic='" + topic + '\'' + - '}'; + return MoreObjects.toStringHelper(this) + .add("consumerGroup", consumerGroup) + .add("topic", topic) + .toString(); } } diff --git a/common/src/main/java/org/apache/rocketmq/common/protocol/header/GetConsumerListByGroupRequestHeader.java b/common/src/main/java/org/apache/rocketmq/common/protocol/header/GetConsumerListByGroupRequestHeader.java index 3a8c482147..ecab653150 100644 --- a/common/src/main/java/org/apache/rocketmq/common/protocol/header/GetConsumerListByGroupRequestHeader.java +++ b/common/src/main/java/org/apache/rocketmq/common/protocol/header/GetConsumerListByGroupRequestHeader.java @@ -17,6 +17,7 @@ package org.apache.rocketmq.common.protocol.header; +import com.google.common.base.MoreObjects; import org.apache.rocketmq.remoting.CommandCustomHeader; import org.apache.rocketmq.remoting.annotation.CFNotNull; import org.apache.rocketmq.remoting.exception.RemotingCommandException; @@ -39,8 +40,8 @@ public class GetConsumerListByGroupRequestHeader implements CommandCustomHeader @Override public String toString() { - return "GetConsumerListByGroupRequestHeader [" + - "consumerGroup='" + consumerGroup + '\'' + - ']'; + return MoreObjects.toStringHelper(this) + .add("consumerGroup", consumerGroup) + .toString(); } } diff --git a/common/src/main/java/org/apache/rocketmq/common/protocol/header/GetConsumerRunningInfoRequestHeader.java b/common/src/main/java/org/apache/rocketmq/common/protocol/header/GetConsumerRunningInfoRequestHeader.java index 5f9bee4e93..840716f5a3 100644 --- a/common/src/main/java/org/apache/rocketmq/common/protocol/header/GetConsumerRunningInfoRequestHeader.java +++ b/common/src/main/java/org/apache/rocketmq/common/protocol/header/GetConsumerRunningInfoRequestHeader.java @@ -17,6 +17,7 @@ package org.apache.rocketmq.common.protocol.header; +import com.google.common.base.MoreObjects; import org.apache.rocketmq.remoting.CommandCustomHeader; import org.apache.rocketmq.remoting.annotation.CFNotNull; import org.apache.rocketmq.remoting.annotation.CFNullable; @@ -60,10 +61,10 @@ public class GetConsumerRunningInfoRequestHeader implements CommandCustomHeader @Override public String toString() { - return "GetConsumerRunningInfoRequestHeader{" + - "consumerGroup='" + consumerGroup + '\'' + - ", clientId='" + clientId + '\'' + - ", jstackEnable=" + jstackEnable + - '}'; + return MoreObjects.toStringHelper(this) + .add("consumerGroup", consumerGroup) + .add("clientId", clientId) + .add("jstackEnable", jstackEnable) + .toString(); } } diff --git a/common/src/main/java/org/apache/rocketmq/common/protocol/header/GetConsumerStatusRequestHeader.java b/common/src/main/java/org/apache/rocketmq/common/protocol/header/GetConsumerStatusRequestHeader.java index d77acda8cd..0a983fecf6 100644 --- a/common/src/main/java/org/apache/rocketmq/common/protocol/header/GetConsumerStatusRequestHeader.java +++ b/common/src/main/java/org/apache/rocketmq/common/protocol/header/GetConsumerStatusRequestHeader.java @@ -17,6 +17,7 @@ package org.apache.rocketmq.common.protocol.header; +import com.google.common.base.MoreObjects; import org.apache.rocketmq.remoting.CommandCustomHeader; import org.apache.rocketmq.remoting.annotation.CFNotNull; import org.apache.rocketmq.remoting.annotation.CFNullable; @@ -60,10 +61,10 @@ public class GetConsumerStatusRequestHeader implements CommandCustomHeader { @Override public String toString() { - return "GetConsumerStatusRequestHeader{" + - "topic='" + topic + '\'' + - ", group='" + group + '\'' + - ", clientAddr='" + clientAddr + '\'' + - '}'; + return MoreObjects.toStringHelper(this) + .add("topic", topic) + .add("group", group) + .add("clientAddr", clientAddr) + .toString(); } } diff --git a/common/src/main/java/org/apache/rocketmq/common/protocol/header/GetMaxOffsetRequestHeader.java b/common/src/main/java/org/apache/rocketmq/common/protocol/header/GetMaxOffsetRequestHeader.java index 1883eecc12..f98e8500dd 100644 --- a/common/src/main/java/org/apache/rocketmq/common/protocol/header/GetMaxOffsetRequestHeader.java +++ b/common/src/main/java/org/apache/rocketmq/common/protocol/header/GetMaxOffsetRequestHeader.java @@ -20,6 +20,7 @@ */ package org.apache.rocketmq.common.protocol.header; +import com.google.common.base.MoreObjects; import org.apache.rocketmq.common.rpc.TopicQueueRequestHeader; import org.apache.rocketmq.remoting.annotation.CFNotNull; import org.apache.rocketmq.remoting.annotation.CFNullable; @@ -74,10 +75,10 @@ public class GetMaxOffsetRequestHeader extends TopicQueueRequestHeader { @Override public String toString() { - return "GetMaxOffsetRequestHeader [" + - "topic='" + topic + '\'' + - ", queueId=" + queueId + - ", committed=" + committed + - ']'; + return MoreObjects.toStringHelper(this) + .add("topic", topic) + .add("queueId", queueId) + .add("committed", committed) + .toString(); } } diff --git a/common/src/main/java/org/apache/rocketmq/common/protocol/header/GetMinOffsetRequestHeader.java b/common/src/main/java/org/apache/rocketmq/common/protocol/header/GetMinOffsetRequestHeader.java index b205326f67..d54c4aa41c 100644 --- a/common/src/main/java/org/apache/rocketmq/common/protocol/header/GetMinOffsetRequestHeader.java +++ b/common/src/main/java/org/apache/rocketmq/common/protocol/header/GetMinOffsetRequestHeader.java @@ -20,6 +20,7 @@ */ package org.apache.rocketmq.common.protocol.header; +import com.google.common.base.MoreObjects; import org.apache.rocketmq.common.rpc.TopicQueueRequestHeader; import org.apache.rocketmq.remoting.annotation.CFNotNull; import org.apache.rocketmq.remoting.exception.RemotingCommandException; @@ -56,9 +57,9 @@ public class GetMinOffsetRequestHeader extends TopicQueueRequestHeader { @Override public String toString() { - return "GetMinOffsetRequestHeader [" + - "topic='" + topic + '\'' + - ", queueId=" + queueId + - ']'; + return MoreObjects.toStringHelper(this) + .add("topic", topic) + .add("queueId", queueId) + .toString(); } } diff --git a/common/src/main/java/org/apache/rocketmq/common/protocol/header/PopMessageRequestHeader.java b/common/src/main/java/org/apache/rocketmq/common/protocol/header/PopMessageRequestHeader.java index c90a26a334..a3a186a917 100644 --- a/common/src/main/java/org/apache/rocketmq/common/protocol/header/PopMessageRequestHeader.java +++ b/common/src/main/java/org/apache/rocketmq/common/protocol/header/PopMessageRequestHeader.java @@ -16,6 +16,7 @@ */ package org.apache.rocketmq.common.protocol.header; +import com.google.common.base.MoreObjects; import org.apache.rocketmq.remoting.CommandCustomHeader; import org.apache.rocketmq.remoting.annotation.CFNotNull; import org.apache.rocketmq.remoting.exception.RemotingCommandException; @@ -155,18 +156,18 @@ public class PopMessageRequestHeader implements CommandCustomHeader { @Override public String toString() { - return "PopMessageRequestHeader [" + - "consumerGroup='" + consumerGroup + '\'' + - ", topic='" + topic + '\'' + - ", queueId=" + queueId + - ", maxMsgNums=" + maxMsgNums + - ", invisibleTime=" + invisibleTime + - ", pollTime=" + pollTime + - ", bornTime=" + bornTime + - ", initMode=" + initMode + - ", expType='" + expType + '\'' + - ", exp='" + exp + '\'' + - ", order=" + order + - ']'; + return MoreObjects.toStringHelper(this) + .add("consumerGroup", consumerGroup) + .add("topic", topic) + .add("queueId", queueId) + .add("maxMsgNums", maxMsgNums) + .add("invisibleTime", invisibleTime) + .add("pollTime", pollTime) + .add("bornTime", bornTime) + .add("initMode", initMode) + .add("expType", expType) + .add("exp", exp) + .add("order", order) + .toString(); } } diff --git a/common/src/main/java/org/apache/rocketmq/common/protocol/header/PullMessageRequestHeader.java b/common/src/main/java/org/apache/rocketmq/common/protocol/header/PullMessageRequestHeader.java index bbcd813973..77a17f3d0c 100644 --- a/common/src/main/java/org/apache/rocketmq/common/protocol/header/PullMessageRequestHeader.java +++ b/common/src/main/java/org/apache/rocketmq/common/protocol/header/PullMessageRequestHeader.java @@ -20,6 +20,7 @@ */ package org.apache.rocketmq.common.protocol.header; +import com.google.common.base.MoreObjects; import org.apache.rocketmq.common.rpc.TopicQueueRequestHeader; import org.apache.rocketmq.remoting.annotation.CFNotNull; import org.apache.rocketmq.remoting.annotation.CFNullable; @@ -157,19 +158,19 @@ public class PullMessageRequestHeader extends TopicQueueRequestHeader { @Override public String toString() { - return "PullMessageRequestHeader [" + - "consumerGroup='" + consumerGroup + '\'' + - ", topic='" + topic + '\'' + - ", queueId=" + queueId + - ", queueOffset=" + queueOffset + - ", maxMsgBytes=" + maxMsgBytes + - ", maxMsgNums=" + maxMsgNums + - ", sysFlag=" + sysFlag + - ", commitOffset=" + commitOffset + - ", suspendTimeoutMillis=" + suspendTimeoutMillis + - ", subscription='" + subscription + '\'' + - ", subVersion=" + subVersion + - ", expressionType='" + expressionType + '\'' + - ']'; + return MoreObjects.toStringHelper(this) + .add("consumerGroup", consumerGroup) + .add("topic", topic) + .add("queueId", queueId) + .add("queueOffset", queueOffset) + .add("maxMsgBytes", maxMsgBytes) + .add("maxMsgNums", maxMsgNums) + .add("sysFlag", sysFlag) + .add("commitOffset", commitOffset) + .add("suspendTimeoutMillis", suspendTimeoutMillis) + .add("subscription", subscription) + .add("subVersion", subVersion) + .add("expressionType", expressionType) + .toString(); } } diff --git a/common/src/main/java/org/apache/rocketmq/common/protocol/header/SearchOffsetRequestHeader.java b/common/src/main/java/org/apache/rocketmq/common/protocol/header/SearchOffsetRequestHeader.java index 1fcab60db5..3753e062b7 100644 --- a/common/src/main/java/org/apache/rocketmq/common/protocol/header/SearchOffsetRequestHeader.java +++ b/common/src/main/java/org/apache/rocketmq/common/protocol/header/SearchOffsetRequestHeader.java @@ -20,6 +20,7 @@ */ package org.apache.rocketmq.common.protocol.header; +import com.google.common.base.MoreObjects; import org.apache.rocketmq.common.rpc.TopicQueueRequestHeader; import org.apache.rocketmq.remoting.annotation.CFNotNull; import org.apache.rocketmq.remoting.exception.RemotingCommandException; @@ -67,10 +68,10 @@ public class SearchOffsetRequestHeader extends TopicQueueRequestHeader { @Override public String toString() { - return "SearchOffsetRequestHeader [" + - "topic='" + topic + '\'' + - ", queueId=" + queueId + - ", timestamp=" + timestamp + - ']'; + return MoreObjects.toStringHelper(this) + .add("topic", topic) + .add("queueId", queueId) + .add("timestamp", timestamp) + .toString(); } } diff --git a/common/src/main/java/org/apache/rocketmq/common/protocol/header/SendMessageRequestHeader.java b/common/src/main/java/org/apache/rocketmq/common/protocol/header/SendMessageRequestHeader.java index cc4db84032..abea27e502 100644 --- a/common/src/main/java/org/apache/rocketmq/common/protocol/header/SendMessageRequestHeader.java +++ b/common/src/main/java/org/apache/rocketmq/common/protocol/header/SendMessageRequestHeader.java @@ -20,6 +20,7 @@ */ package org.apache.rocketmq.common.protocol.header; +import com.google.common.base.MoreObjects; import org.apache.rocketmq.common.rpc.TopicQueueRequestHeader; import org.apache.rocketmq.remoting.annotation.CFNotNull; import org.apache.rocketmq.remoting.annotation.CFNullable; @@ -166,20 +167,20 @@ public class SendMessageRequestHeader extends TopicQueueRequestHeader { @Override public String toString() { - return "SendMessageRequestHeader [" + - "producerGroup='" + producerGroup + '\'' + - ", topic='" + topic + '\'' + - ", defaultTopic='" + defaultTopic + '\'' + - ", defaultTopicQueueNums=" + defaultTopicQueueNums + - ", queueId=" + queueId + - ", sysFlag=" + sysFlag + - ", bornTimestamp=" + bornTimestamp + - ", flag=" + flag + - ", properties='" + properties + '\'' + - ", reconsumeTimes=" + reconsumeTimes + - ", unitMode=" + unitMode + - ", batch=" + batch + - ", maxReconsumeTimes=" + maxReconsumeTimes + - ']'; + return MoreObjects.toStringHelper(this) + .add("producerGroup", producerGroup) + .add("topic", topic) + .add("defaultTopic", defaultTopic) + .add("defaultTopicQueueNums", defaultTopicQueueNums) + .add("queueId", queueId) + .add("sysFlag", sysFlag) + .add("bornTimestamp", bornTimestamp) + .add("flag", flag) + .add("properties", properties) + .add("reconsumeTimes", reconsumeTimes) + .add("unitMode", unitMode) + .add("batch", batch) + .add("maxReconsumeTimes", maxReconsumeTimes) + .toString(); } } diff --git a/common/src/main/java/org/apache/rocketmq/common/protocol/header/SendMessageRequestHeaderV2.java b/common/src/main/java/org/apache/rocketmq/common/protocol/header/SendMessageRequestHeaderV2.java index 4e0098b5f0..5c9394e0cc 100644 --- a/common/src/main/java/org/apache/rocketmq/common/protocol/header/SendMessageRequestHeaderV2.java +++ b/common/src/main/java/org/apache/rocketmq/common/protocol/header/SendMessageRequestHeaderV2.java @@ -17,6 +17,7 @@ package org.apache.rocketmq.common.protocol.header; +import com.google.common.base.MoreObjects; import org.apache.rocketmq.remoting.CommandCustomHeader; import org.apache.rocketmq.remoting.annotation.CFNotNull; import org.apache.rocketmq.remoting.annotation.CFNullable; @@ -197,4 +198,23 @@ public class SendMessageRequestHeaderV2 implements CommandCustomHeader { public void setM(boolean m) { this.m = m; } + + @Override + public String toString() { + return MoreObjects.toStringHelper(this) + .add("a", a) + .add("b", b) + .add("c", c) + .add("d", d) + .add("e", e) + .add("f", f) + .add("g", g) + .add("h", h) + .add("i", i) + .add("j", j) + .add("k", k) + .add("l", l) + .add("m", m) + .toString(); + } } \ No newline at end of file diff --git a/common/src/main/java/org/apache/rocketmq/common/protocol/header/UpdateConsumerOffsetRequestHeader.java b/common/src/main/java/org/apache/rocketmq/common/protocol/header/UpdateConsumerOffsetRequestHeader.java index 5b47211e67..77af812184 100644 --- a/common/src/main/java/org/apache/rocketmq/common/protocol/header/UpdateConsumerOffsetRequestHeader.java +++ b/common/src/main/java/org/apache/rocketmq/common/protocol/header/UpdateConsumerOffsetRequestHeader.java @@ -20,6 +20,7 @@ */ package org.apache.rocketmq.common.protocol.header; +import com.google.common.base.MoreObjects; import org.apache.rocketmq.common.rpc.TopicQueueRequestHeader; import org.apache.rocketmq.remoting.annotation.CFNotNull; import org.apache.rocketmq.remoting.exception.RemotingCommandException; @@ -76,11 +77,11 @@ public class UpdateConsumerOffsetRequestHeader extends TopicQueueRequestHeader { @Override public String toString() { - return "UpdateConsumerOffsetRequestHeader [" + - "consumerGroup='" + consumerGroup + '\'' + - ", topic='" + topic + '\'' + - ", queueId=" + queueId + - ", commitOffset=" + commitOffset + - ']'; + return MoreObjects.toStringHelper(this) + .add("consumerGroup", consumerGroup) + .add("topic", topic) + .add("queueId", queueId) + .add("commitOffset", commitOffset) + .toString(); } } diff --git a/proxy/src/main/java/org/apache/rocketmq/proxy/service/route/MessageQueueSelector.java b/proxy/src/main/java/org/apache/rocketmq/proxy/service/route/MessageQueueSelector.java index 4c4ccdc49a..7c2f40a6e0 100644 --- a/proxy/src/main/java/org/apache/rocketmq/proxy/service/route/MessageQueueSelector.java +++ b/proxy/src/main/java/org/apache/rocketmq/proxy/service/route/MessageQueueSelector.java @@ -16,6 +16,7 @@ */ package org.apache.rocketmq.proxy.service.route; +import com.google.common.base.MoreObjects; import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; @@ -192,12 +193,13 @@ public class MessageQueueSelector { return Objects.hash(queues, brokerActingQueues); } - @Override - public String toString() { - return "SelectableMessageQueue{" + "queues=" + queues + - ", brokers=" + brokerActingQueues + - ", queueIndex=" + queueIndex + - ", brokerIndex=" + brokerIndex + - '}'; + @Override public String toString() { + return MoreObjects.toStringHelper(this) + .add("queues", queues) + .add("brokerActingQueues", brokerActingQueues) + .add("brokerNameQueueMap", brokerNameQueueMap) + .add("queueIndex", queueIndex) + .add("brokerIndex", brokerIndex) + .toString(); } } diff --git a/proxy/src/main/java/org/apache/rocketmq/proxy/service/route/SelectableMessageQueue.java b/proxy/src/main/java/org/apache/rocketmq/proxy/service/route/SelectableMessageQueue.java index 88446c7195..85f7434aed 100644 --- a/proxy/src/main/java/org/apache/rocketmq/proxy/service/route/SelectableMessageQueue.java +++ b/proxy/src/main/java/org/apache/rocketmq/proxy/service/route/SelectableMessageQueue.java @@ -16,6 +16,7 @@ */ package org.apache.rocketmq.proxy.service.route; +import com.google.common.base.MoreObjects; import java.util.Objects; import org.apache.rocketmq.common.message.MessageQueue; @@ -72,9 +73,9 @@ public class SelectableMessageQueue implements Comparable