[#148] Throwables.propagate in deprecated for making runtime exception more verbose (#160)

Abhijeetmishr · web-flow · commit 6456630324e3 · 2023-04-19T20:33:17.000+08:00
diff --git a/src/main/java/org/apache/rocketmq/dashboard/service/AbstractCommonService.java b/src/main/java/org/apache/rocketmq/dashboard/service/AbstractCommonService.java
@@ -38,7 +38,8 @@ protected final Set<String> changeToBrokerNameSet(Map<String, Set<String>> clust
                 }
             }
             catch (Exception e) {
-                throw Throwables.propagate(e);
+                Throwables.throwIfUnchecked(e);
+                throw new RuntimeException(e);
             }
         }
         if (CollectionUtils.isNotEmpty(brokerNameList)) {
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
@@ -140,15 +140,16 @@ public void createAndUpdateSubscriptionGroupConfig(String addr, SubscriptionGrou
     }
 
     @Override
-    public SubscriptionGroupConfig examineSubscriptionGroupConfig(String addr, String group) {
+    public SubscriptionGroupConfig examineSubscriptionGroupConfig(String addr, String group) throws MQBrokerException {
         RemotingClient remotingClient = MQAdminInstance.threadLocalRemotingClient();
         RemotingCommand request = RemotingCommand.createRequestCommand(RequestCode.GET_ALL_SUBSCRIPTIONGROUP_CONFIG, null);
         RemotingCommand response = null;
         try {
             response = remotingClient.invokeSync(addr, request, 3000);
         }
         catch (Exception err) {
-            throw Throwables.propagate(err);
+            Throwables.throwIfUnchecked(err);
+            throw new RuntimeException(err);
         }
         assert response != null;
         switch (response.getCode()) {
@@ -157,28 +158,29 @@ public SubscriptionGroupConfig examineSubscriptionGroupConfig(String addr, Strin
                 return subscriptionGroupWrapper.getSubscriptionGroupTable().get(group);
             }
             default:
-                throw Throwables.propagate(new MQBrokerException(response.getCode(), response.getRemark()));
+                throw new MQBrokerException(response.getCode(), response.getRemark());
         }
     }
 
     @Override
-    public TopicConfig examineTopicConfig(String addr, String topic) {
+    public TopicConfig examineTopicConfig(String addr, String topic) throws MQBrokerException {
         RemotingClient remotingClient = MQAdminInstance.threadLocalRemotingClient();
         RemotingCommand request = RemotingCommand.createRequestCommand(RequestCode.GET_ALL_TOPIC_CONFIG, null);
         RemotingCommand response = null;
         try {
             response = remotingClient.invokeSync(addr, request, 3000);
         }
         catch (Exception err) {
-            throw Throwables.propagate(err);
+            Throwables.throwIfUnchecked(err);
+            throw new RuntimeException(err);
         }
         switch (response.getCode()) {
             case ResponseCode.SUCCESS: {
                 TopicConfigSerializeWrapper topicConfigSerializeWrapper = decode(response.getBody(), TopicConfigSerializeWrapper.class);
                 return topicConfigSerializeWrapper.getTopicConfigTable().get(topic);
             }
             default:
-                throw Throwables.propagate(new MQBrokerException(response.getCode(), response.getRemark()));
+                throw new MQBrokerException(response.getCode(), response.getRemark());
         }
     }
 
diff --git a/src/main/java/org/apache/rocketmq/dashboard/service/impl/AclServiceImpl.java b/src/main/java/org/apache/rocketmq/dashboard/service/impl/AclServiceImpl.java
@@ -68,7 +68,8 @@ public AclConfig getAclConfig(boolean excludeSecretKey) {
             }
         } catch (Exception e) {
             log.error("getAclConfig error.", e);
-            throw Throwables.propagate(e);
+            Throwables.throwIfUnchecked(e);
+            throw new RuntimeException(e);
         }
         AclConfig aclConfig = new AclConfig();
         aclConfig.setGlobalWhiteAddrs(Collections.emptyList());
@@ -100,7 +101,8 @@ public void addAclConfig(PlainAccessConfig config) {
                 mqAdminExt.createAndUpdatePlainAccessConfig(addr, config);
             }
         } catch (Exception e) {
-            throw Throwables.propagate(e);
+            Throwables.throwIfUnchecked(e);
+            throw new RuntimeException(e);
         }
 
     }
@@ -116,7 +118,8 @@ public void deleteAclConfig(PlainAccessConfig config) {
                 log.info("Delete acl [{}] from broker [{}] complete", config.getAccessKey(), addr);
             }
         } catch (Exception e) {
-            throw Throwables.propagate(e);
+            Throwables.throwIfUnchecked(e);
+            throw new RuntimeException(e);
         }
     }
 
@@ -142,7 +145,8 @@ public void updateAclConfig(PlainAccessConfig config) {
                 mqAdminExt.createAndUpdatePlainAccessConfig(addr, config);
             }
         } catch (Exception e) {
-            throw Throwables.propagate(e);
+            Throwables.throwIfUnchecked(e);
+            throw new RuntimeException(e);
         }
     }
 
@@ -174,7 +178,8 @@ public void addOrUpdateAclTopicConfig(AclRequest request) {
                 }
             }
         } catch (Exception e) {
-            throw Throwables.propagate(e);
+            Throwables.throwIfUnchecked(e);
+            throw new RuntimeException(e);
         }
     }
 
@@ -206,7 +211,8 @@ public void addOrUpdateAclGroupConfig(AclRequest request) {
                 }
             }
         } catch (Exception e) {
-            throw Throwables.propagate(e);
+            Throwables.throwIfUnchecked(e);
+            throw new RuntimeException(e);
         }
     }
 
@@ -249,7 +255,8 @@ public void deletePermConfig(AclRequest request) {
                 }
             }
         } catch (Exception e) {
-            throw Throwables.propagate(e);
+            Throwables.throwIfUnchecked(e);
+            throw new RuntimeException(e);
         }
 
     }
@@ -261,7 +268,8 @@ public void syncData(PlainAccessConfig config) {
                 mqAdminExt.createAndUpdatePlainAccessConfig(addr, config);
             }
         } catch (Exception e) {
-            throw Throwables.propagate(e);
+            Throwables.throwIfUnchecked(e);
+            throw new RuntimeException(e);
         }
     }
 
@@ -281,7 +289,8 @@ public void addWhiteList(List<String> whiteList) {
                 mqAdminExt.updateGlobalWhiteAddrConfig(addr, StringUtils.join(aclConfig.getGlobalWhiteAddrs(), ","));
             }
         } catch (Exception e) {
-            throw Throwables.propagate(e);
+            Throwables.throwIfUnchecked(e);
+            throw new RuntimeException(e);
         }
     }
 
@@ -297,7 +306,8 @@ public void deleteWhiteAddr(String deleteAddr) {
                 mqAdminExt.updateGlobalWhiteAddrConfig(addr, StringUtils.join(aclConfig.getGlobalWhiteAddrs(), ","));
             }
         } catch (Exception e) {
-            throw Throwables.propagate(e);
+            Throwables.throwIfUnchecked(e);
+            throw new RuntimeException(e);
         }
     }
 
@@ -311,7 +321,8 @@ public void synchronizeWhiteList(List<String> whiteList) {
                 mqAdminExt.updateGlobalWhiteAddrConfig(addr, StringUtils.join(whiteList, ","));
             }
         } catch (Exception e) {
-            throw Throwables.propagate(e);
+            Throwables.throwIfUnchecked(e);
+            throw new RuntimeException(e);
         }
     }
 
diff --git a/src/main/java/org/apache/rocketmq/dashboard/service/impl/ClusterServiceImpl.java b/src/main/java/org/apache/rocketmq/dashboard/service/impl/ClusterServiceImpl.java
@@ -59,7 +59,8 @@ public Map<String, Object> list() {
             return resultMap;
         }
         catch (Exception err) {
-            throw Throwables.propagate(err);
+            Throwables.throwIfUnchecked(err);
+            throw new RuntimeException(err);
         }
     }
 
@@ -70,7 +71,8 @@ public Properties getBrokerConfig(String brokerAddr) {
             return mqAdminExt.getBrokerConfig(brokerAddr);
         }
         catch (Exception e) {
-            throw Throwables.propagate(e);
+            Throwables.throwIfUnchecked(e);
+            throw new RuntimeException(e);
         }
     }
 }
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
@@ -73,8 +73,6 @@
 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);
@@ -131,7 +129,8 @@ public List<GroupConsumeInfo> queryGroupList(boolean skipSysGroup) {
             }
         }
         catch (Exception err) {
-            throw Throwables.propagate(err);
+            Throwables.throwIfUnchecked(err);
+            throw new RuntimeException(err);
         }
         List<GroupConsumeInfo> groupConsumeInfoList = Collections.synchronizedList(Lists.newArrayList());
         CountDownLatch countDownLatch = new CountDownLatch(consumerGroupSet.size());
@@ -218,7 +217,8 @@ public List<TopicConsumerInfo> queryConsumeStatsList(final String topic, String
             consumeStats = mqAdminExt.examineConsumeStats(groupName, topic);
         }
         catch (Exception e) {
-            throw propagate(e);
+            Throwables.throwIfUnchecked(e);
+            throw new RuntimeException(e);
         }
         List<MessageQueue> mqList = Lists.newArrayList(Iterables.filter(consumeStats.getOffsetTable().keySet(), new Predicate<MessageQueue>() {
             @Override
@@ -278,7 +278,8 @@ private Map<MessageQueue, String> getClientConnection(String groupName) {
             return group2ConsumerInfoMap;
         }
         catch (Exception e) {
-            throw propagate(e);
+            Throwables.throwIfUnchecked(e);
+            throw new RuntimeException(e);
         }
     }
 
@@ -341,7 +342,8 @@ public List<ConsumerConfigInfo> examineSubscriptionGroupConfig(String group) {
             }
         }
         catch (Exception e) {
-            throw propagate(e);
+            Throwables.throwIfUnchecked(e);
+            throw new RuntimeException(e);
         }
         return consumerConfigInfoList;
     }
@@ -366,7 +368,8 @@ public boolean deleteSubGroup(DeleteSubGroupRequest deleteSubGroupRequest) {
             }
         }
         catch (Exception e) {
-            throw propagate(e);
+            Throwables.throwIfUnchecked(e);
+            throw new RuntimeException(e);
         }
         return true;
     }
@@ -393,7 +396,8 @@ public boolean createAndUpdateSubscriptionGroupConfig(ConsumerConfigInfo consume
             }
         }
         catch (Exception err) {
-            throw Throwables.propagate(err);
+            Throwables.throwIfUnchecked(err);
+            throw new RuntimeException(err);
         }
         return true;
     }
@@ -408,7 +412,8 @@ public Set<String> fetchBrokerNameSetBySubscriptionGroup(String group) {
             }
         }
         catch (Exception e) {
-            throw Throwables.propagate(e);
+            Throwables.throwIfUnchecked(e);
+            throw new RuntimeException(e);
         }
         return brokerNameSet;
 
@@ -420,7 +425,8 @@ public ConsumerConnection getConsumerConnection(String consumerGroup) {
             return mqAdminExt.examineConsumerConnectionInfo(consumerGroup);
         }
         catch (Exception e) {
-            throw Throwables.propagate(e);
+            Throwables.throwIfUnchecked(e);
+            throw new RuntimeException(e);
         }
     }
 
@@ -430,7 +436,8 @@ public ConsumerRunningInfo getConsumerRunningInfo(String consumerGroup, String c
             return mqAdminExt.getConsumerRunningInfo(consumerGroup, clientId, jstack);
         }
         catch (Exception e) {
-            throw Throwables.propagate(e);
+            Throwables.throwIfUnchecked(e);
+            throw new RuntimeException(e);
         }
     }
 }
diff --git a/src/main/java/org/apache/rocketmq/dashboard/service/impl/DashboardCollectServiceImpl.java b/src/main/java/org/apache/rocketmq/dashboard/service/impl/DashboardCollectServiceImpl.java
@@ -107,7 +107,8 @@ public Map<String, List<String>> jsonDataFile2map(File file) {
             strings = Files.readLines(file, Charsets.UTF_8);
         }
         catch (IOException e) {
-            throw Throwables.propagate(e);
+            Throwables.throwIfUnchecked(e);
+            throw new RuntimeException(e);
         }
         StringBuffer sb = new StringBuffer();
         for (String string : strings) {
diff --git a/src/main/java/org/apache/rocketmq/dashboard/service/impl/DlqMessageServiceImpl.java b/src/main/java/org/apache/rocketmq/dashboard/service/impl/DlqMessageServiceImpl.java
@@ -62,10 +62,12 @@ public MessagePage queryDlqMessageByPage(MessageQuery query) {
                 && e.getResponseCode() == ResponseCode.TOPIC_NOT_EXIST) {
                 return new MessagePage(new PageImpl<>(messageViews, page, 0), query.getTaskId());
             } else {
-                throw Throwables.propagate(e);
+                Throwables.throwIfUnchecked(e);
+                throw new RuntimeException(e);
             }
         } catch (Exception e) {
-            throw Throwables.propagate(e);
+            Throwables.throwIfUnchecked(e);
+            throw new RuntimeException(e);
         }
         return messageService.queryMessageByPage(query);
     }
diff --git a/src/main/java/org/apache/rocketmq/dashboard/service/impl/MessageServiceImpl.java b/src/main/java/org/apache/rocketmq/dashboard/service/impl/MessageServiceImpl.java
@@ -115,7 +115,8 @@ public MessageView apply(MessageExt messageExt) {
             if (err instanceof MQClientException) {
                 throw new ServiceException(-1, ((MQClientException) err).getErrorMessage());
             }
-            throw Throwables.propagate(err);
+            Throwables.throwIfUnchecked(err);
+            throw new RuntimeException(err);
         }
     }
 
@@ -185,7 +186,8 @@ public int compare(MessageView o1, MessageView o2) {
             });
             return messageViewList;
         } catch (Exception e) {
-            throw Throwables.propagate(e);
+            Throwables.throwIfUnchecked(e);
+            throw new RuntimeException(e);
         } finally {
             consumer.shutdown();
         }
@@ -209,7 +211,8 @@ public ConsumeMessageDirectlyResult consumeMessageDirectly(String topic, String
             try {
                 return mqAdminExt.consumeMessageDirectly(consumerGroup, clientId, topic, msgId);
             } catch (Exception e) {
-                throw Throwables.propagate(e);
+                Throwables.throwIfUnchecked(e);
+                throw new RuntimeException(e);
             }
         }
 
@@ -223,7 +226,8 @@ public ConsumeMessageDirectlyResult consumeMessageDirectly(String topic, String
                 return mqAdminExt.consumeMessageDirectly(consumerGroup, connection.getClientId(), topic, msgId);
             }
         } catch (Exception e) {
-            throw Throwables.propagate(e);
+            Throwables.throwIfUnchecked(e);
+            throw new RuntimeException(e);
         }
         throw new IllegalStateException("NO CONSUMER");
 
@@ -388,7 +392,8 @@ private MessagePageTask queryFirstMessagePage(MessageQueryByPage query) {
             PageImpl<MessageView> page = new PageImpl<>(messageViews, query.page(), total);
             return new MessagePageTask(page, queueOffsetInfos);
         } catch (Exception e) {
-            throw Throwables.propagate(e);
+            Throwables.throwIfUnchecked(e);
+            throw new RuntimeException(e);
         } finally {
             consumer.shutdown();
         }
@@ -455,7 +460,8 @@ private Page<MessageView> queryMessageByTaskPage(MessageQueryByPage query, List<
             }
             return new PageImpl<>(messageViews, query.page(), total);
         } catch (Exception e) {
-            throw Throwables.propagate(e);
+            Throwables.throwIfUnchecked(e);
+            throw new RuntimeException(e);
         } finally {
             consumer.shutdown();
         }
diff --git a/src/main/java/org/apache/rocketmq/dashboard/service/impl/MonitorServiceImpl.java b/src/main/java/org/apache/rocketmq/dashboard/service/impl/MonitorServiceImpl.java
@@ -82,7 +82,8 @@ private void writeDataJsonToFile(String path, String dataStr) {
             MixAll.string2File(dataStr, path);
         }
         catch (Exception e) {
-            throw Throwables.propagate(e);
+            Throwables.throwIfUnchecked(e);
+            throw new RuntimeException(e);
         }
     }
 
diff --git a/src/main/java/org/apache/rocketmq/dashboard/service/impl/ProducerServiceImpl.java b/src/main/java/org/apache/rocketmq/dashboard/service/impl/ProducerServiceImpl.java
@@ -35,7 +35,8 @@ public ProducerConnection getProducerConnection(String producerGroup, String top
             return mqAdminExt.examineProducerConnectionInfo(producerGroup, topic);
         }
         catch (Exception e) {
-            throw Throwables.propagate(e);
+            Throwables.throwIfUnchecked(e);
+            throw new RuntimeException(e);
         }
     }
 }
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
diff --git a/src/main/java/org/apache/rocketmq/dashboard/task/CollectTaskRunnble.java b/src/main/java/org/apache/rocketmq/dashboard/task/CollectTaskRunnble.java
diff --git a/src/main/java/org/apache/rocketmq/dashboard/task/DashboardCollectTask.java b/src/main/java/org/apache/rocketmq/dashboard/task/DashboardCollectTask.java
diff --git a/src/test/java/org/apache/rocketmq/dashboard/testbase/RocketMQConsoleTestBase.java b/src/test/java/org/apache/rocketmq/dashboard/testbase/RocketMQConsoleTestBase.java

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,8 @@ protected final Set<String> changeToBrokerNameSet(Map<String, Set<String>> clust`
`38`	`38`	`}`
`39`	`39`	`}`
`40`	`40`	`catch (Exception e) {`
`41`		`- throw Throwables.propagate(e);`
	`41`	`+ Throwables.throwIfUnchecked(e);`
	`42`	`+ throw new RuntimeException(e);`
`42`	`43`	`}`
`43`	`44`	`}`
`44`	`45`	`if (CollectionUtils.isNotEmpty(brokerNameList)) {`
Original file line number	Diff line number	Diff line change
`@@ -140,15 +140,16 @@ public void createAndUpdateSubscriptionGroupConfig(String addr, SubscriptionGrou`
`140`	`140`	`}`
`141`	`141`
`142`	`142`	`@Override`
`143`		`- public SubscriptionGroupConfig examineSubscriptionGroupConfig(String addr, String group) {`
	`143`	`+ public SubscriptionGroupConfig examineSubscriptionGroupConfig(String addr, String group) throws MQBrokerException {`
`144`	`144`	`RemotingClient remotingClient = MQAdminInstance.threadLocalRemotingClient();`
`145`	`145`	`RemotingCommand request = RemotingCommand.createRequestCommand(RequestCode.GET_ALL_SUBSCRIPTIONGROUP_CONFIG, null);`
`146`	`146`	`RemotingCommand response = null;`
`147`	`147`	`try {`
`148`	`148`	`response = remotingClient.invokeSync(addr, request, 3000);`
`149`	`149`	`}`
`150`	`150`	`catch (Exception err) {`
`151`		`- throw Throwables.propagate(err);`
	`151`	`+ Throwables.throwIfUnchecked(err);`
	`152`	`+ throw new RuntimeException(err);`
`152`	`153`	`}`
`153`	`154`	`assert response != null;`
`154`	`155`	`switch (response.getCode()) {`
`@@ -157,28 +158,29 @@ public SubscriptionGroupConfig examineSubscriptionGroupConfig(String addr, Strin`
`157`	`158`	`return subscriptionGroupWrapper.getSubscriptionGroupTable().get(group);`
`158`	`159`	`}`
`159`	`160`	`default:`
`160`		`- throw Throwables.propagate(new MQBrokerException(response.getCode(), response.getRemark()));`
	`161`	`+ throw new MQBrokerException(response.getCode(), response.getRemark());`
`161`	`162`	`}`
`162`	`163`	`}`
`163`	`164`
`164`	`165`	`@Override`
`165`		`- public TopicConfig examineTopicConfig(String addr, String topic) {`
	`166`	`+ public TopicConfig examineTopicConfig(String addr, String topic) throws MQBrokerException {`
`166`	`167`	`RemotingClient remotingClient = MQAdminInstance.threadLocalRemotingClient();`
`167`	`168`	`RemotingCommand request = RemotingCommand.createRequestCommand(RequestCode.GET_ALL_TOPIC_CONFIG, null);`
`168`	`169`	`RemotingCommand response = null;`
`169`	`170`	`try {`
`170`	`171`	`response = remotingClient.invokeSync(addr, request, 3000);`
`171`	`172`	`}`
`172`	`173`	`catch (Exception err) {`
`173`		`- throw Throwables.propagate(err);`
	`174`	`+ Throwables.throwIfUnchecked(err);`
	`175`	`+ throw new RuntimeException(err);`
`174`	`176`	`}`
`175`	`177`	`switch (response.getCode()) {`
`176`	`178`	`case ResponseCode.SUCCESS: {`
`177`	`179`	`TopicConfigSerializeWrapper topicConfigSerializeWrapper = decode(response.getBody(), TopicConfigSerializeWrapper.class);`
`178`	`180`	`return topicConfigSerializeWrapper.getTopicConfigTable().get(topic);`
`179`	`181`	`}`
`180`	`182`	`default:`
`181`		`- throw Throwables.propagate(new MQBrokerException(response.getCode(), response.getRemark()));`
	`183`	`+ throw new MQBrokerException(response.getCode(), response.getRemark());`
`182`	`184`	`}`
`183`	`185`	`}`
`184`	`186`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,8 @@ public AclConfig getAclConfig(boolean excludeSecretKey) {`
`68`	`68`	`}`
`69`	`69`	`} catch (Exception e) {`
`70`	`70`	`log.error("getAclConfig error.", e);`
`71`		`- throw Throwables.propagate(e);`
	`71`	`+ Throwables.throwIfUnchecked(e);`
	`72`	`+ throw new RuntimeException(e);`
`72`	`73`	`}`
`73`	`74`	`AclConfig aclConfig = new AclConfig();`
`74`	`75`	`aclConfig.setGlobalWhiteAddrs(Collections.emptyList());`
`@@ -100,7 +101,8 @@ public void addAclConfig(PlainAccessConfig config) {`
`100`	`101`	`mqAdminExt.createAndUpdatePlainAccessConfig(addr, config);`
`101`	`102`	`}`
`102`	`103`	`} catch (Exception e) {`
`103`		`- throw Throwables.propagate(e);`
	`104`	`+ Throwables.throwIfUnchecked(e);`
	`105`	`+ throw new RuntimeException(e);`
`104`	`106`	`}`
`105`	`107`
`106`	`108`	`}`
`@@ -116,7 +118,8 @@ public void deleteAclConfig(PlainAccessConfig config) {`
`116`	`118`	`log.info("Delete acl [{}] from broker [{}] complete", config.getAccessKey(), addr);`
`117`	`119`	`}`
`118`	`120`	`} catch (Exception e) {`
`119`		`- throw Throwables.propagate(e);`
	`121`	`+ Throwables.throwIfUnchecked(e);`
	`122`	`+ throw new RuntimeException(e);`
`120`	`123`	`}`
`121`	`124`	`}`
`122`	`125`
`@@ -142,7 +145,8 @@ public void updateAclConfig(PlainAccessConfig config) {`
`142`	`145`	`mqAdminExt.createAndUpdatePlainAccessConfig(addr, config);`
`143`	`146`	`}`
`144`	`147`	`} catch (Exception e) {`
`145`		`- throw Throwables.propagate(e);`
	`148`	`+ Throwables.throwIfUnchecked(e);`
	`149`	`+ throw new RuntimeException(e);`
`146`	`150`	`}`
`147`	`151`	`}`
`148`	`152`
`@@ -174,7 +178,8 @@ public void addOrUpdateAclTopicConfig(AclRequest request) {`
`174`	`178`	`}`
`175`	`179`	`}`
`176`	`180`	`} catch (Exception e) {`
`177`		`- throw Throwables.propagate(e);`
	`181`	`+ Throwables.throwIfUnchecked(e);`
	`182`	`+ throw new RuntimeException(e);`
`178`	`183`	`}`
`179`	`184`	`}`
`180`	`185`
`@@ -206,7 +211,8 @@ public void addOrUpdateAclGroupConfig(AclRequest request) {`
`206`	`211`	`}`
`207`	`212`	`}`
`208`	`213`	`} catch (Exception e) {`
`209`		`- throw Throwables.propagate(e);`
	`214`	`+ Throwables.throwIfUnchecked(e);`
	`215`	`+ throw new RuntimeException(e);`
`210`	`216`	`}`
`211`	`217`	`}`
`212`	`218`
`@@ -249,7 +255,8 @@ public void deletePermConfig(AclRequest request) {`
`249`	`255`	`}`
`250`	`256`	`}`
`251`	`257`	`} catch (Exception e) {`
`252`		`- throw Throwables.propagate(e);`
	`258`	`+ Throwables.throwIfUnchecked(e);`
	`259`	`+ throw new RuntimeException(e);`
`253`	`260`	`}`
`254`	`261`
`255`	`262`	`}`
`@@ -261,7 +268,8 @@ public void syncData(PlainAccessConfig config) {`
`261`	`268`	`mqAdminExt.createAndUpdatePlainAccessConfig(addr, config);`
`262`	`269`	`}`
`263`	`270`	`} catch (Exception e) {`
`264`		`- throw Throwables.propagate(e);`
	`271`	`+ Throwables.throwIfUnchecked(e);`
	`272`	`+ throw new RuntimeException(e);`
`265`	`273`	`}`
`266`	`274`	`}`
`267`	`275`
`@@ -281,7 +289,8 @@ public void addWhiteList(List<String> whiteList) {`
`281`	`289`	`mqAdminExt.updateGlobalWhiteAddrConfig(addr, StringUtils.join(aclConfig.getGlobalWhiteAddrs(), ","));`
`282`	`290`	`}`
`283`	`291`	`} catch (Exception e) {`
`284`		`- throw Throwables.propagate(e);`
	`292`	`+ Throwables.throwIfUnchecked(e);`
	`293`	`+ throw new RuntimeException(e);`
`285`	`294`	`}`
`286`	`295`	`}`
`287`	`296`
`@@ -297,7 +306,8 @@ public void deleteWhiteAddr(String deleteAddr) {`
`297`	`306`	`mqAdminExt.updateGlobalWhiteAddrConfig(addr, StringUtils.join(aclConfig.getGlobalWhiteAddrs(), ","));`
`298`	`307`	`}`
`299`	`308`	`} catch (Exception e) {`
`300`		`- throw Throwables.propagate(e);`
	`309`	`+ Throwables.throwIfUnchecked(e);`
	`310`	`+ throw new RuntimeException(e);`
`301`	`311`	`}`
`302`	`312`	`}`
`303`	`313`
`@@ -311,7 +321,8 @@ public void synchronizeWhiteList(List<String> whiteList) {`
`311`	`321`	`mqAdminExt.updateGlobalWhiteAddrConfig(addr, StringUtils.join(whiteList, ","));`
`312`	`322`	`}`
`313`	`323`	`} catch (Exception e) {`
`314`		`- throw Throwables.propagate(e);`
	`324`	`+ Throwables.throwIfUnchecked(e);`
	`325`	`+ throw new RuntimeException(e);`
`315`	`326`	`}`
`316`	`327`	`}`
`317`	`328`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,8 @@ public Map<String, Object> list() {`
`59`	`59`	`return resultMap;`
`60`	`60`	`}`
`61`	`61`	`catch (Exception err) {`
`62`		`- throw Throwables.propagate(err);`
	`62`	`+ Throwables.throwIfUnchecked(err);`
	`63`	`+ throw new RuntimeException(err);`
`63`	`64`	`}`
`64`	`65`	`}`
`65`	`66`
`@@ -70,7 +71,8 @@ public Properties getBrokerConfig(String brokerAddr) {`
`70`	`71`	`return mqAdminExt.getBrokerConfig(brokerAddr);`
`71`	`72`	`}`
`72`	`73`	`catch (Exception e) {`
`73`		`- throw Throwables.propagate(e);`
	`74`	`+ Throwables.throwIfUnchecked(e);`
	`75`	`+ throw new RuntimeException(e);`
`74`	`76`	`}`
`75`	`77`	`}`
`76`	`78`	`}`
Original file line number	Diff line number	Diff line change
`@@ -73,8 +73,6 @@`
`73`	`73`	`import org.springframework.beans.factory.InitializingBean;`
`74`	`74`	`import org.springframework.stereotype.Service;`
`75`	`75`
`76`		`-import static com.google.common.base.Throwables.propagate;`
`77`		`-`
`78`	`76`	`@Service`
`79`	`77`	`public class ConsumerServiceImpl extends AbstractCommonService implements ConsumerService, InitializingBean, DisposableBean {`
`80`	`78`	`private Logger logger = LoggerFactory.getLogger(ConsumerServiceImpl.class);`
`@@ -131,7 +129,8 @@ public List<GroupConsumeInfo> queryGroupList(boolean skipSysGroup) {`
`131`	`129`	`}`
`132`	`130`	`}`
`133`	`131`	`catch (Exception err) {`
`134`		`- throw Throwables.propagate(err);`
	`132`	`+ Throwables.throwIfUnchecked(err);`
	`133`	`+ throw new RuntimeException(err);`
`135`	`134`	`}`
`136`	`135`	`List<GroupConsumeInfo> groupConsumeInfoList = Collections.synchronizedList(Lists.newArrayList());`
`137`	`136`	`CountDownLatch countDownLatch = new CountDownLatch(consumerGroupSet.size());`
`@@ -218,7 +217,8 @@ public List<TopicConsumerInfo> queryConsumeStatsList(final String topic, String`
`218`	`217`	`consumeStats = mqAdminExt.examineConsumeStats(groupName, topic);`
`219`	`218`	`}`
`220`	`219`	`catch (Exception e) {`
`221`		`- throw propagate(e);`
	`220`	`+ Throwables.throwIfUnchecked(e);`
	`221`	`+ throw new RuntimeException(e);`
`222`	`222`	`}`
`223`	`223`	`List<MessageQueue> mqList = Lists.newArrayList(Iterables.filter(consumeStats.getOffsetTable().keySet(), new Predicate<MessageQueue>() {`
`224`	`224`	`@Override`
`@@ -278,7 +278,8 @@ private Map<MessageQueue, String> getClientConnection(String groupName) {`
`278`	`278`	`return group2ConsumerInfoMap;`
`279`	`279`	`}`
`280`	`280`	`catch (Exception e) {`
`281`		`- throw propagate(e);`
	`281`	`+ Throwables.throwIfUnchecked(e);`
	`282`	`+ throw new RuntimeException(e);`
`282`	`283`	`}`
`283`	`284`	`}`
`284`	`285`
`@@ -341,7 +342,8 @@ public List<ConsumerConfigInfo> examineSubscriptionGroupConfig(String group) {`
`341`	`342`	`}`
`342`	`343`	`}`
`343`	`344`	`catch (Exception e) {`
`344`		`- throw propagate(e);`
	`345`	`+ Throwables.throwIfUnchecked(e);`
	`346`	`+ throw new RuntimeException(e);`
`345`	`347`	`}`
`346`	`348`	`return consumerConfigInfoList;`
`347`	`349`	`}`
`@@ -366,7 +368,8 @@ public boolean deleteSubGroup(DeleteSubGroupRequest deleteSubGroupRequest) {`
`366`	`368`	`}`
`367`	`369`	`}`
`368`	`370`	`catch (Exception e) {`
`369`		`- throw propagate(e);`
	`371`	`+ Throwables.throwIfUnchecked(e);`
	`372`	`+ throw new RuntimeException(e);`
`370`	`373`	`}`
`371`	`374`	`return true;`
`372`	`375`	`}`
`@@ -393,7 +396,8 @@ public boolean createAndUpdateSubscriptionGroupConfig(ConsumerConfigInfo consume`
`393`	`396`	`}`
`394`	`397`	`}`
`395`	`398`	`catch (Exception err) {`
`396`		`- throw Throwables.propagate(err);`
	`399`	`+ Throwables.throwIfUnchecked(err);`
	`400`	`+ throw new RuntimeException(err);`
`397`	`401`	`}`
`398`	`402`	`return true;`
`399`	`403`	`}`
`@@ -408,7 +412,8 @@ public Set<String> fetchBrokerNameSetBySubscriptionGroup(String group) {`
`408`	`412`	`}`
`409`	`413`	`}`
`410`	`414`	`catch (Exception e) {`
`411`		`- throw Throwables.propagate(e);`
	`415`	`+ Throwables.throwIfUnchecked(e);`
	`416`	`+ throw new RuntimeException(e);`
`412`	`417`	`}`
`413`	`418`	`return brokerNameSet;`
`414`	`419`
`@@ -420,7 +425,8 @@ public ConsumerConnection getConsumerConnection(String consumerGroup) {`
`420`	`425`	`return mqAdminExt.examineConsumerConnectionInfo(consumerGroup);`
`421`	`426`	`}`
`422`	`427`	`catch (Exception e) {`
`423`		`- throw Throwables.propagate(e);`
	`428`	`+ Throwables.throwIfUnchecked(e);`
	`429`	`+ throw new RuntimeException(e);`
`424`	`430`	`}`
`425`	`431`	`}`
`426`	`432`
`@@ -430,7 +436,8 @@ public ConsumerRunningInfo getConsumerRunningInfo(String consumerGroup, String c`
`430`	`436`	`return mqAdminExt.getConsumerRunningInfo(consumerGroup, clientId, jstack);`
`431`	`437`	`}`
`432`	`438`	`catch (Exception e) {`
`433`		`- throw Throwables.propagate(e);`
	`439`	`+ Throwables.throwIfUnchecked(e);`
	`440`	`+ throw new RuntimeException(e);`
`434`	`441`	`}`
`435`	`442`	`}`
`436`	`443`	`}`
Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,8 @@ public Map<String, List<String>> jsonDataFile2map(File file) {`
`107`	`107`	`strings = Files.readLines(file, Charsets.UTF_8);`
`108`	`108`	`}`
`109`	`109`	`catch (IOException e) {`
`110`		`- throw Throwables.propagate(e);`
	`110`	`+ Throwables.throwIfUnchecked(e);`
	`111`	`+ throw new RuntimeException(e);`
`111`	`112`	`}`
`112`	`113`	`StringBuffer sb = new StringBuffer();`
`113`	`114`	`for (String string : strings) {`
Original file line number	Diff line number	Diff line change
`@@ -62,10 +62,12 @@ public MessagePage queryDlqMessageByPage(MessageQuery query) {`
`62`	`62`	`&& e.getResponseCode() == ResponseCode.TOPIC_NOT_EXIST) {`
`63`	`63`	`return new MessagePage(new PageImpl<>(messageViews, page, 0), query.getTaskId());`
`64`	`64`	`} else {`
`65`		`- throw Throwables.propagate(e);`
	`65`	`+ Throwables.throwIfUnchecked(e);`
	`66`	`+ throw new RuntimeException(e);`
`66`	`67`	`}`
`67`	`68`	`} catch (Exception e) {`
`68`		`- throw Throwables.propagate(e);`
	`69`	`+ Throwables.throwIfUnchecked(e);`
	`70`	`+ throw new RuntimeException(e);`
`69`	`71`	`}`
`70`	`72`	`return messageService.queryMessageByPage(query);`
`71`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,8 @@ public MessageView apply(MessageExt messageExt) {`
`115`	`115`	`if (err instanceof MQClientException) {`
`116`	`116`	`throw new ServiceException(-1, ((MQClientException) err).getErrorMessage());`
`117`	`117`	`}`
`118`		`- throw Throwables.propagate(err);`
	`118`	`+ Throwables.throwIfUnchecked(err);`
	`119`	`+ throw new RuntimeException(err);`
`119`	`120`	`}`
`120`	`121`	`}`
`121`	`122`
`@@ -185,7 +186,8 @@ public int compare(MessageView o1, MessageView o2) {`
`185`	`186`	`});`
`186`	`187`	`return messageViewList;`
`187`	`188`	`} catch (Exception e) {`
`188`		`- throw Throwables.propagate(e);`
	`189`	`+ Throwables.throwIfUnchecked(e);`
	`190`	`+ throw new RuntimeException(e);`
`189`	`191`	`} finally {`
`190`	`192`	`consumer.shutdown();`
`191`	`193`	`}`
`@@ -209,7 +211,8 @@ public ConsumeMessageDirectlyResult consumeMessageDirectly(String topic, String`
`209`	`211`	`try {`
`210`	`212`	`return mqAdminExt.consumeMessageDirectly(consumerGroup, clientId, topic, msgId);`
`211`	`213`	`} catch (Exception e) {`
`212`		`- throw Throwables.propagate(e);`
	`214`	`+ Throwables.throwIfUnchecked(e);`
	`215`	`+ throw new RuntimeException(e);`
`213`	`216`	`}`
`214`	`217`	`}`
`215`	`218`
`@@ -223,7 +226,8 @@ public ConsumeMessageDirectlyResult consumeMessageDirectly(String topic, String`
`223`	`226`	`return mqAdminExt.consumeMessageDirectly(consumerGroup, connection.getClientId(), topic, msgId);`
`224`	`227`	`}`
`225`	`228`	`} catch (Exception e) {`
`226`		`- throw Throwables.propagate(e);`
	`229`	`+ Throwables.throwIfUnchecked(e);`
	`230`	`+ throw new RuntimeException(e);`
`227`	`231`	`}`
`228`	`232`	`throw new IllegalStateException("NO CONSUMER");`
`229`	`233`
`@@ -388,7 +392,8 @@ private MessagePageTask queryFirstMessagePage(MessageQueryByPage query) {`
`388`	`392`	`PageImpl<MessageView> page = new PageImpl<>(messageViews, query.page(), total);`
`389`	`393`	`return new MessagePageTask(page, queueOffsetInfos);`
`390`	`394`	`} catch (Exception e) {`
`391`		`- throw Throwables.propagate(e);`
	`395`	`+ Throwables.throwIfUnchecked(e);`
	`396`	`+ throw new RuntimeException(e);`
`392`	`397`	`} finally {`
`393`	`398`	`consumer.shutdown();`
`394`	`399`	`}`
`@@ -455,7 +460,8 @@ private Page<MessageView> queryMessageByTaskPage(MessageQueryByPage query, List<`
`455`	`460`	`}`
`456`	`461`	`return new PageImpl<>(messageViews, query.page(), total);`
`457`	`462`	`} catch (Exception e) {`
`458`		`- throw Throwables.propagate(e);`
	`463`	`+ Throwables.throwIfUnchecked(e);`
	`464`	`+ throw new RuntimeException(e);`
`459`	`465`	`} finally {`
`460`	`466`	`consumer.shutdown();`
`461`	`467`	`}`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,8 @@ private void writeDataJsonToFile(String path, String dataStr) {`
`82`	`82`	`MixAll.string2File(dataStr, path);`
`83`	`83`	`}`
`84`	`84`	`catch (Exception e) {`
`85`		`- throw Throwables.propagate(e);`
	`85`	`+ Throwables.throwIfUnchecked(e);`
	`86`	`+ throw new RuntimeException(e);`
`86`	`87`	`}`
`87`	`88`	`}`
`88`	`89`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,8 @@ public ProducerConnection getProducerConnection(String producerGroup, String top`
`35`	`35`	`return mqAdminExt.examineProducerConnectionInfo(producerGroup, topic);`
`36`	`36`	`}`
`37`	`37`	`catch (Exception e) {`
`38`		`- throw Throwables.propagate(e);`
	`38`	`+ Throwables.throwIfUnchecked(e);`
	`39`	`+ throw new RuntimeException(e);`
`39`	`40`	`}`
`40`	`41`	`}`
`41`	`42`	`}`