You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tubemq.apache.org by go...@apache.org on 2021/01/16 05:10:43 UTC
[incubator-tubemq] 01/02: [TUBEMQ-513] fix bad code found by
spotbugs
This is an automated email from the ASF dual-hosted git repository.
gosonzhang pushed a commit to branch TUBEMQ-421
in repository https://gitbox.apache.org/repos/asf/incubator-tubemq.git
commit eb6449c598f8bf23e7af01904664829266455a80
Author: EMsnap <zp...@connect.ust.hk>
AuthorDate: Fri Jan 15 15:09:33 2021 +0800
[TUBEMQ-513] fix bad code found by spotbugs
---
.../tubemq/manager/controller/group/GroupController.java | 2 +-
.../tubemq/manager/service/TopicBackendWorker.java | 2 +-
.../manager/service/tube/TubeHttpBrokerInfoList.java | 16 +++++++++++-----
3 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/tubemq-manager/src/main/java/org/apache/tubemq/manager/controller/group/GroupController.java b/tubemq-manager/src/main/java/org/apache/tubemq/manager/controller/group/GroupController.java
index 052986b..b306522 100644
--- a/tubemq-manager/src/main/java/org/apache/tubemq/manager/controller/group/GroupController.java
+++ b/tubemq-manager/src/main/java/org/apache/tubemq/manager/controller/group/GroupController.java
@@ -114,7 +114,7 @@ public class GroupController {
@PostMapping("/blackGroup")
- public @ResponseBody TubeMQResult BlackGroupProxy(
+ public @ResponseBody TubeMQResult blackGroupProxy(
@RequestParam String method, @RequestBody String req) {
switch (method) {
case ADD:
diff --git a/tubemq-manager/src/main/java/org/apache/tubemq/manager/service/TopicBackendWorker.java b/tubemq-manager/src/main/java/org/apache/tubemq/manager/service/TopicBackendWorker.java
index 7637c0f..7f2f910 100644
--- a/tubemq-manager/src/main/java/org/apache/tubemq/manager/service/TopicBackendWorker.java
+++ b/tubemq-manager/src/main/java/org/apache/tubemq/manager/service/TopicBackendWorker.java
@@ -92,7 +92,7 @@ public class TopicBackendWorker implements DisposableBean, Runnable {
*/
private void batchAddTopic() {
pendingTopics.forEach((clusterId, queue) -> {
- Map<String, TopicFuture> pendingTopicList = new HashMap<>();
+ Map<String, TopicFuture> pendingTopicList = new HashMap<>(32);
if (notSatisfiedCount.get() > queueMaxWait || queue.size() > queueMaxRunningSize) {
notSatisfiedCount.set(0);
List<TopicFuture> tmpTopicList = new ArrayList<>();
diff --git a/tubemq-manager/src/main/java/org/apache/tubemq/manager/service/tube/TubeHttpBrokerInfoList.java b/tubemq-manager/src/main/java/org/apache/tubemq/manager/service/tube/TubeHttpBrokerInfoList.java
index bea2387..03dca0f 100644
--- a/tubemq-manager/src/main/java/org/apache/tubemq/manager/service/tube/TubeHttpBrokerInfoList.java
+++ b/tubemq-manager/src/main/java/org/apache/tubemq/manager/service/tube/TubeHttpBrokerInfoList.java
@@ -27,6 +27,12 @@ import lombok.Data;
@Data
public class TubeHttpBrokerInfoList {
+ public static final String IDLE = "idle";
+ public static final String RUNNING = "running";
+ public static final String ONLINE = "online";
+ public static final String ONLY_READ = "only-read";
+ public static final String ONLY_WRITE = "only-write";
+
/**
* json class for broker info.
*/
@@ -47,15 +53,15 @@ public class TubeHttpBrokerInfoList {
private boolean acceptSubscribe;
public boolean isIdle() {
- return subStatus != null && subStatus.equals("idle");
+ return subStatus != null && IDLE.equals(subStatus);
}
public boolean isWorking() {
if (runStatus != null && manageStatus != null) {
- return runStatus.equals("running") && (
- manageStatus.equals("online") ||
- manageStatus.equals("only-read") ||
- manageStatus.equals("only-write"));
+ return RUNNING.equals(runStatus) && (
+ ONLINE.equals(manageStatus) ||
+ ONLY_READ.equals(manageStatus) ||
+ ONLY_WRITE.equals(manageStatus));
}
return false;
}