[ISSUE #123]Optimize groupList.query

.gitignore

@@ -5,4 +5,3 @@
 .project
 .factorypath
 .settings/
-.vscode

frontend/yarn.lock

@@ -3587,11 +3587,11 @@ create-hmac@^1.1.0, create-hmac@^1.1.4, create-hmac@^1.1.7:
     sha.js "^2.4.8"
 
 cross-fetch@^3.0.4:
-  version "3.1.5"
+  version "3.1.4"
-  resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.5.tgz#e1389f44d9e7ba767907f7af8454787952ab534f"
+  resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.4.tgz#9723f3a3a247bf8b89039f3a380a9244e8fa2f39"
-  integrity sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==
+  integrity sha512-1eAtFWdIubi6T4XPy6ei9iUFoKpUkIF971QLN8lIvvvwueI65+Nw5haMNKUwfJxabqlIIDODJKGrQ66gxC0PbQ==
   dependencies:
-    node-fetch "2.6.7"
+    node-fetch "2.6.1"
 
 cross-spawn@7.0.3, cross-spawn@^7.0.0, cross-spawn@^7.0.2:
   version "7.0.3"
@@ -7440,12 +7440,10 @@ no-case@^3.0.4:
     lower-case "^2.0.2"
     tslib "^2.0.3"
 
-node-fetch@2.6.7:
+node-fetch@2.6.1:
-  version "2.6.7"
+  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052"
-  integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==
+  integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==
-  dependencies:
-    whatwg-url "^5.0.0"
 
 node-forge@^0.10.0:
   version "0.10.0"
@@ -10671,11 +10669,6 @@ tr46@^2.0.2:
   dependencies:
     punycode "^2.1.1"
 
-tr46@~0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
-  integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=
-
 tryer@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/tryer/-/tryer-1.0.1.tgz#f2c85406800b9b0f74c9f7465b81eaad241252f8"
@@ -11121,11 +11114,6 @@ web-vitals@^1.0.1:
   resolved "https://registry.yarnpkg.com/web-vitals/-/web-vitals-1.1.2.tgz#06535308168986096239aa84716e68b4c6ae6d1c"
   integrity sha512-PFMKIY+bRSXlMxVAQ+m2aw9c/ioUYfDgrYot0YUa+/xa0sakubWhSDyxAKwzymvXVdF4CZI71g06W+mqhzu6ig==
 
-webidl-conversions@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
-  integrity sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=
-
 webidl-conversions@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-5.0.0.tgz#ae59c8a00b121543a2acc65c0434f57b0fc11aff"
@@ -11272,14 +11260,6 @@ whatwg-mimetype@^2.3.0:
   resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf"
   integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==
 
-whatwg-url@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"
-  integrity sha1-lmRU6HZUYuN2RNNib2dCzotwll0=
-  dependencies:
-    tr46 "~0.0.3"
-    webidl-conversions "^3.0.0"
-
 whatwg-url@^8.0.0:
   version "8.4.0"
   resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.4.0.tgz#50fb9615b05469591d2b2bd6dfaed2942ed72837"

pom.xml

@@ -91,10 +91,10 @@
         <commons-io.version>2.4</commons-io.version>
         <commons-cli.version>1.2</commons-cli.version>
         <commons-collections.version>3.2.2</commons-collections.version>
-        <rocketmq.version>5.1.0</rocketmq.version>
+        <rocketmq.version>4.9.3</rocketmq.version>
         <surefire.version>2.19.1</surefire.version>
         <aspectj.version>1.9.6</aspectj.version>
-        <lombok.version>1.18.22</lombok.version>
+        <lombok.version>1.18.12</lombok.version>
         <main.basedir>${basedir}/../..</main.basedir>
         <docker.image.prefix>apacherocketmq</docker.image.prefix>
         <spring.boot.version>2.6.0</spring.boot.version>

src/main/java/org/apache/rocketmq/dashboard/admin/MQAdminPooledObjectFactory.java

@@ -21,7 +21,7 @@ import org.apache.commons.collections.MapUtils;
 import org.apache.commons.pool2.PooledObject;
 import org.apache.commons.pool2.PooledObjectFactory;
 import org.apache.commons.pool2.impl.DefaultPooledObject;
-import org.apache.rocketmq.remoting.protocol.body.ClusterInfo;
+import org.apache.rocketmq.common.protocol.body.ClusterInfo;
 import org.apache.rocketmq.tools.admin.MQAdminExt;
 
 @Slf4j

src/main/java/org/apache/rocketmq/dashboard/controller/ConsumerController.java

@@ -19,7 +19,7 @@ package org.apache.rocketmq.dashboard.controller;
 import com.google.common.base.Preconditions;
 import javax.annotation.Resource;
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.rocketmq.remoting.protocol.body.ConsumerConnection;
+import org.apache.rocketmq.common.protocol.body.ConsumerConnection;
 import org.apache.rocketmq.dashboard.model.ConnectionInfo;
 import org.apache.rocketmq.dashboard.model.request.ConsumerConfigInfo;
 import org.apache.rocketmq.dashboard.model.request.DeleteSubGroupRequest;

src/main/java/org/apache/rocketmq/dashboard/controller/MessageController.java

@@ -18,7 +18,7 @@ package org.apache.rocketmq.dashboard.controller;
 
 import com.google.common.collect.Maps;
 import org.apache.rocketmq.common.Pair;
-import org.apache.rocketmq.remoting.protocol.body.ConsumeMessageDirectlyResult;
+import org.apache.rocketmq.common.protocol.body.ConsumeMessageDirectlyResult;
 import org.apache.rocketmq.dashboard.model.MessagePage;
 import org.apache.rocketmq.dashboard.model.MessageView;
 import org.apache.rocketmq.dashboard.model.request.MessageQuery;

src/main/java/org/apache/rocketmq/dashboard/controller/ProducerController.java

@@ -17,7 +17,7 @@
 package org.apache.rocketmq.dashboard.controller;
 
 import javax.annotation.Resource;
-import org.apache.rocketmq.remoting.protocol.body.ProducerConnection;
+import org.apache.rocketmq.common.protocol.body.ProducerConnection;
 import org.apache.rocketmq.dashboard.model.ConnectionInfo;
 import org.apache.rocketmq.dashboard.permisssion.Permission;
 import org.apache.rocketmq.dashboard.service.ProducerService;

src/main/java/org/apache/rocketmq/dashboard/model/ConnectionInfo.java

@@ -20,7 +20,7 @@ import com.google.common.collect.Sets;
 import java.util.Collection;
 import java.util.HashSet;
 import org.apache.rocketmq.common.MQVersion;
-import org.apache.rocketmq.remoting.protocol.body.Connection;
+import org.apache.rocketmq.common.protocol.body.Connection;
 
 public class ConnectionInfo extends Connection {
     private String versionDesc;

src/main/java/org/apache/rocketmq/dashboard/model/ConsumerGroupRollBackStat.java

@@ -16,7 +16,7 @@
  */
 package org.apache.rocketmq.dashboard.model;
 
-import org.apache.rocketmq.remoting.protocol.admin.RollbackStats;
+import org.apache.rocketmq.common.admin.RollbackStats;
 import com.google.common.collect.Lists;
 
 import java.util.List;

src/main/java/org/apache/rocketmq/dashboard/model/DlqMessageResendResult.java

@@ -17,8 +17,8 @@
 package org.apache.rocketmq.dashboard.model;
 
 import lombok.Data;
-import org.apache.rocketmq.remoting.protocol.body.CMResult;
+import org.apache.rocketmq.common.protocol.body.CMResult;
-import org.apache.rocketmq.remoting.protocol.body.ConsumeMessageDirectlyResult;
+import org.apache.rocketmq.common.protocol.body.ConsumeMessageDirectlyResult;
 
 @Data
 public class DlqMessageResendResult {

src/main/java/org/apache/rocketmq/dashboard/model/GroupConsumeInfo.java

@@ -16,8 +16,8 @@
  */
 package org.apache.rocketmq.dashboard.model;
 
-import org.apache.rocketmq.remoting.protocol.heartbeat.ConsumeType;
+import org.apache.rocketmq.common.protocol.heartbeat.ConsumeType;
-import org.apache.rocketmq.remoting.protocol.heartbeat.MessageModel;
+import org.apache.rocketmq.common.protocol.heartbeat.MessageModel;
 
 public class GroupConsumeInfo implements Comparable<GroupConsumeInfo> {
     private String group;

src/main/java/org/apache/rocketmq/dashboard/model/QueueStatInfo.java

@@ -16,7 +16,7 @@
  */
 package org.apache.rocketmq.dashboard.model;
 
-import org.apache.rocketmq.remoting.protocol.admin.OffsetWrapper;
+import org.apache.rocketmq.common.admin.OffsetWrapper;
 import org.apache.rocketmq.common.message.MessageQueue;
 import org.springframework.beans.BeanUtils;
 

src/main/java/org/apache/rocketmq/dashboard/model/request/ConsumerConfigInfo.java

@@ -16,7 +16,7 @@
  */
 package org.apache.rocketmq.dashboard.model.request;
 
-import org.apache.rocketmq.remoting.protocol.subscription.SubscriptionGroupConfig;
+import org.apache.rocketmq.common.subscription.SubscriptionGroupConfig;
 
 import java.util.List;
 

src/main/java/org/apache/rocketmq/dashboard/model/request/TopicConfigInfo.java

@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 package org.apache.rocketmq.dashboard.model.request;
+
 import com.google.common.base.Objects;
 
 import java.util.List;

src/main/java/org/apache/rocketmq/dashboard/service/AbstractCommonService.java

@@ -19,8 +19,8 @@ package org.apache.rocketmq.dashboard.service;
 import org.apache.rocketmq.tools.admin.MQAdminExt;
 import com.google.common.base.Throwables;
 import com.google.common.collect.Sets;
+import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 import javax.annotation.Resource;
 import org.apache.commons.collections.CollectionUtils;
@@ -28,7 +28,7 @@ import org.apache.commons.collections.CollectionUtils;
 public abstract class AbstractCommonService {
     @Resource
     protected MQAdminExt mqAdminExt;
-    protected final Set<String> changeToBrokerNameSet(Map<String, Set<String>> clusterAddrTable,
+    protected final Set<String> changeToBrokerNameSet(HashMap<String, Set<String>> clusterAddrTable,
         List<String> clusterNameList, List<String> brokerNameList) {
         Set<String> finalBrokerNameList = Sets.newHashSet();
         if (CollectionUtils.isNotEmpty(clusterNameList)) {
@@ -38,8 +38,7 @@ public abstract class AbstractCommonService {
                 }
             }
             catch (Exception e) {
-                Throwables.throwIfUnchecked(e);
+                throw Throwables.propagate(e);
-                throw new RuntimeException(e);
             }
         }
         if (CollectionUtils.isNotEmpty(brokerNameList)) {

src/main/java/org/apache/rocketmq/dashboard/service/ConsumerService.java

@@ -17,8 +17,8 @@
 
 package org.apache.rocketmq.dashboard.service;
 
-import org.apache.rocketmq.remoting.protocol.body.ConsumerConnection;
+import org.apache.rocketmq.common.protocol.body.ConsumerConnection;
-import org.apache.rocketmq.remoting.protocol.body.ConsumerRunningInfo;
+import org.apache.rocketmq.common.protocol.body.ConsumerRunningInfo;
 import org.apache.rocketmq.dashboard.model.ConsumerGroupRollBackStat;
 import org.apache.rocketmq.dashboard.model.GroupConsumeInfo;
 import org.apache.rocketmq.dashboard.model.TopicConsumerInfo;

src/main/java/org/apache/rocketmq/dashboard/service/MessageService.java

@@ -19,7 +19,7 @@ package org.apache.rocketmq.dashboard.service;
 
 import org.apache.rocketmq.common.Pair;
 import org.apache.rocketmq.common.message.MessageExt;
-import org.apache.rocketmq.remoting.protocol.body.ConsumeMessageDirectlyResult;
+import org.apache.rocketmq.common.protocol.body.ConsumeMessageDirectlyResult;
 import org.apache.rocketmq.dashboard.model.MessagePage;
 import org.apache.rocketmq.dashboard.model.request.MessageQuery;
 import org.apache.rocketmq.tools.admin.api.MessageTrack;

src/main/java/org/apache/rocketmq/dashboard/service/ProducerService.java

@@ -17,7 +17,7 @@
 
 package org.apache.rocketmq.dashboard.service;
 
-import org.apache.rocketmq.remoting.protocol.body.ProducerConnection;
+import org.apache.rocketmq.common.protocol.body.ProducerConnection;
 
 public interface ProducerService {
     ProducerConnection getProducerConnection(String producerGroup, String topic);

src/main/java/org/apache/rocketmq/dashboard/service/TopicService.java

@@ -19,10 +19,10 @@ package org.apache.rocketmq.dashboard.service;
 
 import org.apache.rocketmq.client.producer.SendResult;
 import org.apache.rocketmq.common.TopicConfig;
-import org.apache.rocketmq.remoting.protocol.admin.TopicStatsTable;
+import org.apache.rocketmq.common.admin.TopicStatsTable;
-import org.apache.rocketmq.remoting.protocol.body.GroupList;
+import org.apache.rocketmq.common.protocol.body.GroupList;
-import org.apache.rocketmq.remoting.protocol.body.TopicList;
+import org.apache.rocketmq.common.protocol.body.TopicList;
-import org.apache.rocketmq.remoting.protocol.route.TopicRouteData;
+import org.apache.rocketmq.common.protocol.route.TopicRouteData;
 import org.apache.rocketmq.dashboard.model.request.SendTopicMessageRequest;
 import org.apache.rocketmq.dashboard.model.request.TopicConfigInfo;
 

src/main/java/org/apache/rocketmq/dashboard/service/client/MQAdminExtImpl.java

@@ -29,41 +29,31 @@ import org.apache.rocketmq.client.impl.MQAdminImpl;
 import org.apache.rocketmq.common.AclConfig;
 import org.apache.rocketmq.common.PlainAccessConfig;
 import org.apache.rocketmq.common.TopicConfig;
-import org.apache.rocketmq.remoting.protocol.admin.ConsumeStats;
+import org.apache.rocketmq.common.admin.ConsumeStats;
-import org.apache.rocketmq.remoting.protocol.admin.RollbackStats;
+import org.apache.rocketmq.common.admin.RollbackStats;
-import org.apache.rocketmq.remoting.protocol.admin.TopicStatsTable;
+import org.apache.rocketmq.common.admin.TopicStatsTable;
 import org.apache.rocketmq.common.message.MessageClientIDSetter;
 import org.apache.rocketmq.common.message.MessageExt;
 import org.apache.rocketmq.common.message.MessageQueue;
-import org.apache.rocketmq.common.message.MessageRequestMode;
+import org.apache.rocketmq.common.protocol.RequestCode;
-import org.apache.rocketmq.remoting.protocol.RequestCode;
+import org.apache.rocketmq.common.protocol.ResponseCode;
-import org.apache.rocketmq.remoting.protocol.ResponseCode;
+import org.apache.rocketmq.common.protocol.body.BrokerStatsData;
-import org.apache.rocketmq.remoting.protocol.body.BrokerReplicasInfo;
+import org.apache.rocketmq.common.protocol.body.ClusterAclVersionInfo;
-import org.apache.rocketmq.remoting.protocol.body.BrokerStatsData;
+import org.apache.rocketmq.common.protocol.body.ClusterInfo;
-import org.apache.rocketmq.remoting.protocol.body.ClusterAclVersionInfo;
+import org.apache.rocketmq.common.protocol.body.ConsumeMessageDirectlyResult;
-import org.apache.rocketmq.remoting.protocol.body.ClusterInfo;
+import org.apache.rocketmq.common.protocol.body.ConsumeStatsList;
-import org.apache.rocketmq.remoting.protocol.body.ConsumeMessageDirectlyResult;
+import org.apache.rocketmq.common.protocol.body.ConsumerConnection;
-import org.apache.rocketmq.remoting.protocol.body.ConsumeStatsList;
+import org.apache.rocketmq.common.protocol.body.ConsumerRunningInfo;
-import org.apache.rocketmq.remoting.protocol.body.ConsumerConnection;
+import org.apache.rocketmq.common.protocol.body.GroupList;
-import org.apache.rocketmq.remoting.protocol.body.ConsumerRunningInfo;
+import org.apache.rocketmq.common.protocol.body.KVTable;
-import org.apache.rocketmq.remoting.protocol.body.EpochEntryCache;
+import org.apache.rocketmq.common.protocol.body.ProducerConnection;
-import org.apache.rocketmq.remoting.protocol.body.GroupList;
+import org.apache.rocketmq.common.protocol.body.QueryConsumeQueueResponseBody;
-import org.apache.rocketmq.remoting.protocol.body.HARuntimeInfo;
+import org.apache.rocketmq.common.protocol.body.QueueTimeSpan;
-import org.apache.rocketmq.remoting.protocol.body.KVTable;
+import org.apache.rocketmq.common.protocol.body.SubscriptionGroupWrapper;
-import org.apache.rocketmq.remoting.protocol.body.ProducerConnection;
+import org.apache.rocketmq.common.protocol.body.TopicConfigSerializeWrapper;
-import org.apache.rocketmq.remoting.protocol.body.ProducerTableInfo;
+import org.apache.rocketmq.common.protocol.body.TopicList;
-import org.apache.rocketmq.remoting.protocol.body.QueryConsumeQueueResponseBody;
+import org.apache.rocketmq.common.protocol.route.TopicRouteData;
-import org.apache.rocketmq.remoting.protocol.body.QueueTimeSpan;
+import org.apache.rocketmq.common.subscription.SubscriptionGroupConfig;
-import org.apache.rocketmq.remoting.protocol.body.SubscriptionGroupWrapper;
-import org.apache.rocketmq.remoting.protocol.body.TopicConfigSerializeWrapper;
-import org.apache.rocketmq.remoting.protocol.body.TopicList;
-import org.apache.rocketmq.remoting.protocol.header.controller.ElectMasterResponseHeader;
-import org.apache.rocketmq.remoting.protocol.header.controller.GetMetaDataResponseHeader;
-import org.apache.rocketmq.remoting.protocol.heartbeat.SubscriptionData;
-import org.apache.rocketmq.remoting.protocol.route.TopicRouteData;
-import org.apache.rocketmq.remoting.protocol.statictopic.TopicQueueMappingDetail;
-import org.apache.rocketmq.remoting.protocol.subscription.GroupForbidden;
-import org.apache.rocketmq.remoting.protocol.subscription.SubscriptionGroupConfig;
 import org.apache.rocketmq.dashboard.util.JsonUtil;
 import org.apache.rocketmq.remoting.RemotingClient;
 import org.apache.rocketmq.remoting.exception.RemotingCommandException;
@@ -73,9 +63,7 @@ import org.apache.rocketmq.remoting.exception.RemotingSendRequestException;
 import org.apache.rocketmq.remoting.exception.RemotingTimeoutException;
 import org.apache.rocketmq.remoting.protocol.RemotingCommand;
 import org.apache.rocketmq.tools.admin.MQAdminExt;
-import org.apache.rocketmq.tools.admin.api.BrokerOperatorResult;
 import org.apache.rocketmq.tools.admin.api.MessageTrack;
-import org.apache.rocketmq.tools.admin.common.AdminToolResult;
 import org.joor.Reflect;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -93,7 +81,7 @@ public class MQAdminExtImpl implements MQAdminExt {
     @Override
     public void updateBrokerConfig(String brokerAddr, Properties properties)
         throws RemotingConnectException, RemotingSendRequestException, RemotingTimeoutException,
-        UnsupportedEncodingException, InterruptedException, MQBrokerException, MQClientException {
+        UnsupportedEncodingException, InterruptedException, MQBrokerException {
         MQAdminInstance.threadLocalMQAdminExt().updateBrokerConfig(brokerAddr, properties);
     }
 
@@ -140,7 +128,7 @@ public class MQAdminExtImpl implements MQAdminExt {
     }
 
     @Override
-    public SubscriptionGroupConfig examineSubscriptionGroupConfig(String addr, String group) throws MQBrokerException {
+    public SubscriptionGroupConfig examineSubscriptionGroupConfig(String addr, String group) {
         RemotingClient remotingClient = MQAdminInstance.threadLocalRemotingClient();
         RemotingCommand request = RemotingCommand.createRequestCommand(RequestCode.GET_ALL_SUBSCRIPTIONGROUP_CONFIG, null);
         RemotingCommand response = null;
@@ -148,8 +136,7 @@ public class MQAdminExtImpl implements MQAdminExt {
             response = remotingClient.invokeSync(addr, request, 3000);
         }
         catch (Exception err) {
-            Throwables.throwIfUnchecked(err);
+            throw Throwables.propagate(err);
-            throw new RuntimeException(err);
         }
         assert response != null;
         switch (response.getCode()) {
@@ -158,12 +145,12 @@ public class MQAdminExtImpl implements MQAdminExt {
                 return subscriptionGroupWrapper.getSubscriptionGroupTable().get(group);
             }
             default:
-                throw new MQBrokerException(response.getCode(), response.getRemark());
+                throw Throwables.propagate(new MQBrokerException(response.getCode(), response.getRemark()));
         }
     }
 
     @Override
-    public TopicConfig examineTopicConfig(String addr, String topic) throws MQBrokerException {
+    public TopicConfig examineTopicConfig(String addr, String topic) {
         RemotingClient remotingClient = MQAdminInstance.threadLocalRemotingClient();
         RemotingCommand request = RemotingCommand.createRequestCommand(RequestCode.GET_ALL_TOPIC_CONFIG, null);
         RemotingCommand response = null;
@@ -171,8 +158,7 @@ public class MQAdminExtImpl implements MQAdminExt {
             response = remotingClient.invokeSync(addr, request, 3000);
         }
         catch (Exception err) {
-            Throwables.throwIfUnchecked(err);
+            throw Throwables.propagate(err);
-            throw new RuntimeException(err);
         }
         switch (response.getCode()) {
             case ResponseCode.SUCCESS: {
@@ -180,7 +166,7 @@ public class MQAdminExtImpl implements MQAdminExt {
                 return topicConfigSerializeWrapper.getTopicConfigTable().get(topic);
             }
             default:
-                throw new MQBrokerException(response.getCode(), response.getRemark());
+                throw Throwables.propagate(new MQBrokerException(response.getCode(), response.getRemark()));
         }
     }
 
@@ -390,14 +376,14 @@ public class MQAdminExtImpl implements MQAdminExt {
     }
 
     @Override
-    public void createTopic(String key, String newTopic, int queueNum, Map<String, String> attributes) throws MQClientException {
+    public void createTopic(String key, String newTopic, int queueNum) throws MQClientException {
-        MQAdminInstance.threadLocalMQAdminExt().createTopic(key, newTopic, queueNum, attributes);
+        MQAdminInstance.threadLocalMQAdminExt().createTopic(key, newTopic, queueNum);
     }
 
     @Override
-    public void createTopic(String key, String newTopic, int queueNum, int topicSysFlag, Map<String, String> attributes)
+    public void createTopic(String key, String newTopic, int queueNum, int topicSysFlag)
         throws MQClientException {
-        MQAdminInstance.threadLocalMQAdminExt().createTopic(key, newTopic, queueNum, topicSysFlag, attributes);
+        MQAdminInstance.threadLocalMQAdminExt().createTopic(key, newTopic, queueNum, topicSysFlag);
     }
 
     @Override
@@ -586,257 +572,4 @@ public class MQAdminExtImpl implements MQAdminExt {
         String msgId) throws RemotingException, MQClientException, InterruptedException, MQBrokerException {
         return false;
     }
-
-    @Override
-    public void addBrokerToContainer(String brokerContainerAddr, String brokerConfig) throws InterruptedException,
-            MQBrokerException, RemotingTimeoutException, RemotingSendRequestException, RemotingConnectException {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'addBrokerToContainer'");
-    }
-
-    @Override
-    public void removeBrokerFromContainer(String brokerContainerAddr, String clusterName, String brokerName,
-            long brokerId) throws InterruptedException, MQBrokerException, RemotingTimeoutException,
-            RemotingSendRequestException, RemotingConnectException {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'removeBrokerFromContainer'");
-    }
-
-    @Override
-    public void updateGlobalWhiteAddrConfig(String addr, String globalWhiteAddrs, String aclFileFullPath)
-            throws RemotingException, MQBrokerException, InterruptedException, MQClientException {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'updateGlobalWhiteAddrConfig'");
-    }
-
-    @Override
-    public TopicStatsTable examineTopicStats(String brokerAddr, String topic)
-            throws RemotingException, MQClientException, InterruptedException, MQBrokerException {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'examineTopicStats'");
-    }
-
-    @Override
-    public AdminToolResult<TopicStatsTable> examineTopicStatsConcurrent(String topic) {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'examineTopicStatsConcurrent'");
-    }
-
-    @Override
-    public ConsumeStats examineConsumeStats(String brokerAddr, String consumerGroup, String topicName,
-            long timeoutMillis) throws InterruptedException, RemotingTimeoutException, RemotingSendRequestException,
-            RemotingConnectException, MQBrokerException {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'examineConsumeStats'");
-    }
-
-    @Override
-    public AdminToolResult<ConsumeStats> examineConsumeStatsConcurrent(String consumerGroup, String topic) {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'examineConsumeStatsConcurrent'");
-    }
-
-    @Override
-    public ConsumerConnection examineConsumerConnectionInfo(String consumerGroup, String brokerAddr)
-            throws InterruptedException, MQBrokerException, RemotingException, MQClientException {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'examineConsumerConnectionInfo'");
-    }
-
-    @Override
-    public ProducerTableInfo getAllProducerInfo(String brokerAddr)
-            throws RemotingException, MQClientException, InterruptedException, MQBrokerException {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'getAllProducerInfo'");
-    }
-
-    @Override
-    public void deleteTopic(String topicName, String clusterName)
-            throws RemotingException, MQBrokerException, InterruptedException, MQClientException {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'deleteTopic'");
-    }
-
-    @Override
-    public AdminToolResult<BrokerOperatorResult> deleteTopicInBrokerConcurrent(Set<String> addrs, String topic) {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'deleteTopicInBrokerConcurrent'");
-    }
-
-    @Override
-    public void deleteTopicInNameServer(Set<String> addrs, String clusterName, String topic)
-            throws RemotingException, MQBrokerException, InterruptedException, MQClientException {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'deleteTopicInNameServer'");
-    }
-
-    @Override
-    public AdminToolResult<BrokerOperatorResult> resetOffsetNewConcurrent(String group, String topic, long timestamp) {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'resetOffsetNewConcurrent'");
-    }
-
-    @Override
-    public TopicList queryTopicsByConsumer(String group)
-            throws InterruptedException, MQBrokerException, RemotingException, MQClientException {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'queryTopicsByConsumer'");
-    }
-
-    @Override
-    public AdminToolResult<TopicList> queryTopicsByConsumerConcurrent(String group) {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'queryTopicsByConsumerConcurrent'");
-    }
-
-    @Override
-    public SubscriptionData querySubscription(String group, String topic)
-            throws InterruptedException, MQBrokerException, RemotingException, MQClientException {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'querySubscription'");
-    }
-
-    @Override
-    public AdminToolResult<List<QueueTimeSpan>> queryConsumeTimeSpanConcurrent(String topic, String group) {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'queryConsumeTimeSpanConcurrent'");
-    }
-
-    @Override
-    public boolean deleteExpiredCommitLog(String cluster) throws RemotingConnectException, RemotingSendRequestException,
-            RemotingTimeoutException, MQClientException, InterruptedException {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'deleteExpiredCommitLog'");
-    }
-
-    @Override
-    public boolean deleteExpiredCommitLogByAddr(String addr) throws RemotingConnectException,
-            RemotingSendRequestException, RemotingTimeoutException, MQClientException, InterruptedException {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'deleteExpiredCommitLogByAddr'");
-    }
-
-    @Override
-    public ConsumerRunningInfo getConsumerRunningInfo(String consumerGroup, String clientId, boolean jstack,
-            boolean metrics) throws RemotingException, MQClientException, InterruptedException {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'getConsumerRunningInfo'");
-    }
-
-    @Override
-    public List<MessageTrack> messageTrackDetailConcurrent(MessageExt msg)
-            throws RemotingException, MQClientException, InterruptedException, MQBrokerException {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'messageTrackDetailConcurrent'");
-    }
-
-    @Override
-    public void setMessageRequestMode(String brokerAddr, String topic, String consumerGroup, MessageRequestMode mode,
-            int popWorkGroupSize, long timeoutMillis) throws InterruptedException, RemotingTimeoutException,
-            RemotingSendRequestException, RemotingConnectException, MQClientException {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'setMessageRequestMode'");
-    }
-
-    @Override
-    public long searchOffset(String brokerAddr, String topicName, int queueId, long timestamp, long timeoutMillis)
-            throws RemotingException, MQBrokerException, InterruptedException {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'searchOffset'");
-    }
-
-    @Override
-    public void resetOffsetByQueueId(String brokerAddr, String consumerGroup, String topicName, int queueId,
-            long resetOffset) throws RemotingException, InterruptedException, MQBrokerException {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'resetOffsetByQueueId'");
-    }
-
-    @Override
-    public void createStaticTopic(String addr, String defaultTopic, TopicConfig topicConfig,
-            TopicQueueMappingDetail mappingDetail, boolean force)
-            throws RemotingException, InterruptedException, MQBrokerException {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'createStaticTopic'");
-    }
-
-    @Override
-    public GroupForbidden updateAndGetGroupReadForbidden(String brokerAddr, String groupName, String topicName,
-            Boolean readable) throws RemotingException, InterruptedException, MQBrokerException {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'updateAndGetGroupReadForbidden'");
-    }
-
-    @Override
-    public MessageExt queryMessage(String clusterName, String topic, String msgId)
-            throws RemotingException, MQBrokerException, InterruptedException, MQClientException {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'queryMessage'");
-    }
-
-    @Override
-    public HARuntimeInfo getBrokerHAStatus(String brokerAddr) throws RemotingConnectException,
-            RemotingSendRequestException, RemotingTimeoutException, InterruptedException, MQBrokerException {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'getBrokerHAStatus'");
-    }
-
-    @Override
-    public BrokerReplicasInfo getInSyncStateData(String controllerAddress, List<String> brokers)
-            throws RemotingException, InterruptedException, MQBrokerException {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'getInSyncStateData'");
-    }
-
-    @Override
-    public EpochEntryCache getBrokerEpochCache(String brokerAddr)
-            throws RemotingException, InterruptedException, MQBrokerException {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'getBrokerEpochCache'");
-    }
-
-    @Override
-    public GetMetaDataResponseHeader getControllerMetaData(String controllerAddr)
-            throws RemotingException, InterruptedException, MQBrokerException {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'getControllerMetaData'");
-    }
-
-    @Override
-    public void resetMasterFlushOffset(String brokerAddr, long masterFlushOffset) throws InterruptedException,
-            MQBrokerException, RemotingTimeoutException, RemotingSendRequestException, RemotingConnectException {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'resetMasterFlushOffset'");
-    }
-
-    @Override
-    public Map<String, Properties> getControllerConfig(List<String> controllerServers)
-            throws InterruptedException, RemotingTimeoutException, RemotingSendRequestException,
-            RemotingConnectException, MQClientException, UnsupportedEncodingException {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'getControllerConfig'");
-    }
-
-    @Override
-    public void updateControllerConfig(Properties properties, List<String> controllers)
-            throws InterruptedException, RemotingConnectException, UnsupportedEncodingException,
-            RemotingSendRequestException, RemotingTimeoutException, MQClientException, MQBrokerException {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'updateControllerConfig'");
-    }
-
-    @Override
-    public ElectMasterResponseHeader electMaster(String controllerAddr, String clusterName, String brokerName,
-            String brokerAddr) throws RemotingException, InterruptedException, MQBrokerException {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'electMaster'");
-    }
-
-    @Override
-    public void cleanControllerBrokerData(String controllerAddr, String clusterName, String brokerName,
-            String brokerAddr, boolean isCleanLivingBroker)
-            throws RemotingException, InterruptedException, MQBrokerException {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'cleanControllerBrokerData'");
-    }
 }

src/main/java/org/apache/rocketmq/dashboard/service/impl/AclServiceImpl.java

@@ -36,8 +36,8 @@ import org.apache.rocketmq.client.exception.MQClientException;
 import org.apache.rocketmq.common.AclConfig;
 import org.apache.rocketmq.common.MixAll;
 import org.apache.rocketmq.common.PlainAccessConfig;
-import org.apache.rocketmq.remoting.protocol.body.ClusterInfo;
+import org.apache.rocketmq.common.protocol.body.ClusterInfo;
-import org.apache.rocketmq.remoting.protocol.route.BrokerData;
+import org.apache.rocketmq.common.protocol.route.BrokerData;
 import org.apache.rocketmq.dashboard.model.request.AclRequest;
 import org.apache.rocketmq.dashboard.service.AbstractCommonService;
 import org.apache.rocketmq.dashboard.service.AclService;
@@ -68,8 +68,7 @@ public class AclServiceImpl extends AbstractCommonService implements AclService
             }
         } catch (Exception e) {
             log.error("getAclConfig error.", e);
-            Throwables.throwIfUnchecked(e);
+            throw Throwables.propagate(e);
-            throw new RuntimeException(e);
         }
         AclConfig aclConfig = new AclConfig();
         aclConfig.setGlobalWhiteAddrs(Collections.emptyList());
@@ -101,8 +100,7 @@ public class AclServiceImpl extends AbstractCommonService implements AclService
                 mqAdminExt.createAndUpdatePlainAccessConfig(addr, config);
             }
         } catch (Exception e) {
-            Throwables.throwIfUnchecked(e);
+            throw Throwables.propagate(e);
-            throw new RuntimeException(e);
         }
 
     }
@@ -118,8 +116,7 @@ public class AclServiceImpl extends AbstractCommonService implements AclService
                 log.info("Delete acl [{}] from broker [{}] complete", config.getAccessKey(), addr);
             }
         } catch (Exception e) {
-            Throwables.throwIfUnchecked(e);
+            throw Throwables.propagate(e);
-            throw new RuntimeException(e);
         }
     }
 
@@ -145,8 +142,7 @@ public class AclServiceImpl extends AbstractCommonService implements AclService
                 mqAdminExt.createAndUpdatePlainAccessConfig(addr, config);
             }
         } catch (Exception e) {
-            Throwables.throwIfUnchecked(e);
+            throw Throwables.propagate(e);
-            throw new RuntimeException(e);
         }
     }
 
@@ -178,8 +174,7 @@ public class AclServiceImpl extends AbstractCommonService implements AclService
                 }
             }
         } catch (Exception e) {
-            Throwables.throwIfUnchecked(e);
+            throw Throwables.propagate(e);
-            throw new RuntimeException(e);
         }
     }
 
@@ -211,8 +206,7 @@ public class AclServiceImpl extends AbstractCommonService implements AclService
                 }
             }
         } catch (Exception e) {
-            Throwables.throwIfUnchecked(e);
+            throw Throwables.propagate(e);
-            throw new RuntimeException(e);
         }
     }
 
@@ -255,8 +249,7 @@ public class AclServiceImpl extends AbstractCommonService implements AclService
                 }
             }
         } catch (Exception e) {
-            Throwables.throwIfUnchecked(e);
+            throw Throwables.propagate(e);
-            throw new RuntimeException(e);
         }
 
     }
@@ -268,8 +261,7 @@ public class AclServiceImpl extends AbstractCommonService implements AclService
                 mqAdminExt.createAndUpdatePlainAccessConfig(addr, config);
             }
         } catch (Exception e) {
-            Throwables.throwIfUnchecked(e);
+            throw Throwables.propagate(e);
-            throw new RuntimeException(e);
         }
     }
 
@@ -289,8 +281,7 @@ public class AclServiceImpl extends AbstractCommonService implements AclService
                 mqAdminExt.updateGlobalWhiteAddrConfig(addr, StringUtils.join(aclConfig.getGlobalWhiteAddrs(), ","));
             }
         } catch (Exception e) {
-            Throwables.throwIfUnchecked(e);
+            throw Throwables.propagate(e);
-            throw new RuntimeException(e);
         }
     }
 
@@ -306,8 +297,7 @@ public class AclServiceImpl extends AbstractCommonService implements AclService
                 mqAdminExt.updateGlobalWhiteAddrConfig(addr, StringUtils.join(aclConfig.getGlobalWhiteAddrs(), ","));
             }
         } catch (Exception e) {
-            Throwables.throwIfUnchecked(e);
+            throw Throwables.propagate(e);
-            throw new RuntimeException(e);
         }
     }
 
@@ -321,8 +311,7 @@ public class AclServiceImpl extends AbstractCommonService implements AclService
                 mqAdminExt.updateGlobalWhiteAddrConfig(addr, StringUtils.join(whiteList, ","));
             }
         } catch (Exception e) {
-            Throwables.throwIfUnchecked(e);
+            throw Throwables.propagate(e);
-            throw new RuntimeException(e);
         }
     }
 

src/main/java/org/apache/rocketmq/dashboard/service/impl/ClusterServiceImpl.java

@@ -17,9 +17,9 @@
 
 package org.apache.rocketmq.dashboard.service.impl;
 
-import org.apache.rocketmq.remoting.protocol.body.ClusterInfo;
+import org.apache.rocketmq.common.protocol.body.ClusterInfo;
-import org.apache.rocketmq.remoting.protocol.body.KVTable;
+import org.apache.rocketmq.common.protocol.body.KVTable;
-import org.apache.rocketmq.remoting.protocol.route.BrokerData;
+import org.apache.rocketmq.common.protocol.route.BrokerData;
 import org.apache.rocketmq.tools.admin.MQAdminExt;
 import org.apache.rocketmq.dashboard.service.ClusterService;
 import org.apache.rocketmq.dashboard.util.JsonUtil;
@@ -59,8 +59,7 @@ public class ClusterServiceImpl implements ClusterService {
             return resultMap;
         }
         catch (Exception err) {
-            Throwables.throwIfUnchecked(err);
+            throw Throwables.propagate(err);
-            throw new RuntimeException(err);
         }
     }
 
@@ -71,8 +70,7 @@ public class ClusterServiceImpl implements ClusterService {
             return mqAdminExt.getBrokerConfig(brokerAddr);
         }
         catch (Exception e) {
-            Throwables.throwIfUnchecked(e);
+            throw Throwables.propagate(e);
-            throw new RuntimeException(e);
         }
     }
 }

src/main/java/org/apache/rocketmq/dashboard/service/impl/ConsumerServiceImpl.java

@@ -44,18 +44,18 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.rocketmq.client.exception.MQClientException;
 import org.apache.rocketmq.common.MQVersion;
 import org.apache.rocketmq.common.MixAll;
-import org.apache.rocketmq.remoting.protocol.admin.ConsumeStats;
+import org.apache.rocketmq.common.admin.ConsumeStats;
-import org.apache.rocketmq.remoting.protocol.admin.RollbackStats;
+import org.apache.rocketmq.common.admin.RollbackStats;
 import org.apache.rocketmq.common.message.MessageQueue;
-import org.apache.rocketmq.remoting.protocol.ResponseCode;
+import org.apache.rocketmq.common.protocol.ResponseCode;
-import org.apache.rocketmq.remoting.protocol.body.ClusterInfo;
+import org.apache.rocketmq.common.protocol.body.ClusterInfo;
-import org.apache.rocketmq.remoting.protocol.body.Connection;
+import org.apache.rocketmq.common.protocol.body.Connection;
-import org.apache.rocketmq.remoting.protocol.body.ConsumerConnection;
+import org.apache.rocketmq.common.protocol.body.ConsumerConnection;
-import org.apache.rocketmq.remoting.protocol.body.ConsumerRunningInfo;
+import org.apache.rocketmq.common.protocol.body.ConsumerRunningInfo;
-import org.apache.rocketmq.remoting.protocol.body.GroupList;
+import org.apache.rocketmq.common.protocol.body.GroupList;
-import org.apache.rocketmq.remoting.protocol.body.SubscriptionGroupWrapper;
+import org.apache.rocketmq.common.protocol.body.SubscriptionGroupWrapper;
-import org.apache.rocketmq.remoting.protocol.route.BrokerData;
+import org.apache.rocketmq.common.protocol.route.BrokerData;
-import org.apache.rocketmq.remoting.protocol.subscription.SubscriptionGroupConfig;
+import org.apache.rocketmq.common.subscription.SubscriptionGroupConfig;
 import org.apache.rocketmq.common.utils.ThreadUtils;
 import org.apache.rocketmq.dashboard.config.RMQConfigure;
 import org.apache.rocketmq.dashboard.model.ConsumerGroupRollBackStat;
@@ -73,6 +73,8 @@ import org.springframework.beans.factory.DisposableBean;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.stereotype.Service;
 
+import static com.google.common.base.Throwables.propagate;
+
 @Service
 public class ConsumerServiceImpl extends AbstractCommonService implements ConsumerService, InitializingBean, DisposableBean {
     private Logger logger = LoggerFactory.getLogger(ConsumerServiceImpl.class);
@@ -129,8 +131,7 @@ public class ConsumerServiceImpl extends AbstractCommonService implements Consum
             }
         }
         catch (Exception err) {
-            Throwables.throwIfUnchecked(err);
+            throw Throwables.propagate(err);
-            throw new RuntimeException(err);
         }
         List<GroupConsumeInfo> groupConsumeInfoList = Collections.synchronizedList(Lists.newArrayList());
         CountDownLatch countDownLatch = new CountDownLatch(consumerGroupSet.size());
@@ -217,8 +218,7 @@ public class ConsumerServiceImpl extends AbstractCommonService implements Consum
             consumeStats = mqAdminExt.examineConsumeStats(groupName, topic);
         }
         catch (Exception e) {
-            Throwables.throwIfUnchecked(e);
+            throw propagate(e);
-            throw new RuntimeException(e);
         }
         List<MessageQueue> mqList = Lists.newArrayList(Iterables.filter(consumeStats.getOffsetTable().keySet(), new Predicate<MessageQueue>() {
             @Override
@@ -278,8 +278,7 @@ public class ConsumerServiceImpl extends AbstractCommonService implements Consum
             return group2ConsumerInfoMap;
         }
         catch (Exception e) {
-            Throwables.throwIfUnchecked(e);
+            throw propagate(e);
-            throw new RuntimeException(e);
         }
     }
 
@@ -342,8 +341,7 @@ public class ConsumerServiceImpl extends AbstractCommonService implements Consum
             }
         }
         catch (Exception e) {
-            Throwables.throwIfUnchecked(e);
+            throw propagate(e);
-            throw new RuntimeException(e);
         }
         return consumerConfigInfoList;
     }
@@ -368,8 +366,7 @@ public class ConsumerServiceImpl extends AbstractCommonService implements Consum
             }
         }
         catch (Exception e) {
-            Throwables.throwIfUnchecked(e);
+            throw propagate(e);
-            throw new RuntimeException(e);
         }
         return true;
     }
@@ -396,8 +393,7 @@ public class ConsumerServiceImpl extends AbstractCommonService implements Consum
             }
         }
         catch (Exception err) {
-            Throwables.throwIfUnchecked(err);
+            throw Throwables.propagate(err);
-            throw new RuntimeException(err);
         }
         return true;
     }
@@ -412,8 +408,7 @@ public class ConsumerServiceImpl extends AbstractCommonService implements Consum
             }
         }
         catch (Exception e) {
-            Throwables.throwIfUnchecked(e);
+            throw Throwables.propagate(e);
-            throw new RuntimeException(e);
         }
         return brokerNameSet;
 
@@ -425,8 +420,7 @@ public class ConsumerServiceImpl extends AbstractCommonService implements Consum
             return mqAdminExt.examineConsumerConnectionInfo(consumerGroup);
         }
         catch (Exception e) {
-            Throwables.throwIfUnchecked(e);
+            throw Throwables.propagate(e);
-            throw new RuntimeException(e);
         }
     }
 
@@ -436,8 +430,7 @@ public class ConsumerServiceImpl extends AbstractCommonService implements Consum
             return mqAdminExt.getConsumerRunningInfo(consumerGroup, clientId, jstack);
         }
         catch (Exception e) {
-            Throwables.throwIfUnchecked(e);
+            throw Throwables.propagate(e);
-            throw new RuntimeException(e);
         }
     }
 }

src/main/java/org/apache/rocketmq/dashboard/service/impl/DashboardCollectServiceImpl.java

@@ -107,8 +107,7 @@ public class DashboardCollectServiceImpl implements DashboardCollectService {
             strings = Files.readLines(file, Charsets.UTF_8);
         }
         catch (IOException e) {
-            Throwables.throwIfUnchecked(e);
+            throw Throwables.propagate(e);
-            throw new RuntimeException(e);
         }
         StringBuffer sb = new StringBuffer();
         for (String string : strings) {

src/main/java/org/apache/rocketmq/dashboard/service/impl/DlqMessageServiceImpl.java

@@ -25,8 +25,8 @@ import javax.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.rocketmq.client.exception.MQClientException;
 import org.apache.rocketmq.common.MixAll;
-import org.apache.rocketmq.remoting.protocol.ResponseCode;
+import org.apache.rocketmq.common.protocol.ResponseCode;
-import org.apache.rocketmq.remoting.protocol.body.ConsumeMessageDirectlyResult;
+import org.apache.rocketmq.common.protocol.body.ConsumeMessageDirectlyResult;
 import org.apache.rocketmq.dashboard.model.DlqMessageResendResult;
 import org.apache.rocketmq.dashboard.model.DlqMessageRequest;
 import org.apache.rocketmq.dashboard.model.MessagePage;
@@ -62,12 +62,10 @@ public class DlqMessageServiceImpl implements DlqMessageService {
                 && e.getResponseCode() == ResponseCode.TOPIC_NOT_EXIST) {
                 return new MessagePage(new PageImpl<>(messageViews, page, 0), query.getTaskId());
             } else {
-                Throwables.throwIfUnchecked(e);
+                throw Throwables.propagate(e);
-                throw new RuntimeException(e);
             }
         } catch (Exception e) {
-            Throwables.throwIfUnchecked(e);
+            throw Throwables.propagate(e);
-            throw new RuntimeException(e);
         }
         return messageService.queryMessageByPage(query);
     }

src/main/java/org/apache/rocketmq/dashboard/service/impl/MessageServiceImpl.java

@@ -37,9 +37,9 @@ import org.apache.rocketmq.common.Pair;
 import org.apache.rocketmq.common.message.MessageClientIDSetter;
 import org.apache.rocketmq.common.message.MessageExt;
 import org.apache.rocketmq.common.message.MessageQueue;
-import org.apache.rocketmq.remoting.protocol.body.Connection;
+import org.apache.rocketmq.common.protocol.body.Connection;
-import org.apache.rocketmq.remoting.protocol.body.ConsumeMessageDirectlyResult;
+import org.apache.rocketmq.common.protocol.body.ConsumeMessageDirectlyResult;
-import org.apache.rocketmq.remoting.protocol.body.ConsumerConnection;
+import org.apache.rocketmq.common.protocol.body.ConsumerConnection;
 import org.apache.rocketmq.dashboard.config.RMQConfigure;
 import org.apache.rocketmq.dashboard.exception.ServiceException;
 import org.apache.rocketmq.dashboard.model.QueueOffsetInfo;
@@ -115,8 +115,7 @@ public class MessageServiceImpl implements MessageService {
             if (err instanceof MQClientException) {
                 throw new ServiceException(-1, ((MQClientException) err).getErrorMessage());
             }
-            Throwables.throwIfUnchecked(err);
+            throw Throwables.propagate(err);
-            throw new RuntimeException(err);
         }
     }
 
@@ -186,8 +185,7 @@ public class MessageServiceImpl implements MessageService {
             });
             return messageViewList;
         } catch (Exception e) {
-            Throwables.throwIfUnchecked(e);
+            throw Throwables.propagate(e);
-            throw new RuntimeException(e);
         } finally {
             consumer.shutdown();
         }
@@ -211,8 +209,7 @@ public class MessageServiceImpl implements MessageService {
             try {
                 return mqAdminExt.consumeMessageDirectly(consumerGroup, clientId, topic, msgId);
             } catch (Exception e) {
-                Throwables.throwIfUnchecked(e);
+                throw Throwables.propagate(e);
-                throw new RuntimeException(e);
             }
         }
 
@@ -226,8 +223,7 @@ public class MessageServiceImpl implements MessageService {
                 return mqAdminExt.consumeMessageDirectly(consumerGroup, connection.getClientId(), topic, msgId);
             }
         } catch (Exception e) {
-            Throwables.throwIfUnchecked(e);
+            throw Throwables.propagate(e);
-            throw new RuntimeException(e);
         }
         throw new IllegalStateException("NO CONSUMER");
 
@@ -392,8 +388,7 @@ public class MessageServiceImpl implements MessageService {
             PageImpl<MessageView> page = new PageImpl<>(messageViews, query.page(), total);
             return new MessagePageTask(page, queueOffsetInfos);
         } catch (Exception e) {
-            Throwables.throwIfUnchecked(e);
+            throw Throwables.propagate(e);
-            throw new RuntimeException(e);
         } finally {
             consumer.shutdown();
         }
@@ -460,8 +455,7 @@ public class MessageServiceImpl implements MessageService {
             }
             return new PageImpl<>(messageViews, query.page(), total);
         } catch (Exception e) {
-            Throwables.throwIfUnchecked(e);
+            throw Throwables.propagate(e);
-            throw new RuntimeException(e);
         } finally {
             consumer.shutdown();
         }

src/main/java/org/apache/rocketmq/dashboard/service/impl/MonitorServiceImpl.java

@@ -82,8 +82,7 @@ public class MonitorServiceImpl implements MonitorService {
             MixAll.string2File(dataStr, path);
         }
         catch (Exception e) {
-            Throwables.throwIfUnchecked(e);
+            throw Throwables.propagate(e);
-            throw new RuntimeException(e);
         }
     }
 

src/main/java/org/apache/rocketmq/dashboard/service/impl/ProducerServiceImpl.java

@@ -19,7 +19,7 @@ package org.apache.rocketmq.dashboard.service.impl;
 
 import com.google.common.base.Throwables;
 import javax.annotation.Resource;
-import org.apache.rocketmq.remoting.protocol.body.ProducerConnection;
+import org.apache.rocketmq.common.protocol.body.ProducerConnection;
 import org.apache.rocketmq.dashboard.service.ProducerService;
 import org.apache.rocketmq.tools.admin.MQAdminExt;
 import org.springframework.stereotype.Service;
@@ -35,8 +35,7 @@ public class ProducerServiceImpl implements ProducerService {
             return mqAdminExt.examineProducerConnectionInfo(producerGroup, topic);
         }
         catch (Exception e) {
-            Throwables.throwIfUnchecked(e);
+            throw Throwables.propagate(e);
-            throw new RuntimeException(e);
         }
     }
 }

src/main/java/org/apache/rocketmq/dashboard/service/impl/TopicServiceImpl.java

@@ -30,13 +30,13 @@ import org.apache.rocketmq.client.trace.TraceContext;
 import org.apache.rocketmq.client.trace.TraceDispatcher;
 import org.apache.rocketmq.common.MixAll;
 import org.apache.rocketmq.common.TopicConfig;
-import org.apache.rocketmq.remoting.protocol.admin.TopicStatsTable;
+import org.apache.rocketmq.common.admin.TopicStatsTable;
 import org.apache.rocketmq.common.message.Message;
-import org.apache.rocketmq.remoting.protocol.body.ClusterInfo;
+import org.apache.rocketmq.common.protocol.body.ClusterInfo;
-import org.apache.rocketmq.remoting.protocol.body.GroupList;
+import org.apache.rocketmq.common.protocol.body.GroupList;
-import org.apache.rocketmq.remoting.protocol.body.TopicList;
+import org.apache.rocketmq.common.protocol.body.TopicList;
-import org.apache.rocketmq.remoting.protocol.route.BrokerData;
+import org.apache.rocketmq.common.protocol.route.BrokerData;
-import org.apache.rocketmq.remoting.protocol.route.TopicRouteData;
+import org.apache.rocketmq.common.protocol.route.TopicRouteData;
 import org.apache.rocketmq.common.topic.TopicValidator;
 import org.apache.rocketmq.dashboard.config.RMQConfigure;
 import org.apache.rocketmq.dashboard.model.request.SendTopicMessageRequest;
@@ -84,8 +84,7 @@ public class TopicServiceImpl extends AbstractCommonService implements TopicServ
             allTopics.getTopicList().addAll(topics);
             return allTopics;
         } catch (Exception e) {
-            Throwables.throwIfUnchecked(e);
+            throw Throwables.propagate(e);
-            throw new RuntimeException(e);
         }
     }
 
@@ -94,8 +93,7 @@ public class TopicServiceImpl extends AbstractCommonService implements TopicServ
         try {
             return mqAdminExt.examineTopicStats(topic);
         } catch (Exception e) {
-            Throwables.throwIfUnchecked(e);
+            throw Throwables.propagate(e);
-            throw new RuntimeException(e);
         }
     }
 
@@ -104,8 +102,7 @@ public class TopicServiceImpl extends AbstractCommonService implements TopicServ
         try {
             return mqAdminExt.examineTopicRouteInfo(topic);
         } catch (Exception ex) {
-            Throwables.throwIfUnchecked(ex);
+            throw Throwables.propagate(ex);
-            throw new RuntimeException(ex);
         }
     }
 
@@ -114,8 +111,7 @@ public class TopicServiceImpl extends AbstractCommonService implements TopicServ
         try {
             return mqAdminExt.queryTopicConsumeByWho(topic);
         } catch (Exception e) {
-            Throwables.throwIfUnchecked(e);
+            throw Throwables.propagate(e);
-            throw new RuntimeException(e);
         }
     }
 
@@ -130,8 +126,7 @@ public class TopicServiceImpl extends AbstractCommonService implements TopicServ
                 mqAdminExt.createAndUpdateTopicConfig(clusterInfo.getBrokerAddrTable().get(brokerName).selectBrokerAddr(), topicConfig);
             }
         } catch (Exception err) {
-            Throwables.throwIfUnchecked(err);
+            throw Throwables.propagate(err);
-            throw new RuntimeException(err);
         }
     }
 
@@ -142,8 +137,7 @@ public class TopicServiceImpl extends AbstractCommonService implements TopicServ
             clusterInfo = mqAdminExt.examineBrokerClusterInfo();
             return mqAdminExt.examineTopicConfig(clusterInfo.getBrokerAddrTable().get(brokerName).selectBrokerAddr(), topic);
         } catch (Exception e) {
-            Throwables.throwIfUnchecked(e);
+            throw Throwables.propagate(e);
-            throw new RuntimeException(e);
         }
     }
 
@@ -176,8 +170,7 @@ public class TopicServiceImpl extends AbstractCommonService implements TopicServ
             }
             mqAdminExt.deleteTopicInNameServer(nameServerSet, topic);
         } catch (Exception err) {
-            Throwables.throwIfUnchecked(err);
+            throw Throwables.propagate(err);
-            throw new RuntimeException(err);
         }
         return true;
     }
@@ -188,8 +181,7 @@ public class TopicServiceImpl extends AbstractCommonService implements TopicServ
         try {
             clusterInfo = mqAdminExt.examineBrokerClusterInfo();
         } catch (Exception err) {
-            Throwables.throwIfUnchecked(err);
+            throw Throwables.propagate(err);
-            throw new RuntimeException(err);
         }
         for (String clusterName : clusterInfo.getClusterAddrTable().keySet()) {
             deleteTopic(topic, clusterName);
@@ -205,13 +197,11 @@ public class TopicServiceImpl extends AbstractCommonService implements TopicServ
             try {
                 clusterInfo = mqAdminExt.examineBrokerClusterInfo();
             } catch (Exception e) {
-                Throwables.throwIfUnchecked(e);
+                throw Throwables.propagate(e);
-                throw new RuntimeException(e);
             }
             mqAdminExt.deleteTopicInBroker(Sets.newHashSet(clusterInfo.getBrokerAddrTable().get(brokerName).selectBrokerAddr()), topic);
         } catch (Exception e) {
-            Throwables.throwIfUnchecked(e);
+            throw Throwables.propagate(e);
-            throw new RuntimeException(e);
         }
         return true;
     }
@@ -240,8 +230,7 @@ public class TopicServiceImpl extends AbstractCommonService implements TopicServ
             producer.start();
             return producer.getDefaultMQProducerImpl().getmQClientFactory().getMQClientAPIImpl().getSystemTopicList(20000L);
         } catch (Exception e) {
-            Throwables.throwIfUnchecked(e);
+            throw Throwables.propagate(e);
-            throw new RuntimeException(e);
         } finally {
             producer.shutdown();
         }
@@ -269,8 +258,7 @@ public class TopicServiceImpl extends AbstractCommonService implements TopicServ
             );
             return producer.send(msg);
         } catch (Exception e) {
-            Throwables.throwIfUnchecked(e);
+            throw Throwables.propagate(e);
-            throw new RuntimeException(e);
         } finally {
             waitSendTraceFinish(producer, sendTopicMessageRequest.isTraceEnabled());
             producer.shutdown();

src/main/java/org/apache/rocketmq/dashboard/task/CollectTaskRunnble.java

@@ -24,10 +24,10 @@ import java.util.List;
 import java.util.concurrent.ExecutionException;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.rocketmq.common.MixAll;
-import org.apache.rocketmq.remoting.protocol.body.BrokerStatsData;
+import org.apache.rocketmq.common.protocol.body.BrokerStatsData;
-import org.apache.rocketmq.remoting.protocol.body.GroupList;
+import org.apache.rocketmq.common.protocol.body.GroupList;
-import org.apache.rocketmq.remoting.protocol.route.BrokerData;
+import org.apache.rocketmq.common.protocol.route.BrokerData;
-import org.apache.rocketmq.remoting.protocol.route.TopicRouteData;
+import org.apache.rocketmq.common.protocol.route.TopicRouteData;
 import org.apache.rocketmq.dashboard.service.DashboardCollectService;
 import org.apache.rocketmq.store.stats.BrokerStatsManager;
 import org.apache.rocketmq.tools.admin.MQAdminExt;
@@ -93,8 +93,7 @@ public class CollectTaskRunnble implements Runnable {
             try {
                 list = dashboardCollectService.getTopicMap().get(topic);
             } catch (ExecutionException e) {
-                Throwables.throwIfUnchecked(e);
+                throw Throwables.propagate(e);
-                throw new RuntimeException(e);
             }
             if (null == list) {
                 list = Lists.newArrayList();

src/main/java/org/apache/rocketmq/dashboard/task/DashboardCollectTask.java

@@ -34,10 +34,10 @@ import java.util.Set;
 import java.util.concurrent.ExecutorService;
 import javax.annotation.Resource;
 import org.apache.rocketmq.common.MixAll;
-import org.apache.rocketmq.remoting.protocol.body.ClusterInfo;
+import org.apache.rocketmq.common.protocol.body.ClusterInfo;
-import org.apache.rocketmq.remoting.protocol.body.KVTable;
+import org.apache.rocketmq.common.protocol.body.KVTable;
-import org.apache.rocketmq.remoting.protocol.body.TopicList;
+import org.apache.rocketmq.common.protocol.body.TopicList;
-import org.apache.rocketmq.remoting.protocol.route.BrokerData;
+import org.apache.rocketmq.common.protocol.route.BrokerData;
 import org.apache.rocketmq.common.topic.TopicValidator;
 import org.apache.rocketmq.dashboard.config.RMQConfigure;
 import org.apache.rocketmq.dashboard.service.DashboardCollectService;
@@ -84,8 +84,7 @@ public class DashboardCollectTask {
             }
         }
         catch (Exception err) {
-            Throwables.throwIfUnchecked(err);
+            throw Throwables.propagate(err);
-            throw new RuntimeException(err);
         }
     }
 
@@ -129,8 +128,7 @@ public class DashboardCollectTask {
             log.debug("Broker Collected Data in memory = {}" + JsonUtil.obj2String(dashboardCollectService.getBrokerMap().asMap()));
         }
         catch (Exception e) {
-            Throwables.throwIfUnchecked(e);
+            throw Throwables.propagate(e);
-            throw new RuntimeException(e);
         }
     }
 
@@ -146,12 +144,10 @@ public class DashboardCollectTask {
                 Thread.sleep(1000);
             }
             catch (InterruptedException e1) {
-                Throwables.throwIfUnchecked(e1);
+                throw Throwables.propagate(e1);
-                throw new RuntimeException(e1);
             }
             fetchBrokerRuntimeStats(brokerAddr, retryTime - 1);
-            Throwables.throwIfUnchecked(e);
+            throw Throwables.propagate(e);
-            throw new RuntimeException(e);
         }
     }
 
@@ -201,8 +197,7 @@ public class DashboardCollectTask {
 
         }
         catch (IOException e) {
-            Throwables.throwIfUnchecked(e);
+            throw Throwables.propagate(e);
-            throw new RuntimeException(e);
         }
     }
 
@@ -255,7 +250,7 @@ public class DashboardCollectTask {
 
     private void addSystemTopic() throws Exception {
         ClusterInfo clusterInfo = mqAdminExt.examineBrokerClusterInfo();
-        Map<String, Set<String>> clusterTable = clusterInfo.getClusterAddrTable();
+        HashMap<String, Set<String>> clusterTable = clusterInfo.getClusterAddrTable();
         for (Map.Entry<String, Set<String>> entry : clusterTable.entrySet()) {
             String clusterName = entry.getKey();
             TopicValidator.addSystemTopic(clusterName);

src/test/java/org/apache/rocketmq/dashboard/admin/MQAdminExtImplTest.java

@@ -34,27 +34,27 @@ import org.apache.rocketmq.client.impl.MQClientAPIImpl;
 import org.apache.rocketmq.client.impl.factory.MQClientInstance;
 import org.apache.rocketmq.common.PlainAccessConfig;
 import org.apache.rocketmq.common.TopicConfig;
-import org.apache.rocketmq.remoting.protocol.admin.ConsumeStats;
+import org.apache.rocketmq.common.admin.ConsumeStats;
-import org.apache.rocketmq.remoting.protocol.admin.RollbackStats;
+import org.apache.rocketmq.common.admin.RollbackStats;
-import org.apache.rocketmq.remoting.protocol.admin.TopicStatsTable;
+import org.apache.rocketmq.common.admin.TopicStatsTable;
 import org.apache.rocketmq.common.message.MessageExt;
 import org.apache.rocketmq.common.message.MessageQueue;
-import org.apache.rocketmq.remoting.protocol.ResponseCode;
+import org.apache.rocketmq.common.protocol.ResponseCode;
-import org.apache.rocketmq.remoting.protocol.body.BrokerStatsData;
+import org.apache.rocketmq.common.protocol.body.BrokerStatsData;
-import org.apache.rocketmq.remoting.protocol.body.ClusterInfo;
+import org.apache.rocketmq.common.protocol.body.ClusterInfo;
-import org.apache.rocketmq.remoting.protocol.body.ConsumeMessageDirectlyResult;
+import org.apache.rocketmq.common.protocol.body.ConsumeMessageDirectlyResult;
-import org.apache.rocketmq.remoting.protocol.body.ConsumeStatsList;
+import org.apache.rocketmq.common.protocol.body.ConsumeStatsList;
-import org.apache.rocketmq.remoting.protocol.body.ConsumerConnection;
+import org.apache.rocketmq.common.protocol.body.ConsumerConnection;
-import org.apache.rocketmq.remoting.protocol.body.ConsumerRunningInfo;
+import org.apache.rocketmq.common.protocol.body.ConsumerRunningInfo;
-import org.apache.rocketmq.remoting.protocol.body.GroupList;
+import org.apache.rocketmq.common.protocol.body.GroupList;
-import org.apache.rocketmq.remoting.protocol.body.KVTable;
+import org.apache.rocketmq.common.protocol.body.KVTable;
-import org.apache.rocketmq.remoting.protocol.body.ProducerConnection;
+import org.apache.rocketmq.common.protocol.body.ProducerConnection;
-import org.apache.rocketmq.remoting.protocol.body.QueueTimeSpan;
+import org.apache.rocketmq.common.protocol.body.QueueTimeSpan;
-import org.apache.rocketmq.remoting.protocol.body.SubscriptionGroupWrapper;
+import org.apache.rocketmq.common.protocol.body.SubscriptionGroupWrapper;
-import org.apache.rocketmq.remoting.protocol.body.TopicConfigSerializeWrapper;
+import org.apache.rocketmq.common.protocol.body.TopicConfigSerializeWrapper;
-import org.apache.rocketmq.remoting.protocol.body.TopicList;
+import org.apache.rocketmq.common.protocol.body.TopicList;
-import org.apache.rocketmq.remoting.protocol.route.TopicRouteData;
+import org.apache.rocketmq.common.protocol.route.TopicRouteData;
-import org.apache.rocketmq.remoting.protocol.subscription.SubscriptionGroupConfig;
+import org.apache.rocketmq.common.subscription.SubscriptionGroupConfig;
 import org.apache.rocketmq.dashboard.service.client.MQAdminExtImpl;
 import org.apache.rocketmq.dashboard.service.client.MQAdminInstance;
 import org.apache.rocketmq.dashboard.util.MockObjectUtil;
@@ -82,7 +82,6 @@ import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.anyLong;
-import static org.mockito.ArgumentMatchers.anyMap;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.mock;
@@ -571,13 +570,11 @@ public class MQAdminExtImplTest {
     public void testCreateTopic() throws Exception {
         assertNotNull(mqAdminExtImpl);
         {
-            doNothing().when(defaultMQAdminExt).createTopic(anyString(), anyString(), anyInt(), anyMap());
+            doNothing().when(defaultMQAdminExt).createTopic(anyString(), anyString(), anyInt());
-            doNothing().when(defaultMQAdminExt).createTopic(anyString(), anyString(), anyInt(), anyInt(), anyMap());
+            doNothing().when(defaultMQAdminExt).createTopic(anyString(), anyString(), anyInt(), anyInt());
         }
-        Map<String, String> map = new HashMap<>();
+        mqAdminExtImpl.createTopic("key", "topic_test", 8);
-        map.put("message.type", "FIFO");
+        mqAdminExtImpl.createTopic("key", "topic_test", 8, 1);
-        mqAdminExtImpl.createTopic("key", "topic_test", 8, map);
-        mqAdminExtImpl.createTopic("key", "topic_test", 8, 1, map);
     }
 
     @Test

src/test/java/org/apache/rocketmq/dashboard/admin/MQAdminPoolTest.java

@@ -18,7 +18,7 @@ package org.apache.rocketmq.dashboard.admin;
 
 import org.apache.commons.pool2.PooledObject;
 import org.apache.commons.pool2.impl.GenericObjectPool;
-import org.apache.rocketmq.remoting.protocol.body.ClusterInfo;
+import org.apache.rocketmq.common.protocol.body.ClusterInfo;
 import org.apache.rocketmq.dashboard.config.RMQConfigure;
 import org.apache.rocketmq.dashboard.util.MockObjectUtil;
 import org.apache.rocketmq.tools.admin.MQAdminExt;

src/test/java/org/apache/rocketmq/dashboard/controller/AclControllerTest.java

@@ -21,7 +21,7 @@ import com.google.common.collect.Lists;
 import java.util.List;
 import org.apache.rocketmq.common.AclConfig;
 import org.apache.rocketmq.common.PlainAccessConfig;
-import org.apache.rocketmq.remoting.protocol.body.ClusterInfo;
+import org.apache.rocketmq.common.protocol.body.ClusterInfo;
 import org.apache.rocketmq.dashboard.model.request.AclRequest;
 import org.apache.rocketmq.dashboard.service.impl.AclServiceImpl;
 import org.apache.rocketmq.dashboard.util.MockObjectUtil;

src/test/java/org/apache/rocketmq/dashboard/controller/ClusterControllerTest.java

@@ -18,8 +18,8 @@ package org.apache.rocketmq.dashboard.controller;
 
 import java.util.HashMap;
 import java.util.Properties;
-import org.apache.rocketmq.remoting.protocol.body.ClusterInfo;
+import org.apache.rocketmq.common.protocol.body.ClusterInfo;
-import org.apache.rocketmq.remoting.protocol.body.KVTable;
+import org.apache.rocketmq.common.protocol.body.KVTable;
 import org.apache.rocketmq.dashboard.service.impl.ClusterServiceImpl;
 import org.apache.rocketmq.dashboard.util.MockObjectUtil;
 import org.junit.Test;

src/test/java/org/apache/rocketmq/dashboard/controller/ConsumerControllerTest.java

@@ -23,17 +23,17 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import org.apache.rocketmq.client.exception.MQClientException;
-import org.apache.rocketmq.remoting.protocol.admin.ConsumeStats;
+import org.apache.rocketmq.common.admin.ConsumeStats;
-import org.apache.rocketmq.remoting.protocol.admin.RollbackStats;
+import org.apache.rocketmq.common.admin.RollbackStats;
 import org.apache.rocketmq.common.message.MessageQueue;
-import org.apache.rocketmq.remoting.protocol.ResponseCode;
+import org.apache.rocketmq.common.protocol.ResponseCode;
-import org.apache.rocketmq.remoting.protocol.body.ClusterInfo;
+import org.apache.rocketmq.common.protocol.body.ClusterInfo;
-import org.apache.rocketmq.remoting.protocol.body.ConsumerConnection;
+import org.apache.rocketmq.common.protocol.body.ConsumerConnection;
-import org.apache.rocketmq.remoting.protocol.body.ConsumerRunningInfo;
+import org.apache.rocketmq.common.protocol.body.ConsumerRunningInfo;
-import org.apache.rocketmq.remoting.protocol.body.SubscriptionGroupWrapper;
+import org.apache.rocketmq.common.protocol.body.SubscriptionGroupWrapper;
-import org.apache.rocketmq.remoting.protocol.heartbeat.ConsumeType;
+import org.apache.rocketmq.common.protocol.heartbeat.ConsumeType;
-import org.apache.rocketmq.remoting.protocol.heartbeat.MessageModel;
+import org.apache.rocketmq.common.protocol.heartbeat.MessageModel;
-import org.apache.rocketmq.remoting.protocol.subscription.SubscriptionGroupConfig;
+import org.apache.rocketmq.common.subscription.SubscriptionGroupConfig;
 import org.apache.rocketmq.dashboard.model.request.ConsumerConfigInfo;
 import org.apache.rocketmq.dashboard.model.request.DeleteSubGroupRequest;
 import org.apache.rocketmq.dashboard.model.request.ResetOffsetRequest;

src/test/java/org/apache/rocketmq/dashboard/controller/DlqMessageControllerTest.java

@@ -21,10 +21,10 @@ import com.google.common.collect.Lists;
 import java.util.List;
 import org.apache.rocketmq.client.exception.MQClientException;
 import org.apache.rocketmq.common.MixAll;
-import org.apache.rocketmq.remoting.protocol.ResponseCode;
+import org.apache.rocketmq.common.protocol.ResponseCode;
-import org.apache.rocketmq.remoting.protocol.body.CMResult;
+import org.apache.rocketmq.common.protocol.body.CMResult;
-import org.apache.rocketmq.remoting.protocol.body.ConsumeMessageDirectlyResult;
+import org.apache.rocketmq.common.protocol.body.ConsumeMessageDirectlyResult;
-import org.apache.rocketmq.remoting.protocol.route.TopicRouteData;
+import org.apache.rocketmq.common.protocol.route.TopicRouteData;
 import org.apache.rocketmq.dashboard.model.DlqMessageRequest;
 import org.apache.rocketmq.dashboard.model.MessagePage;
 import org.apache.rocketmq.dashboard.model.MessageView;

src/test/java/org/apache/rocketmq/dashboard/controller/MessageControllerTest.java

@@ -32,9 +32,9 @@ import org.apache.rocketmq.client.exception.MQClientException;
 import org.apache.rocketmq.common.message.MessageClientIDSetter;
 import org.apache.rocketmq.common.message.MessageExt;
 import org.apache.rocketmq.common.message.MessageQueue;
-import org.apache.rocketmq.remoting.protocol.body.CMResult;
+import org.apache.rocketmq.common.protocol.body.CMResult;
-import org.apache.rocketmq.remoting.protocol.body.ConsumeMessageDirectlyResult;
+import org.apache.rocketmq.common.protocol.body.ConsumeMessageDirectlyResult;
-import org.apache.rocketmq.remoting.protocol.body.ConsumerConnection;
+import org.apache.rocketmq.common.protocol.body.ConsumerConnection;
 import org.apache.rocketmq.dashboard.model.QueueOffsetInfo;
 import org.apache.rocketmq.dashboard.model.request.MessageQuery;
 import org.apache.rocketmq.dashboard.service.impl.MessageServiceImpl;

src/test/java/org/apache/rocketmq/dashboard/controller/ProducerControllerTest.java

@@ -19,8 +19,8 @@ package org.apache.rocketmq.dashboard.controller;
 
 import java.util.HashSet;
 import org.apache.rocketmq.client.exception.MQClientException;
-import org.apache.rocketmq.remoting.protocol.body.Connection;
+import org.apache.rocketmq.common.protocol.body.Connection;
-import org.apache.rocketmq.remoting.protocol.body.ProducerConnection;
+import org.apache.rocketmq.common.protocol.body.ProducerConnection;
 import org.apache.rocketmq.dashboard.interceptor.AuthInterceptor;
 import org.apache.rocketmq.dashboard.service.impl.LoginServiceImpl;
 import org.apache.rocketmq.dashboard.service.impl.ProducerServiceImpl;

src/test/java/org/apache/rocketmq/dashboard/controller/TopicControllerTest.java

@@ -29,16 +29,16 @@ import org.apache.rocketmq.client.producer.DefaultMQProducer;
 import org.apache.rocketmq.client.producer.SendResult;
 import org.apache.rocketmq.client.producer.SendStatus;
 import org.apache.rocketmq.common.TopicConfig;
-import org.apache.rocketmq.remoting.protocol.admin.ConsumeStats;
+import org.apache.rocketmq.common.admin.ConsumeStats;
-import org.apache.rocketmq.remoting.protocol.admin.TopicStatsTable;
+import org.apache.rocketmq.common.admin.TopicStatsTable;
 import org.apache.rocketmq.common.message.Message;
 import org.apache.rocketmq.common.message.MessageQueue;
-import org.apache.rocketmq.remoting.protocol.body.ClusterInfo;
+import org.apache.rocketmq.common.protocol.body.ClusterInfo;
-import org.apache.rocketmq.remoting.protocol.body.ConsumerConnection;
+import org.apache.rocketmq.common.protocol.body.ConsumerConnection;
-import org.apache.rocketmq.remoting.protocol.body.ConsumerRunningInfo;
+import org.apache.rocketmq.common.protocol.body.ConsumerRunningInfo;
-import org.apache.rocketmq.remoting.protocol.body.GroupList;
+import org.apache.rocketmq.common.protocol.body.GroupList;
-import org.apache.rocketmq.remoting.protocol.body.TopicList;
+import org.apache.rocketmq.common.protocol.body.TopicList;
-import org.apache.rocketmq.remoting.protocol.route.TopicRouteData;
+import org.apache.rocketmq.common.protocol.route.TopicRouteData;
 import org.apache.rocketmq.dashboard.model.request.SendTopicMessageRequest;
 import org.apache.rocketmq.dashboard.model.request.TopicConfigInfo;
 import org.apache.rocketmq.dashboard.service.impl.ConsumerServiceImpl;

src/test/java/org/apache/rocketmq/dashboard/task/DashboardCollectTaskTest.java

@@ -33,12 +33,12 @@ import java.util.Set;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.TimeUnit;
 import org.apache.rocketmq.common.MixAll;
-import org.apache.rocketmq.remoting.protocol.body.BrokerStatsData;
+import org.apache.rocketmq.common.protocol.body.BrokerStatsData;
-import org.apache.rocketmq.remoting.protocol.body.ClusterInfo;
+import org.apache.rocketmq.common.protocol.body.ClusterInfo;
-import org.apache.rocketmq.remoting.protocol.body.GroupList;
+import org.apache.rocketmq.common.protocol.body.GroupList;
-import org.apache.rocketmq.remoting.protocol.body.KVTable;
+import org.apache.rocketmq.common.protocol.body.KVTable;
-import org.apache.rocketmq.remoting.protocol.body.TopicList;
+import org.apache.rocketmq.common.protocol.body.TopicList;
-import org.apache.rocketmq.remoting.protocol.route.TopicRouteData;
+import org.apache.rocketmq.common.protocol.route.TopicRouteData;
 import org.apache.rocketmq.dashboard.BaseTest;
 import org.apache.rocketmq.dashboard.config.CollectExecutorConfig;
 import org.apache.rocketmq.dashboard.config.RMQConfigure;

src/test/java/org/apache/rocketmq/dashboard/testbase/RocketMQConsoleTestBase.java

@@ -29,7 +29,7 @@ import org.apache.rocketmq.client.producer.SendResult;
 import org.apache.rocketmq.common.consumer.ConsumeFromWhere;
 import org.apache.rocketmq.common.message.Message;
 import org.apache.rocketmq.common.message.MessageExt;
-import org.apache.rocketmq.remoting.protocol.subscription.SubscriptionGroupConfig;
+import org.apache.rocketmq.common.subscription.SubscriptionGroupConfig;
 import org.apache.rocketmq.dashboard.model.request.ConsumerConfigInfo;
 import org.apache.rocketmq.dashboard.model.request.TopicConfigInfo;
 import org.apache.rocketmq.dashboard.service.ConsumerService;
@@ -78,8 +78,7 @@ public abstract class RocketMQConsoleTestBase {
                     }
                 }
             }
-            Throwables.throwIfUnchecked(exception);
+            throw Throwables.propagate(exception);
-            throw new RuntimeException(exception);
         }
     }
 
@@ -92,8 +91,7 @@ public abstract class RocketMQConsoleTestBase {
             producer.start();
         }
         catch (Exception e) {
-            Throwables.throwIfUnchecked(e);
+            throw Throwables.propagate(e);
-            throw new RuntimeException(e);
         }
     }
 
@@ -139,8 +137,7 @@ public abstract class RocketMQConsoleTestBase {
             consumer.start();
         }
         catch (Exception e) {
-            Throwables.throwIfUnchecked(e);
+            throw Throwables.propagate(e);
-            throw new RuntimeException(e);
         }
     }
 

src/test/java/org/apache/rocketmq/dashboard/util/MockObjectUtil.java

@@ -33,39 +33,39 @@ import org.apache.rocketmq.client.producer.LocalTransactionState;
 import org.apache.rocketmq.client.trace.TraceConstants;
 import org.apache.rocketmq.client.trace.TraceType;
 import org.apache.rocketmq.common.AclConfig;
-import org.apache.rocketmq.remoting.protocol.DataVersion;
+import org.apache.rocketmq.common.DataVersion;
 import org.apache.rocketmq.common.MixAll;
 import org.apache.rocketmq.common.PlainAccessConfig;
 import org.apache.rocketmq.common.TopicConfig;
-import org.apache.rocketmq.remoting.protocol.admin.ConsumeStats;
+import org.apache.rocketmq.common.admin.ConsumeStats;
-import org.apache.rocketmq.remoting.protocol.admin.OffsetWrapper;
+import org.apache.rocketmq.common.admin.OffsetWrapper;
-import org.apache.rocketmq.remoting.protocol.admin.TopicOffset;
+import org.apache.rocketmq.common.admin.TopicOffset;
-import org.apache.rocketmq.remoting.protocol.admin.TopicStatsTable;
+import org.apache.rocketmq.common.admin.TopicStatsTable;
 import org.apache.rocketmq.common.consumer.ConsumeFromWhere;
 import org.apache.rocketmq.common.message.MessageExt;
 import org.apache.rocketmq.common.message.MessageQueue;
-import org.apache.rocketmq.remoting.protocol.body.BrokerStatsData;
+import org.apache.rocketmq.common.protocol.body.BrokerStatsData;
-import org.apache.rocketmq.remoting.protocol.body.BrokerStatsItem;
+import org.apache.rocketmq.common.protocol.body.BrokerStatsItem;
-import org.apache.rocketmq.remoting.protocol.body.ClusterInfo;
+import org.apache.rocketmq.common.protocol.body.ClusterInfo;
-import org.apache.rocketmq.remoting.protocol.body.Connection;
+import org.apache.rocketmq.common.protocol.body.Connection;
-import org.apache.rocketmq.remoting.protocol.body.ConsumeStatus;
+import org.apache.rocketmq.common.protocol.body.ConsumeStatus;
-import org.apache.rocketmq.remoting.protocol.body.ConsumerConnection;
+import org.apache.rocketmq.common.protocol.body.ConsumerConnection;
-import org.apache.rocketmq.remoting.protocol.body.ConsumerRunningInfo;
+import org.apache.rocketmq.common.protocol.body.ConsumerRunningInfo;
-import org.apache.rocketmq.remoting.protocol.body.ProcessQueueInfo;
+import org.apache.rocketmq.common.protocol.body.ProcessQueueInfo;
-import org.apache.rocketmq.remoting.protocol.body.SubscriptionGroupWrapper;
+import org.apache.rocketmq.common.protocol.body.SubscriptionGroupWrapper;
-import org.apache.rocketmq.remoting.protocol.body.TopicConfigSerializeWrapper;
+import org.apache.rocketmq.common.protocol.body.TopicConfigSerializeWrapper;
-import org.apache.rocketmq.remoting.protocol.heartbeat.ConsumeType;
+import org.apache.rocketmq.common.protocol.heartbeat.ConsumeType;
-import org.apache.rocketmq.remoting.protocol.heartbeat.MessageModel;
+import org.apache.rocketmq.common.protocol.heartbeat.MessageModel;
-import org.apache.rocketmq.remoting.protocol.heartbeat.SubscriptionData;
+import org.apache.rocketmq.common.protocol.heartbeat.SubscriptionData;
-import org.apache.rocketmq.remoting.protocol.route.BrokerData;
+import org.apache.rocketmq.common.protocol.route.BrokerData;
-import org.apache.rocketmq.remoting.protocol.route.QueueData;
+import org.apache.rocketmq.common.protocol.route.QueueData;
-import org.apache.rocketmq.remoting.protocol.route.TopicRouteData;
+import org.apache.rocketmq.common.protocol.route.TopicRouteData;
-import org.apache.rocketmq.remoting.protocol.subscription.SubscriptionGroupConfig;
+import org.apache.rocketmq.common.subscription.SubscriptionGroupConfig;
 import org.apache.rocketmq.dashboard.model.DlqMessageRequest;
 import org.apache.rocketmq.remoting.protocol.LanguageCode;
 import org.checkerframework.checker.units.qual.A;
 
-import static org.apache.rocketmq.remoting.protocol.heartbeat.ConsumeType.CONSUME_ACTIVELY;
+import static org.apache.rocketmq.common.protocol.heartbeat.ConsumeType.CONSUME_ACTIVELY;
 
 public class MockObjectUtil {