This is an automated email from the ASF dual-hosted git repository.
yuanbo pushed a commit to branch TUBEMQ-421
in repository https://gitbox.apache.org/repos/asf/incubator-tubemq.git
The following commit(s) were added to refs/heads/TUBEMQ-421 by this push:
new 4da4e01 [TUBEMQ-492] amend some code regulation problem (#381)
4da4e01 is described below
commit 4da4e01507cb1134aa3ecee8e2f2ef8d254e5f75
Author: EMsnap <[email protected]>
AuthorDate: Wed Jan 6 18:43:35 2021 +0800
[TUBEMQ-492] amend some code regulation problem (#381)
---
.../controller/node/request/AddBrokersReq.java | 12 +++----
.../manager/controller/node/request/BaseReq.java | 6 ++--
.../controller/node/request/CloneOffsetReq.java | 10 +++---
.../controller/topic/TopicWebController.java | 18 ++++++----
.../apache/tubemq/manager/service/NodeService.java | 37 ++++++++++---------
.../manager/service/tube/AddTopicsResult.java | 4 +--
.../tubemq/manager/service/tube/BrokerConf.java | 34 +++++++++---------
.../manager/service/tube/BrokerStatusInfo.java | 6 ++--
.../tubemq/manager/service/tube/IpIdRelation.java | 4 +--
.../service/tube/TubeHttpBrokerCfgInfo.java | 42 +++++++++++-----------
.../service/tube/TubeHttpBrokerInfoList.java | 5 ++-
.../service/tube/TubeHttpTopicInfoList.java | 4 +--
.../apache/tubemq/manager/utils/ConvertUtils.java | 4 ++-
.../apache/tubemq/manager/utils/MasterUtils.java | 3 +-
14 files changed, 102 insertions(+), 87 deletions(-)
diff --git
a/tubemq-manager/src/main/java/org/apache/tubemq/manager/controller/node/request/AddBrokersReq.java
b/tubemq-manager/src/main/java/org/apache/tubemq/manager/controller/node/request/AddBrokersReq.java
index 66281e6..5bfb486 100644
---
a/tubemq-manager/src/main/java/org/apache/tubemq/manager/controller/node/request/AddBrokersReq.java
+++
b/tubemq-manager/src/main/java/org/apache/tubemq/manager/controller/node/request/AddBrokersReq.java
@@ -29,23 +29,23 @@ import static
org.apache.tubemq.manager.service.TubeMQHttpConst.*;
@Data
public class AddBrokersReq {
- public String confModAuthToken;
+ private String confModAuthToken;
- public String createUser;
+ private String createUser;
- public int clusterId;
+ private int clusterId;
/**
* admin_bath_add_broker_configure
*/
- public String method;
+ private String method;
/**
* op_modify
*/
- public String type;
+ private String type;
- public List<BrokerConf> brokerJsonSet;
+ private List<BrokerConf> brokerJsonSet;
public static AddBrokersReq getAddBrokerReq(String token, int clusterId) {
AddBrokersReq req = new AddBrokersReq();
diff --git
a/tubemq-manager/src/main/java/org/apache/tubemq/manager/controller/node/request/BaseReq.java
b/tubemq-manager/src/main/java/org/apache/tubemq/manager/controller/node/request/BaseReq.java
index 0159220..2a77d7c 100644
---
a/tubemq-manager/src/main/java/org/apache/tubemq/manager/controller/node/request/BaseReq.java
+++
b/tubemq-manager/src/main/java/org/apache/tubemq/manager/controller/node/request/BaseReq.java
@@ -21,7 +21,7 @@ import lombok.Data;
@Data
public class BaseReq {
- public String type;
- public Integer clusterId;
- public String method;
+ private String type;
+ private Integer clusterId;
+ private String method;
}
diff --git
a/tubemq-manager/src/main/java/org/apache/tubemq/manager/controller/node/request/CloneOffsetReq.java
b/tubemq-manager/src/main/java/org/apache/tubemq/manager/controller/node/request/CloneOffsetReq.java
index 645084d..afa80d6 100644
---
a/tubemq-manager/src/main/java/org/apache/tubemq/manager/controller/node/request/CloneOffsetReq.java
+++
b/tubemq-manager/src/main/java/org/apache/tubemq/manager/controller/node/request/CloneOffsetReq.java
@@ -21,9 +21,9 @@ import lombok.Data;
@Data
public class CloneOffsetReq extends BaseReq {
- public String sourceGroupName;
- public String modifyUser;
- public String topicName;
- public String targetGroupName;
- public String confModAuthToken;
+ private String sourceGroupName;
+ private String modifyUser;
+ private String topicName;
+ private String targetGroupName;
+ private String confModAuthToken;
}
diff --git
a/tubemq-manager/src/main/java/org/apache/tubemq/manager/controller/topic/TopicWebController.java
b/tubemq-manager/src/main/java/org/apache/tubemq/manager/controller/topic/TopicWebController.java
index 6addbab..7847ae6 100644
---
a/tubemq-manager/src/main/java/org/apache/tubemq/manager/controller/topic/TopicWebController.java
+++
b/tubemq-manager/src/main/java/org/apache/tubemq/manager/controller/topic/TopicWebController.java
@@ -70,12 +70,14 @@ public class TopicWebController {
*/
@PostMapping("/add")
public TubeMQResult addTopic(@RequestBody BatchAddTopicReq req) {
- if (req.getClusterId() == null)
+ if (req.getClusterId() == null) {
return TubeMQResult.getErrorResult("please input clusterId");
+ }
NodeEntry masterEntry =
nodeRepository.findNodeEntryByClusterIdIsAndMasterIsTrue(
req.getClusterId());
- if (masterEntry == null)
+ if (masterEntry == null) {
return TubeMQResult.getErrorResult("no such cluster");
+ }
return nodeService.addTopicsToBrokers(masterEntry, req.getBrokerIds(),
req.getAddTopicReqs());
}
@@ -88,12 +90,14 @@ public class TopicWebController {
*/
@PostMapping("/clone")
public TubeMQResult cloneTopic(@RequestBody CloneTopicReq req) throws
Exception {
- if (req.getClusterId() == null)
+ if (req.getClusterId() == null) {
return TubeMQResult.getErrorResult("please input clusterId");
+ }
NodeEntry masterEntry =
nodeRepository.findNodeEntryByClusterIdIsAndMasterIsTrue(
req.getClusterId());
- if (masterEntry == null)
+ if (masterEntry == null) {
return TubeMQResult.getErrorResult("no such cluster");
+ }
return nodeService.cloneTopicToBrokers(req, masterEntry);
}
@@ -173,12 +177,14 @@ public class TopicWebController {
@PostMapping("/clone/offset")
public @ResponseBody TubeMQResult cloneOffset(
@RequestBody CloneOffsetReq req) throws Exception {
- if (req.getClusterId() == null)
+ if (req.getClusterId() == null) {
return TubeMQResult.getErrorResult("please input clusterId");
+ }
NodeEntry masterEntry =
nodeRepository.findNodeEntryByClusterIdIsAndMasterIsTrue(
req.getClusterId());
- if (masterEntry == null)
+ if (masterEntry == null) {
return TubeMQResult.getErrorResult("no such cluster");
+ }
return nodeService.cloneOffsetToOtherGroups(req, masterEntry);
}
diff --git
a/tubemq-manager/src/main/java/org/apache/tubemq/manager/service/NodeService.java
b/tubemq-manager/src/main/java/org/apache/tubemq/manager/service/NodeService.java
index 7de3ec3..927025a 100644
---
a/tubemq-manager/src/main/java/org/apache/tubemq/manager/service/NodeService.java
+++
b/tubemq-manager/src/main/java/org/apache/tubemq/manager/service/NodeService.java
@@ -100,7 +100,7 @@ public class NodeService {
gson.fromJson(new
InputStreamReader(response.getEntity().getContent()),
TubeHttpBrokerInfoList.class);
// request return normal.
- if (brokerInfoList.getCode() == 0) {
+ if (brokerInfoList.getCode() == SUCCESS_CODE) {
// divide by state.
brokerInfoList.divideBrokerListByState();
return brokerInfoList;
@@ -120,7 +120,7 @@ public class NodeService {
TubeHttpTopicInfoList topicInfoList =
gson.fromJson(new
InputStreamReader(response.getEntity().getContent()),
TubeHttpTopicInfoList.class);
- if (topicInfoList.getErrCode() == 0) {
+ if (topicInfoList.getErrCode() == SUCCESS_CODE) {
return topicInfoList;
}
} catch (Exception ex) {
@@ -146,7 +146,7 @@ public class NodeService {
AddBrokerResult addBrokerResult =
addBrokersToClusterWithId(addBrokersReq, masterEntry);
// might have duplicate brokers
- if (addBrokerResult.getErrCode() != 0) {
+ if (addBrokerResult.getErrCode() != SUCCESS_CODE) {
return TubeMQResult.getErrorResult(addBrokerResult.getErrMsg());
}
List<Integer> brokerIds = getBrokerIds(addBrokerResult);
@@ -168,7 +168,7 @@ public class NodeService {
String brokerStr = StringUtils.join(brokerIds, ",");
addTopicReq.setBrokerId(brokerStr);
TubeMQResult result = addTopicToBrokers(addTopicReq,
masterEntry);
- if (result.getErrCode() == 0) {
+ if (result.getErrCode() == SUCCESS_CODE) {
addTopicsResult.getSuccessTopics().add(addTopicReq.getTopicName());
} else {
addTopicsResult.getFailTopics().add(addTopicReq.getTopicName());
@@ -242,7 +242,7 @@ public class NodeService {
TubeHttpResponse result =
gson.fromJson(new
InputStreamReader(response.getEntity().getContent()),
TubeHttpResponse.class);
- return result.getCode() == 0 && result.getErrCode() == 0;
+ return result.getCode() == SUCCESS_CODE && result.getErrCode() ==
SUCCESS_CODE;
} catch (Exception ex) {
log.error("exception caught while requesting broker status", ex);
}
@@ -343,7 +343,7 @@ public class NodeService {
TubeHttpResponse result =
gson.fromJson(new
InputStreamReader(response.getEntity().getContent()),
TubeHttpResponse.class);
- if (result.getErrCode() == 0 && result.getCode() == 0) {
+ if (result.getErrCode() == SUCCESS_CODE && result.getCode() ==
SUCCESS_CODE) {
log.info("reload tube broker cgi: " +
url + " ; return value : " + result.getCode());
}
@@ -456,20 +456,23 @@ public class NodeService {
TubeHttpTopicInfoList topicInfoList = requestTopicConfigInfo(master,
req.getTopicName());
TubeMQResult result = new TubeMQResult();
- if (topicInfoList != null) {
- List<TopicInfo> topicInfos = topicInfoList.getTopicInfo();
- // 2. for each broker, request to clone offset
- for (TopicInfo topicInfo : topicInfos) {
- String brokerIp = topicInfo.getBrokerIp();
- String url = SCHEMA + brokerIp + ":" + brokerWebPort
- + "/" + TUBE_REQUEST_PATH + "?" +
convertReqToQueryStr(req);
- result = requestMaster(url);
- if (result.getErrCode() != 0) {
- return result;
- }
+ if (topicInfoList == null) {
+ return result;
+ }
+
+ List<TopicInfo> topicInfos = topicInfoList.getTopicInfo();
+ // 2. for each broker, request to clone offset
+ for (TopicInfo topicInfo : topicInfos) {
+ String brokerIp = topicInfo.getBrokerIp();
+ String url = SCHEMA + brokerIp + ":" + brokerWebPort
+ + "/" + TUBE_REQUEST_PATH + "?" + convertReqToQueryStr(req);
+ result = requestMaster(url);
+ if (result.getErrCode() != SUCCESS_CODE) {
+ return result;
}
}
+
return result;
}
diff --git
a/tubemq-manager/src/main/java/org/apache/tubemq/manager/service/tube/AddTopicsResult.java
b/tubemq-manager/src/main/java/org/apache/tubemq/manager/service/tube/AddTopicsResult.java
index 6cd3b01..3be4582 100644
---
a/tubemq-manager/src/main/java/org/apache/tubemq/manager/service/tube/AddTopicsResult.java
+++
b/tubemq-manager/src/main/java/org/apache/tubemq/manager/service/tube/AddTopicsResult.java
@@ -25,7 +25,7 @@ import java.util.List;
@Data
public class AddTopicsResult {
- public List<String> failTopics = Lists.newArrayList();
+ private List<String> failTopics = Lists.newArrayList();
- public List<String> successTopics = Lists.newArrayList();
+ private List<String> successTopics = Lists.newArrayList();
}
diff --git
a/tubemq-manager/src/main/java/org/apache/tubemq/manager/service/tube/BrokerConf.java
b/tubemq-manager/src/main/java/org/apache/tubemq/manager/service/tube/BrokerConf.java
index 5dc908c..9590da9 100644
---
a/tubemq-manager/src/main/java/org/apache/tubemq/manager/service/tube/BrokerConf.java
+++
b/tubemq-manager/src/main/java/org/apache/tubemq/manager/service/tube/BrokerConf.java
@@ -22,23 +22,23 @@ import lombok.Data;
@Data
public class BrokerConf {
- public String brokerIp;
- public Integer brokerPort;
- public Integer brokerId;
- public String deleteWhen;
- public Integer numPartitions;
- public Integer unflushThreshold;
- public Integer unflushIntegererval;
- public Integer unflushDataHold;
- public boolean acceptPublish;
- public boolean acceptSubscribe;
- public String createUser;
- public Integer brokerTLSPort;
- public Integer numTopicStores;
- public Integer memCacheMsgCntInK;
- public Integer memCacheMsgSizeInMB;
- public Integer memCacheFlushIntegervl;
- public String deletePolicy;
+ private String brokerIp;
+ private Integer brokerPort;
+ private Integer brokerId;
+ private String deleteWhen;
+ private Integer numPartitions;
+ private Integer unflushThreshold;
+ private Integer unflushIntegererval;
+ private Integer unflushDataHold;
+ private boolean acceptPublish;
+ private boolean acceptSubscribe;
+ private String createUser;
+ private Integer brokerTLSPort;
+ private Integer numTopicStores;
+ private Integer memCacheMsgCntInK;
+ private Integer memCacheMsgSizeInMB;
+ private Integer memCacheFlushIntegervl;
+ private String deletePolicy;
public BrokerConf(BrokerConf other) {
this.brokerIp = other.brokerIp;
diff --git
a/tubemq-manager/src/main/java/org/apache/tubemq/manager/service/tube/BrokerStatusInfo.java
b/tubemq-manager/src/main/java/org/apache/tubemq/manager/service/tube/BrokerStatusInfo.java
index 11e806e..5982ac6 100644
---
a/tubemq-manager/src/main/java/org/apache/tubemq/manager/service/tube/BrokerStatusInfo.java
+++
b/tubemq-manager/src/main/java/org/apache/tubemq/manager/service/tube/BrokerStatusInfo.java
@@ -23,8 +23,8 @@ import java.util.List;
@Data
public class BrokerStatusInfo {
- public int code;
- public String errMsg;
+ private int code;
+ private String errMsg;
// total broker configuration info list of brokers.
- public List<BrokerConf> data;
+ private List<BrokerConf> data;
}
diff --git
a/tubemq-manager/src/main/java/org/apache/tubemq/manager/service/tube/IpIdRelation.java
b/tubemq-manager/src/main/java/org/apache/tubemq/manager/service/tube/IpIdRelation.java
index 963b79e..8beafbe 100644
---
a/tubemq-manager/src/main/java/org/apache/tubemq/manager/service/tube/IpIdRelation.java
+++
b/tubemq-manager/src/main/java/org/apache/tubemq/manager/service/tube/IpIdRelation.java
@@ -22,6 +22,6 @@ import lombok.Data;
@Data
public class IpIdRelation {
- public String ip;
- public Integer id;
+ private String ip;
+ private Integer id;
}
diff --git
a/tubemq-manager/src/main/java/org/apache/tubemq/manager/service/tube/TubeHttpBrokerCfgInfo.java
b/tubemq-manager/src/main/java/org/apache/tubemq/manager/service/tube/TubeHttpBrokerCfgInfo.java
index 5debb19..53fe096 100644
---
a/tubemq-manager/src/main/java/org/apache/tubemq/manager/service/tube/TubeHttpBrokerCfgInfo.java
+++
b/tubemq-manager/src/main/java/org/apache/tubemq/manager/service/tube/TubeHttpBrokerCfgInfo.java
@@ -19,25 +19,25 @@
package org.apache.tubemq.manager.service.tube;
public class TubeHttpBrokerCfgInfo {
- public boolean acceptPublish;
- public boolean acceptSubscribe;
- public Integer brokerId;
- public String brokerIp;
- public Integer brokerPort;
- public Integer brokerTLSPort;
- public String createDate;
- public String createUser;
- public String deletePolicy;
- public String deleteWhen;
- public String modifyDate;
- public String modifyUser;
- public Integer memCacheFlushIntvl;
- public Integer memCacheMsgCntInK;
- public Integer memCacheMsgSizeInMB;
- public Integer numPartitions;
- public Integer numTopicStores;
- public Integer unflushDataHold;
- public Integer unflushInterval;
- public Integer unflushThreshold;
- public boolean hasTLSPort;
+ private boolean acceptPublish;
+ private boolean acceptSubscribe;
+ private Integer brokerId;
+ private String brokerIp;
+ private Integer brokerPort;
+ private Integer brokerTLSPort;
+ private String createDate;
+ private String createUser;
+ private String deletePolicy;
+ private String deleteWhen;
+ private String modifyDate;
+ private String modifyUser;
+ private Integer memCacheFlushIntvl;
+ private Integer memCacheMsgCntInK;
+ private Integer memCacheMsgSizeInMB;
+ private Integer numPartitions;
+ private Integer numTopicStores;
+ private Integer unflushDataHold;
+ private Integer unflushInterval;
+ private Integer unflushThreshold;
+ private boolean hasTLSPort;
}
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 83767ce..bea2387 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
@@ -72,7 +72,10 @@ public class TubeHttpBrokerInfoList {
@Override
public boolean equals(Object o) {
- if (o == this) return true;
+ if (o == this) {
+ return true;
+ }
+
if (!(o instanceof BrokerInfo)) {
return false;
}
diff --git
a/tubemq-manager/src/main/java/org/apache/tubemq/manager/service/tube/TubeHttpTopicInfoList.java
b/tubemq-manager/src/main/java/org/apache/tubemq/manager/service/tube/TubeHttpTopicInfoList.java
index ae747a9..0ba3426 100644
---
a/tubemq-manager/src/main/java/org/apache/tubemq/manager/service/tube/TubeHttpTopicInfoList.java
+++
b/tubemq-manager/src/main/java/org/apache/tubemq/manager/service/tube/TubeHttpTopicInfoList.java
@@ -21,6 +21,7 @@ import static
org.apache.tubemq.manager.service.TubeMQHttpConst.BATCH_ADD_TOPIC;
import static org.apache.tubemq.manager.service.TubeMQHttpConst.OP_MODIFY;
import static org.apache.tubemq.manager.service.TubeMQHttpConst.WEB_API;
+import com.google.common.collect.Lists;
import java.util.ArrayList;
import java.util.List;
import lombok.Data;
@@ -104,11 +105,10 @@ public class TubeHttpTopicInfoList {
public List<TopicInfo> getTopicInfo() {
- List<Integer> tmpBrokerIdList = new ArrayList<>();
if (data != null) {
return data.get(0).getTopicInfo();
}
- return null;
+ return Lists.newArrayList();
}
public AddTopicReq getAddTopicReq(List<Integer> brokerIds, List<String>
targetTopicNames, String token) {
diff --git
a/tubemq-manager/src/main/java/org/apache/tubemq/manager/utils/ConvertUtils.java
b/tubemq-manager/src/main/java/org/apache/tubemq/manager/utils/ConvertUtils.java
index 91e4f8f..f59bb73 100644
---
a/tubemq-manager/src/main/java/org/apache/tubemq/manager/utils/ConvertUtils.java
+++
b/tubemq-manager/src/main/java/org/apache/tubemq/manager/utils/ConvertUtils.java
@@ -49,7 +49,9 @@ public class ConvertUtils {
Object o = field.get(req);
String value;
// convert list to json string
- if (o == null) continue;
+ if (o == null) {
+ continue;
+ }
if (o instanceof List) {
value = gson.toJson(o);
} else {
diff --git
a/tubemq-manager/src/main/java/org/apache/tubemq/manager/utils/MasterUtils.java
b/tubemq-manager/src/main/java/org/apache/tubemq/manager/utils/MasterUtils.java
index 811dbca..5dea029 100644
---
a/tubemq-manager/src/main/java/org/apache/tubemq/manager/utils/MasterUtils.java
+++
b/tubemq-manager/src/main/java/org/apache/tubemq/manager/utils/MasterUtils.java
@@ -49,6 +49,7 @@ import static
org.apache.tubemq.manager.service.TubeMQHttpConst.SCHEMA;
@Component
public class MasterUtils {
+ public static final int SUCCESS_CODE = 0;
private static CloseableHttpClient httpclient =
HttpClients.createDefault();
private static Gson gson = new Gson();
public static final String TUBE_REQUEST_PATH = "webapi.htm";
@@ -78,7 +79,7 @@ public class MasterUtils {
TubeHttpResponse tubeResponse =
gson.fromJson(new
InputStreamReader(response.getEntity().getContent()),
TubeHttpResponse.class);
- if (tubeResponse.getCode() == 0 && tubeResponse.getErrCode() == 0)
{
+ if (tubeResponse.getCode() == SUCCESS_CODE &&
tubeResponse.getErrCode() == SUCCESS_CODE) {
return defaultResult;
} else {
defaultResult = getErrorResult(tubeResponse.getErrMsg());
