ROCKETMQ-18 Remove bad practices in client.
Project: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/commit/c8ee3289 Tree: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/tree/c8ee3289 Diff: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/diff/c8ee3289 Branch: refs/heads/master Commit: c8ee3289b7518674bb077773e8b6bab699392984 Parents: 9165667 Author: yukon <[email protected]> Authored: Wed Dec 28 10:43:30 2016 +0800 Committer: yukon <[email protected]> Committed: Wed Dec 28 10:43:30 2016 +0800 ---------------------------------------------------------------------- .../rocketmq/client/consumer/DefaultMQPullConsumer.java | 1 + .../rocketmq/client/consumer/DefaultMQPushConsumer.java | 1 + .../org/apache/rocketmq/client/consumer/PullCallback.java | 4 ++-- .../apache/rocketmq/client/consumer/PullTaskCallback.java | 2 +- .../rocketmq/client/consumer/listener/ConsumeReturnType.java | 3 --- .../rebalance/AllocateMessageQueueByMachineRoom.java | 8 ++++---- .../client/consumer/store/RemoteBrokerOffsetStore.java | 2 +- .../org/apache/rocketmq/client/hook/CheckForbiddenHook.java | 4 ++-- .../org/apache/rocketmq/client/hook/FilterMessageHook.java | 4 ++-- 9 files changed, 14 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/c8ee3289/client/src/main/java/org/apache/rocketmq/client/consumer/DefaultMQPullConsumer.java ---------------------------------------------------------------------- diff --git a/client/src/main/java/org/apache/rocketmq/client/consumer/DefaultMQPullConsumer.java b/client/src/main/java/org/apache/rocketmq/client/consumer/DefaultMQPullConsumer.java index a8dd766..aac4207 100644 --- a/client/src/main/java/org/apache/rocketmq/client/consumer/DefaultMQPullConsumer.java +++ b/client/src/main/java/org/apache/rocketmq/client/consumer/DefaultMQPullConsumer.java @@ -335,6 +335,7 @@ public class DefaultMQPullConsumer extends ClientConfig implements MQPullConsume MessageDecoder.decodeMessageId(uniqKey); return this.viewMessage(uniqKey); } catch (Exception e) { + // Ignore } return this.defaultMQPullConsumerImpl.queryMessageByUniqKey(topic, uniqKey); } http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/c8ee3289/client/src/main/java/org/apache/rocketmq/client/consumer/DefaultMQPushConsumer.java ---------------------------------------------------------------------- diff --git a/client/src/main/java/org/apache/rocketmq/client/consumer/DefaultMQPushConsumer.java b/client/src/main/java/org/apache/rocketmq/client/consumer/DefaultMQPushConsumer.java index 38c4649..2575827 100644 --- a/client/src/main/java/org/apache/rocketmq/client/consumer/DefaultMQPushConsumer.java +++ b/client/src/main/java/org/apache/rocketmq/client/consumer/DefaultMQPushConsumer.java @@ -210,6 +210,7 @@ public class DefaultMQPushConsumer extends ClientConfig implements MQPushConsume MessageDecoder.decodeMessageId(msgId); return this.viewMessage(msgId); } catch (Exception e) { + // Ignore } return this.defaultMQPushConsumerImpl.queryMessageByUniqKey(topic, msgId); } http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/c8ee3289/client/src/main/java/org/apache/rocketmq/client/consumer/PullCallback.java ---------------------------------------------------------------------- diff --git a/client/src/main/java/org/apache/rocketmq/client/consumer/PullCallback.java b/client/src/main/java/org/apache/rocketmq/client/consumer/PullCallback.java index fd2be0e..508050d 100644 --- a/client/src/main/java/org/apache/rocketmq/client/consumer/PullCallback.java +++ b/client/src/main/java/org/apache/rocketmq/client/consumer/PullCallback.java @@ -22,7 +22,7 @@ package org.apache.rocketmq.client.consumer; * @author [email protected] */ public interface PullCallback { - public void onSuccess(final PullResult pullResult); + void onSuccess(final PullResult pullResult); - public void onException(final Throwable e); + void onException(final Throwable e); } http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/c8ee3289/client/src/main/java/org/apache/rocketmq/client/consumer/PullTaskCallback.java ---------------------------------------------------------------------- diff --git a/client/src/main/java/org/apache/rocketmq/client/consumer/PullTaskCallback.java b/client/src/main/java/org/apache/rocketmq/client/consumer/PullTaskCallback.java index f0e9b25..dc74bca 100644 --- a/client/src/main/java/org/apache/rocketmq/client/consumer/PullTaskCallback.java +++ b/client/src/main/java/org/apache/rocketmq/client/consumer/PullTaskCallback.java @@ -20,5 +20,5 @@ import org.apache.rocketmq.common.message.MessageQueue; public interface PullTaskCallback { - public void doPullTask(final MessageQueue mq, final PullTaskContext context); + void doPullTask(final MessageQueue mq, final PullTaskContext context); } http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/c8ee3289/client/src/main/java/org/apache/rocketmq/client/consumer/listener/ConsumeReturnType.java ---------------------------------------------------------------------- diff --git a/client/src/main/java/org/apache/rocketmq/client/consumer/listener/ConsumeReturnType.java b/client/src/main/java/org/apache/rocketmq/client/consumer/listener/ConsumeReturnType.java index 82570ab..99083b4 100644 --- a/client/src/main/java/org/apache/rocketmq/client/consumer/listener/ConsumeReturnType.java +++ b/client/src/main/java/org/apache/rocketmq/client/consumer/listener/ConsumeReturnType.java @@ -17,9 +17,6 @@ package org.apache.rocketmq.client.consumer.listener; -/** - * Created by alvin on 16-11-30. - */ public enum ConsumeReturnType { /** * consume return success http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/c8ee3289/client/src/main/java/org/apache/rocketmq/client/consumer/rebalance/AllocateMessageQueueByMachineRoom.java ---------------------------------------------------------------------- diff --git a/client/src/main/java/org/apache/rocketmq/client/consumer/rebalance/AllocateMessageQueueByMachineRoom.java b/client/src/main/java/org/apache/rocketmq/client/consumer/rebalance/AllocateMessageQueueByMachineRoom.java index d3448c9..adfc124 100644 --- a/client/src/main/java/org/apache/rocketmq/client/consumer/rebalance/AllocateMessageQueueByMachineRoom.java +++ b/client/src/main/java/org/apache/rocketmq/client/consumer/rebalance/AllocateMessageQueueByMachineRoom.java @@ -45,12 +45,12 @@ public class AllocateMessageQueueByMachineRoom implements AllocateMessageQueueSt premqAll.add(mq); } } - // Todo cid + int mod = premqAll.size() / cidAll.size(); int rem = premqAll.size() % cidAll.size(); - int startindex = mod * currentIndex; - int endindex = startindex + mod; - for (int i = startindex; i < endindex; i++) { + int startIndex = mod * currentIndex; + int endIndex = startIndex + mod; + for (int i = startIndex; i < endIndex; i++) { result.add(mqAll.get(i)); } if (rem > currentIndex) { http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/c8ee3289/client/src/main/java/org/apache/rocketmq/client/consumer/store/RemoteBrokerOffsetStore.java ---------------------------------------------------------------------- diff --git a/client/src/main/java/org/apache/rocketmq/client/consumer/store/RemoteBrokerOffsetStore.java b/client/src/main/java/org/apache/rocketmq/client/consumer/store/RemoteBrokerOffsetStore.java index 4fd6911..de9d0dd 100644 --- a/client/src/main/java/org/apache/rocketmq/client/consumer/store/RemoteBrokerOffsetStore.java +++ b/client/src/main/java/org/apache/rocketmq/client/consumer/store/RemoteBrokerOffsetStore.java @@ -125,7 +125,7 @@ public class RemoteBrokerOffsetStore implements OffsetStore { return; final HashSet<MessageQueue> unusedMQ = new HashSet<MessageQueue>(); - if (mqs != null && !mqs.isEmpty()) { + if (!mqs.isEmpty()) { for (Map.Entry<MessageQueue, AtomicLong> entry : this.offsetTable.entrySet()) { MessageQueue mq = entry.getKey(); AtomicLong offset = entry.getValue(); http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/c8ee3289/client/src/main/java/org/apache/rocketmq/client/hook/CheckForbiddenHook.java ---------------------------------------------------------------------- diff --git a/client/src/main/java/org/apache/rocketmq/client/hook/CheckForbiddenHook.java b/client/src/main/java/org/apache/rocketmq/client/hook/CheckForbiddenHook.java index 41ed088..90f164b 100644 --- a/client/src/main/java/org/apache/rocketmq/client/hook/CheckForbiddenHook.java +++ b/client/src/main/java/org/apache/rocketmq/client/hook/CheckForbiddenHook.java @@ -24,8 +24,8 @@ import org.apache.rocketmq.client.exception.MQClientException; * @author manhong.yqd */ public interface CheckForbiddenHook { - public String hookName(); + String hookName(); - public void checkForbidden(final CheckForbiddenContext context) throws MQClientException; + void checkForbidden(final CheckForbiddenContext context) throws MQClientException; } http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/c8ee3289/client/src/main/java/org/apache/rocketmq/client/hook/FilterMessageHook.java ---------------------------------------------------------------------- diff --git a/client/src/main/java/org/apache/rocketmq/client/hook/FilterMessageHook.java b/client/src/main/java/org/apache/rocketmq/client/hook/FilterMessageHook.java index 016ff56..28956ee 100644 --- a/client/src/main/java/org/apache/rocketmq/client/hook/FilterMessageHook.java +++ b/client/src/main/java/org/apache/rocketmq/client/hook/FilterMessageHook.java @@ -20,8 +20,8 @@ package org.apache.rocketmq.client.hook; * @author manhong.yqd */ public interface FilterMessageHook { - public String hookName(); + String hookName(); - public void filterMessage(final FilterMessageContext context); + void filterMessage(final FilterMessageContext context); }
