This is an automated email from the ASF dual-hosted git repository.
healchow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-inlong.git
The following commit(s) were added to refs/heads/master by this push:
new f34f5a75c [INLONG-4551][TubeMQ] Batch delete consumer groups from
blacklist (#4600)
f34f5a75c is described below
commit f34f5a75c50e9fd7c055231b776a1dd49499fae1
Author: Lizhen <[email protected]>
AuthorDate: Tue Jun 14 20:20:58 2022 +0800
[INLONG-4551][TubeMQ] Batch delete consumer groups from blacklist (#4600)
---
.../manager/controller/group/GroupController.java | 5 +++
.../group/request/BatchDeleteGroupReq.java | 38 ++++++++++++++++++++++
.../tubemq/manager/service/TopicServiceImpl.java | 2 +-
.../inlong/tubemq/manager/service/TubeConst.java | 1 +
4 files changed, 45 insertions(+), 1 deletion(-)
diff --git
a/inlong-tubemq/tubemq-manager/src/main/java/org/apache/inlong/tubemq/manager/controller/group/GroupController.java
b/inlong-tubemq/tubemq-manager/src/main/java/org/apache/inlong/tubemq/manager/controller/group/GroupController.java
index 0a502cf51..36d174c24 100644
---
a/inlong-tubemq/tubemq-manager/src/main/java/org/apache/inlong/tubemq/manager/controller/group/GroupController.java
+++
b/inlong-tubemq/tubemq-manager/src/main/java/org/apache/inlong/tubemq/manager/controller/group/GroupController.java
@@ -24,6 +24,7 @@ import java.util.Map;
import lombok.extern.slf4j.Slf4j;
import org.apache.inlong.tubemq.manager.controller.TubeMQResult;
import
org.apache.inlong.tubemq.manager.controller.group.request.AddBlackGroupReq;
+import
org.apache.inlong.tubemq.manager.controller.group.request.BatchDeleteGroupReq;
import
org.apache.inlong.tubemq.manager.controller.group.request.DeleteBlackGroupReq;
import
org.apache.inlong.tubemq.manager.controller.group.request.DeleteOffsetReq;
import
org.apache.inlong.tubemq.manager.controller.group.request.FilterCondGroupReq;
@@ -75,6 +76,8 @@ public class GroupController {
return batchAddGroup(gson.fromJson(req,
BatchAddGroupAuthReq.class));
case TubeConst.DELETE:
return masterService.baseRequestMaster(gson.fromJson(req,
DeleteGroupReq.class));
+ case TubeConst.BATCH_DELETE:
+ return masterService.baseRequestMaster(gson.fromJson(req,
BatchDeleteGroupReq.class));
case TubeConst.REBALANCE_CONSUMER_GROUP:
return topicService.rebalanceGroup(gson.fromJson(req,
RebalanceGroupReq.class));
case TubeConst.REBALANCE_CONSUMER:
@@ -142,6 +145,8 @@ public class GroupController {
return masterService.baseRequestMaster(gson.fromJson(req,
AddBlackGroupReq.class));
case TubeConst.DELETE:
return masterService.baseRequestMaster(gson.fromJson(req,
DeleteBlackGroupReq.class));
+ case TubeConst.BATCH_DELETE:
+ return masterService.baseRequestMaster(gson.fromJson(req,
BatchDeleteGroupReq.class));
default:
return
TubeMQResult.errorResult(TubeMQErrorConst.NO_SUCH_METHOD);
}
diff --git
a/inlong-tubemq/tubemq-manager/src/main/java/org/apache/inlong/tubemq/manager/controller/group/request/BatchDeleteGroupReq.java
b/inlong-tubemq/tubemq-manager/src/main/java/org/apache/inlong/tubemq/manager/controller/group/request/BatchDeleteGroupReq.java
new file mode 100644
index 000000000..5a5d1a449
--- /dev/null
+++
b/inlong-tubemq/tubemq-manager/src/main/java/org/apache/inlong/tubemq/manager/controller/group/request/BatchDeleteGroupReq.java
@@ -0,0 +1,38 @@
+/*
+ * 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.inlong.tubemq.manager.controller.group.request;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import org.apache.inlong.tubemq.manager.controller.node.request.BaseReq;
+import org.apache.inlong.tubemq.manager.controller.topic.request.GroupAuthItem;
+
+import java.util.List;
+
+/**
+ * Batch delete group info
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class BatchDeleteGroupReq extends BaseReq {
+ private List<GroupAuthItem> groupNameJsonSet;
+ private String confModAuthToken;
+ private String modifyUser;
+}
diff --git
a/inlong-tubemq/tubemq-manager/src/main/java/org/apache/inlong/tubemq/manager/service/TopicServiceImpl.java
b/inlong-tubemq/tubemq-manager/src/main/java/org/apache/inlong/tubemq/manager/service/TopicServiceImpl.java
index 01a04d42e..49e2dd873 100644
---
a/inlong-tubemq/tubemq-manager/src/main/java/org/apache/inlong/tubemq/manager/service/TopicServiceImpl.java
+++
b/inlong-tubemq/tubemq-manager/src/main/java/org/apache/inlong/tubemq/manager/service/TopicServiceImpl.java
@@ -253,7 +253,7 @@ public class TopicServiceImpl implements TopicService {
generateOffsetInfo(offsetPerBroker, topicInfo, res);
}
- result.setData(gson.toJson(allBrokersOffsetRes));
+ result.setData(allBrokersOffsetRes);
return result;
}
diff --git
a/inlong-tubemq/tubemq-manager/src/main/java/org/apache/inlong/tubemq/manager/service/TubeConst.java
b/inlong-tubemq/tubemq-manager/src/main/java/org/apache/inlong/tubemq/manager/service/TubeConst.java
index f919738bb..3abe11802 100644
---
a/inlong-tubemq/tubemq-manager/src/main/java/org/apache/inlong/tubemq/manager/service/TubeConst.java
+++
b/inlong-tubemq/tubemq-manager/src/main/java/org/apache/inlong/tubemq/manager/service/TubeConst.java
@@ -62,6 +62,7 @@ public class TubeConst {
public static final String QUERY_CAN_WRITE = "queryCanWrite";
public static final String FILTER_CONDITION = "filterCondition";
public static final String FLOW_CONTROL = "flowControl";
+ public static final String BATCH_DELETE = "batchDelete";
/**
