[rocketmq-dashboard] branch master updated: [ISSUE #42]Fix deleteSubscriptionGroup not remove consumer offset. (#45)

[styletang]

This is an automated email from the ASF dual-hosted git repository.

styletang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/rocketmq-dashboard.git


The following commit(s) were added to refs/heads/master by this push:
     new e660c7d  [ISSUE #42]Fix deleteSubscriptionGroup not remove consumer 
offset. (#45)
e660c7d is described below

commit e660c7d874b544108d2223bc6ea10a156edf7a77
Author: zhangjidi2016 <1017543...@qq.com>
AuthorDate: Wed Nov 17 13:30:12 2021 +0800

    [ISSUE #42]Fix deleteSubscriptionGroup not remove consumer offset. (#45)
    
    Co-authored-by: zhangjidi2016 <zhangj...@cmss.chinamobile.com>
---
 .../org/apache/rocketmq/dashboard/service/client/MQAdminExtImpl.java | 5 +++--
 .../apache/rocketmq/dashboard/service/impl/ConsumerServiceImpl.java  | 2 +-
 .../java/org/apache/rocketmq/dashboard/admin/MQAdminExtImplTest.java | 2 ++
 3 files changed, 6 insertions(+), 3 deletions(-)

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 6b99e7a..5b76f99 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
@@ -278,8 +278,9 @@ public class MQAdminExtImpl implements MQAdminExt {
     }
 
     @Override
-    public void deleteSubscriptionGroup(String addr, String groupName, boolean 
removeOffset) throws RemotingException, MQBrokerException, 
InterruptedException, MQClientException {
-        throw new UnsupportedOperationException();
+    public void deleteSubscriptionGroup(String addr, String groupName, boolean 
removeOffset)
+        throws RemotingException, MQBrokerException, InterruptedException, 
MQClientException {
+        MQAdminInstance.threadLocalMQAdminExt().deleteSubscriptionGroup(addr, 
groupName, removeOffset);
     }
 
     @Override
diff --git 
a/src/main/java/org/apache/rocketmq/dashboard/service/impl/ConsumerServiceImpl.java
 
b/src/main/java/org/apache/rocketmq/dashboard/service/impl/ConsumerServiceImpl.java
index 4e6c637..2d60501 100644
--- 
a/src/main/java/org/apache/rocketmq/dashboard/service/impl/ConsumerServiceImpl.java
+++ 
b/src/main/java/org/apache/rocketmq/dashboard/service/impl/ConsumerServiceImpl.java
@@ -294,7 +294,7 @@ public class ConsumerServiceImpl extends 
AbstractCommonService implements Consum
             ClusterInfo clusterInfo = mqAdminExt.examineBrokerClusterInfo();
             for (String brokerName : 
deleteSubGroupRequest.getBrokerNameList()) {
                 logger.info("addr={} groupName={}", 
clusterInfo.getBrokerAddrTable().get(brokerName).selectBrokerAddr(), 
deleteSubGroupRequest.getGroupName());
-                
mqAdminExt.deleteSubscriptionGroup(clusterInfo.getBrokerAddrTable().get(brokerName).selectBrokerAddr(),
 deleteSubGroupRequest.getGroupName());
+                
mqAdminExt.deleteSubscriptionGroup(clusterInfo.getBrokerAddrTable().get(brokerName).selectBrokerAddr(),
 deleteSubGroupRequest.getGroupName(), true);
             }
         }
         catch (Exception e) {
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 9cafc8f..1b6a33b 100644
--- a/src/test/java/org/apache/rocketmq/dashboard/admin/MQAdminExtImplTest.java
+++ b/src/test/java/org/apache/rocketmq/dashboard/admin/MQAdminExtImplTest.java
@@ -418,8 +418,10 @@ public class MQAdminExtImplTest {
         assertNotNull(mqAdminExtImpl);
         {
             
doNothing().when(defaultMQAdminExt).deleteSubscriptionGroup(anyString(), 
anyString());
+            
doNothing().when(defaultMQAdminExt).deleteSubscriptionGroup(anyString(), 
anyString(), anyBoolean());
         }
         mqAdminExtImpl.deleteSubscriptionGroup(brokerAddr, "group_test");
+        mqAdminExtImpl.deleteSubscriptionGroup(brokerAddr, "group_test", true);
     }
 
     @Test