Skip to content

Commit 05ceeea

Browse files
author
xuguang
committed
bugfix: LogicalClusterDTO和RegionDTO校验参数冗余 & RdLogicalClusterController解释修正
1 parent 4d5e4d0 commit 05ceeea

File tree

3 files changed

+3
-9
lines changed

3 files changed

+3
-9
lines changed

kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/dto/rd/LogicalClusterDTO.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,10 +118,7 @@ public String toString() {
118118
}
119119

120120
public boolean legal() {
121-
if (ValidateUtils.isNull(clusterId)
122-
|| ValidateUtils.isNull(clusterId)
123-
|| ValidateUtils.isEmptyList(regionIdList)
124-
|| ValidateUtils.isNull(mode)) {
121+
if (ValidateUtils.isNull(clusterId) || ValidateUtils.isEmptyList(regionIdList) || ValidateUtils.isNull(mode)) {
125122
return false;
126123
}
127124
if (!ClusterModeEnum.SHARED_MODE.getCode().equals(mode) && ValidateUtils.isNull(appId)) {

kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/dto/rd/RegionDTO.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,10 +94,7 @@ public String toString() {
9494
}
9595

9696
public boolean legal() {
97-
if (ValidateUtils.isNull(clusterId)
98-
|| ValidateUtils.isNull(clusterId)
99-
|| ValidateUtils.isEmptyList(brokerIdList)
100-
|| ValidateUtils.isNull(status)) {
97+
if (ValidateUtils.isNull(clusterId) || ValidateUtils.isEmptyList(brokerIdList) || ValidateUtils.isNull(status)) {
10198
return false;
10299
}
103100
description = ValidateUtils.isNull(description)? "": description;

kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/api/versionone/rd/RdLogicalClusterController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public Result updateById(@RequestBody LogicalClusterDTO dto) {
5757
);
5858
}
5959

60-
@ApiOperation(value = "查询逻辑集群列表", notes = "")
60+
@ApiOperation(value = "根据逻辑集群Id获取逻辑集群", notes = "")
6161
@RequestMapping(value = "logical-clusters", method = RequestMethod.GET)
6262
@ResponseBody
6363
public Result<LogicalClusterVO> getByLogicalClusterId(@RequestParam("id") Long physicalClusterId) {

0 commit comments

Comments
 (0)