From 2160e23b917824905d12567090da568fbc08a1c7 Mon Sep 17 00:00:00 2001 From: zhangjidi2016 <1017543663@qq.com> Date: Fri, 5 Nov 2021 09:04:59 +0800 Subject: [PATCH] [ISSUE #38]update rocketmq version. (#39) Co-authored-by: zhangjidi2016 --- pom.xml | 2 +- .../service/client/MQAdminExtImpl.java | 22 ++++++++- .../service/impl/TopicServiceImpl.java | 2 +- .../dashboard/admin/MQAdminExtImplTest.java | 48 +++++++++++++++---- 4 files changed, 60 insertions(+), 14 deletions(-) diff --git a/pom.xml b/pom.xml index 2ebb77a..b2a7c52 100644 --- a/pom.xml +++ b/pom.xml @@ -90,7 +90,7 @@ 2.6 2.4 1.2 - 4.9.0 + 4.9.2 2.19.1 1.9.6 1.18.12 diff --git a/src/main/java/org/apache/rocketmq/dashboard/service/client/MQAdminExtImpl.java b/src/main/java/org/apache/rocketmq/dashboard/service/client/MQAdminExtImpl.java index 81e1202..6b99e7a 100644 --- a/src/main/java/org/apache/rocketmq/dashboard/service/client/MQAdminExtImpl.java +++ b/src/main/java/org/apache/rocketmq/dashboard/service/client/MQAdminExtImpl.java @@ -235,6 +235,12 @@ public class MQAdminExtImpl implements MQAdminExt { return MQAdminInstance.threadLocalMQAdminExt().wipeWritePermOfBroker(namesrvAddr, brokerName); } + @Override + public int addWritePermOfBroker(String namesrvAddr, + String brokerName) throws RemotingCommandException, RemotingConnectException, RemotingSendRequestException, RemotingTimeoutException, InterruptedException, MQClientException { + return MQAdminInstance.threadLocalMQAdminExt().addWritePermOfBroker(namesrvAddr, brokerName); + } + @Override public void putKVConfig(String namespace, String key, String value) { MQAdminInstance.threadLocalMQAdminExt().putKVConfig(namespace, key, value); @@ -511,9 +517,21 @@ public class MQAdminExtImpl implements MQAdminExt { } @Override - public TopicConfigSerializeWrapper getAllTopicGroup(String brokerAddr, + public SubscriptionGroupWrapper getUserSubscriptionGroup(String brokerAddr, long timeoutMillis) throws InterruptedException, RemotingTimeoutException, RemotingSendRequestException, RemotingConnectException, MQBrokerException { - return MQAdminInstance.threadLocalMQAdminExt().getAllTopicGroup(brokerAddr, timeoutMillis); + return MQAdminInstance.threadLocalMQAdminExt().getUserSubscriptionGroup(brokerAddr, timeoutMillis); + } + + @Override + public TopicConfigSerializeWrapper getAllTopicConfig(String brokerAddr, + long timeoutMillis) throws InterruptedException, RemotingTimeoutException, RemotingSendRequestException, RemotingConnectException, MQBrokerException { + return MQAdminInstance.threadLocalMQAdminExt().getAllTopicConfig(brokerAddr, timeoutMillis); + } + + @Override + public TopicConfigSerializeWrapper getUserTopicConfig(String brokerAddr, boolean specialTopic, + long timeoutMillis) throws InterruptedException, RemotingException, MQBrokerException, MQClientException { + return MQAdminInstance.threadLocalMQAdminExt().getUserTopicConfig(brokerAddr, specialTopic, timeoutMillis); } @Override diff --git a/src/main/java/org/apache/rocketmq/dashboard/service/impl/TopicServiceImpl.java b/src/main/java/org/apache/rocketmq/dashboard/service/impl/TopicServiceImpl.java index b6197b7..9dfde72 100644 --- a/src/main/java/org/apache/rocketmq/dashboard/service/impl/TopicServiceImpl.java +++ b/src/main/java/org/apache/rocketmq/dashboard/service/impl/TopicServiceImpl.java @@ -135,10 +135,10 @@ public class TopicServiceImpl extends AbstractCommonService implements TopicServ ClusterInfo clusterInfo = null; try { clusterInfo = mqAdminExt.examineBrokerClusterInfo(); + return mqAdminExt.examineTopicConfig(clusterInfo.getBrokerAddrTable().get(brokerName).selectBrokerAddr(), topic); } catch (Exception e) { throw Throwables.propagate(e); } - return mqAdminExt.examineTopicConfig(clusterInfo.getBrokerAddrTable().get(brokerName).selectBrokerAddr(), topic); } @Override diff --git a/src/test/java/org/apache/rocketmq/dashboard/admin/MQAdminExtImplTest.java b/src/test/java/org/apache/rocketmq/dashboard/admin/MQAdminExtImplTest.java index 28a898d..9cafc8f 100644 --- a/src/test/java/org/apache/rocketmq/dashboard/admin/MQAdminExtImplTest.java +++ b/src/test/java/org/apache/rocketmq/dashboard/admin/MQAdminExtImplTest.java @@ -758,16 +758,6 @@ public class MQAdminExtImplTest { Assert.assertNotNull(wrapper); } - @Test - public void testGetAllTopicGroup() throws Exception { - assertNotNull(mqAdminExtImpl); - { - when(defaultMQAdminExt.getAllTopicGroup(anyString(), anyLong())).thenReturn(new TopicConfigSerializeWrapper()); - } - TopicConfigSerializeWrapper wrapper = mqAdminExtImpl.getAllTopicGroup(brokerAddr, 5000L); - Assert.assertNotNull(wrapper); - } - @Test public void testUpdateConsumeOffset() throws Exception { assertNotNull(mqAdminExtImpl); @@ -801,4 +791,42 @@ public class MQAdminExtImplTest { Assert.assertFalse(mqAdminExtImpl.resumeCheckHalfMessage("topic_test", "7F000001ACC018B4AAC2116AF6500000")); } + @Test + public void testAddWritePermOfBroker() throws Exception { + assertNotNull(mqAdminExtImpl); + { + when(defaultMQAdminExt.addWritePermOfBroker(anyString(), anyString())).thenReturn(6); + } + Assert.assertEquals(mqAdminExtImpl.addWritePermOfBroker("127.0.0.1:9876", "broker-a"), 6); + } + + @Test + public void testGetUserSubscriptionGroup() throws Exception { + assertNotNull(mqAdminExtImpl); + SubscriptionGroupWrapper wrapper = new SubscriptionGroupWrapper(); + { + when(defaultMQAdminExt.getUserSubscriptionGroup(anyString(), anyLong())).thenReturn(wrapper); + } + Assert.assertEquals(mqAdminExtImpl.getUserSubscriptionGroup("127.0.0.1:10911", 3000), wrapper); + } + + @Test + public void testGetAllTopicConfig() throws Exception { + assertNotNull(mqAdminExtImpl); + TopicConfigSerializeWrapper wrapper = new TopicConfigSerializeWrapper(); + { + when(defaultMQAdminExt.getAllTopicConfig(anyString(), anyLong())).thenReturn(wrapper); + } + Assert.assertEquals(mqAdminExtImpl.getAllTopicConfig("127.0.0.1:10911", 3000), wrapper); + } + + @Test + public void testGetUserTopicConfig() throws Exception { + assertNotNull(mqAdminExtImpl); + TopicConfigSerializeWrapper wrapper = new TopicConfigSerializeWrapper(); + { + when(defaultMQAdminExt.getUserTopicConfig(anyString(), anyBoolean(), anyLong())).thenReturn(wrapper); + } + Assert.assertEquals(mqAdminExtImpl.getUserTopicConfig("127.0.0.1:10911", true, 3000), wrapper); + } }