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 00e4c94de35fe1a99ea53942423caf8ded6499fa Author: EMsnap <[email protected]> AuthorDate: Fri Jan 15 16:46:19 2021 +0800 [TUBEMQ-513] change public to private --- .../manager/controller/cluster/ClusterController.java | 2 +- .../manager/controller/group/GroupController.java | 2 +- .../controller/group/result/OffsetQueryRes.java | 6 +++--- .../controller/node/request/BatchAddTopicReq.java | 4 ++-- .../controller/node/request/CloneBrokersReq.java | 12 ++++++------ .../manager/controller/node/request/CloneTopicReq.java | 10 +++++----- .../controller/node/request/QueryBrokerCfgReq.java | 10 +++++----- .../manager/controller/topic/TopicWebController.java | 2 +- .../controller/topic/request/BatchAddGroupAuthReq.java | 6 +++--- .../controller/topic/request/BatchAddTopicAuthReq.java | 6 +++--- .../controller/topic/request/DeleteGroupReq.java | 6 +++--- .../controller/topic/request/GroupAuthItem.java | 4 ++-- .../controller/topic/request/RebalanceConsumerReq.java | 10 +++++----- .../controller/topic/request/RebalanceGroupReq.java | 8 ++++---- .../controller/topic/request/TopicAuthItem.java | 2 +- .../manager/service/tube/RebalanceGroupResult.java | 4 ++-- .../manager/service/tube/TubeHttpBrokerInfoList.java | 18 +++++++++--------- .../manager/service/tube/TubeHttpGroupDetailInfo.java | 2 +- .../org/apache/tubemq/manager/utils/ConvertUtils.java | 2 +- 19 files changed, 58 insertions(+), 58 deletions(-) diff --git a/tubemq-manager/src/main/java/org/apache/tubemq/manager/controller/cluster/ClusterController.java b/tubemq-manager/src/main/java/org/apache/tubemq/manager/controller/cluster/ClusterController.java index a2242a1..6b2cf9f 100644 --- a/tubemq-manager/src/main/java/org/apache/tubemq/manager/controller/cluster/ClusterController.java +++ b/tubemq-manager/src/main/java/org/apache/tubemq/manager/controller/cluster/ClusterController.java @@ -48,7 +48,7 @@ public class ClusterController { private NodeRepository nodeRepository; @Autowired - public MasterService masterService; + private MasterService masterService; /** * query cluster info 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 b306522..3f56342 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 @@ -57,7 +57,7 @@ import org.springframework.web.bind.annotation.RestController; public class GroupController { - public Gson gson = new Gson(); + private Gson gson = new Gson(); @Autowired private MasterService masterService; diff --git a/tubemq-manager/src/main/java/org/apache/tubemq/manager/controller/group/result/OffsetQueryRes.java b/tubemq-manager/src/main/java/org/apache/tubemq/manager/controller/group/result/OffsetQueryRes.java index 434923a..d185db8 100644 --- a/tubemq-manager/src/main/java/org/apache/tubemq/manager/controller/group/result/OffsetQueryRes.java +++ b/tubemq-manager/src/main/java/org/apache/tubemq/manager/controller/group/result/OffsetQueryRes.java @@ -29,19 +29,19 @@ public class OffsetQueryRes { private int totalCnt; @Data - public static class GroupOffsetRes { + private static class GroupOffsetRes { private String groupName; private List<TopicOffsetRes> subInfo; private int topicCount; @Data - public static class TopicOffsetRes { + private static class TopicOffsetRes { private String topicName; private List<OffsetPartitionRes> offsets; private int partCount; @Data - public static class OffsetPartitionRes { + private static class OffsetPartitionRes { private int partitionId; private long curOffset; private int flightOffset; diff --git a/tubemq-manager/src/main/java/org/apache/tubemq/manager/controller/node/request/BatchAddTopicReq.java b/tubemq-manager/src/main/java/org/apache/tubemq/manager/controller/node/request/BatchAddTopicReq.java index 08ec6ae..207e1db 100644 --- a/tubemq-manager/src/main/java/org/apache/tubemq/manager/controller/node/request/BatchAddTopicReq.java +++ b/tubemq-manager/src/main/java/org/apache/tubemq/manager/controller/node/request/BatchAddTopicReq.java @@ -22,6 +22,6 @@ import lombok.Data; @Data public class BatchAddTopicReq extends BaseReq{ - List<AddTopicReq> addTopicReqs; - List<Integer> brokerIds; + private List<AddTopicReq> addTopicReqs; + private List<Integer> brokerIds; } diff --git a/tubemq-manager/src/main/java/org/apache/tubemq/manager/controller/node/request/CloneBrokersReq.java b/tubemq-manager/src/main/java/org/apache/tubemq/manager/controller/node/request/CloneBrokersReq.java index f59c5d5..81b7ce3 100644 --- a/tubemq-manager/src/main/java/org/apache/tubemq/manager/controller/node/request/CloneBrokersReq.java +++ b/tubemq-manager/src/main/java/org/apache/tubemq/manager/controller/node/request/CloneBrokersReq.java @@ -25,10 +25,10 @@ import java.util.List; @Data public class CloneBrokersReq { - Integer sourceBrokerId; - List<String> targetIps; - List<AddTopicReq> addTopicReqs; - public String confModAuthToken; - public String createUser; - public int clusterId; + private Integer sourceBrokerId; + private List<String> targetIps; + private List<AddTopicReq> addTopicReqs; + private String confModAuthToken; + private String createUser; + private int clusterId; } \ No newline at end of file diff --git a/tubemq-manager/src/main/java/org/apache/tubemq/manager/controller/node/request/CloneTopicReq.java b/tubemq-manager/src/main/java/org/apache/tubemq/manager/controller/node/request/CloneTopicReq.java index f577b50..0d98107 100644 --- a/tubemq-manager/src/main/java/org/apache/tubemq/manager/controller/node/request/CloneTopicReq.java +++ b/tubemq-manager/src/main/java/org/apache/tubemq/manager/controller/node/request/CloneTopicReq.java @@ -22,9 +22,9 @@ import lombok.Data; @Data public class CloneTopicReq extends BaseReq{ - public String sourceTopicName; - public Integer clusterId; - public List<Integer> brokerId; - public List<String> targetTopicName; - public String confModAuthToken; + private String sourceTopicName; + private Integer clusterId; + private List<Integer> brokerId; + private List<String> targetTopicName; + private String confModAuthToken; } diff --git a/tubemq-manager/src/main/java/org/apache/tubemq/manager/controller/node/request/QueryBrokerCfgReq.java b/tubemq-manager/src/main/java/org/apache/tubemq/manager/controller/node/request/QueryBrokerCfgReq.java index d60c375..fe48ba8 100644 --- a/tubemq-manager/src/main/java/org/apache/tubemq/manager/controller/node/request/QueryBrokerCfgReq.java +++ b/tubemq-manager/src/main/java/org/apache/tubemq/manager/controller/node/request/QueryBrokerCfgReq.java @@ -25,15 +25,15 @@ import static org.apache.tubemq.manager.service.TubeMQHttpConst.QUERY_BROKER_CON @Data public class QueryBrokerCfgReq { - public String method; + private String method; - public Integer brokerId; + private Integer brokerId; - public String type; + private String type; - public boolean withDetail; + private boolean withDetail; - public boolean withTopic; + private boolean withTopic; public static QueryBrokerCfgReq getReq(Integer brokerId) { QueryBrokerCfgReq req = new QueryBrokerCfgReq(); 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 2f19062..b1f6341 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 @@ -54,7 +54,7 @@ public class TopicWebController { @Autowired private NodeService nodeService; - public Gson gson = new Gson(); + private Gson gson = new Gson(); @Autowired private MasterService masterService; diff --git a/tubemq-manager/src/main/java/org/apache/tubemq/manager/controller/topic/request/BatchAddGroupAuthReq.java b/tubemq-manager/src/main/java/org/apache/tubemq/manager/controller/topic/request/BatchAddGroupAuthReq.java index 081cfe3..82235e8 100644 --- a/tubemq-manager/src/main/java/org/apache/tubemq/manager/controller/topic/request/BatchAddGroupAuthReq.java +++ b/tubemq-manager/src/main/java/org/apache/tubemq/manager/controller/topic/request/BatchAddGroupAuthReq.java @@ -24,7 +24,7 @@ import org.apache.tubemq.manager.controller.node.request.BaseReq; @Data public class BatchAddGroupAuthReq extends BaseReq { - public String confModAuthToken; - public List<GroupAuthItem> groupNameJsonSet; - public String createUser; + private String confModAuthToken; + private List<GroupAuthItem> groupNameJsonSet; + private String createUser; } diff --git a/tubemq-manager/src/main/java/org/apache/tubemq/manager/controller/topic/request/BatchAddTopicAuthReq.java b/tubemq-manager/src/main/java/org/apache/tubemq/manager/controller/topic/request/BatchAddTopicAuthReq.java index 3df3734..286f9f6 100644 --- a/tubemq-manager/src/main/java/org/apache/tubemq/manager/controller/topic/request/BatchAddTopicAuthReq.java +++ b/tubemq-manager/src/main/java/org/apache/tubemq/manager/controller/topic/request/BatchAddTopicAuthReq.java @@ -23,7 +23,7 @@ import org.apache.tubemq.manager.controller.node.request.BaseReq; @Data public class BatchAddTopicAuthReq extends BaseReq { - public String confModAuthToken; - public List<TopicAuthItem> topicJsonSet; - public String createUser; + private String confModAuthToken; + private List<TopicAuthItem> topicJsonSet; + private String createUser; } diff --git a/tubemq-manager/src/main/java/org/apache/tubemq/manager/controller/topic/request/DeleteGroupReq.java b/tubemq-manager/src/main/java/org/apache/tubemq/manager/controller/topic/request/DeleteGroupReq.java index a9d9505..a247700 100644 --- a/tubemq-manager/src/main/java/org/apache/tubemq/manager/controller/topic/request/DeleteGroupReq.java +++ b/tubemq-manager/src/main/java/org/apache/tubemq/manager/controller/topic/request/DeleteGroupReq.java @@ -22,7 +22,7 @@ import org.apache.tubemq.manager.controller.node.request.BaseReq; @Data public class DeleteGroupReq extends BaseReq { - public String confModAuthToken; - public String topicName; - public String groupName; + private String confModAuthToken; + private String topicName; + private String groupName; } diff --git a/tubemq-manager/src/main/java/org/apache/tubemq/manager/controller/topic/request/GroupAuthItem.java b/tubemq-manager/src/main/java/org/apache/tubemq/manager/controller/topic/request/GroupAuthItem.java index d830ca7..fc03425 100644 --- a/tubemq-manager/src/main/java/org/apache/tubemq/manager/controller/topic/request/GroupAuthItem.java +++ b/tubemq-manager/src/main/java/org/apache/tubemq/manager/controller/topic/request/GroupAuthItem.java @@ -23,6 +23,6 @@ import org.apache.tubemq.manager.controller.node.request.BaseReq; @Data public class GroupAuthItem extends BaseReq { - public String topicName; - public String groupName; + private String topicName; + private String groupName; } diff --git a/tubemq-manager/src/main/java/org/apache/tubemq/manager/controller/topic/request/RebalanceConsumerReq.java b/tubemq-manager/src/main/java/org/apache/tubemq/manager/controller/topic/request/RebalanceConsumerReq.java index 040d5ea..ce4b278 100644 --- a/tubemq-manager/src/main/java/org/apache/tubemq/manager/controller/topic/request/RebalanceConsumerReq.java +++ b/tubemq-manager/src/main/java/org/apache/tubemq/manager/controller/topic/request/RebalanceConsumerReq.java @@ -22,9 +22,9 @@ import org.apache.tubemq.manager.controller.node.request.BaseReq; @Data public class RebalanceConsumerReq extends BaseReq { - public String groupName; - public String confModAuthToken; - public Integer reJoinWait; - public String modifyUser; - public String consumerId; + private String groupName; + private String confModAuthToken; + private Integer reJoinWait; + private String modifyUser; + private String consumerId; } diff --git a/tubemq-manager/src/main/java/org/apache/tubemq/manager/controller/topic/request/RebalanceGroupReq.java b/tubemq-manager/src/main/java/org/apache/tubemq/manager/controller/topic/request/RebalanceGroupReq.java index 92271ca..fb61cda 100644 --- a/tubemq-manager/src/main/java/org/apache/tubemq/manager/controller/topic/request/RebalanceGroupReq.java +++ b/tubemq-manager/src/main/java/org/apache/tubemq/manager/controller/topic/request/RebalanceGroupReq.java @@ -22,8 +22,8 @@ import org.apache.tubemq.manager.controller.node.request.BaseReq; @Data public class RebalanceGroupReq extends BaseReq { - public String groupName; - public String confModAuthToken; - public Integer reJoinWait; - public String modifyUser; + private String groupName; + private String confModAuthToken; + private Integer reJoinWait; + private String modifyUser; } diff --git a/tubemq-manager/src/main/java/org/apache/tubemq/manager/controller/topic/request/TopicAuthItem.java b/tubemq-manager/src/main/java/org/apache/tubemq/manager/controller/topic/request/TopicAuthItem.java index 501c19f..63831b7 100644 --- a/tubemq-manager/src/main/java/org/apache/tubemq/manager/controller/topic/request/TopicAuthItem.java +++ b/tubemq-manager/src/main/java/org/apache/tubemq/manager/controller/topic/request/TopicAuthItem.java @@ -22,5 +22,5 @@ import lombok.Data; @Data public class TopicAuthItem { - public String topicName; + private String topicName; } diff --git a/tubemq-manager/src/main/java/org/apache/tubemq/manager/service/tube/RebalanceGroupResult.java b/tubemq-manager/src/main/java/org/apache/tubemq/manager/service/tube/RebalanceGroupResult.java index 5db9ee3..3024597 100644 --- a/tubemq-manager/src/main/java/org/apache/tubemq/manager/service/tube/RebalanceGroupResult.java +++ b/tubemq-manager/src/main/java/org/apache/tubemq/manager/service/tube/RebalanceGroupResult.java @@ -24,7 +24,7 @@ import lombok.Data; @Data public class RebalanceGroupResult { - public List<String> failConsumers = Lists.newArrayList(); + private List<String> failConsumers = Lists.newArrayList(); - public List<String> successConsumers = Lists.newArrayList(); + private List<String> successConsumers = Lists.newArrayList(); } 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 03dca0f..61a5bd9 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,17 +27,17 @@ 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"; + private static final String IDLE = "idle"; + private static final String RUNNING = "running"; + private static final String ONLINE = "online"; + private static final String ONLY_READ = "only-read"; + private static final String ONLY_WRITE = "only-write"; /** * json class for broker info. */ @Data - public static class BrokerInfo { + private static class BrokerInfo { private int brokerId; private String brokerIp; private int brokerPort; @@ -52,11 +52,11 @@ public class TubeHttpBrokerInfoList { private boolean acceptPublish; private boolean acceptSubscribe; - public boolean isIdle() { + private boolean isIdle() { return subStatus != null && IDLE.equals(subStatus); } - public boolean isWorking() { + private boolean isWorking() { if (runStatus != null && manageStatus != null) { return RUNNING.equals(runStatus) && ( ONLINE.equals(manageStatus) || @@ -66,7 +66,7 @@ public class TubeHttpBrokerInfoList { return false; } - public boolean isConfigurable() { + private boolean isConfigurable() { return stepOp == -2 || stepOp == 31 || stepOp == 32; } diff --git a/tubemq-manager/src/main/java/org/apache/tubemq/manager/service/tube/TubeHttpGroupDetailInfo.java b/tubemq-manager/src/main/java/org/apache/tubemq/manager/service/tube/TubeHttpGroupDetailInfo.java index 6ff4568..9834d98 100644 --- a/tubemq-manager/src/main/java/org/apache/tubemq/manager/service/tube/TubeHttpGroupDetailInfo.java +++ b/tubemq-manager/src/main/java/org/apache/tubemq/manager/service/tube/TubeHttpGroupDetailInfo.java @@ -40,7 +40,7 @@ public class TubeHttpGroupDetailInfo { private List<ConsumerInfo> data; @Data - public static class ConsumerInfo { + private static class ConsumerInfo { private String consumerId; 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 130faa0..f36c98d 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 @@ -36,7 +36,7 @@ import static org.apache.tubemq.manager.service.TubeMQHttpConst.REBALANCE_GROUP; @Slf4j public class ConvertUtils { - public static final Gson gson = new Gson(); + private static final Gson gson = new Gson(); public static String convertReqToQueryStr(Object req) { List<String> queryList = new ArrayList<>();
