From 27210cae8a842ef586199c630ea51dcbb96a73c0 Mon Sep 17 00:00:00 2001 From: Aaron Ai Date: Sun, 18 Sep 2022 00:20:58 +0800 Subject: [PATCH 1/2] Bump checkstyle to 3.2.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 958c9015a3f..ca53fb2358d 100644 --- a/pom.xml +++ b/pom.xml @@ -147,7 +147,7 @@ 3.5.1 3.0.1 2.2 - 3.1.2 + 3.2.0 0.12 3.0.2 4.3.0 From a66dc42acae865de19c75130bd7875271f7f511f Mon Sep 17 00:00:00 2001 From: Aaron Ai Date: Sun, 18 Sep 2022 00:21:17 +0800 Subject: [PATCH 2/2] Fix checkstyle --- .../org/apache/rocketmq/acl/common/Permission.java | 2 +- .../org/apache/rocketmq/broker/BrokerController.java | 2 +- .../broker/processor/AdminBrokerProcessor.java | 2 +- .../broker/processor/PopBufferMergeService.java | 10 +++++----- .../rocketmq/broker/processor/PopReviveService.java | 2 +- .../queue/TransactionalMessageServiceImpl.java | 8 ++++---- .../impl/consumer/ConsumeMessageOrderlyService.java | 2 +- .../impl/consumer/DefaultMQPushConsumerImpl.java | 4 ++-- .../java/org/apache/rocketmq/common/DataVersion.java | 2 +- .../apache/rocketmq/common/filter/impl/PolishExpr.java | 4 ++-- .../common/protocol/body/ConsumerRunningInfo.java | 2 +- .../common/statictopic/TopicQueueMappingDetail.java | 4 ++-- .../controller/impl/DefaultBrokerHeartbeatManager.java | 2 +- .../apache/rocketmq/logging/inner/LoggingBuilder.java | 4 ++-- .../namesrv/processor/ClientRequestProcessor.java | 2 +- .../openmessaging/rocketmq/promise/DefaultPromise.java | 2 +- .../org/apache/rocketmq/store/ha/DefaultHAService.java | 4 ++-- .../org/apache/rocketmq/store/index/IndexFile.java | 6 +++--- .../apache/rocketmq/store/queue/BatchConsumeQueue.java | 2 +- .../rocketmq/tools/admin/DefaultMQAdminExtImpl.java | 2 +- .../apache/rocketmq/tools/command/MQAdminStartup.java | 2 +- .../tools/command/stats/StatsAllSubCommand.java | 6 +++--- .../command/topic/UpdateStaticTopicSubCommand.java | 2 +- 23 files changed, 39 insertions(+), 39 deletions(-) diff --git a/acl/src/main/java/org/apache/rocketmq/acl/common/Permission.java b/acl/src/main/java/org/apache/rocketmq/acl/common/Permission.java index dadcaa304aa..7213cf72d86 100644 --- a/acl/src/main/java/org/apache/rocketmq/acl/common/Permission.java +++ b/acl/src/main/java/org/apache/rocketmq/acl/common/Permission.java @@ -50,7 +50,7 @@ public static boolean checkPermission(byte neededPerm, byte ownedPerm) { return false; } if ((neededPerm & ANY) > 0) { - return ((ownedPerm & PUB) > 0) || ((ownedPerm & SUB) > 0); + return (ownedPerm & PUB) > 0 || (ownedPerm & SUB) > 0; } return (neededPerm & ownedPerm) > 0; } diff --git a/broker/src/main/java/org/apache/rocketmq/broker/BrokerController.java b/broker/src/main/java/org/apache/rocketmq/broker/BrokerController.java index 8fe80e513e6..e0262a105f2 100644 --- a/broker/src/main/java/org/apache/rocketmq/broker/BrokerController.java +++ b/broker/src/main/java/org/apache/rocketmq/broker/BrokerController.java @@ -1510,7 +1510,7 @@ public void start() throws Exception { this.shouldStartTime = System.currentTimeMillis() + messageStoreConfig.getDisappearTimeAfterStart(); - if ((messageStoreConfig.getTotalReplicas() > 1 && this.brokerConfig.isEnableSlaveActingMaster()) || this.brokerConfig.isEnableControllerMode()) { + if (messageStoreConfig.getTotalReplicas() > 1 && this.brokerConfig.isEnableSlaveActingMaster() || this.brokerConfig.isEnableControllerMode()) { isIsolated = true; } diff --git a/broker/src/main/java/org/apache/rocketmq/broker/processor/AdminBrokerProcessor.java b/broker/src/main/java/org/apache/rocketmq/broker/processor/AdminBrokerProcessor.java index 0ec1c226a4e..fac4a0c38ca 100644 --- a/broker/src/main/java/org/apache/rocketmq/broker/processor/AdminBrokerProcessor.java +++ b/broker/src/main/java/org/apache/rocketmq/broker/processor/AdminBrokerProcessor.java @@ -806,7 +806,7 @@ private RemotingCommand rewriteRequestForStaticTopic(SearchOffsetRequestHeader r } SearchOffsetResponseHeader offsetResponseHeader = (SearchOffsetResponseHeader) rpcResponse.getHeader(); if (offsetResponseHeader.getOffset() < 0 - || (item.checkIfEndOffsetDecided() && offsetResponseHeader.getOffset() >= item.getEndOffset())) { + || item.checkIfEndOffsetDecided() && offsetResponseHeader.getOffset() >= item.getEndOffset()) { continue; } else { offset = item.computeStaticQueueOffsetStrictly(offsetResponseHeader.getOffset()); diff --git a/broker/src/main/java/org/apache/rocketmq/broker/processor/PopBufferMergeService.java b/broker/src/main/java/org/apache/rocketmq/broker/processor/PopBufferMergeService.java index a8f93c22bb7..3a1d8baea56 100644 --- a/broker/src/main/java/org/apache/rocketmq/broker/processor/PopBufferMergeService.java +++ b/broker/src/main/java/org/apache/rocketmq/broker/processor/PopBufferMergeService.java @@ -137,8 +137,8 @@ private int scanCommitOffset() { // 1. just offset & stored, not processed by scan // 2. ck is buffer(acked) // 3. ck is buffer(not all acked), all ak are stored and ck is stored - if ((pointWrapper.isJustOffset() && pointWrapper.isCkStored()) || isCkDone(pointWrapper) - || (isCkDoneForFinish(pointWrapper) && pointWrapper.isCkStored())) { + if (pointWrapper.isJustOffset() && pointWrapper.isCkStored() || isCkDone(pointWrapper) + || isCkDoneForFinish(pointWrapper) && pointWrapper.isCkStored()) { if (commitOffset(pointWrapper)) { queue.poll(); } else { @@ -218,8 +218,8 @@ private void scan() { PopCheckPointWrapper pointWrapper = entry.getValue(); // just process offset(already stored at pull thread), or buffer ck(not stored and ack finish) - if ((pointWrapper.isJustOffset() && pointWrapper.isCkStored()) || isCkDone(pointWrapper) - || (isCkDoneForFinish(pointWrapper) && pointWrapper.isCkStored())) { + if (pointWrapper.isJustOffset() && pointWrapper.isCkStored() || isCkDone(pointWrapper) + || isCkDoneForFinish(pointWrapper) && pointWrapper.isCkStored()) { if (brokerController.getBrokerConfig().isEnablePopLog()) { POP_LOGGER.info("[PopBuffer]ck done, {}", pointWrapper); } @@ -231,7 +231,7 @@ private void scan() { PopCheckPoint point = pointWrapper.getCk(); long now = System.currentTimeMillis(); - boolean removeCk = this.serving ? false : true; + boolean removeCk = !this.serving; // ck will be timeout if (point.getReviveTime() - now < brokerController.getBrokerConfig().getPopCkStayBufferTimeOut()) { removeCk = true; diff --git a/broker/src/main/java/org/apache/rocketmq/broker/processor/PopReviveService.java b/broker/src/main/java/org/apache/rocketmq/broker/processor/PopReviveService.java index 8708b48a6a5..7eefe58767e 100644 --- a/broker/src/main/java/org/apache/rocketmq/broker/processor/PopReviveService.java +++ b/broker/src/main/java/org/apache/rocketmq/broker/processor/PopReviveService.java @@ -173,7 +173,7 @@ protected List getReviveMessage(long offset, int queueId) { private boolean reachTail(PullResult pullResult, long offset) { return pullResult.getPullStatus() == PullStatus.NO_NEW_MSG - || (pullResult.getPullStatus() == PullStatus.OFFSET_ILLEGAL && offset == pullResult.getMaxOffset()); + || pullResult.getPullStatus() == PullStatus.OFFSET_ILLEGAL && offset == pullResult.getMaxOffset(); } private MessageExt getBizMessage(String topic, long offset, int queueId, String brokerName) { diff --git a/broker/src/main/java/org/apache/rocketmq/broker/transaction/queue/TransactionalMessageServiceImpl.java b/broker/src/main/java/org/apache/rocketmq/broker/transaction/queue/TransactionalMessageServiceImpl.java index 1ae0f7aedd4..63b188e6483 100644 --- a/broker/src/main/java/org/apache/rocketmq/broker/transaction/queue/TransactionalMessageServiceImpl.java +++ b/broker/src/main/java/org/apache/rocketmq/broker/transaction/queue/TransactionalMessageServiceImpl.java @@ -212,16 +212,16 @@ public void check(long transactionTimeout, int transactionCheckMax, } } } else { - if ((0 <= valueOfCurrentMinusBorn) && (valueOfCurrentMinusBorn < checkImmunityTime)) { + if (0 <= valueOfCurrentMinusBorn && valueOfCurrentMinusBorn < checkImmunityTime) { log.debug("New arrived, the miss offset={}, check it later checkImmunity={}, born={}", i, checkImmunityTime, new Date(msgExt.getBornTimestamp())); break; } } List opMsg = pullResult.getMsgFoundList(); - boolean isNeedCheck = (opMsg == null && valueOfCurrentMinusBorn > checkImmunityTime) - || (opMsg != null && (opMsg.get(opMsg.size() - 1).getBornTimestamp() - startTime > transactionTimeout)) - || (valueOfCurrentMinusBorn <= -1); + boolean isNeedCheck = opMsg == null && valueOfCurrentMinusBorn > checkImmunityTime + || opMsg != null && opMsg.get(opMsg.size() - 1).getBornTimestamp() - startTime > transactionTimeout + || valueOfCurrentMinusBorn <= -1; if (isNeedCheck) { if (!putBackHalfMsgQueue(msgExt, i)) { diff --git a/client/src/main/java/org/apache/rocketmq/client/impl/consumer/ConsumeMessageOrderlyService.java b/client/src/main/java/org/apache/rocketmq/client/impl/consumer/ConsumeMessageOrderlyService.java index df2b2a6b792..4f4f98c98a9 100644 --- a/client/src/main/java/org/apache/rocketmq/client/impl/consumer/ConsumeMessageOrderlyService.java +++ b/client/src/main/java/org/apache/rocketmq/client/impl/consumer/ConsumeMessageOrderlyService.java @@ -438,7 +438,7 @@ public void run() { final Object objLock = messageQueueLock.fetchLockObject(this.messageQueue); synchronized (objLock) { if (MessageModel.BROADCASTING.equals(ConsumeMessageOrderlyService.this.defaultMQPushConsumerImpl.messageModel()) - || (this.processQueue.isLocked() && !this.processQueue.isLockExpired())) { + || this.processQueue.isLocked() && !this.processQueue.isLockExpired()) { final long beginTime = System.currentTimeMillis(); for (boolean continueConsume = true; continueConsume; ) { if (this.processQueue.isDropped()) { diff --git a/client/src/main/java/org/apache/rocketmq/client/impl/consumer/DefaultMQPushConsumerImpl.java b/client/src/main/java/org/apache/rocketmq/client/impl/consumer/DefaultMQPushConsumerImpl.java index f1a8e866c78..789852a6cf1 100644 --- a/client/src/main/java/org/apache/rocketmq/client/impl/consumer/DefaultMQPushConsumerImpl.java +++ b/client/src/main/java/org/apache/rocketmq/client/impl/consumer/DefaultMQPushConsumerImpl.java @@ -726,8 +726,8 @@ public void sendMessageBack(MessageExt msg, int delayLevel, final MessageQueue m private void sendMessageBack(MessageExt msg, int delayLevel, final String brokerName, final MessageQueue mq) throws RemotingException, MQBrokerException, InterruptedException, MQClientException { try { - if ((brokerName != null && brokerName.startsWith(MixAll.LOGICAL_QUEUE_MOCK_BROKER_PREFIX)) - || (mq != null && mq.getBrokerName().startsWith(MixAll.LOGICAL_QUEUE_MOCK_BROKER_PREFIX))) { + if (brokerName != null && brokerName.startsWith(MixAll.LOGICAL_QUEUE_MOCK_BROKER_PREFIX) + || mq != null && mq.getBrokerName().startsWith(MixAll.LOGICAL_QUEUE_MOCK_BROKER_PREFIX)) { sendMessageBackAsNormalMessage(msg); } else { String brokerAddr = (null != brokerName) ? this.mQClientFactory.findBrokerAddressInPublish(brokerName) diff --git a/common/src/main/java/org/apache/rocketmq/common/DataVersion.java b/common/src/main/java/org/apache/rocketmq/common/DataVersion.java index 6d53bd8214c..73f409e7d01 100644 --- a/common/src/main/java/org/apache/rocketmq/common/DataVersion.java +++ b/common/src/main/java/org/apache/rocketmq/common/DataVersion.java @@ -82,7 +82,7 @@ public boolean equals(final Object o) { return counter.longValue() == version.counter.longValue(); } - return (null == counter) && (null == version.counter); + return null == counter && null == version.counter; } diff --git a/common/src/main/java/org/apache/rocketmq/common/filter/impl/PolishExpr.java b/common/src/main/java/org/apache/rocketmq/common/filter/impl/PolishExpr.java index cdc6187a148..388d095def3 100644 --- a/common/src/main/java/org/apache/rocketmq/common/filter/impl/PolishExpr.java +++ b/common/src/main/java/org/apache/rocketmq/common/filter/impl/PolishExpr.java @@ -97,8 +97,8 @@ private static List participle(String expression) { for (int i = 0; i < size; i++) { int chValue = (int) expression.charAt(i); - if ((97 <= chValue && chValue <= 122) || (65 <= chValue && chValue <= 90) - || (49 <= chValue && chValue <= 57) || 95 == chValue) { + if (97 <= chValue && chValue <= 122 || 65 <= chValue && chValue <= 90 + || 49 <= chValue && chValue <= 57 || 95 == chValue) { if (Type.OPERATOR == preType || Type.SEPAERATOR == preType || Type.NULL == preType || Type.PARENTHESIS == preType) { diff --git a/common/src/main/java/org/apache/rocketmq/common/protocol/body/ConsumerRunningInfo.java b/common/src/main/java/org/apache/rocketmq/common/protocol/body/ConsumerRunningInfo.java index 4a68b25a5f4..79206727d19 100644 --- a/common/src/main/java/org/apache/rocketmq/common/protocol/body/ConsumerRunningInfo.java +++ b/common/src/main/java/org/apache/rocketmq/common/protocol/body/ConsumerRunningInfo.java @@ -141,7 +141,7 @@ public static String analyzeProcessQueue(final String clientId, ConsumerRunningI mq, System.currentTimeMillis() - pq.getLastLockTimestamp())); } else { - if (pq.isDroped() && (pq.getTryUnlockTimes() > 0)) { + if (pq.isDroped() && pq.getTryUnlockTimes() > 0) { sb.append(String.format("%s %s unlock %d times, still failed%n", clientId, mq, diff --git a/common/src/main/java/org/apache/rocketmq/common/statictopic/TopicQueueMappingDetail.java b/common/src/main/java/org/apache/rocketmq/common/statictopic/TopicQueueMappingDetail.java index f0f27a5cd0c..40e50f4b402 100644 --- a/common/src/main/java/org/apache/rocketmq/common/statictopic/TopicQueueMappingDetail.java +++ b/common/src/main/java/org/apache/rocketmq/common/statictopic/TopicQueueMappingDetail.java @@ -97,8 +97,8 @@ public static TopicQueueMappingInfo cloneAsMappingInfo(TopicQueueMappingDetail m public static boolean checkIfAsPhysical(TopicQueueMappingDetail mappingDetail, Integer globalId) { List mappingItems = getMappingInfo(mappingDetail, globalId); return mappingItems == null - || (mappingItems.size() == 1 - && mappingItems.get(0).getLogicOffset() == 0); + || mappingItems.size() == 1 + && mappingItems.get(0).getLogicOffset() == 0; } public ConcurrentMap> getHostedQueues() { diff --git a/controller/src/main/java/org/apache/rocketmq/controller/impl/DefaultBrokerHeartbeatManager.java b/controller/src/main/java/org/apache/rocketmq/controller/impl/DefaultBrokerHeartbeatManager.java index c369d8353ad..c525c2c36b3 100644 --- a/controller/src/main/java/org/apache/rocketmq/controller/impl/DefaultBrokerHeartbeatManager.java +++ b/controller/src/main/java/org/apache/rocketmq/controller/impl/DefaultBrokerHeartbeatManager.java @@ -140,7 +140,7 @@ public void onBrokerHeartbeat(String clusterName, String brokerAddr, Integer epo long realConfirmOffset = Optional.ofNullable(confirmOffset).orElse(-1L); prev.setLastUpdateTimestamp(System.currentTimeMillis()); - if (realEpoch > prev.getEpoch() || (realEpoch == prev.getEpoch() && realMaxOffset > prev.getMaxOffset())) { + if (realEpoch > prev.getEpoch() || realEpoch == prev.getEpoch() && realMaxOffset > prev.getMaxOffset()) { prev.setEpoch(realEpoch); prev.setMaxOffset(realMaxOffset); prev.setConfirmOffset(realConfirmOffset); diff --git a/logging/src/main/java/org/apache/rocketmq/logging/inner/LoggingBuilder.java b/logging/src/main/java/org/apache/rocketmq/logging/inner/LoggingBuilder.java index 996551e77dc..50b72119c38 100644 --- a/logging/src/main/java/org/apache/rocketmq/logging/inner/LoggingBuilder.java +++ b/logging/src/main/java/org/apache/rocketmq/logging/inner/LoggingBuilder.java @@ -175,7 +175,7 @@ public void addAppender(final Appender newAppender) { } public void append(final LoggingEvent event) { - if ((dispatcher == null) || !dispatcher.isAlive() || (bufferSize <= 0)) { + if (dispatcher == null || !dispatcher.isAlive() || bufferSize <= 0) { synchronized (appenderPipeline) { appenderPipeline.appendLoopOnAppenders(event); } @@ -383,7 +383,7 @@ public void run() { int bufferSize = buffer.size(); isActive = !parent.closed; - while ((bufferSize == 0) && isActive) { + while (bufferSize == 0 && isActive) { buffer.wait(); bufferSize = buffer.size(); isActive = !parent.closed; diff --git a/namesrv/src/main/java/org/apache/rocketmq/namesrv/processor/ClientRequestProcessor.java b/namesrv/src/main/java/org/apache/rocketmq/namesrv/processor/ClientRequestProcessor.java index 007d49a750f..3642d5f5983 100644 --- a/namesrv/src/main/java/org/apache/rocketmq/namesrv/processor/ClientRequestProcessor.java +++ b/namesrv/src/main/java/org/apache/rocketmq/namesrv/processor/ClientRequestProcessor.java @@ -61,7 +61,7 @@ public RemotingCommand getRouteInfoByTopic(ChannelHandlerContext ctx, byte[] content; Boolean standardJsonOnly = requestHeader.getAcceptStandardJsonOnly(); - if (request.getVersion() >= MQVersion.Version.V4_9_4.ordinal() || (null != standardJsonOnly && standardJsonOnly)) { + if (request.getVersion() >= MQVersion.Version.V4_9_4.ordinal() || null != standardJsonOnly && standardJsonOnly) { content = topicRouteData.encode(SerializerFeature.BrowserCompatible, SerializerFeature.QuoteFieldNames, SerializerFeature.SkipTransientField, SerializerFeature.MapSortField); diff --git a/openmessaging/src/main/java/io/openmessaging/rocketmq/promise/DefaultPromise.java b/openmessaging/src/main/java/io/openmessaging/rocketmq/promise/DefaultPromise.java index c1b59993f6f..feee13f1a7b 100644 --- a/openmessaging/src/main/java/io/openmessaging/rocketmq/promise/DefaultPromise.java +++ b/openmessaging/src/main/java/io/openmessaging/rocketmq/promise/DefaultPromise.java @@ -157,7 +157,7 @@ private void notifyListeners() { } private boolean isSuccess() { - return isDone() && (exception == null); + return isDone() && exception == null; } private void timeoutSoCancel() { diff --git a/store/src/main/java/org/apache/rocketmq/store/ha/DefaultHAService.java b/store/src/main/java/org/apache/rocketmq/store/ha/DefaultHAService.java index 8408b7608c3..fcac067c57f 100644 --- a/store/src/main/java/org/apache/rocketmq/store/ha/DefaultHAService.java +++ b/store/src/main/java/org/apache/rocketmq/store/ha/DefaultHAService.java @@ -99,8 +99,8 @@ public boolean isSlaveOK(final long masterPutWhere) { boolean result = this.connectionCount.get() > 0; result = result - && ((masterPutWhere - this.push2SlaveMaxOffset.get()) < this.defaultMessageStore - .getMessageStoreConfig().getHaMaxGapNotInSync()); + && masterPutWhere - this.push2SlaveMaxOffset.get() < this.defaultMessageStore + .getMessageStoreConfig().getHaMaxGapNotInSync(); return result; } diff --git a/store/src/main/java/org/apache/rocketmq/store/index/IndexFile.java b/store/src/main/java/org/apache/rocketmq/store/index/IndexFile.java index 1684eed1291..ac675a5bf5c 100644 --- a/store/src/main/java/org/apache/rocketmq/store/index/IndexFile.java +++ b/store/src/main/java/org/apache/rocketmq/store/index/IndexFile.java @@ -180,8 +180,8 @@ public long getEndPhyOffset() { public boolean isTimeMatched(final long begin, final long end) { boolean result = begin < this.indexHeader.getBeginTimestamp() && end > this.indexHeader.getEndTimestamp(); - result = result || (begin >= this.indexHeader.getBeginTimestamp() && begin <= this.indexHeader.getEndTimestamp()); - result = result || (end >= this.indexHeader.getBeginTimestamp() && end <= this.indexHeader.getEndTimestamp()); + result = result || begin >= this.indexHeader.getBeginTimestamp() && begin <= this.indexHeader.getEndTimestamp(); + result = result || end >= this.indexHeader.getBeginTimestamp() && end <= this.indexHeader.getEndTimestamp(); return result; } @@ -219,7 +219,7 @@ public void selectPhyOffset(final List phyOffsets, final String key, final timeDiff *= 1000L; long timeRead = this.indexHeader.getBeginTimestamp() + timeDiff; - boolean timeMatched = (timeRead >= begin) && (timeRead <= end); + boolean timeMatched = timeRead >= begin && timeRead <= end; if (keyHash == keyHashRead && timeMatched) { phyOffsets.add(phyOffsetRead); diff --git a/store/src/main/java/org/apache/rocketmq/store/queue/BatchConsumeQueue.java b/store/src/main/java/org/apache/rocketmq/store/queue/BatchConsumeQueue.java index fa8d680fd5e..4cd0088b1df 100644 --- a/store/src/main/java/org/apache/rocketmq/store/queue/BatchConsumeQueue.java +++ b/store/src/main/java/org/apache/rocketmq/store/queue/BatchConsumeQueue.java @@ -504,7 +504,7 @@ boolean putBatchMessagePositionInfo(final long offset, final int size, final lon } long behind = System.currentTimeMillis() - storeTime; - if (behind > 10000 && (System.currentTimeMillis() % 10000 == 0)) { + if (behind > 10000 && System.currentTimeMillis() % 10000 == 0) { String flag = "LEVEL" + (behind / 10000); log.warn("Reput behind {} topic:{} queue:{} offset:{} behind:{}", flag, topic, queueId, offset, behind); } diff --git a/tools/src/main/java/org/apache/rocketmq/tools/admin/DefaultMQAdminExtImpl.java b/tools/src/main/java/org/apache/rocketmq/tools/admin/DefaultMQAdminExtImpl.java index 4b14c8f3c12..aa1fa37b5de 100644 --- a/tools/src/main/java/org/apache/rocketmq/tools/admin/DefaultMQAdminExtImpl.java +++ b/tools/src/main/java/org/apache/rocketmq/tools/admin/DefaultMQAdminExtImpl.java @@ -1637,7 +1637,7 @@ public TopicConfigSerializeWrapper getUserTopicConfig(final String brokerAddr, f Iterator> iterator = topicConfigSerializeWrapper.getTopicConfigTable().entrySet().iterator(); while (iterator.hasNext()) { String topic = iterator.next().getKey(); - if (topicList.getTopicList().contains(topic) || (!specialTopic && (topic.startsWith(MixAll.RETRY_GROUP_TOPIC_PREFIX) || topic.startsWith(MixAll.DLQ_GROUP_TOPIC_PREFIX)))) { + if (topicList.getTopicList().contains(topic) || !specialTopic && (topic.startsWith(MixAll.RETRY_GROUP_TOPIC_PREFIX) || topic.startsWith(MixAll.DLQ_GROUP_TOPIC_PREFIX))) { iterator.remove(); } } diff --git a/tools/src/main/java/org/apache/rocketmq/tools/command/MQAdminStartup.java b/tools/src/main/java/org/apache/rocketmq/tools/command/MQAdminStartup.java index ae49ae35e3b..0b74a3e1c6a 100644 --- a/tools/src/main/java/org/apache/rocketmq/tools/command/MQAdminStartup.java +++ b/tools/src/main/java/org/apache/rocketmq/tools/command/MQAdminStartup.java @@ -294,7 +294,7 @@ private static void printHelp() { private static SubCommand findSubCommand(final String name) { for (SubCommand cmd : SUB_COMMANDS) { - if (cmd.commandName().equalsIgnoreCase(name) || (cmd.commandAlias() != null && cmd.commandAlias().equalsIgnoreCase(name))) { + if (cmd.commandName().equalsIgnoreCase(name) || cmd.commandAlias() != null && cmd.commandAlias().equalsIgnoreCase(name)) { return cmd; } } diff --git a/tools/src/main/java/org/apache/rocketmq/tools/command/stats/StatsAllSubCommand.java b/tools/src/main/java/org/apache/rocketmq/tools/command/stats/StatsAllSubCommand.java index 2e1cdaec21e..1fcf791aa42 100644 --- a/tools/src/main/java/org/apache/rocketmq/tools/command/stats/StatsAllSubCommand.java +++ b/tools/src/main/java/org/apache/rocketmq/tools/command/stats/StatsAllSubCommand.java @@ -91,8 +91,8 @@ public static void printTopicDetail(final DefaultMQAdminExt admin, final String } catch (Exception e) { } - if (!activeTopic || (inMsgCntToday > 0) || - (outMsgCntToday > 0)) { + if (!activeTopic || inMsgCntToday > 0 || + outMsgCntToday > 0) { System.out.printf("%-64s %-64s %12d %11.2f %11.2f %14d %14d%n", UtilAll.frontStringAtLeast(topic, 64), @@ -106,7 +106,7 @@ public static void printTopicDetail(final DefaultMQAdminExt admin, final String } } } else { - if (!activeTopic || (inMsgCntToday > 0)) { + if (!activeTopic || inMsgCntToday > 0) { System.out.printf("%-64s %-64s %12d %11.2f %11s %14d %14s%n", UtilAll.frontStringAtLeast(topic, 64), diff --git a/tools/src/main/java/org/apache/rocketmq/tools/command/topic/UpdateStaticTopicSubCommand.java b/tools/src/main/java/org/apache/rocketmq/tools/command/topic/UpdateStaticTopicSubCommand.java index 639191add6c..c0d0fbe46f6 100644 --- a/tools/src/main/java/org/apache/rocketmq/tools/command/topic/UpdateStaticTopicSubCommand.java +++ b/tools/src/main/java/org/apache/rocketmq/tools/command/topic/UpdateStaticTopicSubCommand.java @@ -141,7 +141,7 @@ public void execute(final CommandLine commandLine, final Options options, try { defaultMQAdminExt.start(); - if ((!commandLine.hasOption("b") && !commandLine.hasOption('c')) + if (!commandLine.hasOption("b") && !commandLine.hasOption('c') || !commandLine.hasOption("qn")) { ServerUtil.printCommandLineHelp("mqadmin " + this.commandName(), options); return;