{
mode="horizontal"
items={menuItems}
theme="dark" // Use dark theme to match Header background
- style={{ flex: 1, minWidth: 0 }} // Allow menu items to adapt width
+ style={{flex: 1, minWidth: 0}} // Allow menu items to adapt width
/>
)}
-
{/* Adjust spacing for buttons */}
+ {/* Adjust spacing for buttons */}
{/* Theme switch button */}
- } size="small">
+
- } size="small">
+
{userName && (
{/* 使用一个可点击的元素作为 Dropdown 的唯一子元素 */}
- e.preventDefault()} style={{ display: 'flex', alignItems: 'center' }}>
- {/* 添加一些间距 */}
+ e.preventDefault()} style={{display: 'flex', alignItems: 'center'}}>
+ {/* 添加一些间距 */}
{userName}
-
+
)}
@@ -175,9 +175,9 @@ const Navbar = ({ rmqVersion = true, showAcl = true}) => {
{isSmallScreen && ( // Display hamburger icon on small screens
}
+ icon={}
onClick={() => setDrawerVisible(true)}
- style={{ marginLeft: isExtraSmallScreen ? 8 : 16 }} // Adjust margin for hamburger icon
+ style={{marginLeft: isExtraSmallScreen ? 8 : 16}} // Adjust margin for hamburger icon
/>
)}
@@ -192,7 +192,7 @@ const Navbar = ({ rmqVersion = true, showAcl = true}) => {
open={drawerVisible}
// If you want the Drawer's background to match the Menu's background color, you can set bodyStyle like this
// or set components.Drawer.colorBgElevated in theme.js, etc.
- bodyStyle={{ padding: 0, backgroundColor: '#1c324a' }} // Set Drawer body background to dark
+ bodyStyle={{padding: 0, backgroundColor: '#1c324a'}} // Set Drawer body background to dark
width={200} // Set drawer width
>
diff --git a/frontend-new/src/components/acl/SubjectInput.jsx b/frontend-new/src/components/acl/SubjectInput.jsx
index bf9f649..4c2ee61 100644
--- a/frontend-new/src/components/acl/SubjectInput.jsx
+++ b/frontend-new/src/components/acl/SubjectInput.jsx
@@ -15,27 +15,27 @@
* limitations under the License.
*/
-import { Input, Select } from 'antd';
-import React, { useState, useEffect } from 'react';
+import {Input, Select} from 'antd';
+import React, {useEffect, useState} from 'react';
-const { Option } = Select;
+const {Option} = Select;
// Subject 类型枚举
const subjectTypes = [
- { value: 'User', label: 'User' },
+ {value: 'User', label: 'User'},
];
-const SubjectInput = ({ value, onChange, disabled }) => {
+const SubjectInput = ({value, onChange, disabled}) => {
// 解析传入的 value，将其拆分为 type 和 name
const parseValue = (val) => {
if (!val || typeof val !== 'string') {
- return { type: subjectTypes[0].value, name: '' }; // 默认值
+ return {type: subjectTypes[0].value, name: ''}; // 默认值
}
const parts = val.split(':');
if (parts.length === 2 && subjectTypes.some(t => t.value === parts[0])) {
- return { type: parts[0], name: parts[1] };
+ return {type: parts[0], name: parts[1]};
}
- return { type: subjectTypes[0].value, name: val }; // 如果格式不匹配，将整个值作为 name，类型设为默认
+ return {type: subjectTypes[0].value, name: val}; // 如果格式不匹配，将整个值作为 name，类型设为默认
};
const [currentType, setCurrentType] = useState(() => parseValue(value).type);
@@ -76,7 +76,7 @@ const SubjectInput = ({ value, onChange, disabled }) => {
return (
{
- const { t } = useLanguage();
+const ClientInfoModal = ({visible, group, address, onCancel}) => {
+ const {t} = useLanguage();
const [loading, setLoading] = useState(false);
const [connectionData, setConnectionData] = useState(null);
const [subscriptionData, setSubscriptionData] = useState(null);
@@ -46,15 +46,15 @@ const ClientInfoModal = ({ visible, group, address, onCancel }) => {
}, [visible, group, address]);
const connectionColumns = [
- { title: 'ClientId', dataIndex: 'clientId' },
- { title: 'ClientAddr', dataIndex: 'clientAddr' },
- { title: 'Language', dataIndex: 'language' },
- { title: 'Version', dataIndex: 'versionDesc' },
+ {title: 'ClientId', dataIndex: 'clientId'},
+ {title: 'ClientAddr', dataIndex: 'clientAddr'},
+ {title: 'Language', dataIndex: 'language'},
+ {title: 'Version', dataIndex: 'versionDesc'},
];
const subscriptionColumns = [
- { title: 'Topic', dataIndex: 'topic' },
- { title: 'SubExpression', dataIndex: 'subString' },
+ {title: 'Topic', dataIndex: 'topic'},
+ {title: 'SubExpression', dataIndex: 'subString'},
];
return (
@@ -88,7 +88,7 @@ const ClientInfoModal = ({ visible, group, address, onCancel }) => {
rowKey="topic"
pagination={false}
locale={{
- emptyText: loading ? : t.NO_DATA
+ emptyText: loading ? : t.NO_DATA
}}
/>
ConsumeType: {connectionData.consumeType}
diff --git a/frontend-new/src/components/consumer/ConsumerConfigItem.jsx b/frontend-new/src/components/consumer/ConsumerConfigItem.jsx
index cd083c6..489491e 100644
--- a/frontend-new/src/components/consumer/ConsumerConfigItem.jsx
+++ b/frontend-new/src/components/consumer/ConsumerConfigItem.jsx
@@ -15,13 +15,23 @@
* limitations under the License.
*/
-import React, { useEffect, useState } from 'react';
-import { Button, Descriptions, Form, Input, Select, Switch, message } from 'antd';
-import { remoteApi } from '../../api/remoteApi/remoteApi'; // 确保路径正确
+import React, {useEffect, useState} from 'react';
+import {Button, Descriptions, Form, Input, message, Select, Switch} from 'antd';
+import {remoteApi} from '../../api/remoteApi/remoteApi'; // 确保路径正确
-const { Option } = Select;
+const {Option} = Select;
-const ConsumerConfigItem = ({ initialConfig, isAddConfig, group, brokerName, allBrokerList, allClusterNames,onCancel, onSuccess, t }) => {
+const ConsumerConfigItem = ({
+ initialConfig,
+ isAddConfig,
+ group,
+ brokerName,
+ allBrokerList,
+ allClusterNames,
+ onCancel,
+ onSuccess,
+ t
+ }) => {
const [form] = Form.useForm();
const [currentBrokerName, setCurrentBrokerName] = useState(brokerName);
diff --git a/frontend-new/src/components/consumer/ConsumerConfigModal.jsx b/frontend-new/src/components/consumer/ConsumerConfigModal.jsx
index a58e981..5d19b7d 100644
--- a/frontend-new/src/components/consumer/ConsumerConfigModal.jsx
+++ b/frontend-new/src/components/consumer/ConsumerConfigModal.jsx
@@ -34,7 +34,7 @@ const ConsumerConfigModal = ({visible, isAddConfig, group, onCancel, setIsAddCon
setLoading(true);
try {
// Fetch cluster list for broker names and cluster names
- if(isAddConfig) {
+ if (isAddConfig) {
const clusterResponse = await remoteApi.getClusterList();
if (clusterResponse.status === 0 && clusterResponse.data) {
const clusterInfo = clusterResponse.data.clusterInfo;
diff --git a/frontend-new/src/components/consumer/ConsumerDetailModal.jsx b/frontend-new/src/components/consumer/ConsumerDetailModal.jsx
index d4b2367..4c89acd 100644
--- a/frontend-new/src/components/consumer/ConsumerDetailModal.jsx
+++ b/frontend-new/src/components/consumer/ConsumerDetailModal.jsx
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-import React, { useState, useEffect } from 'react';
-import { Modal, Table, Spin } from 'antd';
-import { remoteApi } from '../../api/remoteApi/remoteApi';
-import { useLanguage } from '../../i18n/LanguageContext';
+import React, {useEffect, useState} from 'react';
+import {Modal, Spin, Table} from 'antd';
+import {remoteApi} from '../../api/remoteApi/remoteApi';
+import {useLanguage} from '../../i18n/LanguageContext';
-const ConsumerDetailModal = ({ visible, group, address, onCancel }) => {
- const { t } = useLanguage();
+const ConsumerDetailModal = ({visible, group, address, onCancel}) => {
+ const {t} = useLanguage();
const [loading, setLoading] = useState(false);
const [details, setDetails] = useState([]);
@@ -44,12 +44,12 @@ const ConsumerDetailModal = ({ visible, group, address, onCancel }) => {
}, [visible, group, address]);
const queueColumns = [
- { title: 'Broker', dataIndex: 'brokerName' },
- { title: 'Queue', dataIndex: 'queueId' },
- { title: 'BrokerOffset', dataIndex: 'brokerOffset' },
- { title: 'ConsumerOffset', dataIndex: 'consumerOffset' },
- { title: 'DiffTotal', dataIndex: 'diffTotal' },
- { title: 'LastTimestamp', dataIndex: 'lastTimestamp' },
+ {title: 'Broker', dataIndex: 'brokerName'},
+ {title: 'Queue', dataIndex: 'queueId'},
+ {title: 'BrokerOffset', dataIndex: 'brokerOffset'},
+ {title: 'ConsumerOffset', dataIndex: 'consumerOffset'},
+ {title: 'DiffTotal', dataIndex: 'diffTotal'},
+ {title: 'LastTimestamp', dataIndex: 'lastTimestamp'},
];
return (
diff --git a/frontend-new/src/components/consumer/DeleteConsumerModal.jsx b/frontend-new/src/components/consumer/DeleteConsumerModal.jsx
index e9e3a1b..504459e 100644
--- a/frontend-new/src/components/consumer/DeleteConsumerModal.jsx
+++ b/frontend-new/src/components/consumer/DeleteConsumerModal.jsx
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-import React, { useState, useEffect } from 'react';
-import { Modal, Spin, Checkbox, Button, notification } from 'antd';
-import { remoteApi } from '../../api/remoteApi/remoteApi';
-import { useLanguage } from '../../i18n/LanguageContext';
+import React, {useEffect, useState} from 'react';
+import {Button, Checkbox, Modal, notification, Spin} from 'antd';
+import {remoteApi} from '../../api/remoteApi/remoteApi';
+import {useLanguage} from '../../i18n/LanguageContext';
-const DeleteConsumerModal = ({ visible, group, onCancel, onSuccess }) => {
- const { t } = useLanguage();
+const DeleteConsumerModal = ({visible, group, onCancel, onSuccess}) => {
+ const {t} = useLanguage();
const [brokerList, setBrokerList] = useState([]);
const [selectedBrokers, setSelectedBrokers] = useState([]);
const [loading, setLoading] = useState(false);
@@ -48,7 +48,7 @@ const DeleteConsumerModal = ({ visible, group, onCancel, onSuccess }) => {
// 处理删除提交
const handleDelete = async () => {
if (selectedBrokers.length === 0) {
- notification.warning({ message: t.PLEASE_SELECT_BROKER });
+ notification.warning({message: t.PLEASE_SELECT_BROKER});
return;
}
@@ -60,7 +60,7 @@ const DeleteConsumerModal = ({ visible, group, onCancel, onSuccess }) => {
);
if (response.status === 0) {
- notification.success({ message: t.DELETE_SUCCESS });
+ notification.success({message: t.DELETE_SUCCESS});
onSuccess();
onCancel();
}
@@ -90,9 +90,9 @@ const DeleteConsumerModal = ({ visible, group, onCancel, onSuccess }) => {
]}
>
- {t.SELECT_DELETE_BROKERS}:
+ {t.SELECT_DELETE_BROKERS}:
setSelectedBrokers(values)}
>
diff --git a/frontend-new/src/components/topic/ConsumerResetOffsetDialog.jsx b/frontend-new/src/components/topic/ConsumerResetOffsetDialog.jsx
index e5056d4..1dc5700 100644
--- a/frontend-new/src/components/topic/ConsumerResetOffsetDialog.jsx
+++ b/frontend-new/src/components/topic/ConsumerResetOffsetDialog.jsx
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-import { Button, DatePicker, Form, Modal, Select } from "antd";
-import React, { useEffect, useState } from "react";
+import {Button, DatePicker, Form, Modal, Select} from "antd";
+import React, {useEffect, useState} from "react";
-const ConsumerResetOffsetDialog = ({ visible, onClose, topic, allConsumerGroupList, handleResetOffset, t }) => {
+const ConsumerResetOffsetDialog = ({visible, onClose, topic, allConsumerGroupList, handleResetOffset, t}) => {
const [form] = Form.useForm();
const [selectedConsumerGroup, setSelectedConsumerGroup] = useState([]);
const [selectedTime, setSelectedTime] = useState(null);
@@ -49,14 +49,14 @@ const ConsumerResetOffsetDialog = ({ visible, onClose, topic, allConsumerGroupLi
,
]}
>
-
diff --git a/frontend-new/src/components/topic/ConsumerViewDialog.jsx b/frontend-new/src/components/topic/ConsumerViewDialog.jsx
index 304628a..c082aee 100644
--- a/frontend-new/src/components/topic/ConsumerViewDialog.jsx
+++ b/frontend-new/src/components/topic/ConsumerViewDialog.jsx
@@ -19,13 +19,13 @@ import moment from "moment/moment";
import {Button, Modal, Table} from "antd";
import React from "react";
-const ConsumerViewDialog = ({ visible, onClose, topic, consumerData, consumerGroupCount, t }) => {
+const ConsumerViewDialog = ({visible, onClose, topic, consumerData, consumerGroupCount, t}) => {
const columns = [
- { title: t.BROKER, dataIndex: 'brokerName', key: 'brokerName', align: 'center' },
- { title: t.QUEUE, dataIndex: 'queueId', key: 'queueId', align: 'center' },
- { title: t.CONSUMER_CLIENT, dataIndex: 'clientInfo', key: 'clientInfo', align: 'center' },
- { title: t.BROKER_OFFSET, dataIndex: 'brokerOffset', key: 'brokerOffset', align: 'center' },
- { title: t.CONSUMER_OFFSET, dataIndex: 'consumerOffset', key: 'consumerOffset', align: 'center' },
+ {title: t.BROKER, dataIndex: 'brokerName', key: 'brokerName', align: 'center'},
+ {title: t.QUEUE, dataIndex: 'queueId', key: 'queueId', align: 'center'},
+ {title: t.CONSUMER_CLIENT, dataIndex: 'clientInfo', key: 'clientInfo', align: 'center'},
+ {title: t.BROKER_OFFSET, dataIndex: 'brokerOffset', key: 'brokerOffset', align: 'center'},
+ {title: t.CONSUMER_OFFSET, dataIndex: 'consumerOffset', key: 'consumerOffset', align: 'center'},
{
title: t.DIFF_TOTAL,
dataIndex: 'diffTotal',
@@ -58,15 +58,19 @@ const ConsumerViewDialog = ({ visible, onClose, topic, consumerData, consumerGro
{t.NO_DATA} {t.SUBSCRIPTION_GROUP}
) : (
consumerData && Object.entries(consumerData).map(([consumerGroup, consumeDetail]) => (
-
+
{
+const ResetOffsetResultDialog = ({visible, onClose, result, t}) => {
return (
{
]}
>
{result && Object.entries(result).map(([groupName, groupData]) => (
-
+
{
You Should Check It Yourself
) : (
({ key: index, item }))}
- columns={[{ dataIndex: 'item', key: 'item' }]}
+ dataSource={groupData.rollbackStatsList.map((item, index) => ({key: index, item}))}
+ columns={[{dataIndex: 'item', key: 'item'}]}
pagination={false}
rowKey="key"
size="small"
diff --git a/frontend-new/src/components/topic/RouterViewDialog.jsx b/frontend-new/src/components/topic/RouterViewDialog.jsx
index aebb899..59546cc 100644
--- a/frontend-new/src/components/topic/RouterViewDialog.jsx
+++ b/frontend-new/src/components/topic/RouterViewDialog.jsx
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-import { Button, Modal, Table } from "antd";
+import {Button, Modal, Table} from "antd";
import React from "react";
-const RouterViewDialog = ({ visible, onClose, topic, routeData, t }) => {
+const RouterViewDialog = ({visible, onClose, topic, routeData, t}) => {
const brokerColumns = [
{
title: 'Broker',
@@ -30,10 +30,14 @@ const RouterViewDialog = ({ visible, onClose, topic, routeData, t }) => {
key: 'brokerAddrs',
render: (_, record) => (
({ key, idx: key, address: value }))}
+ dataSource={Object.entries(record.brokerAddrs || []).map(([key, value]) => ({
+ key,
+ idx: key,
+ address: value
+ }))}
columns={[
- { title: 'Index', dataIndex: 'idx', key: 'idx' },
- { title: 'Address', dataIndex: 'address', key: 'address' },
+ {title: 'Index', dataIndex: 'idx', key: 'idx'},
+ {title: 'Address', dataIndex: 'address', key: 'address'},
]}
pagination={false}
bordered
@@ -82,7 +86,7 @@ const RouterViewDialog = ({ visible, onClose, topic, routeData, t }) => {
Broker Datas:
{routeData?.brokerDatas?.map((item, index) => (
-
+
{
))}
-
+
{t.QUEUE_DATAS}:
{
+const SendResultDialog = ({visible, onClose, result, t}) => {
return (
{
: []
}
columns={[
- { dataIndex: 'label', key: 'label' },
+ {dataIndex: 'label', key: 'label'},
{
dataIndex: 'value',
key: 'value',
- render: (text) => {text},
+ render: (text) => {text},
},
]}
pagination={false}
@@ -61,5 +61,4 @@ const SendResultDialog = ({ visible, onClose, result, t }) => {
};
-
export default SendResultDialog;
diff --git a/frontend-new/src/components/topic/SendTopicMessageDialog.jsx b/frontend-new/src/components/topic/SendTopicMessageDialog.jsx
index 002634d..5efaefc 100644
--- a/frontend-new/src/components/topic/SendTopicMessageDialog.jsx
+++ b/frontend-new/src/components/topic/SendTopicMessageDialog.jsx
@@ -76,24 +76,24 @@ const SendTopicMessageDialog = ({
,
]}
>
-
diff --git a/frontend-new/src/components/topic/SkipMessageAccumulateDialog.jsx b/frontend-new/src/components/topic/SkipMessageAccumulateDialog.jsx
index cd28a6e..4d6e045 100644
--- a/frontend-new/src/components/topic/SkipMessageAccumulateDialog.jsx
+++ b/frontend-new/src/components/topic/SkipMessageAccumulateDialog.jsx
@@ -15,10 +15,17 @@
* limitations under the License.
*/
-import { Button, Form, message, Modal, Select } from "antd";
-import React, { useEffect, useState } from "react";
+import {Button, Form, message, Modal, Select} from "antd";
+import React, {useEffect, useState} from "react";
-const SkipMessageAccumulateDialog = ({ visible, onClose, topic, allConsumerGroupList, handleSkipMessageAccumulate, t }) => {
+const SkipMessageAccumulateDialog = ({
+ visible,
+ onClose,
+ topic,
+ allConsumerGroupList,
+ handleSkipMessageAccumulate,
+ t
+ }) => {
const [form] = Form.useForm();
const [selectedConsumerGroup, setSelectedConsumerGroup] = useState([]);
@@ -52,14 +59,14 @@ const SkipMessageAccumulateDialog = ({ visible, onClose, topic, allConsumerGroup
,
]}
>
-
diff --git a/frontend-new/src/components/topic/StatsViewDialog.jsx b/frontend-new/src/components/topic/StatsViewDialog.jsx
index 2f6f51f..5935233 100644
--- a/frontend-new/src/components/topic/StatsViewDialog.jsx
+++ b/frontend-new/src/components/topic/StatsViewDialog.jsx
@@ -19,11 +19,11 @@ import moment from "moment/moment";
import {Button, Modal, Table} from "antd";
import React from "react";
-const StatsViewDialog = ({ visible, onClose, topic, statsData, t }) => {
+const StatsViewDialog = ({visible, onClose, topic, statsData, t}) => {
const columns = [
- { title: t.QUEUE, dataIndex: 'queue', key: 'queue', align: 'center' },
- { title: t.MIN_OFFSET, dataIndex: 'minOffset', key: 'minOffset', align: 'center' },
- { title: t.MAX_OFFSET, dataIndex: 'maxOffset', key: 'maxOffset', align: 'center' },
+ {title: t.QUEUE, dataIndex: 'queue', key: 'queue', align: 'center'},
+ {title: t.MIN_OFFSET, dataIndex: 'minOffset', key: 'minOffset', align: 'center'},
+ {title: t.MAX_OFFSET, dataIndex: 'maxOffset', key: 'maxOffset', align: 'center'},
{
title: t.LAST_UPDATE_TIME_STAMP,
dataIndex: 'lastUpdateTimestamp',
diff --git a/frontend-new/src/components/topic/TopicModifyDialog.jsx b/frontend-new/src/components/topic/TopicModifyDialog.jsx
index 523d9f3..a03d0d3 100644
--- a/frontend-new/src/components/topic/TopicModifyDialog.jsx
+++ b/frontend-new/src/components/topic/TopicModifyDialog.jsx
@@ -16,7 +16,7 @@
*/
// TopicModifyDialog.js
-import { Button, Modal } from "antd";
+import {Button, Modal} from "antd";
import React from "react";
import TopicSingleModifyForm from './TopicSingleModifyForm';
@@ -43,7 +43,7 @@ const TopicModifyDialog = ({
{t.CLOSE}
,
]}
- Style={{ maxHeight: '70vh', overflowY: 'auto' }}
+ Style={{maxHeight: '70vh', overflowY: 'auto'}}
>
{initialData.map((data, index) => (
{
form.validateFields()
.then(values => {
- const updatedValues = { ...values };
+ const updatedValues = {...values};
// 提交时，如果 clusterNameList 或 brokerNameList 为空，则填充所有可用的名称
- if(!bIsUpdate){
+ if (!bIsUpdate) {
if (!updatedValues.clusterNameList || updatedValues.clusterNameList.length === 0) {
updatedValues.clusterNameList = allClusterNameList;
}
@@ -60,84 +60,85 @@ const TopicSingleModifyForm = ({
};
const messageTypeOptions = [
- { value: 'TRANSACTION', label: 'TRANSACTION' },
- { value: 'FIFO', label: 'FIFO' },
- { value: 'DELAY', label: 'DELAY' },
- { value: 'NORMAL', label: 'NORMAL' },
+ {value: 'TRANSACTION', label: 'TRANSACTION'},
+ {value: 'FIFO', label: 'FIFO'},
+ {value: 'DELAY', label: 'DELAY'},
+ {value: 'NORMAL', label: 'NORMAL'},
];
return (
-
- {bIsUpdate &&
{`${t.TOPIC_CONFIG} - ${initialData.brokerNameList ? initialData.brokerNameList.join(', ') : t.UNKNOWN_BROKER}`}}
-
{/* 使用 Row 居中内容 */}
- {/* 表单内容占据 12 栅格宽度，并自动居中 */}
-
+
+
ProxyServerAddressList
}
bordered={false}
>
-
+
{writeOperationEnabled && (
-
+
setNewProxyAddr(e.target.value)}
placeholder={t.INPUT_PROXY_ADDR}
@@ -149,25 +152,26 @@ const ProxyManager = () => {
onCancel={() => setShowModal(false)}
title={`${t.PROXY_CONFIG} [${selectedProxy}]`}
footer={
-
+
}
width={800}
- bodyStyle={{ maxHeight: '60vh', overflowY: 'auto' }}
+ bodyStyle={{maxHeight: '60vh', overflowY: 'auto'}}
>
-
+
{Object.entries(allProxyConfig).length > 0 ? (
Object.entries(allProxyConfig).map(([key, value]) => (
- | {key} |
+ {key} |
{value} |
))
) : (
- | {t.NO_CONFIG_DATA || "No configuration data available."} |
+ {t.NO_CONFIG_DATA || "No configuration data available."} |
)}
diff --git a/frontend-new/src/pages/Topic/topic.jsx b/frontend-new/src/pages/Topic/topic.jsx
index aa41d0d..8a3abc9 100644
--- a/frontend-new/src/pages/Topic/topic.jsx
+++ b/frontend-new/src/pages/Topic/topic.jsx
@@ -173,7 +173,6 @@ const DeployHistoryList = () => {
};
-
const filterList = (currentPage) => {
const lowExceptStr = filterStr.toLowerCase();
const canShowList = allTopicList.filter((topic, index) => {
@@ -223,7 +222,7 @@ const DeployHistoryList = () => {
try {
if (isUpdate) {
- // topic 已经是字符串
+ // topic 已经是字符串
const configResult = await remoteApi.getTopicConfig(topic);
if (configResult.status === 0) {
const dataToSet = Array.isArray(configResult.data) ? configResult.data : [configResult.data];
@@ -257,7 +256,7 @@ const DeployHistoryList = () => {
return;
}
- if(!isUpdate){
+ if (!isUpdate) {
const clusterResult = await remoteApi.getClusterList();
if (clusterResult.status === 0) {
setAllClusterNameList(Object.keys(clusterResult.data.clusterInfo.clusterAddrTable));
@@ -276,7 +275,7 @@ const DeployHistoryList = () => {
if (result.status === 0) {
messageApi.success(t.TOPIC_OPERATION_SUCCESS);
closeAddUpdateDialog();
- if(!isUpdateMode) {
+ if (!isUpdateMode) {
await getTopicList()
}
} else {
diff --git a/frontend-new/src/reportWebVitals.js b/frontend-new/src/reportWebVitals.js
index 36281f2..5540044 100644
--- a/frontend-new/src/reportWebVitals.js
+++ b/frontend-new/src/reportWebVitals.js
@@ -16,15 +16,15 @@
*/
const reportWebVitals = onPerfEntry => {
- if (onPerfEntry && onPerfEntry instanceof Function) {
- import('web-vitals').then(({ getCLS, getFID, getFCP, getLCP, getTTFB }) => {
- getCLS(onPerfEntry);
- getFID(onPerfEntry);
- getFCP(onPerfEntry);
- getLCP(onPerfEntry);
- getTTFB(onPerfEntry);
- });
- }
+ if (onPerfEntry && onPerfEntry instanceof Function) {
+ import('web-vitals').then(({getCLS, getFID, getFCP, getLCP, getTTFB}) => {
+ getCLS(onPerfEntry);
+ getFID(onPerfEntry);
+ getFCP(onPerfEntry);
+ getLCP(onPerfEntry);
+ getTTFB(onPerfEntry);
+ });
+ }
};
export default reportWebVitals;
diff --git a/frontend-new/src/router/index.jsx b/frontend-new/src/router/index.jsx
index 9408532..bbf2814 100644
--- a/frontend-new/src/router/index.jsx
+++ b/frontend-new/src/router/index.jsx
@@ -64,7 +64,7 @@ const AppRouter = () => {
useEffect(() => {
remoteApi.setRedirectHandler(() => {
- navigate('/login', { replace: true });
+ navigate('/login', {replace: true});
});
}, [navigate]);
diff --git a/frontend-new/src/store/context/ThemeContext.js b/frontend-new/src/store/context/ThemeContext.js
index 7f2ce65..7249876 100644
--- a/frontend-new/src/store/context/ThemeContext.js
+++ b/frontend-new/src/store/context/ThemeContext.js
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-import { useEffect } from 'react';
-import { useSelector, useDispatch } from 'react-redux';
-import { themes, defaultTheme } from '../../assets/styles/theme';
-import { setTheme } from '../actions/themeActions';
+import {useEffect} from 'react';
+import {useDispatch, useSelector} from 'react-redux';
+import {defaultTheme, themes} from '../../assets/styles/theme';
+import {setTheme} from '../actions/themeActions';
export const useTheme = () => {
// 从 Redux store 中取出 currentThemeName
diff --git a/frontend-new/src/store/index.js b/frontend-new/src/store/index.js
index f303f5d..8cf73ff 100644
--- a/frontend-new/src/store/index.js
+++ b/frontend-new/src/store/index.js
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-import { createStore,combineReducers } from 'redux';
+import {combineReducers, createStore} from 'redux';
import themeReducer from './reducers/themeReducer';
// 组合所有的 reducers
diff --git a/frontend-new/src/store/reducers/themeReducer.js b/frontend-new/src/store/reducers/themeReducer.js
index 9e131ab..5601f94 100644
--- a/frontend-new/src/store/reducers/themeReducer.js
+++ b/frontend-new/src/store/reducers/themeReducer.js
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { SET_THEME } from '../actions/themeActions';
+import {SET_THEME} from '../actions/themeActions';
const getInitialTheme = () => {
return localStorage.getItem('appTheme') || 'default';
diff --git a/pom.xml b/pom.xml
index 6107e7d..0726fdf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,8 @@
~ limitations under the License.
-->
-
+
org.apache
@@ -432,7 +433,7 @@
- install node
+ install node
install-node-and-npm
@@ -469,7 +470,7 @@
-
+
diff --git a/src/main/java/org/apache/rocketmq/dashboard/admin/MQAdminExtCallback.java b/src/main/java/org/apache/rocketmq/dashboard/admin/MQAdminExtCallback.java
deleted file mode 100644
index 324b82d..0000000
--- a/src/main/java/org/apache/rocketmq/dashboard/admin/MQAdminExtCallback.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.rocketmq.dashboard.admin;
-
-import org.apache.rocketmq.tools.admin.MQAdminExt;
-
-@FunctionalInterface
-public interface MQAdminExtCallback {
- T doInMQAdminExt(MQAdminExt mqAdminExt) throws Exception;
-}
diff --git a/src/main/java/org/apache/rocketmq/dashboard/admin/MQAdminPooledObjectFactory.java b/src/main/java/org/apache/rocketmq/dashboard/admin/MQAdminPooledObjectFactory.java
index 0c495be..78b7655 100644
--- a/src/main/java/org/apache/rocketmq/dashboard/admin/MQAdminPooledObjectFactory.java
+++ b/src/main/java/org/apache/rocketmq/dashboard/admin/MQAdminPooledObjectFactory.java
@@ -32,7 +32,7 @@ public class MQAdminPooledObjectFactory implements PooledObjectFactory makeObject() throws Exception {
DefaultPooledObject pooledObject = new DefaultPooledObject<>(
- mqAdminFactory.getInstance());
+ mqAdminFactory.getInstance());
return pooledObject;
}
diff --git a/src/main/java/org/apache/rocketmq/dashboard/admin/MqAdminExtObjectPool.java b/src/main/java/org/apache/rocketmq/dashboard/admin/MqAdminExtObjectPool.java
index 976c009..ba5e9c4 100644
--- a/src/main/java/org/apache/rocketmq/dashboard/admin/MqAdminExtObjectPool.java
+++ b/src/main/java/org/apache/rocketmq/dashboard/admin/MqAdminExtObjectPool.java
@@ -40,8 +40,8 @@ public class MqAdminExtObjectPool {
MQAdminFactory mqAdminFactory = new MQAdminFactory(rmqConfigure);
mqAdminPooledObjectFactory.setMqAdminFactory(mqAdminFactory);
GenericObjectPool genericObjectPool = new GenericObjectPool(
- mqAdminPooledObjectFactory,
- genericObjectPoolConfig);
+ mqAdminPooledObjectFactory,
+ genericObjectPoolConfig);
return genericObjectPool;
}
}
diff --git a/src/main/java/org/apache/rocketmq/dashboard/config/CollectExecutorConfig.java b/src/main/java/org/apache/rocketmq/dashboard/config/CollectExecutorConfig.java
index d72b62a..dad8245 100644
--- a/src/main/java/org/apache/rocketmq/dashboard/config/CollectExecutorConfig.java
+++ b/src/main/java/org/apache/rocketmq/dashboard/config/CollectExecutorConfig.java
@@ -41,20 +41,20 @@ public class CollectExecutorConfig {
@Bean(name = "collectExecutor")
public ExecutorService collectExecutor(CollectExecutorConfig collectExecutorConfig) {
ExecutorService collectExecutor = new ThreadPoolExecutor(
- collectExecutorConfig.getCoreSize(),
- collectExecutorConfig.getMaxSize(),
- collectExecutorConfig.getKeepAliveTime(),
- TimeUnit.MILLISECONDS,
- new LinkedBlockingDeque<>(collectExecutorConfig.getQueueSize()),
- new ThreadFactory() {
- private final AtomicLong threadIndex = new AtomicLong(0);
+ collectExecutorConfig.getCoreSize(),
+ collectExecutorConfig.getMaxSize(),
+ collectExecutorConfig.getKeepAliveTime(),
+ TimeUnit.MILLISECONDS,
+ new LinkedBlockingDeque<>(collectExecutorConfig.getQueueSize()),
+ new ThreadFactory() {
+ private final AtomicLong threadIndex = new AtomicLong(0);
- @Override
- public Thread newThread(Runnable r) {
- return new Thread(r, "collectTopicThread_" + this.threadIndex.incrementAndGet());
- }
- },
- new ThreadPoolExecutor.DiscardOldestPolicy()
+ @Override
+ public Thread newThread(Runnable r) {
+ return new Thread(r, "collectTopicThread_" + this.threadIndex.incrementAndGet());
+ }
+ },
+ new ThreadPoolExecutor.DiscardOldestPolicy()
);
return collectExecutor;
}
diff --git a/src/main/java/org/apache/rocketmq/dashboard/config/RMQConfigure.java b/src/main/java/org/apache/rocketmq/dashboard/config/RMQConfigure.java
index 7bec055..78e5a77 100644
--- a/src/main/java/org/apache/rocketmq/dashboard/config/RMQConfigure.java
+++ b/src/main/java/org/apache/rocketmq/dashboard/config/RMQConfigure.java
@@ -91,6 +91,10 @@ public class RMQConfigure {
@Getter
private Integer clientCallbackExecutorThreads = 4;
+ @Setter
+ @Getter
+ private String authMode = "file";
+
public void setProxyAddrs(List proxyAddrs) {
this.proxyAddrs = proxyAddrs;
if (CollectionUtils.isNotEmpty(proxyAddrs)) {
@@ -112,10 +116,12 @@ public class RMQConfigure {
logger.info("setNameSrvAddrByProperty nameSrvAddr={}", namesrvAddr);
}
}
+
public boolean isACLEnabled() {
return !(StringUtils.isAnyBlank(this.accessKey, this.secretKey) ||
- StringUtils.isAnyEmpty(this.accessKey, this.secretKey));
+ StringUtils.isAnyEmpty(this.accessKey, this.secretKey));
}
+
public String getRocketMqDashboardDataPath() {
return dataPath;
}
diff --git a/src/main/java/org/apache/rocketmq/dashboard/controller/ConsumerController.java b/src/main/java/org/apache/rocketmq/dashboard/controller/ConsumerController.java
index fdf51bf..6d62e3e 100644
--- a/src/main/java/org/apache/rocketmq/dashboard/controller/ConsumerController.java
+++ b/src/main/java/org/apache/rocketmq/dashboard/controller/ConsumerController.java
@@ -54,7 +54,7 @@ public class ConsumerController {
@RequestMapping(value = "/group.refresh")
@ResponseBody
public Object refresh(String address,
- String consumerGroup) {
+ String consumerGroup) {
return consumerService.refreshGroup(address, consumerGroup);
}
@@ -100,7 +100,7 @@ public class ConsumerController {
@ResponseBody
public Object consumerCreateOrUpdateRequest(@RequestBody ConsumerConfigInfo consumerConfigInfo) {
Preconditions.checkArgument(CollectionUtils.isNotEmpty(consumerConfigInfo.getBrokerNameList()) || CollectionUtils.isNotEmpty(consumerConfigInfo.getClusterNameList()),
- "clusterName or brokerName can not be all blank");
+ "clusterName or brokerName can not be all blank");
return consumerService.createAndUpdateSubscriptionGroupConfig(consumerConfigInfo);
}
@@ -127,7 +127,7 @@ public class ConsumerController {
@RequestMapping(value = "/consumerRunningInfo.query")
@ResponseBody
public Object getConsumerRunningInfo(@RequestParam String consumerGroup, @RequestParam String clientId,
- @RequestParam boolean jstack) {
+ @RequestParam boolean jstack) {
return consumerService.getConsumerRunningInfo(consumerGroup, clientId, jstack);
}
}
diff --git a/src/main/java/org/apache/rocketmq/dashboard/controller/DashboardController.java b/src/main/java/org/apache/rocketmq/dashboard/controller/DashboardController.java
index 6ea911e..6b3f1a8 100644
--- a/src/main/java/org/apache/rocketmq/dashboard/controller/DashboardController.java
+++ b/src/main/java/org/apache/rocketmq/dashboard/controller/DashboardController.java
@@ -47,7 +47,7 @@ public class DashboardController {
if (Strings.isNullOrEmpty(topicName)) {
return dashboardService.queryTopicData(date);
}
- return dashboardService.queryTopicData(date,topicName);
+ return dashboardService.queryTopicData(date, topicName);
}
@RequestMapping(value = "/topicCurrent.query", method = RequestMethod.GET)
diff --git a/src/main/java/org/apache/rocketmq/dashboard/controller/MessageTraceController.java b/src/main/java/org/apache/rocketmq/dashboard/controller/MessageTraceController.java
index f2b04af..fa76ea5 100644
--- a/src/main/java/org/apache/rocketmq/dashboard/controller/MessageTraceController.java
+++ b/src/main/java/org/apache/rocketmq/dashboard/controller/MessageTraceController.java
@@ -64,7 +64,7 @@ public class MessageTraceController {
@RequestMapping(value = "/viewMessageTraceGraph.query", method = RequestMethod.GET)
@ResponseBody
public MessageTraceGraph viewMessageTraceGraph(@RequestParam String msgId,
- @RequestParam(required = false) String traceTopic) {
+ @RequestParam(required = false) String traceTopic) {
return messageTraceService.queryMessageTraceGraph(msgId, traceTopic);
}
}
diff --git a/src/main/java/org/apache/rocketmq/dashboard/controller/MonitorController.java b/src/main/java/org/apache/rocketmq/dashboard/controller/MonitorController.java
index 224ae04..53aecdf 100644
--- a/src/main/java/org/apache/rocketmq/dashboard/controller/MonitorController.java
+++ b/src/main/java/org/apache/rocketmq/dashboard/controller/MonitorController.java
@@ -40,7 +40,7 @@ public class MonitorController {
@RequestMapping(value = "/createOrUpdateConsumerMonitor.do", method = {RequestMethod.POST})
@ResponseBody
public Object createOrUpdateConsumerMonitor(@RequestParam String consumeGroupName, @RequestParam int minCount,
- @RequestParam int maxDiffTotal) {
+ @RequestParam int maxDiffTotal) {
return monitorService.createOrUpdateConsumerMonitor(consumeGroupName, new ConsumerMonitorConfig(minCount, maxDiffTotal));
}
diff --git a/src/main/java/org/apache/rocketmq/dashboard/controller/OpsController.java b/src/main/java/org/apache/rocketmq/dashboard/controller/OpsController.java
index 601a679..3270961 100644
--- a/src/main/java/org/apache/rocketmq/dashboard/controller/OpsController.java
+++ b/src/main/java/org/apache/rocketmq/dashboard/controller/OpsController.java
@@ -52,7 +52,7 @@ public class OpsController {
@ResponseBody
public Object addNameSvrAddr(@RequestParam String newNamesrvAddr) {
Preconditions.checkArgument(StringUtils.isNotEmpty(newNamesrvAddr),
- "namesrvAddr can not be blank");
+ "namesrvAddr can not be blank");
opsService.addNameSvrAddr(newNamesrvAddr);
return true;
}
diff --git a/src/main/java/org/apache/rocketmq/dashboard/controller/ProxyController.java b/src/main/java/org/apache/rocketmq/dashboard/controller/ProxyController.java
index ca8c4c8..589eaea 100644
--- a/src/main/java/org/apache/rocketmq/dashboard/controller/ProxyController.java
+++ b/src/main/java/org/apache/rocketmq/dashboard/controller/ProxyController.java
@@ -31,6 +31,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
public class ProxyController {
@Resource
private ProxyService proxyService;
+
@RequestMapping(value = "/homePage.query", method = RequestMethod.GET)
@ResponseBody
public Object homePage() {
diff --git a/src/main/java/org/apache/rocketmq/dashboard/controller/TestController.java b/src/main/java/org/apache/rocketmq/dashboard/controller/TestController.java
index 43938c7..3da1f07 100644
--- a/src/main/java/org/apache/rocketmq/dashboard/controller/TestController.java
+++ b/src/main/java/org/apache/rocketmq/dashboard/controller/TestController.java
@@ -59,7 +59,7 @@ public class TestController {
@Override
public ConsumeConcurrentlyStatus consumeMessage(List msgs,
- ConsumeConcurrentlyContext context) {
+ ConsumeConcurrentlyContext context) {
logger.info("receiveMessage msgSize={}", msgs.size());
return ConsumeConcurrentlyStatus.CONSUME_SUCCESS;
}
@@ -72,26 +72,25 @@ public class TestController {
new Thread(new Runnable() {
- @Override public void run() {
+ @Override
+ public void run() {
int i = 0;
while (true) {
try {
Message msg = new Message(testTopic,
- "TagA" + i,
- "KEYS" + i,
- ("Hello RocketMQ " + i).getBytes()
+ "TagA" + i,
+ "KEYS" + i,
+ ("Hello RocketMQ " + i).getBytes()
);
Thread.sleep(1000L);
SendResult sendResult = producer.send(msg);
logger.info("sendMessage={}", JsonUtil.obj2String(sendResult));
- }
- catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
try {
Thread.sleep(1000);
- }
- catch (Exception ignore) {
+ } catch (Exception ignore) {
}
}
}
diff --git a/src/main/java/org/apache/rocketmq/dashboard/controller/TopicController.java b/src/main/java/org/apache/rocketmq/dashboard/controller/TopicController.java
index 7b9f4e1..a64be06 100644
--- a/src/main/java/org/apache/rocketmq/dashboard/controller/TopicController.java
+++ b/src/main/java/org/apache/rocketmq/dashboard/controller/TopicController.java
@@ -51,7 +51,7 @@ public class TopicController {
@RequestMapping(value = "/list.query", method = RequestMethod.GET)
@ResponseBody
public Object list(@RequestParam(value = "skipSysProcess", required = false) boolean skipSysProcess,
- @RequestParam(value = "skipRetryAndDlq", required = false) boolean skipRetryAndDlq) {
+ @RequestParam(value = "skipRetryAndDlq", required = false) boolean skipRetryAndDlq) {
return topicService.fetchAllTopicList(skipSysProcess, skipRetryAndDlq);
}
@@ -75,11 +75,11 @@ public class TopicController {
}
- @RequestMapping(value = "/createOrUpdate.do", method = { RequestMethod.POST})
+ @RequestMapping(value = "/createOrUpdate.do", method = {RequestMethod.POST})
@ResponseBody
public Object topicCreateOrUpdateRequest(@RequestBody TopicConfigInfo topicCreateOrUpdateRequest) {
Preconditions.checkArgument(CollectionUtils.isNotEmpty(topicCreateOrUpdateRequest.getBrokerNameList()) || CollectionUtils.isNotEmpty(topicCreateOrUpdateRequest.getClusterNameList()),
- "clusterName or brokerName can not be all blank");
+ "clusterName or brokerName can not be all blank");
logger.info("op=look topicCreateOrUpdateRequest={}", JsonUtil.obj2String(topicCreateOrUpdateRequest));
topicService.createOrUpdate(topicCreateOrUpdateRequest);
return true;
@@ -100,14 +100,14 @@ public class TopicController {
@RequestMapping(value = "/examineTopicConfig.query")
@ResponseBody
public Object examineTopicConfig(@RequestParam String topic,
- @RequestParam(required = false) String brokerName) throws RemotingException, MQClientException, InterruptedException {
+ @RequestParam(required = false) String brokerName) throws RemotingException, MQClientException, InterruptedException {
return topicService.examineTopicConfig(topic);
}
@RequestMapping(value = "/sendTopicMessage.do", method = {RequestMethod.POST})
@ResponseBody
public Object sendTopicMessage(
- @RequestBody SendTopicMessageRequest sendTopicMessageRequest) throws RemotingException, MQClientException, InterruptedException {
+ @RequestBody SendTopicMessageRequest sendTopicMessageRequest) throws RemotingException, MQClientException, InterruptedException {
return topicService.sendTopicMessageRequest(sendTopicMessageRequest);
}
diff --git a/src/main/java/org/apache/rocketmq/dashboard/filter/HttpBasicAuthorizedFilter.java b/src/main/java/org/apache/rocketmq/dashboard/filter/HttpBasicAuthorizedFilter.java
index 3e25a68..132a0d5 100644
--- a/src/main/java/org/apache/rocketmq/dashboard/filter/HttpBasicAuthorizedFilter.java
+++ b/src/main/java/org/apache/rocketmq/dashboard/filter/HttpBasicAuthorizedFilter.java
@@ -29,7 +29,6 @@ import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
-
@WebFilter(urlPatterns = "/*", filterName = "httpBasicAuthorizedFilter")
public class HttpBasicAuthorizedFilter implements Filter {
diff --git a/src/main/java/org/apache/rocketmq/dashboard/model/MessageView.java b/src/main/java/org/apache/rocketmq/dashboard/model/MessageView.java
index edd56e0..c22dfaa 100644
--- a/src/main/java/org/apache/rocketmq/dashboard/model/MessageView.java
+++ b/src/main/java/org/apache/rocketmq/dashboard/model/MessageView.java
@@ -25,7 +25,9 @@ import java.util.Map;
public class MessageView {
- /** from MessageExt **/
+ /**
+ * from MessageExt
+ **/
private int queueId;
private int storeSize;
private long queueOffset;
@@ -41,13 +43,17 @@ public class MessageView {
private long preparedTransactionOffset;
/**from MessageExt**/
- /** from Message **/
+ /**
+ * from Message
+ **/
private String topic;
private int flag;
private Map properties;
private String messageBody; // body
- /** from Message **/
+ /**
+ * from Message
+ **/
public static MessageView fromMessageExt(MessageExt messageExt) {
MessageView messageView = new MessageView();
diff --git a/src/main/java/org/apache/rocketmq/dashboard/model/request/TopicConfigInfo.java b/src/main/java/org/apache/rocketmq/dashboard/model/request/TopicConfigInfo.java
index 6b9eb67..1089716 100644
--- a/src/main/java/org/apache/rocketmq/dashboard/model/request/TopicConfigInfo.java
+++ b/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;
@@ -24,7 +25,9 @@ public class TopicConfigInfo {
private List clusterNameList;
private List brokerNameList;
- /** topicConfig */
+ /**
+ * topicConfig
+ */
private String topicName;
private int writeQueueNums;
private int readQueueNums;
@@ -32,6 +35,7 @@ public class TopicConfigInfo {
private boolean order;
private String messageType;
+
public List getClusterNameList() {
return clusterNameList;
}
@@ -40,8 +44,9 @@ public class TopicConfigInfo {
this.clusterNameList = clusterNameList;
}
- /** topicConfig */
-
+ /**
+ * topicConfig
+ */
public List getBrokerNameList() {
@@ -102,8 +107,6 @@ public class TopicConfigInfo {
}
-
-
@Override
public boolean equals(Object o) {
if (this == o)
@@ -112,16 +115,16 @@ public class TopicConfigInfo {
return false;
TopicConfigInfo that = (TopicConfigInfo) o;
return writeQueueNums == that.writeQueueNums &&
- readQueueNums == that.readQueueNums &&
- perm == that.perm &&
- order == that.order &&
- Objects.equal(topicName, that.topicName) &&
- Objects.equal(messageType, that.messageType);
+ readQueueNums == that.readQueueNums &&
+ perm == that.perm &&
+ order == that.order &&
+ Objects.equal(topicName, that.topicName) &&
+ Objects.equal(messageType, that.messageType);
}
@Override
public int hashCode() {
- return Objects.hashCode(topicName, writeQueueNums, readQueueNums, perm, order,messageType);
+ return Objects.hashCode(topicName, writeQueueNums, readQueueNums, perm, order, messageType);
}
}
diff --git a/src/main/java/org/apache/rocketmq/dashboard/service/AbstractCommonService.java b/src/main/java/org/apache/rocketmq/dashboard/service/AbstractCommonService.java
index b1b097c..1833b76 100644
--- a/src/main/java/org/apache/rocketmq/dashboard/service/AbstractCommonService.java
+++ b/src/main/java/org/apache/rocketmq/dashboard/service/AbstractCommonService.java
@@ -29,16 +29,16 @@ import java.util.Set;
public abstract class AbstractCommonService {
@Resource
protected MQAdminExt mqAdminExt;
+
protected final Set changeToBrokerNameSet(Map> clusterAddrTable,
- List clusterNameList, List brokerNameList) {
+ List clusterNameList, List brokerNameList) {
Set finalBrokerNameList = Sets.newHashSet();
if (CollectionUtils.isNotEmpty(clusterNameList)) {
try {
for (String clusterName : clusterNameList) {
finalBrokerNameList.addAll(clusterAddrTable.get(clusterName));
}
- }
- catch (Exception e) {
+ } catch (Exception e) {
Throwables.throwIfUnchecked(e);
throw new RuntimeException(e);
}
diff --git a/src/main/java/org/apache/rocketmq/dashboard/service/AclService.java b/src/main/java/org/apache/rocketmq/dashboard/service/AclService.java
index 9386331..fcc340c 100644
--- a/src/main/java/org/apache/rocketmq/dashboard/service/AclService.java
+++ b/src/main/java/org/apache/rocketmq/dashboard/service/AclService.java
@@ -39,5 +39,5 @@ public interface AclService {
void deleteAcl(String brokerAddress, String subject, String resource);
- void updateAcl(PolicyRequest policyRequest);
+ void updateAcl(PolicyRequest policyRequest);
}
diff --git a/src/main/java/org/apache/rocketmq/dashboard/service/ConsumerService.java b/src/main/java/org/apache/rocketmq/dashboard/service/ConsumerService.java
index 9a80df3..93c8448 100644
--- a/src/main/java/org/apache/rocketmq/dashboard/service/ConsumerService.java
+++ b/src/main/java/org/apache/rocketmq/dashboard/service/ConsumerService.java
@@ -31,7 +31,7 @@ import java.util.Map;
import java.util.Set;
public interface ConsumerService {
- List queryGroupList(boolean skipSysGroup,String address);
+ List queryGroupList(boolean skipSysGroup, String address);
GroupConsumeInfo queryGroup(String consumerGroup, String address);
diff --git a/src/main/java/org/apache/rocketmq/dashboard/service/DashboardService.java b/src/main/java/org/apache/rocketmq/dashboard/service/DashboardService.java
index 3dc5041..8744383 100644
--- a/src/main/java/org/apache/rocketmq/dashboard/service/DashboardService.java
+++ b/src/main/java/org/apache/rocketmq/dashboard/service/DashboardService.java
@@ -32,7 +32,7 @@ public interface DashboardService {
Map> queryTopicData(String date);
/**
- * @param date format yyyy-MM-dd
+ * @param date format yyyy-MM-dd
* @param topicName
*/
List queryTopicData(String date, String topicName);
diff --git a/src/main/java/org/apache/rocketmq/dashboard/service/MessageService.java b/src/main/java/org/apache/rocketmq/dashboard/service/MessageService.java
index ce738fe..6d3c9ab 100644
--- a/src/main/java/org/apache/rocketmq/dashboard/service/MessageService.java
+++ b/src/main/java/org/apache/rocketmq/dashboard/service/MessageService.java
@@ -39,21 +39,18 @@ public interface MessageService {
/**
* @param topic
* @param begin
- * @param end
- * org.apache.rocketmq.tools.command.message.PrintMessageSubCommand
+ * @param end org.apache.rocketmq.tools.command.message.PrintMessageSubCommand
*/
List queryMessageByTopic(final String topic, final long begin,
- final long end);
+ final long end);
List messageTrackDetail(MessageExt msg);
ConsumeMessageDirectlyResult consumeMessageDirectly(String topic, String msgId, String consumerGroup,
- String clientId);
+ String clientId);
MessagePage queryMessageByPage(MessageQuery query);
-
-
}
diff --git a/src/main/java/org/apache/rocketmq/dashboard/service/OpsService.java b/src/main/java/org/apache/rocketmq/dashboard/service/OpsService.java
index 4d7fd0a..a03343d 100644
--- a/src/main/java/org/apache/rocketmq/dashboard/service/OpsService.java
+++ b/src/main/java/org/apache/rocketmq/dashboard/service/OpsService.java
@@ -27,7 +27,7 @@ public interface OpsService {
String getNameSvrList();
- Map rocketMqStatusCheck();
+ Map rocketMqStatusCheck();
boolean updateIsVIPChannel(String useVIPChannel);
diff --git a/src/main/java/org/apache/rocketmq/dashboard/service/ProxyService.java b/src/main/java/org/apache/rocketmq/dashboard/service/ProxyService.java
index 2a64680..6f18cd4 100644
--- a/src/main/java/org/apache/rocketmq/dashboard/service/ProxyService.java
+++ b/src/main/java/org/apache/rocketmq/dashboard/service/ProxyService.java
@@ -24,5 +24,5 @@ public interface ProxyService {
void updateProxyAddrList(String proxyAddr);
- Map getProxyHomePage();
+ Map getProxyHomePage();
}
diff --git a/src/main/java/org/apache/rocketmq/dashboard/service/client/MQAdminExtImpl.java b/src/main/java/org/apache/rocketmq/dashboard/service/client/MQAdminExtImpl.java
index c1e5fd1..57e689f 100644
--- a/src/main/java/org/apache/rocketmq/dashboard/service/client/MQAdminExtImpl.java
+++ b/src/main/java/org/apache/rocketmq/dashboard/service/client/MQAdminExtImpl.java
@@ -94,19 +94,20 @@ public class MQAdminExtImpl implements MQAdminExt {
private Logger logger = LoggerFactory.getLogger(MQAdminExtImpl.class);
- public MQAdminExtImpl() {}
+ public MQAdminExtImpl() {
+ }
@Override
public void updateBrokerConfig(String brokerAddr, Properties properties)
- throws RemotingConnectException, RemotingSendRequestException, RemotingTimeoutException,
- UnsupportedEncodingException, InterruptedException, MQBrokerException, MQClientException {
+ throws RemotingConnectException, RemotingSendRequestException, RemotingTimeoutException,
+ UnsupportedEncodingException, InterruptedException, MQBrokerException, MQClientException {
MQAdminInstance.threadLocalMQAdminExt().updateBrokerConfig(brokerAddr, properties);
}
@Override
public void createAndUpdateTopicConfig(String addr, TopicConfig config)
- throws RemotingException, MQBrokerException, InterruptedException, MQClientException {
+ throws RemotingException, MQBrokerException, InterruptedException, MQClientException {
MQAdminInstance.threadLocalMQAdminExt().createAndUpdateTopicConfig(addr, config);
}
@@ -118,7 +119,7 @@ public class MQAdminExtImpl implements MQAdminExt {
@Override
public void createAndUpdateSubscriptionGroupConfig(String addr, SubscriptionGroupConfig config)
- throws RemotingException, MQBrokerException, InterruptedException, MQClientException {
+ throws RemotingException, MQBrokerException, InterruptedException, MQClientException {
MQAdminInstance.threadLocalMQAdminExt().createAndUpdateSubscriptionGroupConfig(addr, config);
}
@@ -134,8 +135,7 @@ public class MQAdminExtImpl implements MQAdminExt {
RemotingCommand response = null;
try {
response = remotingClient.invokeSync(addr, request, 8000);
- }
- catch (Exception err) {
+ } catch (Exception err) {
Throwables.throwIfUnchecked(err);
throw new RuntimeException(err);
}
@@ -178,7 +178,7 @@ public class MQAdminExtImpl implements MQAdminExt {
@Override
public TopicStatsTable examineTopicStats(String topic)
- throws RemotingException, MQClientException, InterruptedException, MQBrokerException {
+ throws RemotingException, MQClientException, InterruptedException, MQBrokerException {
return MQAdminInstance.threadLocalMQAdminExt().examineTopicStats(topic);
}
@@ -191,14 +191,14 @@ public class MQAdminExtImpl implements MQAdminExt {
@Override
public KVTable fetchBrokerRuntimeStats(String brokerAddr)
- throws RemotingConnectException, RemotingSendRequestException, RemotingTimeoutException,
- InterruptedException, MQBrokerException {
+ throws RemotingConnectException, RemotingSendRequestException, RemotingTimeoutException,
+ InterruptedException, MQBrokerException {
return MQAdminInstance.threadLocalMQAdminExt().fetchBrokerRuntimeStats(brokerAddr);
}
@Override
public ConsumeStats examineConsumeStats(String consumerGroup)
- throws RemotingException, MQClientException, InterruptedException, MQBrokerException {
+ throws RemotingException, MQClientException, InterruptedException, MQBrokerException {
return MQAdminInstance.threadLocalMQAdminExt().examineConsumeStats(consumerGroup);
}
@@ -209,7 +209,7 @@ public class MQAdminExtImpl implements MQAdminExt {
@Override
public ConsumeStats examineConsumeStats(String consumerGroup, String topic)
- throws RemotingException, MQClientException, InterruptedException, MQBrokerException {
+ throws RemotingException, MQClientException, InterruptedException, MQBrokerException {
return MQAdminInstance.threadLocalMQAdminExt().examineConsumeStats(consumerGroup, topic);
}
@@ -220,27 +220,27 @@ public class MQAdminExtImpl implements MQAdminExt {
@Override
public ClusterInfo examineBrokerClusterInfo()
- throws InterruptedException, MQBrokerException, RemotingTimeoutException, RemotingSendRequestException,
- RemotingConnectException {
+ throws InterruptedException, MQBrokerException, RemotingTimeoutException, RemotingSendRequestException,
+ RemotingConnectException {
return MQAdminInstance.threadLocalMQAdminExt().examineBrokerClusterInfo();
}
@Override
public TopicRouteData examineTopicRouteInfo(String topic)
- throws RemotingException, MQClientException, InterruptedException {
+ throws RemotingException, MQClientException, InterruptedException {
return MQAdminInstance.threadLocalMQAdminExt().examineTopicRouteInfo(topic);
}
@Override
public ConsumerConnection examineConsumerConnectionInfo(String consumerGroup)
- throws RemotingConnectException, RemotingSendRequestException, RemotingTimeoutException,
- InterruptedException, MQBrokerException, RemotingException, MQClientException {
+ throws RemotingConnectException, RemotingSendRequestException, RemotingTimeoutException,
+ InterruptedException, MQBrokerException, RemotingException, MQClientException {
return MQAdminInstance.threadLocalMQAdminExt().examineConsumerConnectionInfo(consumerGroup);
}
@Override
public ProducerConnection examineProducerConnectionInfo(String producerGroup, String topic)
- throws RemotingException, MQClientException, InterruptedException, MQBrokerException {
+ throws RemotingException, MQClientException, InterruptedException, MQBrokerException {
return MQAdminInstance.threadLocalMQAdminExt().examineProducerConnectionInfo(producerGroup, topic);
}
@@ -251,14 +251,14 @@ public class MQAdminExtImpl implements MQAdminExt {
@Override
public int wipeWritePermOfBroker(String namesrvAddr, String brokerName)
- throws RemotingCommandException, RemotingConnectException, RemotingSendRequestException,
- RemotingTimeoutException, InterruptedException, MQClientException {
+ throws RemotingCommandException, RemotingConnectException, RemotingSendRequestException,
+ RemotingTimeoutException, InterruptedException, MQClientException {
return MQAdminInstance.threadLocalMQAdminExt().wipeWritePermOfBroker(namesrvAddr, brokerName);
}
@Override
public int addWritePermOfBroker(String namesrvAddr,
- String brokerName) throws RemotingCommandException, RemotingConnectException, RemotingSendRequestException, RemotingTimeoutException, InterruptedException, MQClientException {
+ String brokerName) throws RemotingCommandException, RemotingConnectException, RemotingSendRequestException, RemotingTimeoutException, InterruptedException, MQClientException {
return MQAdminInstance.threadLocalMQAdminExt().addWritePermOfBroker(namesrvAddr, brokerName);
}
@@ -269,62 +269,62 @@ public class MQAdminExtImpl implements MQAdminExt {
@Override
public String getKVConfig(String namespace, String key)
- throws RemotingException, MQClientException, InterruptedException {
+ throws RemotingException, MQClientException, InterruptedException {
return MQAdminInstance.threadLocalMQAdminExt().getKVConfig(namespace, key);
}
@Override
public KVTable getKVListByNamespace(String namespace)
- throws RemotingException, MQClientException, InterruptedException {
+ throws RemotingException, MQClientException, InterruptedException {
return MQAdminInstance.threadLocalMQAdminExt().getKVListByNamespace(namespace);
}
@Override
public void deleteTopicInBroker(Set addrs, String topic)
- throws RemotingException, MQBrokerException, InterruptedException, MQClientException {
+ throws RemotingException, MQBrokerException, InterruptedException, MQClientException {
logger.info("addrs={} topic={}", JsonUtil.obj2String(addrs), topic);
MQAdminInstance.threadLocalMQAdminExt().deleteTopicInBroker(addrs, topic);
}
@Override
public void deleteTopicInNameServer(Set addrs, String topic)
- throws RemotingException, MQBrokerException, InterruptedException, MQClientException {
+ throws RemotingException, MQBrokerException, InterruptedException, MQClientException {
MQAdminInstance.threadLocalMQAdminExt().deleteTopicInNameServer(addrs, topic);
}
@Override
public void deleteSubscriptionGroup(String addr, String groupName)
- throws RemotingException, MQBrokerException, InterruptedException, MQClientException {
+ throws RemotingException, MQBrokerException, InterruptedException, MQClientException {
MQAdminInstance.threadLocalMQAdminExt().deleteSubscriptionGroup(addr, groupName);
}
@Override
public void deleteSubscriptionGroup(String addr, String groupName, boolean removeOffset)
- throws RemotingException, MQBrokerException, InterruptedException, MQClientException {
+ throws RemotingException, MQBrokerException, InterruptedException, MQClientException {
MQAdminInstance.threadLocalMQAdminExt().deleteSubscriptionGroup(addr, groupName, removeOffset);
}
@Override
public void createAndUpdateKvConfig(String namespace, String key, String value)
- throws RemotingException, MQBrokerException, InterruptedException, MQClientException {
+ throws RemotingException, MQBrokerException, InterruptedException, MQClientException {
MQAdminInstance.threadLocalMQAdminExt().createAndUpdateKvConfig(namespace, key, value);
}
@Override
public void deleteKvConfig(String namespace, String key)
- throws RemotingException, MQBrokerException, InterruptedException, MQClientException {
+ throws RemotingException, MQBrokerException, InterruptedException, MQClientException {
MQAdminInstance.threadLocalMQAdminExt().deleteKvConfig(namespace, key);
}
@Override
public List resetOffsetByTimestampOld(String consumerGroup, String topic, long timestamp,
- boolean force) throws RemotingException, MQBrokerException, InterruptedException, MQClientException {
+ boolean force) throws RemotingException, MQBrokerException, InterruptedException, MQClientException {
return MQAdminInstance.threadLocalMQAdminExt().resetOffsetByTimestampOld(consumerGroup, topic, timestamp, force);
}
@Override
public Map resetOffsetByTimestamp(String topic, String group, long timestamp,
- boolean isForce) throws RemotingException, MQBrokerException, InterruptedException, MQClientException {
+ boolean isForce) throws RemotingException, MQBrokerException, InterruptedException, MQClientException {
return MQAdminInstance.threadLocalMQAdminExt().resetOffsetByTimestamp(topic, group, timestamp, isForce);
}
@@ -335,59 +335,59 @@ public class MQAdminExtImpl implements MQAdminExt {
@Override
public void resetOffsetNew(String consumerGroup, String topic, long timestamp)
- throws RemotingException, MQBrokerException, InterruptedException, MQClientException {
+ throws RemotingException, MQBrokerException, InterruptedException, MQClientException {
MQAdminInstance.threadLocalMQAdminExt().resetOffsetNew(consumerGroup, topic, timestamp);
}
@Override
public Map> getConsumeStatus(String topic, String group,
- String clientAddr) throws RemotingException, MQBrokerException, InterruptedException, MQClientException {
+ String clientAddr) throws RemotingException, MQBrokerException, InterruptedException, MQClientException {
return MQAdminInstance.threadLocalMQAdminExt().getConsumeStatus(topic, group, clientAddr);
}
@Override
public void createOrUpdateOrderConf(String key, String value, boolean isCluster)
- throws RemotingException, MQBrokerException, InterruptedException, MQClientException {
+ throws RemotingException, MQBrokerException, InterruptedException, MQClientException {
MQAdminInstance.threadLocalMQAdminExt().createOrUpdateOrderConf(key, value, isCluster);
}
@Override
public GroupList queryTopicConsumeByWho(String topic)
- throws RemotingConnectException, RemotingSendRequestException, RemotingTimeoutException,
- InterruptedException, MQBrokerException, RemotingException, MQClientException {
+ throws RemotingConnectException, RemotingSendRequestException, RemotingTimeoutException,
+ InterruptedException, MQBrokerException, RemotingException, MQClientException {
return MQAdminInstance.threadLocalMQAdminExt().queryTopicConsumeByWho(topic);
}
@Override
public boolean cleanExpiredConsumerQueue(String cluster)
- throws RemotingConnectException, RemotingSendRequestException, RemotingTimeoutException, MQClientException,
- InterruptedException {
+ throws RemotingConnectException, RemotingSendRequestException, RemotingTimeoutException, MQClientException,
+ InterruptedException {
return MQAdminInstance.threadLocalMQAdminExt().cleanExpiredConsumerQueue(cluster);
}
@Override
public boolean cleanExpiredConsumerQueueByAddr(String addr)
- throws RemotingConnectException, RemotingSendRequestException, RemotingTimeoutException, MQClientException,
- InterruptedException {
+ throws RemotingConnectException, RemotingSendRequestException, RemotingTimeoutException, MQClientException,
+ InterruptedException {
return MQAdminInstance.threadLocalMQAdminExt().cleanExpiredConsumerQueueByAddr(addr);
}
@Override
public ConsumerRunningInfo getConsumerRunningInfo(String consumerGroup, String clientId, boolean jstack)
- throws RemotingException, MQClientException, InterruptedException {
+ throws RemotingException, MQClientException, InterruptedException {
return MQAdminInstance.threadLocalMQAdminExt().getConsumerRunningInfo(consumerGroup, clientId, jstack);
}
@Override
public List messageTrackDetail(MessageExt msg)
- throws RemotingException, MQClientException, InterruptedException, MQBrokerException {
+ throws RemotingException, MQClientException, InterruptedException, MQBrokerException {
return MQAdminInstance.threadLocalMQAdminExt().messageTrackDetail(msg);
}
@Override
public void cloneGroupOffset(String srcGroup, String destGroup, String topic, boolean isOffline)
- throws RemotingException, MQClientException, InterruptedException, MQBrokerException {
+ throws RemotingException, MQClientException, InterruptedException, MQBrokerException {
MQAdminInstance.threadLocalMQAdminExt().cloneGroupOffset(srcGroup, destGroup, topic, isOffline);
}
@@ -398,7 +398,7 @@ public class MQAdminExtImpl implements MQAdminExt {
@Override
public void createTopic(String key, String newTopic, int queueNum, int topicSysFlag, Map attributes)
- throws MQClientException {
+ throws MQClientException {
MQAdminInstance.threadLocalMQAdminExt().createTopic(key, newTopic, queueNum, topicSysFlag, attributes);
}
@@ -424,7 +424,7 @@ public class MQAdminExtImpl implements MQAdminExt {
@Override
public QueryResult queryMessage(String topic, String key, int maxNum, long begin, long end)
- throws MQClientException, InterruptedException {
+ throws MQClientException, InterruptedException {
return MQAdminInstance.threadLocalMQAdminExt().queryMessage(topic, key, maxNum, begin, end);
}
@@ -444,7 +444,7 @@ public class MQAdminExtImpl implements MQAdminExt {
@Override
public List queryConsumeTimeSpan(String topic,
- String group) throws InterruptedException, MQBrokerException, RemotingException, MQClientException {
+ String group) throws InterruptedException, MQBrokerException, RemotingException, MQClientException {
return MQAdminInstance.threadLocalMQAdminExt().queryConsumeTimeSpan(topic, group);
}
@@ -454,7 +454,7 @@ public class MQAdminExtImpl implements MQAdminExt {
//https://github.com/apache/incubator-rocketmq/pull/69
@Override
public MessageExt viewMessage(String topic,
- String msgId) throws RemotingException, MQBrokerException, InterruptedException, MQClientException {
+ String msgId) throws RemotingException, MQBrokerException, InterruptedException, MQClientException {
logger.info("MessageClientIDSetter.getNearlyTimeFromID(msgId)={} msgId={}", MessageClientIDSetter.getNearlyTimeFromID(msgId), msgId);
MQAdminImpl mqAdminImpl = MQAdminInstance.threadLocalMqClientInstance().getMQAdminImpl();
Set clusterList = MQAdminInstance.threadLocalMQAdminExt().getTopicClusterList(topic);
@@ -478,7 +478,7 @@ public class MQAdminExtImpl implements MQAdminExt {
@Override
public ConsumeMessageDirectlyResult consumeMessageDirectly(String consumerGroup, String clientId, String topic,
- String msgId) throws RemotingException, MQClientException, InterruptedException, MQBrokerException {
+ String msgId) throws RemotingException, MQClientException, InterruptedException, MQBrokerException {
return MQAdminInstance.threadLocalMQAdminExt().consumeMessageDirectly(consumerGroup, clientId, topic, msgId);
}
@@ -489,96 +489,99 @@ public class MQAdminExtImpl implements MQAdminExt {
@Override
public Properties getBrokerConfig(
- String brokerAddr) throws RemotingConnectException, RemotingSendRequestException, RemotingTimeoutException, UnsupportedEncodingException, InterruptedException, MQBrokerException {
+ String brokerAddr) throws RemotingConnectException, RemotingSendRequestException, RemotingTimeoutException, UnsupportedEncodingException, InterruptedException, MQBrokerException {
return MQAdminInstance.threadLocalMQAdminExt().getBrokerConfig(brokerAddr);
}
@Override
public TopicList fetchTopicsByCLuster(
- String clusterName) throws RemotingException, MQClientException, InterruptedException {
+ String clusterName) throws RemotingException, MQClientException, InterruptedException {
return MQAdminInstance.threadLocalMQAdminExt().fetchTopicsByCLuster(clusterName);
}
@Override
public boolean cleanUnusedTopic(
- String cluster) throws RemotingConnectException, RemotingSendRequestException, RemotingTimeoutException, MQClientException, InterruptedException {
+ String cluster) throws RemotingConnectException, RemotingSendRequestException, RemotingTimeoutException, MQClientException, InterruptedException {
return MQAdminInstance.threadLocalMQAdminExt().cleanUnusedTopic(cluster);
}
@Override
public boolean cleanUnusedTopicByAddr(
- String addr) throws RemotingConnectException, RemotingSendRequestException, RemotingTimeoutException, MQClientException, InterruptedException {
+ String addr) throws RemotingConnectException, RemotingSendRequestException, RemotingTimeoutException, MQClientException, InterruptedException {
return MQAdminInstance.threadLocalMQAdminExt().cleanUnusedTopicByAddr(addr);
}
@Override
public BrokerStatsData viewBrokerStatsData(String brokerAddr, String statsName,
- String statsKey) throws RemotingConnectException, RemotingSendRequestException, RemotingTimeoutException, MQClientException, InterruptedException {
+ String statsKey) throws RemotingConnectException, RemotingSendRequestException, RemotingTimeoutException, MQClientException, InterruptedException {
return MQAdminInstance.threadLocalMQAdminExt().viewBrokerStatsData(brokerAddr, statsName, statsKey);
}
@Override
public Set getClusterList(
- String topic) throws RemotingConnectException, RemotingSendRequestException, RemotingTimeoutException, MQClientException, InterruptedException {
+ String topic) throws RemotingConnectException, RemotingSendRequestException, RemotingTimeoutException, MQClientException, InterruptedException {
return MQAdminInstance.threadLocalMQAdminExt().getClusterList(topic);
}
@Override
public ConsumeStatsList fetchConsumeStatsInBroker(String brokerAddr, boolean isOrder,
- long timeoutMillis) throws RemotingConnectException, RemotingSendRequestException, RemotingTimeoutException, MQClientException, InterruptedException {
+ long timeoutMillis) throws RemotingConnectException, RemotingSendRequestException, RemotingTimeoutException, MQClientException, InterruptedException {
return MQAdminInstance.threadLocalMQAdminExt().fetchConsumeStatsInBroker(brokerAddr, isOrder, timeoutMillis);
}
@Override
public Set getTopicClusterList(
- String topic) throws InterruptedException, MQBrokerException, MQClientException, RemotingException {
+ String topic) throws InterruptedException, MQBrokerException, MQClientException, RemotingException {
return MQAdminInstance.threadLocalMQAdminExt().getTopicClusterList(topic);
}
@Override
public SubscriptionGroupWrapper getAllSubscriptionGroup(String brokerAddr,
- long timeoutMillis) throws InterruptedException, RemotingTimeoutException, RemotingSendRequestException, RemotingConnectException, MQBrokerException {
+ long timeoutMillis) throws InterruptedException, RemotingTimeoutException, RemotingSendRequestException, RemotingConnectException, MQBrokerException {
return MQAdminInstance.threadLocalMQAdminExt().getAllSubscriptionGroup(brokerAddr, timeoutMillis);
}
@Override
public SubscriptionGroupWrapper getUserSubscriptionGroup(String brokerAddr,
- long timeoutMillis) throws InterruptedException, RemotingTimeoutException, RemotingSendRequestException, RemotingConnectException, MQBrokerException {
+ long timeoutMillis) throws InterruptedException, RemotingTimeoutException, RemotingSendRequestException, RemotingConnectException, MQBrokerException {
return MQAdminInstance.threadLocalMQAdminExt().getUserSubscriptionGroup(brokerAddr, timeoutMillis);
}
@Override
public TopicConfigSerializeWrapper getAllTopicConfig(String brokerAddr,
- long timeoutMillis) throws InterruptedException, RemotingTimeoutException, RemotingSendRequestException, RemotingConnectException, MQBrokerException {
+ long timeoutMillis) throws InterruptedException, RemotingTimeoutException, RemotingSendRequestException, RemotingConnectException, MQBrokerException {
return MQAdminInstance.threadLocalMQAdminExt().getAllTopicConfig(brokerAddr, timeoutMillis);
}
@Override
public TopicConfigSerializeWrapper getUserTopicConfig(String brokerAddr, boolean specialTopic,
- long timeoutMillis) throws InterruptedException, RemotingException, MQBrokerException, MQClientException {
+ long timeoutMillis) throws InterruptedException, RemotingException, MQBrokerException, MQClientException {
return MQAdminInstance.threadLocalMQAdminExt().getUserTopicConfig(brokerAddr, specialTopic, timeoutMillis);
}
@Override
public void updateConsumeOffset(String brokerAddr, String consumeGroup, MessageQueue mq,
- long offset) throws RemotingException, InterruptedException, MQBrokerException {
+ long offset) throws RemotingException, InterruptedException, MQBrokerException {
MQAdminInstance.threadLocalMQAdminExt().updateConsumeOffset(brokerAddr, consumeGroup, mq, offset);
}
// 4.0.0 added
- @Override public void updateNameServerConfig(Properties properties,
- List list) throws InterruptedException, RemotingConnectException, UnsupportedEncodingException, RemotingSendRequestException, RemotingTimeoutException, MQClientException, MQBrokerException {
+ @Override
+ public void updateNameServerConfig(Properties properties,
+ List list) throws InterruptedException, RemotingConnectException, UnsupportedEncodingException, RemotingSendRequestException, RemotingTimeoutException, MQClientException, MQBrokerException {
}
- @Override public Map getNameServerConfig(
- List list) throws InterruptedException, RemotingTimeoutException, RemotingSendRequestException, RemotingConnectException, MQClientException, UnsupportedEncodingException {
+ @Override
+ public Map getNameServerConfig(
+ List list) throws InterruptedException, RemotingTimeoutException, RemotingSendRequestException, RemotingConnectException, MQClientException, UnsupportedEncodingException {
return null;
}
- @Override public QueryConsumeQueueResponseBody queryConsumeQueue(String brokerAddr, String topic,
- int queueId, long index, int count,
- String consumerGroup) throws InterruptedException, RemotingTimeoutException, RemotingSendRequestException, RemotingConnectException, MQClientException {
+ @Override
+ public QueryConsumeQueueResponseBody queryConsumeQueue(String brokerAddr, String topic,
+ int queueId, long index, int count,
+ String consumerGroup) throws InterruptedException, RemotingTimeoutException, RemotingSendRequestException, RemotingConnectException, MQClientException {
return null;
}
@@ -588,8 +591,9 @@ public class MQAdminExtImpl implements MQAdminExt {
}
- @Override public boolean resumeCheckHalfMessage(String topic,
- String msgId) throws RemotingException, MQClientException, InterruptedException, MQBrokerException {
+ @Override
+ public boolean resumeCheckHalfMessage(String topic,
+ String msgId) throws RemotingException, MQClientException, InterruptedException, MQBrokerException {
return false;
}
@@ -602,7 +606,7 @@ public class MQAdminExtImpl implements MQAdminExt {
@Override
public void removeBrokerFromContainer(String brokerContainerAddr, String clusterName, String brokerName,
- long brokerId) throws InterruptedException, MQBrokerException, RemotingTimeoutException,
+ long brokerId) throws InterruptedException, MQBrokerException, RemotingTimeoutException,
RemotingSendRequestException, RemotingConnectException {
// TODO Auto-generated method stub
throw new UnsupportedOperationException("Unimplemented method 'removeBrokerFromContainer'");
@@ -624,7 +628,7 @@ public class MQAdminExtImpl implements MQAdminExt {
@Override
public ConsumeStats examineConsumeStats(String brokerAddr, String consumerGroup, String topicName,
- long timeoutMillis) throws InterruptedException, RemotingTimeoutException, RemotingSendRequestException,
+ long timeoutMillis) throws InterruptedException, RemotingTimeoutException, RemotingSendRequestException,
RemotingConnectException, MQBrokerException {
// TODO Auto-generated method stub
return MQAdminInstance.threadLocalMQAdminExt().examineConsumeStats(brokerAddr, consumerGroup, topicName, timeoutMillis);
@@ -717,7 +721,7 @@ public class MQAdminExtImpl implements MQAdminExt {
@Override
public ConsumerRunningInfo getConsumerRunningInfo(String consumerGroup, String clientId, boolean jstack,
- boolean metrics) throws RemotingException, MQClientException, InterruptedException {
+ boolean metrics) throws RemotingException, MQClientException, InterruptedException {
// TODO Auto-generated method stub
throw new UnsupportedOperationException("Unimplemented method 'getConsumerRunningInfo'");
}
@@ -731,7 +735,7 @@ public class MQAdminExtImpl implements MQAdminExt {
@Override
public void setMessageRequestMode(String brokerAddr, String topic, String consumerGroup, MessageRequestMode mode,
- int popWorkGroupSize, long timeoutMillis) throws InterruptedException, RemotingTimeoutException,
+ int popWorkGroupSize, long timeoutMillis) throws InterruptedException, RemotingTimeoutException,
RemotingSendRequestException, RemotingConnectException, MQClientException {
// TODO Auto-generated method stub
throw new UnsupportedOperationException("Unimplemented method 'setMessageRequestMode'");
@@ -746,14 +750,14 @@ public class MQAdminExtImpl implements MQAdminExt {
@Override
public void resetOffsetByQueueId(String brokerAddr, String consumerGroup, String topicName, int queueId,
- long resetOffset) throws RemotingException, InterruptedException, MQBrokerException {
+ 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)
+ TopicQueueMappingDetail mappingDetail, boolean force)
throws RemotingException, InterruptedException, MQBrokerException {
// TODO Auto-generated method stub
throw new UnsupportedOperationException("Unimplemented method 'createStaticTopic'");
@@ -761,7 +765,7 @@ public class MQAdminExtImpl implements MQAdminExt {
@Override
public GroupForbidden updateAndGetGroupReadForbidden(String brokerAddr, String groupName, String topicName,
- Boolean readable) throws RemotingException, InterruptedException, MQBrokerException {
+ Boolean readable) throws RemotingException, InterruptedException, MQBrokerException {
// TODO Auto-generated method stub
throw new UnsupportedOperationException("Unimplemented method 'updateAndGetGroupReadForbidden'");
}
@@ -831,7 +835,7 @@ public class MQAdminExtImpl implements MQAdminExt {
@Override
public void cleanControllerBrokerData(String controllerAddr, String clusterName, String brokerName,
- String brokerAddr, boolean isCleanLivingBroker)
+ String brokerAddr, boolean isCleanLivingBroker)
throws RemotingException, InterruptedException, MQBrokerException {
// TODO Auto-generated method stub
throw new UnsupportedOperationException("Unimplemented method 'cleanControllerBrokerData'");
diff --git a/src/main/java/org/apache/rocketmq/dashboard/service/impl/ConsumerServiceImpl.java b/src/main/java/org/apache/rocketmq/dashboard/service/impl/ConsumerServiceImpl.java
index ab61a71..93b39e7 100644
--- a/src/main/java/org/apache/rocketmq/dashboard/service/impl/ConsumerServiceImpl.java
+++ b/src/main/java/org/apache/rocketmq/dashboard/service/impl/ConsumerServiceImpl.java
@@ -212,7 +212,6 @@ public class ConsumerServiceImpl extends AbstractCommonService implements Consum
} else {
consumeInfo.setSubGroupType(subscriptionGroupTable.get(consumerGroup).isConsumeMessageOrderly() ? "FIFO" : "NORMAL");
}
- consumeInfo.setGroup(consumerGroup);
consumeInfo.setUpdateTime(new Date());
groupConsumeInfoList.add(consumeInfo);
} catch (Exception e) {
@@ -270,6 +269,7 @@ public class ConsumerServiceImpl extends AbstractCommonService implements Consum
logger.warn("examineConsumeStats or examineConsumerConnectionInfo exception, "
+ consumerGroup, e);
}
+ groupConsumeInfo.setGroup(consumerGroup);
return groupConsumeInfo;
}
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
index f6c8f6b..0500615 100644
--- a/src/main/java/org/apache/rocketmq/dashboard/service/impl/DashboardCollectServiceImpl.java
+++ b/src/main/java/org/apache/rocketmq/dashboard/service/impl/DashboardCollectServiceImpl.java
@@ -51,51 +51,52 @@ public class DashboardCollectServiceImpl implements DashboardCollectService {
private final static Logger log = LoggerFactory.getLogger(DashboardCollectServiceImpl.class);
private LoadingCache> brokerMap = CacheBuilder.newBuilder()
- .maximumSize(1000)
- .concurrencyLevel(10)
- .recordStats()
- .ticker(Ticker.systemTicker())
- .removalListener(new RemovalListener() {
- @Override
- public void onRemoval(RemovalNotification notification) {
- log.debug(notification.getKey() + " was removed, cause is " + notification.getCause());
- }
- })
- .build(
- new CacheLoader>() {
+ .maximumSize(1000)
+ .concurrencyLevel(10)
+ .recordStats()
+ .ticker(Ticker.systemTicker())
+ .removalListener(new RemovalListener() {
@Override
- public List load(String key) {
- List list = Lists.newArrayList();
- return list;
+ public void onRemoval(RemovalNotification notification) {
+ log.debug(notification.getKey() + " was removed, cause is " + notification.getCause());
}
- }
- );
+ })
+ .build(
+ new CacheLoader>() {
+ @Override
+ public List load(String key) {
+ List list = Lists.newArrayList();
+ return list;
+ }
+ }
+ );
private LoadingCache> topicMap = CacheBuilder.newBuilder()
- .maximumSize(1000)
- .concurrencyLevel(10)
- .recordStats()
- .ticker(Ticker.systemTicker())
- .removalListener(new RemovalListener() {
- @Override
- public void onRemoval(RemovalNotification notification) {
- log.debug(notification.getKey() + " was removed, cause is " + notification.getCause());
- }
- })
- .build(
- new CacheLoader>() {
+ .maximumSize(1000)
+ .concurrencyLevel(10)
+ .recordStats()
+ .ticker(Ticker.systemTicker())
+ .removalListener(new RemovalListener() {
@Override
- public List load(String key) {
- List list = Lists.newArrayList();
- return list;
+ public void onRemoval(RemovalNotification notification) {
+ log.debug(notification.getKey() + " was removed, cause is " + notification.getCause());
}
- }
- );
+ })
+ .build(
+ new CacheLoader>() {
+ @Override
+ public List load(String key) {
+ List list = Lists.newArrayList();
+ return list;
+ }
+ }
+ );
@Override
public LoadingCache> getBrokerMap() {
return brokerMap;
}
+
@Override
public LoadingCache> getTopicMap() {
return topicMap;
@@ -106,8 +107,7 @@ public class DashboardCollectServiceImpl implements DashboardCollectService {
List strings;
try {
strings = Files.readLines(file, Charsets.UTF_8);
- }
- catch (IOException e) {
+ } catch (IOException e) {
Throwables.throwIfUnchecked(e);
throw new RuntimeException(e);
}
diff --git a/src/main/java/org/apache/rocketmq/dashboard/service/impl/DashboardServiceImpl.java b/src/main/java/org/apache/rocketmq/dashboard/service/impl/DashboardServiceImpl.java
index ae8c31d..c106943 100644
--- a/src/main/java/org/apache/rocketmq/dashboard/service/impl/DashboardServiceImpl.java
+++ b/src/main/java/org/apache/rocketmq/dashboard/service/impl/DashboardServiceImpl.java
@@ -34,6 +34,7 @@ public class DashboardServiceImpl implements DashboardService {
@Resource
private DashboardCollectService dashboardCollectService;
+
/**
* @param date format yyyy-MM-dd
*/
@@ -48,7 +49,7 @@ public class DashboardServiceImpl implements DashboardService {
}
/**
- * @param date format yyyy-MM-dd
+ * @param date format yyyy-MM-dd
* @param topicName
*/
@Override
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
index e21ff00..540270b 100644
--- a/src/main/java/org/apache/rocketmq/dashboard/service/impl/DlqMessageServiceImpl.java
+++ b/src/main/java/org/apache/rocketmq/dashboard/service/impl/DlqMessageServiceImpl.java
@@ -60,7 +60,7 @@ public class DlqMessageServiceImpl implements DlqMessageService {
} catch (MQClientException e) {
// If the %DLQ%Group does not exist, the message returns null
if (topic.startsWith(MixAll.DLQ_GROUP_TOPIC_PREFIX)
- && e.getResponseCode() == ResponseCode.TOPIC_NOT_EXIST) {
+ && e.getResponseCode() == ResponseCode.TOPIC_NOT_EXIST) {
return new MessagePage(new PageImpl<>(messageViews, page, 0), query.getTaskId());
} else {
Throwables.throwIfUnchecked(e);
@@ -78,8 +78,8 @@ public class DlqMessageServiceImpl implements DlqMessageService {
List batchResendResults = new LinkedList<>();
for (DlqMessageRequest dlqMessage : dlqMessages) {
ConsumeMessageDirectlyResult result = messageService.consumeMessageDirectly(dlqMessage.getTopicName(),
- dlqMessage.getMsgId(), dlqMessage.getConsumerGroup(),
- dlqMessage.getClientId());
+ dlqMessage.getMsgId(), dlqMessage.getConsumerGroup(),
+ dlqMessage.getClientId());
DlqMessageResendResult resendResult = new DlqMessageResendResult(result, dlqMessage.getMsgId());
batchResendResults.add(resendResult);
}
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
index 584ba10..69a2b2c 100644
--- a/src/main/java/org/apache/rocketmq/dashboard/service/impl/MessageServiceImpl.java
+++ b/src/main/java/org/apache/rocketmq/dashboard/service/impl/MessageServiceImpl.java
@@ -33,7 +33,6 @@ import org.apache.rocketmq.client.consumer.DefaultMQPullConsumer;
import org.apache.rocketmq.client.consumer.PullResult;
import org.apache.rocketmq.client.consumer.PullStatus;
import org.apache.rocketmq.client.exception.MQClientException;
-import org.apache.rocketmq.common.MixAll;
import org.apache.rocketmq.common.Pair;
import org.apache.rocketmq.common.message.MessageClientIDSetter;
import org.apache.rocketmq.common.message.MessageExt;
@@ -74,6 +73,9 @@ import java.util.stream.Collectors;
@Service
public class MessageServiceImpl implements MessageService {
+ @Resource
+ private AutoCloseConsumerWrapper autoCloseConsumerWrapper;
+
private Logger logger = LoggerFactory.getLogger(MessageServiceImpl.class);
private static final Cache> CACHE = CacheBuilder.newBuilder()
@@ -128,8 +130,8 @@ public class MessageServiceImpl implements MessageService {
if (isEnableAcl) {
rpcHook = new AclClientRPCHook(new SessionCredentials(configure.getAccessKey(), configure.getSecretKey()));
}
- AutoCloseConsumerWrapper consumerWrapper = new AutoCloseConsumerWrapper();
- DefaultMQPullConsumer consumer = consumerWrapper.getConsumer(rpcHook, configure.isUseTLS());
+
+ DefaultMQPullConsumer consumer = autoCloseConsumerWrapper.getConsumer(rpcHook, configure.isUseTLS());
List messageViewList = Lists.newArrayList();
try {
String subExpression = "*";
@@ -262,8 +264,8 @@ public class MessageServiceImpl implements MessageService {
if (isEnableAcl) {
rpcHook = new AclClientRPCHook(new SessionCredentials(configure.getAccessKey(), configure.getSecretKey()));
}
- AutoCloseConsumerWrapper consumerWrapper = new AutoCloseConsumerWrapper();
- DefaultMQPullConsumer consumer = consumerWrapper.getConsumer(rpcHook, configure.isUseTLS());
+
+ DefaultMQPullConsumer consumer = autoCloseConsumerWrapper.getConsumer(rpcHook, configure.isUseTLS());
long total = 0;
List queueOffsetInfos = new ArrayList<>();
@@ -402,8 +404,8 @@ public class MessageServiceImpl implements MessageService {
if (isEnableAcl) {
rpcHook = new AclClientRPCHook(new SessionCredentials(configure.getAccessKey(), configure.getSecretKey()));
}
- AutoCloseConsumerWrapper consumerWrapper = new AutoCloseConsumerWrapper();
- DefaultMQPullConsumer consumer = consumerWrapper.getConsumer(rpcHook, configure.isUseTLS());
+
+ DefaultMQPullConsumer consumer = autoCloseConsumerWrapper.getConsumer(rpcHook, configure.isUseTLS());
List messageViews = new ArrayList<>();
long offset = query.getPageNum() * query.getPageSize();
@@ -541,9 +543,9 @@ public class MessageServiceImpl implements MessageService {
}
}
- public DefaultMQPullConsumer buildDefaultMQPullConsumer(RPCHook rpcHook, boolean useTLS) {
- DefaultMQPullConsumer consumer = new DefaultMQPullConsumer(MixAll.TOOLS_CONSUMER_GROUP, rpcHook);
- consumer.setUseTLS(useTLS);
- return consumer;
- }
+// public DefaultMQPullConsumer buildDefaultMQPullConsumer(RPCHook rpcHook, boolean useTLS) {
+// DefaultMQPullConsumer consumer = new DefaultMQPullConsumer(MixAll.TOOLS_CONSUMER_GROUP, rpcHook);
+// consumer.setUseTLS(useTLS);
+// return consumer;
+// }
}
diff --git a/src/main/java/org/apache/rocketmq/dashboard/service/impl/MessageTraceServiceImpl.java b/src/main/java/org/apache/rocketmq/dashboard/service/impl/MessageTraceServiceImpl.java
index b07025c..ecfc753 100644
--- a/src/main/java/org/apache/rocketmq/dashboard/service/impl/MessageTraceServiceImpl.java
+++ b/src/main/java/org/apache/rocketmq/dashboard/service/impl/MessageTraceServiceImpl.java
@@ -133,21 +133,21 @@ public class MessageTraceServiceImpl implements MessageTraceService {
}
private List buildSubscriptionNodeList(
- Map> requestIdTracePairMap) {
+ Map> requestIdTracePairMap) {
Map> subscriptionTraceNodeMap = Maps.newHashMap();
for (Pair traceNodePair : requestIdTracePairMap.values()) {
List traceNodeList = subscriptionTraceNodeMap
- .computeIfAbsent(buildGroupName(traceNodePair), (o) -> Lists.newArrayList());
+ .computeIfAbsent(buildGroupName(traceNodePair), (o) -> Lists.newArrayList());
traceNodeList.add(buildConsumeMessageTraceNode(traceNodePair));
}
return subscriptionTraceNodeMap.entrySet().stream()
- .map((Function>, SubscriptionNode>) subscriptionEntry -> {
- List traceNodeList = subscriptionEntry.getValue();
- SubscriptionNode subscriptionNode = new SubscriptionNode();
- subscriptionNode.setSubscriptionGroup(subscriptionEntry.getKey());
- subscriptionNode.setConsumeNodeList(sortTraceNodeListByBeginTimestamp(traceNodeList));
- return subscriptionNode;
- }).collect(Collectors.toList());
+ .map((Function>, SubscriptionNode>) subscriptionEntry -> {
+ List traceNodeList = subscriptionEntry.getValue();
+ SubscriptionNode subscriptionNode = new SubscriptionNode();
+ subscriptionNode.setSubscriptionGroup(subscriptionEntry.getKey());
+ subscriptionNode.setConsumeNodeList(sortTraceNodeListByBeginTimestamp(traceNodeList));
+ return subscriptionNode;
+ }).collect(Collectors.toList());
}
private E getTraceValue(Pair traceNodePair, Function function) {
@@ -206,7 +206,7 @@ public class MessageTraceServiceImpl implements MessageTraceService {
private void putIntoMessageTraceViewGroupMap(MessageTraceView messageTraceView,
Map> messageTraceViewGroupMap) {
Pair messageTracePair = messageTraceViewGroupMap
- .computeIfAbsent(messageTraceView.getRequestId(), (o) -> new Pair<>(null, null));
+ .computeIfAbsent(messageTraceView.getRequestId(), (o) -> new Pair<>(null, null));
switch (TraceType.valueOf(messageTraceView.getTraceType())) {
case SubBefore:
messageTracePair.setObject1(messageTraceView);
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
index 3bdd98e..dcdf100 100644
--- a/src/main/java/org/apache/rocketmq/dashboard/service/impl/MonitorServiceImpl.java
+++ b/src/main/java/org/apache/rocketmq/dashboard/service/impl/MonitorServiceImpl.java
@@ -81,8 +81,7 @@ public class MonitorServiceImpl implements MonitorService {
private void writeDataJsonToFile(String path, String dataStr) {
try {
MixAll.string2File(dataStr, path);
- }
- catch (Exception e) {
+ } catch (Exception 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
index 85433f8..90d1318 100644
--- a/src/main/java/org/apache/rocketmq/dashboard/service/impl/ProducerServiceImpl.java
+++ b/src/main/java/org/apache/rocketmq/dashboard/service/impl/ProducerServiceImpl.java
@@ -33,8 +33,7 @@ public class ProducerServiceImpl implements ProducerService {
public ProducerConnection getProducerConnection(String producerGroup, String topic) {
try {
return mqAdminExt.examineProducerConnectionInfo(producerGroup, topic);
- }
- catch (Exception e) {
+ } catch (Exception 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
index 39a9bf1..e1e7ac1 100644
--- a/src/main/java/org/apache/rocketmq/dashboard/service/impl/TopicServiceImpl.java
+++ b/src/main/java/org/apache/rocketmq/dashboard/service/impl/TopicServiceImpl.java
@@ -127,7 +127,7 @@ public class TopicServiceImpl extends AbstractCommonService implements TopicServ
try {
TopicConfigSerializeWrapper topicConfigSerializeWrapper = mqAdminExt.getAllTopicConfig(brokerAddr.getBrokerAddrs().get(0L), 10000L);
for (TopicConfig topicConfig : topicConfigSerializeWrapper.getTopicConfigTable().values()) {
- TopicTypeMeta topicType = classifyTopicType(topicConfig.getTopicName(), topicConfigSerializeWrapper.getTopicConfigTable().get(topicConfig.getTopicName()).getAttributes(),sysTopics.getTopicList());
+ TopicTypeMeta topicType = classifyTopicType(topicConfig.getTopicName(), topicConfigSerializeWrapper.getTopicConfigTable().get(topicConfig.getTopicName()).getAttributes(), sysTopics.getTopicList());
if (names.contains(topicType.getTopicName())) {
continue;
}
@@ -149,7 +149,7 @@ public class TopicServiceImpl extends AbstractCommonService implements TopicServ
return new TopicTypeList(names, messageTypes);
}
- private TopicTypeMeta classifyTopicType(String topicName, Map attributes, Set sysTopics) {
+ private TopicTypeMeta classifyTopicType(String topicName, Map attributes, Set sysTopics) {
TopicTypeMeta topicType = new TopicTypeMeta();
topicType.setTopicName(topicName);
diff --git a/src/main/java/org/apache/rocketmq/dashboard/service/impl/UserServiceImpl.java b/src/main/java/org/apache/rocketmq/dashboard/service/impl/UserServiceImpl.java
index 4b8e191..4cf4940 100644
--- a/src/main/java/org/apache/rocketmq/dashboard/service/impl/UserServiceImpl.java
+++ b/src/main/java/org/apache/rocketmq/dashboard/service/impl/UserServiceImpl.java
@@ -17,29 +17,26 @@
package org.apache.rocketmq.dashboard.service.impl;
-import jakarta.annotation.Resource;
import org.apache.rocketmq.auth.authentication.enums.UserType;
import org.apache.rocketmq.dashboard.admin.UserMQAdminPoolManager;
-import org.apache.rocketmq.dashboard.config.RMQConfigure;
import org.apache.rocketmq.dashboard.model.User;
import org.apache.rocketmq.dashboard.service.UserService;
-import org.apache.rocketmq.dashboard.service.provider.UserInfoProvider;
+import org.apache.rocketmq.dashboard.service.strategy.UserContext;
import org.apache.rocketmq.remoting.protocol.body.UserInfo;
import org.apache.rocketmq.tools.admin.MQAdminExt;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
@Service
public class UserServiceImpl implements UserService {
private static final Logger log = LoggerFactory.getLogger(UserServiceImpl.class);
- @Resource
- private RMQConfigure configure;
@Autowired
- private UserInfoProvider userInfoProvider;
+ private UserContext userContext;
@Autowired
private UserMQAdminPoolManager userMQAdminPoolManager;
@@ -47,7 +44,7 @@ public class UserServiceImpl implements UserService {
@Override
public User queryByName(String name) {
- UserInfo userInfo = userInfoProvider.getUserInfoByUsername(name);
+ UserInfo userInfo = userContext.queryByUsername(name);
if (userInfo == null) {
return null;
}
diff --git a/src/main/java/org/apache/rocketmq/dashboard/support/AutoCloseConsumerWrapper.java b/src/main/java/org/apache/rocketmq/dashboard/support/AutoCloseConsumerWrapper.java
index ce2d034..967b6f6 100644
--- a/src/main/java/org/apache/rocketmq/dashboard/support/AutoCloseConsumerWrapper.java
+++ b/src/main/java/org/apache/rocketmq/dashboard/support/AutoCloseConsumerWrapper.java
@@ -23,6 +23,7 @@ import org.apache.rocketmq.common.MixAll;
import org.apache.rocketmq.remoting.RPCHook;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
import java.time.Duration;
import java.time.Instant;
@@ -32,9 +33,10 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
+@Component
public class AutoCloseConsumerWrapper {
- private final Logger logger = LoggerFactory.getLogger(GlobalRestfulResponseBodyAdvice.class);
+ private final Logger logger = LoggerFactory.getLogger(AutoCloseConsumerWrapper.class);
private static final AtomicReference CONSUMER_REF = new AtomicReference<>();
private final AtomicBoolean isTaskScheduled = new AtomicBoolean(false);
@@ -77,7 +79,10 @@ public class AutoCloseConsumerWrapper {
protected DefaultMQPullConsumer createNewConsumer(RPCHook rpcHook, Boolean useTLS) {
return new DefaultMQPullConsumer(MixAll.TOOLS_CONSUMER_GROUP, rpcHook) {
- { setUseTLS(useTLS); } };
+ {
+ setUseTLS(useTLS);
+ }
+ };
}
private void startIdleCheckTask() {
diff --git a/src/main/java/org/apache/rocketmq/dashboard/support/GlobalExceptionHandler.java b/src/main/java/org/apache/rocketmq/dashboard/support/GlobalExceptionHandler.java
index 1b46da2..ddc3fcf 100644
--- a/src/main/java/org/apache/rocketmq/dashboard/support/GlobalExceptionHandler.java
+++ b/src/main/java/org/apache/rocketmq/dashboard/support/GlobalExceptionHandler.java
@@ -37,8 +37,7 @@ public class GlobalExceptionHandler {
if (ex instanceof ServiceException) {
logger.error("Occur service exception: {}", ex.getMessage());
value = new JsonResult