[ISSUE #3949] v2 support

This commit is contained in:
kaiyi.lk
2022-07-13 11:29:27 +08:00
committed by zhouxiang
parent 30aa97317b
commit afcade74cf
20 changed files with 206 additions and 5 deletions
@@ -80,6 +80,12 @@ public class AckMessageRequestHeader implements CommandCustomHeader {
@Override
public String toString() {
return topic + "," + this.consumerGroup + "," + this.queueId + "," + this.offset + "," + this.extraInfo;
return "AckMessageRequestHeader{" +
"consumerGroup='" + consumerGroup + '\'' +
", topic='" + topic + '\'' +
", queueId=" + queueId +
", extraInfo='" + extraInfo + '\'' +
", offset=" + offset +
'}';
}
}
@@ -96,13 +96,13 @@ public class ChangeInvisibleTimeRequestHeader implements CommandCustomHeader {
@Override
public String toString() {
return "ChangeInvisibleTimeRequestHeader [" +
return "ChangeInvisibleTimeRequestHeader{" +
"consumerGroup='" + consumerGroup + '\'' +
", topic='" + topic + '\'' +
", queueId=" + queueId +
", extraInfo='" + extraInfo + '\'' +
", offset=" + offset +
", invisibleTime=" + invisibleTime +
']';
'}';
}
}
@@ -76,4 +76,15 @@ public class CheckTransactionStateRequestHeader implements CommandCustomHeader {
public void setOffsetMsgId(String offsetMsgId) {
this.offsetMsgId = offsetMsgId;
}
@Override
public String toString() {
return "CheckTransactionStateRequestHeader{" +
"tranStateTableOffset=" + tranStateTableOffset +
", commitLogOffset=" + commitLogOffset +
", msgId='" + msgId + '\'' +
", transactionId='" + transactionId + '\'' +
", offsetMsgId='" + offsetMsgId + '\'' +
'}';
}
}
@@ -68,4 +68,14 @@ public class CloneGroupOffsetRequestHeader implements CommandCustomHeader {
public void setOffline(boolean offline) {
this.offline = offline;
}
@Override
public String toString() {
return "CloneGroupOffsetRequestHeader{" +
"srcGroup='" + srcGroup + '\'' +
", destGroup='" + destGroup + '\'' +
", topic='" + topic + '\'' +
", offline=" + offline +
'}';
}
}
@@ -97,4 +97,17 @@ public class ConsumeMessageDirectlyResultRequestHeader implements CommandCustomH
public void setGroupSysFlag(Integer groupSysFlag) {
this.groupSysFlag = groupSysFlag;
}
@Override
public String toString() {
return "ConsumeMessageDirectlyResultRequestHeader{" +
"consumerGroup='" + consumerGroup + '\'' +
", clientId='" + clientId + '\'' +
", msgId='" + msgId + '\'' +
", brokerName='" + brokerName + '\'' +
", topic='" + topic + '\'' +
", topicSysFlag=" + topicSysFlag +
", groupSysFlag=" + groupSysFlag +
'}';
}
}
@@ -98,7 +98,14 @@ public class ConsumerSendMsgBackRequestHeader implements CommandCustomHeader {
@Override
public String toString() {
return "ConsumerSendMsgBackRequestHeader [group=" + group + ", originTopic=" + originTopic + ", originMsgId=" + originMsgId
+ ", delayLevel=" + delayLevel + ", unitMode=" + unitMode + ", maxReconsumeTimes=" + maxReconsumeTimes + "]";
return "ConsumerSendMsgBackRequestHeader{" +
"offset=" + offset +
", group='" + group + '\'' +
", delayLevel=" + delayLevel +
", originMsgId='" + originMsgId + '\'' +
", originTopic='" + originTopic + '\'' +
", unitMode=" + unitMode +
", maxReconsumeTimes=" + maxReconsumeTimes +
'}';
}
}
@@ -110,4 +110,18 @@ public class CreateAccessConfigRequestHeader implements CommandCustomHeader {
public void setGroupPerms(String groupPerms) {
this.groupPerms = groupPerms;
}
@Override
public String toString() {
return "CreateAccessConfigRequestHeader{" +
"accessKey='" + accessKey + '\'' +
", secretKey='" + secretKey + '\'' +
", whiteRemoteAddress='" + whiteRemoteAddress + '\'' +
", admin=" + admin +
", defaultTopicPerm='" + defaultTopicPerm + '\'' +
", defaultGroupPerm='" + defaultGroupPerm + '\'' +
", topicPerms='" + topicPerms + '\'' +
", groupPerms='" + groupPerms + '\'' +
'}';
}
}
@@ -139,4 +139,20 @@ public class CreateTopicRequestHeader implements CommandCustomHeader {
public void setAttributes(String attributes) {
this.attributes = attributes;
}
@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 +
'}';
}
}
@@ -44,4 +44,12 @@ public class GetConsumeStatsRequestHeader implements CommandCustomHeader {
public void setTopic(String topic) {
this.topic = topic;
}
@Override
public String toString() {
return "GetConsumeStatsRequestHeader{" +
"consumerGroup='" + consumerGroup + '\'' +
", topic='" + topic + '\'' +
'}';
}
}
@@ -36,4 +36,11 @@ public class GetConsumerListByGroupRequestHeader implements CommandCustomHeader
public void setConsumerGroup(String consumerGroup) {
this.consumerGroup = consumerGroup;
}
@Override
public String toString() {
return "GetConsumerListByGroupRequestHeader [" +
"consumerGroup='" + consumerGroup + '\'' +
']';
}
}
@@ -57,4 +57,13 @@ public class GetConsumerRunningInfoRequestHeader implements CommandCustomHeader
public void setJstackEnable(boolean jstackEnable) {
this.jstackEnable = jstackEnable;
}
@Override
public String toString() {
return "GetConsumerRunningInfoRequestHeader{" +
"consumerGroup='" + consumerGroup + '\'' +
", clientId='" + clientId + '\'' +
", jstackEnable=" + jstackEnable +
'}';
}
}
@@ -57,4 +57,13 @@ public class GetConsumerStatusRequestHeader implements CommandCustomHeader {
public void setClientAddr(String clientAddr) {
this.clientAddr = clientAddr;
}
@Override
public String toString() {
return "GetConsumerStatusRequestHeader{" +
"topic='" + topic + '\'' +
", group='" + group + '\'' +
", clientAddr='" + clientAddr + '\'' +
'}';
}
}
@@ -71,4 +71,13 @@ public class GetMaxOffsetRequestHeader extends TopicQueueRequestHeader {
public void setCommitted(final boolean committed) {
this.committed = committed;
}
@Override
public String toString() {
return "GetMaxOffsetRequestHeader [" +
"topic='" + topic + '\'' +
", queueId=" + queueId +
", committed=" + committed +
']';
}
}
@@ -53,4 +53,12 @@ public class GetMinOffsetRequestHeader extends TopicQueueRequestHeader {
public void setQueueId(Integer queueId) {
this.queueId = queueId;
}
@Override
public String toString() {
return "GetMinOffsetRequestHeader [" +
"topic='" + topic + '\'' +
", queueId=" + queueId +
']';
}
}
@@ -152,4 +152,21 @@ public class PopMessageRequestHeader implements CommandCustomHeader {
public boolean isOrder() {
return this.order != null && this.order.booleanValue();
}
@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 +
']';
}
}
@@ -154,4 +154,22 @@ public class PullMessageRequestHeader extends TopicQueueRequestHeader {
public void setMaxMsgBytes(Integer maxMsgBytes) {
this.maxMsgBytes = maxMsgBytes;
}
@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 + '\'' +
']';
}
}
@@ -65,4 +65,12 @@ public class SearchOffsetRequestHeader extends TopicQueueRequestHeader {
this.timestamp = timestamp;
}
@Override
public String toString() {
return "SearchOffsetRequestHeader [" +
"topic='" + topic + '\'' +
", queueId=" + queueId +
", timestamp=" + timestamp +
']';
}
}
@@ -163,4 +163,23 @@ public class SendMessageRequestHeader extends TopicQueueRequestHeader {
public void setBatch(boolean batch) {
this.batch = batch;
}
@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 +
']';
}
}
@@ -73,4 +73,14 @@ public class UpdateConsumerOffsetRequestHeader extends TopicQueueRequestHeader {
public void setCommitOffset(Long commitOffset) {
this.commitOffset = commitOffset;
}
@Override
public String toString() {
return "UpdateConsumerOffsetRequestHeader [" +
"consumerGroup='" + consumerGroup + '\'' +
", topic='" + topic + '\'' +
", queueId=" + queueId +
", commitOffset=" + commitOffset +
']';
}
}
@@ -29,6 +29,8 @@ public class ForwardClientManagerTest extends InitConfigAndLoggerTest {
@Test
public void testConnectorManager() throws Exception {
ConfigurationManager.getProxyConfig().setNameSrvAddr("127.0.0.1:9876");
TransactionStateChecker mockedTransactionStateChecker = Mockito.mock(TransactionStateChecker.class);
ConnectorManager connectorManager = new ConnectorManager(mockedTransactionStateChecker);
connectorManager.start();