ROCKETMQ-18 Fix the conflicts between code and check style.
Project: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/commit/853b167b Tree: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/tree/853b167b Diff: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/diff/853b167b Branch: refs/heads/master Commit: 853b167bda89c58dc1bdffceb95ee4698e5d9e53 Parents: 388ba7a Author: yukon <yu...@apache.org> Authored: Wed Dec 28 16:11:32 2016 +0800 Committer: yukon <yu...@apache.org> Committed: Wed Dec 28 16:11:32 2016 +0800 ---------------------------------------------------------------------- .../rocketmq/broker/BrokerController.java | 4 +- .../apache/rocketmq/broker/BrokerStartup.java | 2 +- .../broker/client/ClientChannelInfo.java | 4 +- .../broker/latency/BrokerFastFailure.java | 4 +- .../broker/longpolling/ManyPullRequest.java | 2 +- .../rocketmq/broker/out/BrokerOuterAPI.java | 2 +- .../broker/plugin/MessageStoreFactory.java | 2 +- .../processor/AbstractSendMessageProcessor.java | 6 +- .../broker/processor/AdminBrokerProcessor.java | 62 ++++----- .../broker/processor/ClientManageProcessor.java | 2 +- .../processor/ConsumerManageProcessor.java | 8 +- .../processor/EndTransactionProcessor.java | 2 +- .../broker/processor/PullMessageProcessor.java | 6 +- .../broker/processor/QueryMessageProcessor.java | 6 +- .../broker/processor/SendMessageProcessor.java | 8 +- .../rocketmq/broker/BrokerTestHarness.java | 2 + .../rocketmq/broker/api/SendMessageTest.java | 2 + .../offset/ConsumerOffsetManagerTest.java | 2 + .../broker/topic/TopicConfigManagerTest.java | 2 + checkstyle/checkstyle.xml | 128 ------------------- .../apache/rocketmq/client/ClientConfig.java | 1 - .../org/apache/rocketmq/client/MQAdmin.java | 70 +++------- .../org/apache/rocketmq/client/Validators.java | 9 +- .../client/consumer/DefaultMQPullConsumer.java | 1 - .../rocketmq/client/consumer/MQConsumer.java | 8 +- .../client/consumer/MQPullConsumer.java | 33 +---- .../client/consumer/MQPushConsumer.java | 20 +-- .../client/consumer/MessageQueueListener.java | 10 +- .../rocketmq/client/consumer/PullCallback.java | 1 - .../listener/ConsumeOrderlyContext.java | 1 - .../consumer/listener/MessageListener.java | 1 - .../listener/MessageListenerConcurrently.java | 6 +- .../listener/MessageListenerOrderly.java | 6 +- .../consumer/store/OffsetSerializeWrapper.java | 1 - .../client/consumer/store/OffsetStore.java | 4 - .../client/impl/ClientRemotingProcessor.java | 12 +- .../rocketmq/client/impl/MQAdminImpl.java | 2 +- .../rocketmq/client/impl/MQClientAPIImpl.java | 18 +-- .../consumer/DefaultMQPushConsumerImpl.java | 8 +- .../client/impl/consumer/MQConsumerInner.java | 1 - .../client/impl/consumer/MessageQueueLock.java | 1 - .../client/impl/consumer/ProcessQueue.java | 3 - .../client/impl/consumer/PullAPIWrapper.java | 2 +- .../impl/consumer/PullMessageService.java | 2 +- .../client/impl/consumer/PullRequest.java | 2 +- .../client/impl/consumer/RebalanceService.java | 1 - .../client/impl/factory/MQClientInstance.java | 10 +- .../impl/producer/DefaultMQProducerImpl.java | 6 +- .../latency/LatencyFaultToleranceImpl.java | 6 +- .../client/stat/ConsumerStatsManager.java | 10 +- .../apache/rocketmq/common/Configuration.java | 3 +- .../apache/rocketmq/common/CountDownLatch2.java | 2 +- .../org/apache/rocketmq/common/DataVersion.java | 4 +- .../java/org/apache/rocketmq/common/MixAll.java | 4 +- .../org/apache/rocketmq/common/TopicConfig.java | 2 +- .../org/apache/rocketmq/common/UtilAll.java | 40 +++--- .../rocketmq/common/filter/impl/PolishExpr.java | 17 +-- .../common/message/MessageClientIDSetter.java | 12 +- .../rocketmq/common/message/MessageDecoder.java | 14 +- .../rocketmq/common/message/MessageExt.java | 6 +- .../rocketmq/common/message/MessageQueue.java | 2 +- .../common/message/MessageQueueForC.java | 2 +- .../rocketmq/common/namesrv/NamesrvConfig.java | 2 + .../rocketmq/common/namesrv/TopAddressing.java | 2 + .../protocol/body/ConsumerRunningInfo.java | 4 +- .../CheckTransactionStateRequestHeader.java | 2 + .../CheckTransactionStateResponseHeader.java | 2 + .../header/CloneGroupOffsetRequestHeader.java | 2 + .../header/CreateTopicRequestHeader.java | 2 + .../header/DeleteTopicRequestHeader.java | 2 + .../header/EndTransactionRequestHeader.java | 2 + .../header/EndTransactionResponseHeader.java | 2 + .../header/GetAllTopicConfigResponseHeader.java | 2 + .../header/GetBrokerConfigResponseHeader.java | 2 + .../GetEarliestMsgStoretimeRequestHeader.java | 2 + .../GetEarliestMsgStoretimeResponseHeader.java | 2 + .../header/GetMaxOffsetRequestHeader.java | 2 + .../header/GetMaxOffsetResponseHeader.java | 2 + .../header/GetMinOffsetRequestHeader.java | 2 + .../header/GetMinOffsetResponseHeader.java | 2 + .../header/PullMessageRequestHeader.java | 2 + .../header/PullMessageResponseHeader.java | 2 + .../QueryConsumerOffsetRequestHeader.java | 2 + .../QueryConsumerOffsetResponseHeader.java | 2 + .../header/QueryCorrectionOffsetHeader.java | 2 + .../header/QueryMessageRequestHeader.java | 2 + .../header/QueryMessageResponseHeader.java | 2 + .../QueryTopicConsumeByWhoRequestHeader.java | 2 + .../header/SearchOffsetRequestHeader.java | 2 + .../header/SearchOffsetResponseHeader.java | 2 + .../header/SendMessageRequestHeader.java | 2 + .../header/SendMessageResponseHeader.java | 2 + .../UpdateConsumerOffsetRequestHeader.java | 2 + .../UpdateConsumerOffsetResponseHeader.java | 2 + .../header/ViewMessageRequestHeader.java | 2 + .../header/ViewMessageResponseHeader.java | 2 + .../namesrv/GetRouteInfoRequestHeader.java | 2 + .../namesrv/GetRouteInfoResponseHeader.java | 2 + .../namesrv/RegisterBrokerRequestHeader.java | 2 + .../RegisterOrderTopicRequestHeader.java | 2 + .../namesrv/UnRegisterBrokerRequestHeader.java | 2 + .../common/protocol/heartbeat/ConsumeType.java | 2 + .../common/protocol/heartbeat/ConsumerData.java | 2 + .../protocol/heartbeat/HeartbeatData.java | 2 + .../common/protocol/heartbeat/MessageModel.java | 2 + .../common/protocol/heartbeat/ProducerData.java | 2 + .../protocol/heartbeat/SubscriptionData.java | 4 +- .../common/protocol/route/BrokerData.java | 4 +- .../common/protocol/route/QueueData.java | 4 +- .../common/protocol/route/TopicRouteData.java | 4 +- .../common/queue/ConcurrentTreeMap.java | 1 - .../rocketmq/common/queue/RoundQueue.java | 1 - .../subscription/SubscriptionGroupConfig.java | 6 +- .../rocketmq/common/utils/ChannelUtil.java | 2 +- .../rocketmq/common/utils/HttpTinyClient.java | 18 +-- .../rocketmq/common/utils/IOTinyUtils.java | 9 +- .../rocketmq/example/benchmark/Consumer.java | 6 +- .../rocketmq/example/benchmark/Producer.java | 4 +- .../example/benchmark/TransactionProducer.java | 4 +- .../rocketmq/example/ordermessage/Producer.java | 2 +- .../filtersrv/FilterServerOuterAPI.java | 2 +- .../rocketmq/filtersrv/FiltersrvStartup.java | 2 +- .../rocketmq/filtersrv/filter/DynaCode.java | 2 +- .../filtersrv/filter/FilterClassManager.java | 4 +- .../processor/DefaultRequestProcessor.java | 10 +- .../apache/rocketmq/namesrv/NamesrvStartup.java | 2 +- .../processor/ClusterTestRequestProcessor.java | 2 +- .../processor/DefaultRequestProcessor.java | 30 ++--- .../namesrv/routeinfo/RouteInfoManager.java | 2 +- pom.xml | 4 +- .../remoting/common/RemotingHelper.java | 6 +- .../rocketmq/remoting/common/RemotingUtil.java | 4 +- .../rocketmq/remoting/common/ServiceThread.java | 2 - .../rocketmq/remoting/netty/NettyDecoder.java | 2 +- .../remoting/netty/NettyRemotingClient.java | 2 +- .../remoting/netty/NettyRemotingServer.java | 4 +- .../remoting/netty/NettyRequestProcessor.java | 2 - .../remoting/netty/NettyServerConfig.java | 2 +- .../rocketmq/remoting/netty/RequestTask.java | 4 +- .../remoting/protocol/LanguageCode.java | 18 +-- .../remoting/protocol/RemotingCommand.java | 8 +- .../remoting/protocol/RocketMQSerializable.java | 6 +- .../remoting/protocol/SerializeType.java | 4 +- .../org/apache/rocketmq/remoting/MixTest.java | 2 + .../apache/rocketmq/remoting/NettyRPCTest.java | 65 ++++------ .../store/AllocateMappedFileService.java | 2 +- .../rocketmq/store/AppendMessageCallback.java | 3 - .../rocketmq/store/AppendMessageResult.java | 1 - .../rocketmq/store/AppendMessageStatus.java | 2 - .../org/apache/rocketmq/store/CommitLog.java | 10 +- .../org/apache/rocketmq/store/ConsumeQueue.java | 6 +- .../rocketmq/store/DefaultMessageStore.java | 48 +++---- .../apache/rocketmq/store/GetMessageResult.java | 2 +- .../org/apache/rocketmq/store/MappedFile.java | 8 +- .../apache/rocketmq/store/MappedFileQueue.java | 20 +-- .../org/apache/rocketmq/store/StoreUtil.java | 2 +- .../rocketmq/store/TransientStorePool.java | 4 +- .../store/config/MessageStoreConfig.java | 21 +-- .../org/apache/rocketmq/store/ha/HAService.java | 2 +- .../apache/rocketmq/store/index/IndexFile.java | 17 +-- .../rocketmq/store/index/IndexService.java | 2 +- .../store/schedule/ScheduleMessageService.java | 2 - .../org/apache/rocketmq/store/util/LibC.java | 2 +- .../rocketmq/store/MappedFileQueueTest.java | 2 + .../apache/rocketmq/store/MappedFileTest.java | 2 + .../rocketmq/store/StoreCheckpointTest.java | 2 + .../rocketmq/store/index/IndexFileTest.java | 2 + .../store/schedule/ScheduleMessageTest.java | 2 + style/rmq_checkstyle.xml | 126 ++++++++++++++++++ .../tools/admin/DefaultMQAdminExtImpl.java | 2 +- .../rocketmq/tools/command/MQAdminStartup.java | 2 +- .../cluster/CLusterSendMsgRTCommand.java | 2 +- .../consumer/ConsumerProgressSubCommand.java | 4 +- .../command/message/CheckMsgSendRTCommand.java | 4 +- .../message/PrintMessageByQueueCommand.java | 2 +- .../command/message/QueryMsgByIdSubCommand.java | 2 +- 176 files changed, 619 insertions(+), 659 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/853b167b/broker/src/main/java/org/apache/rocketmq/broker/BrokerController.java ---------------------------------------------------------------------- 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 501c1c5..f2fea43 100644 --- a/broker/src/main/java/org/apache/rocketmq/broker/BrokerController.java +++ b/broker/src/main/java/org/apache/rocketmq/broker/BrokerController.java @@ -205,7 +205,7 @@ public class BrokerController { this.messageStore = new DefaultMessageStore(this.messageStoreConfig, this.brokerStatsManager, this.messageArrivingListener, this.brokerConfig); - this.brokerStats = new BrokerStats((DefaultMessageStore)this.messageStore); + this.brokerStats = new BrokerStats((DefaultMessageStore) this.messageStore); //load plugin MessageStorePluginContext context = new MessageStorePluginContext(messageStoreConfig, brokerStatsManager, messageArrivingListener, brokerConfig); this.messageStore = MessageStoreFactory.build(context, this.messageStore); @@ -219,7 +219,7 @@ public class BrokerController { if (result) { this.remotingServer = new NettyRemotingServer(this.nettyServerConfig, this.clientHousekeepingService); - NettyServerConfig fastConfig = (NettyServerConfig)this.nettyServerConfig.clone(); + NettyServerConfig fastConfig = (NettyServerConfig) this.nettyServerConfig.clone(); fastConfig.setListenPort(nettyServerConfig.getListenPort() - 2); this.fastRemotingServer = new NettyRemotingServer(fastConfig, this.clientHousekeepingService); this.sendMessageExecutor = new BrokerFixedThreadPoolExecutor( http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/853b167b/broker/src/main/java/org/apache/rocketmq/broker/BrokerStartup.java ---------------------------------------------------------------------- diff --git a/broker/src/main/java/org/apache/rocketmq/broker/BrokerStartup.java b/broker/src/main/java/org/apache/rocketmq/broker/BrokerStartup.java index dfa97c1..4c23eb0 100644 --- a/broker/src/main/java/org/apache/rocketmq/broker/BrokerStartup.java +++ b/broker/src/main/java/org/apache/rocketmq/broker/BrokerStartup.java @@ -178,7 +178,7 @@ public class BrokerStartup { } messageStoreConfig.setHaListenPort(nettyServerConfig.getListenPort() + 1); - LoggerContext lc = (LoggerContext)LoggerFactory.getILoggerFactory(); + LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory(); JoranConfigurator configurator = new JoranConfigurator(); configurator.setContext(lc); lc.reset(); http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/853b167b/broker/src/main/java/org/apache/rocketmq/broker/client/ClientChannelInfo.java ---------------------------------------------------------------------- diff --git a/broker/src/main/java/org/apache/rocketmq/broker/client/ClientChannelInfo.java b/broker/src/main/java/org/apache/rocketmq/broker/client/ClientChannelInfo.java index 24cddb9..b37fce5 100644 --- a/broker/src/main/java/org/apache/rocketmq/broker/client/ClientChannelInfo.java +++ b/broker/src/main/java/org/apache/rocketmq/broker/client/ClientChannelInfo.java @@ -68,7 +68,7 @@ public class ClientChannelInfo { result = prime * result + ((channel == null) ? 0 : channel.hashCode()); result = prime * result + ((clientId == null) ? 0 : clientId.hashCode()); result = prime * result + ((language == null) ? 0 : language.hashCode()); - result = prime * result + (int)(lastUpdateTimestamp ^ (lastUpdateTimestamp >>> 32)); + result = prime * result + (int) (lastUpdateTimestamp ^ (lastUpdateTimestamp >>> 32)); result = prime * result + version; return result; } @@ -81,7 +81,7 @@ public class ClientChannelInfo { return false; if (getClass() != obj.getClass()) return false; - ClientChannelInfo other = (ClientChannelInfo)obj; + ClientChannelInfo other = (ClientChannelInfo) obj; if (channel == null) { if (other.channel != null) return false; http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/853b167b/broker/src/main/java/org/apache/rocketmq/broker/latency/BrokerFastFailure.java ---------------------------------------------------------------------- diff --git a/broker/src/main/java/org/apache/rocketmq/broker/latency/BrokerFastFailure.java b/broker/src/main/java/org/apache/rocketmq/broker/latency/BrokerFastFailure.java index f616e33..f885b71 100644 --- a/broker/src/main/java/org/apache/rocketmq/broker/latency/BrokerFastFailure.java +++ b/broker/src/main/java/org/apache/rocketmq/broker/latency/BrokerFastFailure.java @@ -39,8 +39,8 @@ public class BrokerFastFailure { public static RequestTask castRunnable(final Runnable runnable) { try { - FutureTaskExt object = (FutureTaskExt)runnable; - return (RequestTask)object.getRunnable(); + FutureTaskExt object = (FutureTaskExt) runnable; + return (RequestTask) object.getRunnable(); } catch (Throwable e) { log.error(String.format("castRunnable exception, %s", runnable.getClass().getName()), e); } http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/853b167b/broker/src/main/java/org/apache/rocketmq/broker/longpolling/ManyPullRequest.java ---------------------------------------------------------------------- diff --git a/broker/src/main/java/org/apache/rocketmq/broker/longpolling/ManyPullRequest.java b/broker/src/main/java/org/apache/rocketmq/broker/longpolling/ManyPullRequest.java index 0ee02ad..30edf34 100644 --- a/broker/src/main/java/org/apache/rocketmq/broker/longpolling/ManyPullRequest.java +++ b/broker/src/main/java/org/apache/rocketmq/broker/longpolling/ManyPullRequest.java @@ -32,7 +32,7 @@ public class ManyPullRequest { public synchronized List<PullRequest> cloneListAndClear() { if (!this.pullRequestList.isEmpty()) { - List<PullRequest> result = (ArrayList<PullRequest>)this.pullRequestList.clone(); + List<PullRequest> result = (ArrayList<PullRequest>) this.pullRequestList.clone(); this.pullRequestList.clear(); return result; } http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/853b167b/broker/src/main/java/org/apache/rocketmq/broker/out/BrokerOuterAPI.java ---------------------------------------------------------------------- diff --git a/broker/src/main/java/org/apache/rocketmq/broker/out/BrokerOuterAPI.java b/broker/src/main/java/org/apache/rocketmq/broker/out/BrokerOuterAPI.java index 25b333a..1866628 100644 --- a/broker/src/main/java/org/apache/rocketmq/broker/out/BrokerOuterAPI.java +++ b/broker/src/main/java/org/apache/rocketmq/broker/out/BrokerOuterAPI.java @@ -169,7 +169,7 @@ public class BrokerOuterAPI { switch (response.getCode()) { case ResponseCode.SUCCESS: { RegisterBrokerResponseHeader responseHeader = - (RegisterBrokerResponseHeader)response.decodeCommandCustomHeader(RegisterBrokerResponseHeader.class); + (RegisterBrokerResponseHeader) response.decodeCommandCustomHeader(RegisterBrokerResponseHeader.class); RegisterBrokerResult result = new RegisterBrokerResult(); result.setMasterAddr(responseHeader.getMasterAddr()); result.setHaServerAddr(responseHeader.getHaServerAddr()); http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/853b167b/broker/src/main/java/org/apache/rocketmq/broker/plugin/MessageStoreFactory.java ---------------------------------------------------------------------- diff --git a/broker/src/main/java/org/apache/rocketmq/broker/plugin/MessageStoreFactory.java b/broker/src/main/java/org/apache/rocketmq/broker/plugin/MessageStoreFactory.java index 294bf8c..ac7f949 100644 --- a/broker/src/main/java/org/apache/rocketmq/broker/plugin/MessageStoreFactory.java +++ b/broker/src/main/java/org/apache/rocketmq/broker/plugin/MessageStoreFactory.java @@ -34,7 +34,7 @@ public final class MessageStoreFactory { String pluginClass = pluginClasses[i]; try { @SuppressWarnings("unchecked") - Class<AbstractPluginMessageStore> clazz = (Class<AbstractPluginMessageStore>)Class.forName(pluginClass); + Class<AbstractPluginMessageStore> clazz = (Class<AbstractPluginMessageStore>) Class.forName(pluginClass); Constructor<AbstractPluginMessageStore> construct = clazz.getConstructor(MessageStorePluginContext.class, MessageStore.class); messageStore = construct.newInstance(context, messageStore); } catch (Throwable e) { http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/853b167b/broker/src/main/java/org/apache/rocketmq/broker/processor/AbstractSendMessageProcessor.java ---------------------------------------------------------------------- diff --git a/broker/src/main/java/org/apache/rocketmq/broker/processor/AbstractSendMessageProcessor.java b/broker/src/main/java/org/apache/rocketmq/broker/processor/AbstractSendMessageProcessor.java index 75e5766..06e546b 100644 --- a/broker/src/main/java/org/apache/rocketmq/broker/processor/AbstractSendMessageProcessor.java +++ b/broker/src/main/java/org/apache/rocketmq/broker/processor/AbstractSendMessageProcessor.java @@ -283,12 +283,12 @@ public abstract class AbstractSendMessageProcessor implements NettyRequestProces switch (request.getCode()) { case RequestCode.SEND_MESSAGE_V2: requestHeaderV2 = - (SendMessageRequestHeaderV2)request + (SendMessageRequestHeaderV2) request .decodeCommandCustomHeader(SendMessageRequestHeaderV2.class); case RequestCode.SEND_MESSAGE: if (null == requestHeaderV2) { requestHeader = - (SendMessageRequestHeader)request + (SendMessageRequestHeader) request .decodeCommandCustomHeader(SendMessageRequestHeader.class); } else { requestHeader = SendMessageRequestHeaderV2.createSendMessageRequestHeaderV1(requestHeaderV2); @@ -305,7 +305,7 @@ public abstract class AbstractSendMessageProcessor implements NettyRequestProces try { if (response != null) { final SendMessageResponseHeader responseHeader = - (SendMessageResponseHeader)response.readCustomHeader(); + (SendMessageResponseHeader) response.readCustomHeader(); context.setMsgId(responseHeader.getMsgId()); context.setQueueId(responseHeader.getQueueId()); context.setQueueOffset(responseHeader.getQueueOffset()); http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/853b167b/broker/src/main/java/org/apache/rocketmq/broker/processor/AdminBrokerProcessor.java ---------------------------------------------------------------------- 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 722bec2..1398057 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 @@ -202,7 +202,7 @@ public class AdminBrokerProcessor implements NettyRequestProcessor { private RemotingCommand updateAndCreateTopic(ChannelHandlerContext ctx, RemotingCommand request) throws RemotingCommandException { final RemotingCommand response = RemotingCommand.createResponseCommand(null); final CreateTopicRequestHeader requestHeader = - (CreateTopicRequestHeader)request.decodeCommandCustomHeader(CreateTopicRequestHeader.class); + (CreateTopicRequestHeader) request.decodeCommandCustomHeader(CreateTopicRequestHeader.class); log.info("updateAndCreateTopic called by {}", RemotingHelper.parseChannelRemoteAddr(ctx.channel())); if (requestHeader.getTopic().equals(this.brokerController.getBrokerConfig().getBrokerClusterName())) { @@ -237,7 +237,7 @@ public class AdminBrokerProcessor implements NettyRequestProcessor { private RemotingCommand deleteTopic(ChannelHandlerContext ctx, RemotingCommand request) throws RemotingCommandException { final RemotingCommand response = RemotingCommand.createResponseCommand(null); DeleteTopicRequestHeader requestHeader = - (DeleteTopicRequestHeader)request.decodeCommandCustomHeader(DeleteTopicRequestHeader.class); + (DeleteTopicRequestHeader) request.decodeCommandCustomHeader(DeleteTopicRequestHeader.class); log.info("deleteTopic called by {}", RemotingHelper.parseChannelRemoteAddr(ctx.channel())); @@ -318,7 +318,7 @@ public class AdminBrokerProcessor implements NettyRequestProcessor { private RemotingCommand getBrokerConfig(ChannelHandlerContext ctx, RemotingCommand request) { final RemotingCommand response = RemotingCommand.createResponseCommand(GetBrokerConfigResponseHeader.class); - final GetBrokerConfigResponseHeader responseHeader = (GetBrokerConfigResponseHeader)response.readCustomHeader(); + final GetBrokerConfigResponseHeader responseHeader = (GetBrokerConfigResponseHeader) response.readCustomHeader(); String content = this.brokerController.getConfiguration().getAllConfigsFormatString(); if (content != null && content.length() > 0) { @@ -342,9 +342,9 @@ public class AdminBrokerProcessor implements NettyRequestProcessor { private RemotingCommand searchOffsetByTimestamp(ChannelHandlerContext ctx, RemotingCommand request) throws RemotingCommandException { final RemotingCommand response = RemotingCommand.createResponseCommand(SearchOffsetResponseHeader.class); - final SearchOffsetResponseHeader responseHeader = (SearchOffsetResponseHeader)response.readCustomHeader(); + final SearchOffsetResponseHeader responseHeader = (SearchOffsetResponseHeader) response.readCustomHeader(); final SearchOffsetRequestHeader requestHeader = - (SearchOffsetRequestHeader)request.decodeCommandCustomHeader(SearchOffsetRequestHeader.class); + (SearchOffsetRequestHeader) request.decodeCommandCustomHeader(SearchOffsetRequestHeader.class); long offset = this.brokerController.getMessageStore().getOffsetInQueueByTime(requestHeader.getTopic(), requestHeader.getQueueId(), requestHeader.getTimestamp()); @@ -358,9 +358,9 @@ public class AdminBrokerProcessor implements NettyRequestProcessor { private RemotingCommand getMaxOffset(ChannelHandlerContext ctx, RemotingCommand request) throws RemotingCommandException { final RemotingCommand response = RemotingCommand.createResponseCommand(GetMaxOffsetResponseHeader.class); - final GetMaxOffsetResponseHeader responseHeader = (GetMaxOffsetResponseHeader)response.readCustomHeader(); + final GetMaxOffsetResponseHeader responseHeader = (GetMaxOffsetResponseHeader) response.readCustomHeader(); final GetMaxOffsetRequestHeader requestHeader = - (GetMaxOffsetRequestHeader)request.decodeCommandCustomHeader(GetMaxOffsetRequestHeader.class); + (GetMaxOffsetRequestHeader) request.decodeCommandCustomHeader(GetMaxOffsetRequestHeader.class); long offset = this.brokerController.getMessageStore().getMaxOffsetInQuque(requestHeader.getTopic(), requestHeader.getQueueId()); @@ -373,9 +373,9 @@ public class AdminBrokerProcessor implements NettyRequestProcessor { private RemotingCommand getMinOffset(ChannelHandlerContext ctx, RemotingCommand request) throws RemotingCommandException { final RemotingCommand response = RemotingCommand.createResponseCommand(GetMinOffsetResponseHeader.class); - final GetMinOffsetResponseHeader responseHeader = (GetMinOffsetResponseHeader)response.readCustomHeader(); + final GetMinOffsetResponseHeader responseHeader = (GetMinOffsetResponseHeader) response.readCustomHeader(); final GetMinOffsetRequestHeader requestHeader = - (GetMinOffsetRequestHeader)request.decodeCommandCustomHeader(GetMinOffsetRequestHeader.class); + (GetMinOffsetRequestHeader) request.decodeCommandCustomHeader(GetMinOffsetRequestHeader.class); long offset = this.brokerController.getMessageStore().getMinOffsetInQuque(requestHeader.getTopic(), requestHeader.getQueueId()); @@ -387,9 +387,9 @@ public class AdminBrokerProcessor implements NettyRequestProcessor { private RemotingCommand getEarliestMsgStoretime(ChannelHandlerContext ctx, RemotingCommand request) throws RemotingCommandException { final RemotingCommand response = RemotingCommand.createResponseCommand(GetEarliestMsgStoretimeResponseHeader.class); - final GetEarliestMsgStoretimeResponseHeader responseHeader = (GetEarliestMsgStoretimeResponseHeader)response.readCustomHeader(); + final GetEarliestMsgStoretimeResponseHeader responseHeader = (GetEarliestMsgStoretimeResponseHeader) response.readCustomHeader(); final GetEarliestMsgStoretimeRequestHeader requestHeader = - (GetEarliestMsgStoretimeRequestHeader)request.decodeCommandCustomHeader(GetEarliestMsgStoretimeRequestHeader.class); + (GetEarliestMsgStoretimeRequestHeader) request.decodeCommandCustomHeader(GetEarliestMsgStoretimeRequestHeader.class); long timestamp = this.brokerController.getMessageStore().getEarliestMessageTime(requestHeader.getTopic(), requestHeader.getQueueId()); @@ -491,7 +491,7 @@ public class AdminBrokerProcessor implements NettyRequestProcessor { private RemotingCommand deleteSubscriptionGroup(ChannelHandlerContext ctx, RemotingCommand request) throws RemotingCommandException { final RemotingCommand response = RemotingCommand.createResponseCommand(null); DeleteSubscriptionGroupRequestHeader requestHeader = - (DeleteSubscriptionGroupRequestHeader)request.decodeCommandCustomHeader(DeleteSubscriptionGroupRequestHeader.class); + (DeleteSubscriptionGroupRequestHeader) request.decodeCommandCustomHeader(DeleteSubscriptionGroupRequestHeader.class); log.info("deleteSubscriptionGroup called by {}", RemotingHelper.parseChannelRemoteAddr(ctx.channel())); @@ -505,7 +505,7 @@ public class AdminBrokerProcessor implements NettyRequestProcessor { private RemotingCommand getTopicStatsInfo(ChannelHandlerContext ctx, RemotingCommand request) throws RemotingCommandException { final RemotingCommand response = RemotingCommand.createResponseCommand(null); final GetTopicStatsInfoRequestHeader requestHeader = - (GetTopicStatsInfoRequestHeader)request.decodeCommandCustomHeader(GetTopicStatsInfoRequestHeader.class); + (GetTopicStatsInfoRequestHeader) request.decodeCommandCustomHeader(GetTopicStatsInfoRequestHeader.class); final String topic = requestHeader.getTopic(); TopicConfig topicConfig = this.brokerController.getTopicConfigManager().selectTopicConfig(topic); @@ -553,7 +553,7 @@ public class AdminBrokerProcessor implements NettyRequestProcessor { private RemotingCommand getConsumerConnectionList(ChannelHandlerContext ctx, RemotingCommand request) throws RemotingCommandException { final RemotingCommand response = RemotingCommand.createResponseCommand(null); final GetConsumerConnectionListRequestHeader requestHeader = - (GetConsumerConnectionListRequestHeader)request.decodeCommandCustomHeader(GetConsumerConnectionListRequestHeader.class); + (GetConsumerConnectionListRequestHeader) request.decodeCommandCustomHeader(GetConsumerConnectionListRequestHeader.class); ConsumerGroupInfo consumerGroupInfo = this.brokerController.getConsumerManager().getConsumerGroupInfo(requestHeader.getConsumerGroup()); @@ -592,7 +592,7 @@ public class AdminBrokerProcessor implements NettyRequestProcessor { private RemotingCommand getProducerConnectionList(ChannelHandlerContext ctx, RemotingCommand request) throws RemotingCommandException { final RemotingCommand response = RemotingCommand.createResponseCommand(null); final GetProducerConnectionListRequestHeader requestHeader = - (GetProducerConnectionListRequestHeader)request.decodeCommandCustomHeader(GetProducerConnectionListRequestHeader.class); + (GetProducerConnectionListRequestHeader) request.decodeCommandCustomHeader(GetProducerConnectionListRequestHeader.class); ProducerConnection bodydata = new ProducerConnection(); HashMap<Channel, ClientChannelInfo> channelInfoHashMap = @@ -625,7 +625,7 @@ public class AdminBrokerProcessor implements NettyRequestProcessor { private RemotingCommand getConsumeStats(ChannelHandlerContext ctx, RemotingCommand request) throws RemotingCommandException { final RemotingCommand response = RemotingCommand.createResponseCommand(null); final GetConsumeStatsRequestHeader requestHeader = - (GetConsumeStatsRequestHeader)request.decodeCommandCustomHeader(GetConsumeStatsRequestHeader.class); + (GetConsumeStatsRequestHeader) request.decodeCommandCustomHeader(GetConsumeStatsRequestHeader.class); ConsumeStats consumeStats = new ConsumeStats(); @@ -733,7 +733,7 @@ public class AdminBrokerProcessor implements NettyRequestProcessor { private RemotingCommand getAllDelayOffset(ChannelHandlerContext ctx, RemotingCommand request) { final RemotingCommand response = RemotingCommand.createResponseCommand(null); - String content = ((DefaultMessageStore)this.brokerController.getMessageStore()).getScheduleMessageService().encode(); + String content = ((DefaultMessageStore) this.brokerController.getMessageStore()).getScheduleMessageService().encode(); if (content != null && content.length() > 0) { try { response.setBody(content.getBytes(MixAll.DEFAULT_CHARSET)); @@ -759,7 +759,7 @@ public class AdminBrokerProcessor implements NettyRequestProcessor { public RemotingCommand resetOffset(ChannelHandlerContext ctx, RemotingCommand request) throws RemotingCommandException { final ResetOffsetRequestHeader requestHeader = - (ResetOffsetRequestHeader)request.decodeCommandCustomHeader(ResetOffsetRequestHeader.class); + (ResetOffsetRequestHeader) request.decodeCommandCustomHeader(ResetOffsetRequestHeader.class); log.info("[reset-offset] reset offset started by {}. topic={}, group={}, timestamp={}, isForce={}", RemotingHelper.parseChannelRemoteAddr(ctx.channel()), requestHeader.getTopic(), requestHeader.getGroup(), requestHeader.getTimestamp(), requestHeader.isForce()); @@ -776,7 +776,7 @@ public class AdminBrokerProcessor implements NettyRequestProcessor { public RemotingCommand getConsumerStatus(ChannelHandlerContext ctx, RemotingCommand request) throws RemotingCommandException { final GetConsumerStatusRequestHeader requestHeader = - (GetConsumerStatusRequestHeader)request.decodeCommandCustomHeader(GetConsumerStatusRequestHeader.class); + (GetConsumerStatusRequestHeader) request.decodeCommandCustomHeader(GetConsumerStatusRequestHeader.class); log.info("[get-consumer-status] get consumer status by {}. topic={}, group={}", RemotingHelper.parseChannelRemoteAddr(ctx.channel()), requestHeader.getTopic(), requestHeader.getGroup()); @@ -788,7 +788,7 @@ public class AdminBrokerProcessor implements NettyRequestProcessor { private RemotingCommand queryTopicConsumeByWho(ChannelHandlerContext ctx, RemotingCommand request) throws RemotingCommandException { final RemotingCommand response = RemotingCommand.createResponseCommand(null); QueryTopicConsumeByWhoRequestHeader requestHeader = - (QueryTopicConsumeByWhoRequestHeader)request.decodeCommandCustomHeader(QueryTopicConsumeByWhoRequestHeader.class); + (QueryTopicConsumeByWhoRequestHeader) request.decodeCommandCustomHeader(QueryTopicConsumeByWhoRequestHeader.class); HashSet<String> groups = this.brokerController.getConsumerManager().queryTopicConsumeByWho(requestHeader.getTopic()); @@ -809,9 +809,9 @@ public class AdminBrokerProcessor implements NettyRequestProcessor { private RemotingCommand registerFilterServer(ChannelHandlerContext ctx, RemotingCommand request) throws RemotingCommandException { final RemotingCommand response = RemotingCommand.createResponseCommand(RegisterFilterServerResponseHeader.class); - final RegisterFilterServerResponseHeader responseHeader = (RegisterFilterServerResponseHeader)response.readCustomHeader(); + final RegisterFilterServerResponseHeader responseHeader = (RegisterFilterServerResponseHeader) response.readCustomHeader(); final RegisterFilterServerRequestHeader requestHeader = - (RegisterFilterServerRequestHeader)request.decodeCommandCustomHeader(RegisterFilterServerRequestHeader.class); + (RegisterFilterServerRequestHeader) request.decodeCommandCustomHeader(RegisterFilterServerRequestHeader.class); this.brokerController.getFilterServerManager().registerFilterServer(ctx.channel(), requestHeader.getFilterServerAddr()); @@ -826,7 +826,7 @@ public class AdminBrokerProcessor implements NettyRequestProcessor { private RemotingCommand queryConsumeTimeSpan(ChannelHandlerContext ctx, RemotingCommand request) throws RemotingCommandException { final RemotingCommand response = RemotingCommand.createResponseCommand(null); QueryConsumeTimeSpanRequestHeader requestHeader = - (QueryConsumeTimeSpanRequestHeader)request.decodeCommandCustomHeader(QueryConsumeTimeSpanRequestHeader.class); + (QueryConsumeTimeSpanRequestHeader) request.decodeCommandCustomHeader(QueryConsumeTimeSpanRequestHeader.class); final String topic = requestHeader.getTopic(); TopicConfig topicConfig = this.brokerController.getTopicConfigManager().selectTopicConfig(topic); @@ -916,7 +916,7 @@ public class AdminBrokerProcessor implements NettyRequestProcessor { */ private RemotingCommand getConsumerRunningInfo(ChannelHandlerContext ctx, RemotingCommand request) throws RemotingCommandException { final GetConsumerRunningInfoRequestHeader requestHeader = - (GetConsumerRunningInfoRequestHeader)request.decodeCommandCustomHeader(GetConsumerRunningInfoRequestHeader.class); + (GetConsumerRunningInfoRequestHeader) request.decodeCommandCustomHeader(GetConsumerRunningInfoRequestHeader.class); return this.callConsumer(RequestCode.GET_CONSUMER_RUNNING_INFO, request, requestHeader.getConsumerGroup(), requestHeader.getClientId()); @@ -925,7 +925,7 @@ public class AdminBrokerProcessor implements NettyRequestProcessor { private RemotingCommand queryCorrectionOffset(ChannelHandlerContext ctx, RemotingCommand request) throws RemotingCommandException { final RemotingCommand response = RemotingCommand.createResponseCommand(null); QueryCorrectionOffsetHeader requestHeader = - (QueryCorrectionOffsetHeader)request.decodeCommandCustomHeader(QueryCorrectionOffsetHeader.class); + (QueryCorrectionOffsetHeader) request.decodeCommandCustomHeader(QueryCorrectionOffsetHeader.class); Map<Integer, Long> correctionOffset = this.brokerController.getConsumerOffsetManager() .queryMinOffsetInAllGroup(requestHeader.getTopic(), requestHeader.getFilterGroups()); @@ -950,7 +950,7 @@ public class AdminBrokerProcessor implements NettyRequestProcessor { } private RemotingCommand consumeMessageDirectly(ChannelHandlerContext ctx, RemotingCommand request) throws RemotingCommandException { - final ConsumeMessageDirectlyResultRequestHeader requestHeader = (ConsumeMessageDirectlyResultRequestHeader)request + final ConsumeMessageDirectlyResultRequestHeader requestHeader = (ConsumeMessageDirectlyResultRequestHeader) request .decodeCommandCustomHeader(ConsumeMessageDirectlyResultRequestHeader.class); request.getExtFields().put("brokerName", this.brokerController.getBrokerConfig().getBrokerName()); @@ -976,7 +976,7 @@ public class AdminBrokerProcessor implements NettyRequestProcessor { private RemotingCommand cloneGroupOffset(ChannelHandlerContext ctx, RemotingCommand request) throws RemotingCommandException { final RemotingCommand response = RemotingCommand.createResponseCommand(null); CloneGroupOffsetRequestHeader requestHeader = - (CloneGroupOffsetRequestHeader)request.decodeCommandCustomHeader(CloneGroupOffsetRequestHeader.class); + (CloneGroupOffsetRequestHeader) request.decodeCommandCustomHeader(CloneGroupOffsetRequestHeader.class); Set<String> topics; if (UtilAll.isBlank(requestHeader.getTopic())) { @@ -1018,9 +1018,9 @@ public class AdminBrokerProcessor implements NettyRequestProcessor { private RemotingCommand ViewBrokerStatsData(ChannelHandlerContext ctx, RemotingCommand request) throws RemotingCommandException { final ViewBrokerStatsDataRequestHeader requestHeader = - (ViewBrokerStatsDataRequestHeader)request.decodeCommandCustomHeader(ViewBrokerStatsDataRequestHeader.class); + (ViewBrokerStatsDataRequestHeader) request.decodeCommandCustomHeader(ViewBrokerStatsDataRequestHeader.class); final RemotingCommand response = RemotingCommand.createResponseCommand(null); - DefaultMessageStore messageStore = (DefaultMessageStore)this.brokerController.getMessageStore(); + DefaultMessageStore messageStore = (DefaultMessageStore) this.brokerController.getMessageStore(); StatsItem statsItem = messageStore.getBrokerStatsManager().getStatsItem(requestHeader.getStatsName(), requestHeader.getStatsKey()); if (null == statsItem) { @@ -1068,7 +1068,7 @@ public class AdminBrokerProcessor implements NettyRequestProcessor { throws RemotingCommandException { final RemotingCommand response = RemotingCommand.createResponseCommand(null); GetConsumeStatsInBrokerHeader requestHeader = - (GetConsumeStatsInBrokerHeader)request.decodeCommandCustomHeader(GetConsumeStatsInBrokerHeader.class); + (GetConsumeStatsInBrokerHeader) request.decodeCommandCustomHeader(GetConsumeStatsInBrokerHeader.class); boolean isOrder = requestHeader.isOrder(); ConcurrentHashMap<String, SubscriptionGroupConfig> subscriptionGroups = brokerController.getSubscriptionGroupManager().getSubscriptionGroupTable(); @@ -1185,7 +1185,7 @@ public class AdminBrokerProcessor implements NettyRequestProcessor { runtimeInfo.put("earliestMessageTimeStamp", String.valueOf(this.brokerController.getMessageStore().getEarliestMessageTime())); runtimeInfo.put("startAcceptSendRequestTimeStamp", String.valueOf(this.brokerController.getBrokerConfig().getStartAcceptSendRequestTimeStamp())); if (this.brokerController.getMessageStore() instanceof DefaultMessageStore) { - DefaultMessageStore defaultMessageStore = (DefaultMessageStore)this.brokerController.getMessageStore(); + DefaultMessageStore defaultMessageStore = (DefaultMessageStore) this.brokerController.getMessageStore(); runtimeInfo.put("remainTransientStoreBufferNumbs", String.valueOf(defaultMessageStore.remainTransientStoreBufferNumbs())); if (defaultMessageStore.getMessageStoreConfig().isTransientStorePoolEnable()) { runtimeInfo.put("remainHowManyDataToCommit", MixAll.humanReadableByteCount(defaultMessageStore.getCommitLog().remainHowManyDataToCommit(), false)); http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/853b167b/broker/src/main/java/org/apache/rocketmq/broker/processor/ClientManageProcessor.java ---------------------------------------------------------------------- diff --git a/broker/src/main/java/org/apache/rocketmq/broker/processor/ClientManageProcessor.java b/broker/src/main/java/org/apache/rocketmq/broker/processor/ClientManageProcessor.java index 717afaf..74046a6 100644 --- a/broker/src/main/java/org/apache/rocketmq/broker/processor/ClientManageProcessor.java +++ b/broker/src/main/java/org/apache/rocketmq/broker/processor/ClientManageProcessor.java @@ -125,7 +125,7 @@ public class ClientManageProcessor implements NettyRequestProcessor { final RemotingCommand response = RemotingCommand.createResponseCommand(UnregisterClientResponseHeader.class); final UnregisterClientRequestHeader requestHeader = - (UnregisterClientRequestHeader)request + (UnregisterClientRequestHeader) request .decodeCommandCustomHeader(UnregisterClientRequestHeader.class); ClientChannelInfo clientChannelInfo = new ClientChannelInfo( http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/853b167b/broker/src/main/java/org/apache/rocketmq/broker/processor/ConsumerManageProcessor.java ---------------------------------------------------------------------- diff --git a/broker/src/main/java/org/apache/rocketmq/broker/processor/ConsumerManageProcessor.java b/broker/src/main/java/org/apache/rocketmq/broker/processor/ConsumerManageProcessor.java index d2e6d7d..b732326 100644 --- a/broker/src/main/java/org/apache/rocketmq/broker/processor/ConsumerManageProcessor.java +++ b/broker/src/main/java/org/apache/rocketmq/broker/processor/ConsumerManageProcessor.java @@ -72,7 +72,7 @@ public class ConsumerManageProcessor implements NettyRequestProcessor { final RemotingCommand response = RemotingCommand.createResponseCommand(GetConsumerListByGroupResponseHeader.class); final GetConsumerListByGroupRequestHeader requestHeader = - (GetConsumerListByGroupRequestHeader)request + (GetConsumerListByGroupRequestHeader) request .decodeCommandCustomHeader(GetConsumerListByGroupRequestHeader.class); ConsumerGroupInfo consumerGroupInfo = @@ -106,7 +106,7 @@ public class ConsumerManageProcessor implements NettyRequestProcessor { final RemotingCommand response = RemotingCommand.createResponseCommand(UpdateConsumerOffsetResponseHeader.class); final UpdateConsumerOffsetRequestHeader requestHeader = - (UpdateConsumerOffsetRequestHeader)request + (UpdateConsumerOffsetRequestHeader) request .decodeCommandCustomHeader(UpdateConsumerOffsetRequestHeader.class); this.brokerController.getConsumerOffsetManager().commitOffset(RemotingHelper.parseChannelRemoteAddr(ctx.channel()), requestHeader.getConsumerGroup(), requestHeader.getTopic(), requestHeader.getQueueId(), requestHeader.getCommitOffset()); @@ -120,9 +120,9 @@ public class ConsumerManageProcessor implements NettyRequestProcessor { final RemotingCommand response = RemotingCommand.createResponseCommand(QueryConsumerOffsetResponseHeader.class); final QueryConsumerOffsetResponseHeader responseHeader = - (QueryConsumerOffsetResponseHeader)response.readCustomHeader(); + (QueryConsumerOffsetResponseHeader) response.readCustomHeader(); final QueryConsumerOffsetRequestHeader requestHeader = - (QueryConsumerOffsetRequestHeader)request + (QueryConsumerOffsetRequestHeader) request .decodeCommandCustomHeader(QueryConsumerOffsetRequestHeader.class); long offset = http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/853b167b/broker/src/main/java/org/apache/rocketmq/broker/processor/EndTransactionProcessor.java ---------------------------------------------------------------------- diff --git a/broker/src/main/java/org/apache/rocketmq/broker/processor/EndTransactionProcessor.java b/broker/src/main/java/org/apache/rocketmq/broker/processor/EndTransactionProcessor.java index 6a34a69..5bf512f 100644 --- a/broker/src/main/java/org/apache/rocketmq/broker/processor/EndTransactionProcessor.java +++ b/broker/src/main/java/org/apache/rocketmq/broker/processor/EndTransactionProcessor.java @@ -49,7 +49,7 @@ public class EndTransactionProcessor implements NettyRequestProcessor { public RemotingCommand processRequest(ChannelHandlerContext ctx, RemotingCommand request) throws RemotingCommandException { final RemotingCommand response = RemotingCommand.createResponseCommand(null); final EndTransactionRequestHeader requestHeader = - (EndTransactionRequestHeader)request.decodeCommandCustomHeader(EndTransactionRequestHeader.class); + (EndTransactionRequestHeader) request.decodeCommandCustomHeader(EndTransactionRequestHeader.class); if (requestHeader.getFromTransactionCheck()) { switch (requestHeader.getCommitOrRollback()) { http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/853b167b/broker/src/main/java/org/apache/rocketmq/broker/processor/PullMessageProcessor.java ---------------------------------------------------------------------- diff --git a/broker/src/main/java/org/apache/rocketmq/broker/processor/PullMessageProcessor.java b/broker/src/main/java/org/apache/rocketmq/broker/processor/PullMessageProcessor.java index 7169b9c..54e56cd 100644 --- a/broker/src/main/java/org/apache/rocketmq/broker/processor/PullMessageProcessor.java +++ b/broker/src/main/java/org/apache/rocketmq/broker/processor/PullMessageProcessor.java @@ -81,9 +81,9 @@ public class PullMessageProcessor implements NettyRequestProcessor { private RemotingCommand processRequest(final Channel channel, RemotingCommand request, boolean brokerAllowSuspend) throws RemotingCommandException { RemotingCommand response = RemotingCommand.createResponseCommand(PullMessageResponseHeader.class); - final PullMessageResponseHeader responseHeader = (PullMessageResponseHeader)response.readCustomHeader(); + final PullMessageResponseHeader responseHeader = (PullMessageResponseHeader) response.readCustomHeader(); final PullMessageRequestHeader requestHeader = - (PullMessageRequestHeader)request.decodeCommandCustomHeader(PullMessageRequestHeader.class); + (PullMessageRequestHeader) request.decodeCommandCustomHeader(PullMessageRequestHeader.class); response.setOpaque(request.getOpaque()); @@ -335,7 +335,7 @@ public class PullMessageProcessor implements NettyRequestProcessor { final byte[] r = this.readGetMessageResult(getMessageResult, requestHeader.getConsumerGroup(), requestHeader.getTopic(), requestHeader.getQueueId()); this.brokerController.getBrokerStatsManager().incGroupGetLatency(requestHeader.getConsumerGroup(), requestHeader.getTopic(), requestHeader.getQueueId(), - (int)(this.brokerController.getMessageStore().now() - beginTimeMills)); + (int) (this.brokerController.getMessageStore().now() - beginTimeMills)); response.setBody(r); } else { try { http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/853b167b/broker/src/main/java/org/apache/rocketmq/broker/processor/QueryMessageProcessor.java ---------------------------------------------------------------------- diff --git a/broker/src/main/java/org/apache/rocketmq/broker/processor/QueryMessageProcessor.java b/broker/src/main/java/org/apache/rocketmq/broker/processor/QueryMessageProcessor.java index 04f206f..9df5a01 100644 --- a/broker/src/main/java/org/apache/rocketmq/broker/processor/QueryMessageProcessor.java +++ b/broker/src/main/java/org/apache/rocketmq/broker/processor/QueryMessageProcessor.java @@ -72,9 +72,9 @@ public class QueryMessageProcessor implements NettyRequestProcessor { final RemotingCommand response = RemotingCommand.createResponseCommand(QueryMessageResponseHeader.class); final QueryMessageResponseHeader responseHeader = - (QueryMessageResponseHeader)response.readCustomHeader(); + (QueryMessageResponseHeader) response.readCustomHeader(); final QueryMessageRequestHeader requestHeader = - (QueryMessageRequestHeader)request + (QueryMessageRequestHeader) request .decodeCommandCustomHeader(QueryMessageRequestHeader.class); response.setOpaque(request.getOpaque()); @@ -127,7 +127,7 @@ public class QueryMessageProcessor implements NettyRequestProcessor { throws RemotingCommandException { final RemotingCommand response = RemotingCommand.createResponseCommand(null); final ViewMessageRequestHeader requestHeader = - (ViewMessageRequestHeader)request.decodeCommandCustomHeader(ViewMessageRequestHeader.class); + (ViewMessageRequestHeader) request.decodeCommandCustomHeader(ViewMessageRequestHeader.class); response.setOpaque(request.getOpaque()); http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/853b167b/broker/src/main/java/org/apache/rocketmq/broker/processor/SendMessageProcessor.java ---------------------------------------------------------------------- diff --git a/broker/src/main/java/org/apache/rocketmq/broker/processor/SendMessageProcessor.java b/broker/src/main/java/org/apache/rocketmq/broker/processor/SendMessageProcessor.java index 1b95205..ea8c44b 100644 --- a/broker/src/main/java/org/apache/rocketmq/broker/processor/SendMessageProcessor.java +++ b/broker/src/main/java/org/apache/rocketmq/broker/processor/SendMessageProcessor.java @@ -89,7 +89,7 @@ public class SendMessageProcessor extends AbstractSendMessageProcessor implement throws RemotingCommandException { final RemotingCommand response = RemotingCommand.createResponseCommand(null); final ConsumerSendMsgBackRequestHeader requestHeader = - (ConsumerSendMsgBackRequestHeader)request.decodeCommandCustomHeader(ConsumerSendMsgBackRequestHeader.class); + (ConsumerSendMsgBackRequestHeader) request.decodeCommandCustomHeader(ConsumerSendMsgBackRequestHeader.class); if (this.hasConsumeMessageHook() && !UtilAll.isBlank(requestHeader.getOriginMsgId())) { @@ -244,7 +244,7 @@ public class SendMessageProcessor extends AbstractSendMessageProcessor implement final SendMessageRequestHeader requestHeader) throws RemotingCommandException { final RemotingCommand response = RemotingCommand.createResponseCommand(SendMessageResponseHeader.class); - final SendMessageResponseHeader responseHeader = (SendMessageResponseHeader)response.readCustomHeader(); + final SendMessageResponseHeader responseHeader = (SendMessageResponseHeader) response.readCustomHeader(); response.setOpaque(request.getOpaque()); @@ -415,7 +415,7 @@ public class SendMessageProcessor extends AbstractSendMessageProcessor implement int commercialBaseCount = brokerController.getBrokerConfig().getCommercialBaseCount(); int wroteSize = putMessageResult.getAppendMessageResult().getWroteBytes(); - int incValue = (int)Math.ceil(wroteSize / BrokerStatsManager.SIZE_PER_COUNT) * commercialBaseCount; + int incValue = (int) Math.ceil(wroteSize / BrokerStatsManager.SIZE_PER_COUNT) * commercialBaseCount; sendMessageContext.setCommercialSendStats(BrokerStatsManager.StatsType.SEND_SUCCESS); sendMessageContext.setCommercialSendTimes(incValue); @@ -426,7 +426,7 @@ public class SendMessageProcessor extends AbstractSendMessageProcessor implement } else { if (hasSendMessageHook()) { int wroteSize = request.getBody().length; - int incValue = (int)Math.ceil(wroteSize / BrokerStatsManager.SIZE_PER_COUNT); + int incValue = (int) Math.ceil(wroteSize / BrokerStatsManager.SIZE_PER_COUNT); sendMessageContext.setCommercialSendStats(BrokerStatsManager.StatsType.SEND_FAILURE); sendMessageContext.setCommercialSendTimes(incValue); http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/853b167b/broker/src/test/java/org/apache/rocketmq/broker/BrokerTestHarness.java ---------------------------------------------------------------------- diff --git a/broker/src/test/java/org/apache/rocketmq/broker/BrokerTestHarness.java b/broker/src/test/java/org/apache/rocketmq/broker/BrokerTestHarness.java index 5e944d8..1eefb25 100644 --- a/broker/src/test/java/org/apache/rocketmq/broker/BrokerTestHarness.java +++ b/broker/src/test/java/org/apache/rocketmq/broker/BrokerTestHarness.java @@ -15,6 +15,8 @@ * limitations under the License. * * $Id: SendMessageTest.java 1831 2013-05-16 01:39:51Z vintagew...@apache.org $ + * + * $Id: SendMessageTest.java 1831 2013-05-16 01:39:51Z vintagew...@apache.org $ */ /** http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/853b167b/broker/src/test/java/org/apache/rocketmq/broker/api/SendMessageTest.java ---------------------------------------------------------------------- diff --git a/broker/src/test/java/org/apache/rocketmq/broker/api/SendMessageTest.java b/broker/src/test/java/org/apache/rocketmq/broker/api/SendMessageTest.java index 38d885e..1ab0093 100644 --- a/broker/src/test/java/org/apache/rocketmq/broker/api/SendMessageTest.java +++ b/broker/src/test/java/org/apache/rocketmq/broker/api/SendMessageTest.java @@ -15,6 +15,8 @@ * limitations under the License. * * $Id: SendMessageTest.java 1831 2013-05-16 01:39:51Z vintagew...@apache.org $ + * + * $Id: SendMessageTest.java 1831 2013-05-16 01:39:51Z vintagew...@apache.org $ */ /** http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/853b167b/broker/src/test/java/org/apache/rocketmq/broker/offset/ConsumerOffsetManagerTest.java ---------------------------------------------------------------------- diff --git a/broker/src/test/java/org/apache/rocketmq/broker/offset/ConsumerOffsetManagerTest.java b/broker/src/test/java/org/apache/rocketmq/broker/offset/ConsumerOffsetManagerTest.java index 89813fc..a4eb659 100644 --- a/broker/src/test/java/org/apache/rocketmq/broker/offset/ConsumerOffsetManagerTest.java +++ b/broker/src/test/java/org/apache/rocketmq/broker/offset/ConsumerOffsetManagerTest.java @@ -15,6 +15,8 @@ * limitations under the License. * * $Id: ConsumerOffsetManagerTest.java 1831 2013-05-16 01:39:51Z vintagew...@apache.org $ + * + * $Id: ConsumerOffsetManagerTest.java 1831 2013-05-16 01:39:51Z vintagew...@apache.org $ */ /** http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/853b167b/broker/src/test/java/org/apache/rocketmq/broker/topic/TopicConfigManagerTest.java ---------------------------------------------------------------------- diff --git a/broker/src/test/java/org/apache/rocketmq/broker/topic/TopicConfigManagerTest.java b/broker/src/test/java/org/apache/rocketmq/broker/topic/TopicConfigManagerTest.java index 2f85dbc..6897967 100644 --- a/broker/src/test/java/org/apache/rocketmq/broker/topic/TopicConfigManagerTest.java +++ b/broker/src/test/java/org/apache/rocketmq/broker/topic/TopicConfigManagerTest.java @@ -15,6 +15,8 @@ * limitations under the License. * * $Id: TopicConfigManagerTest.java 1831 2013-05-16 01:39:51Z vintagew...@apache.org $ + * + * $Id: TopicConfigManagerTest.java 1831 2013-05-16 01:39:51Z vintagew...@apache.org $ */ /** http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/853b167b/checkstyle/checkstyle.xml ---------------------------------------------------------------------- diff --git a/checkstyle/checkstyle.xml b/checkstyle/checkstyle.xml deleted file mode 100644 index 0d22d7d..0000000 --- a/checkstyle/checkstyle.xml +++ /dev/null @@ -1,128 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE module PUBLIC - "-//Puppy Crawl//DTD Check Configuration 1.3//EN" - "http://www.puppycrawl.com/dtds/configuration_1_3.dtd";> -<!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> -<!--Refer http://checkstyle.sourceforge.net/reports/google-java-style.html#s2.2-file-encoding --> -<module name="Checker"> - - <property name="localeLanguage" value="en"/> - - <!--To configure the check to report on the first instance in each file--> - <module name="FileTabCharacter"/> - - <!-- header --> - <module name="RegexpHeader"> - <property name="header" value="/\*\*\nLicensed to the Apache Software Foundation*"/> - </module> - - <module name="RegexpSingleline"> - <property name="format" value="System\.out\.println"/> - <property name="message" value="Prohibit invoking System.out.println in source code !"/> - </module> - - <module name="RegexpSingleline"> - <property name="format" value="//FIXME"/> - <property name="message" value="Recommended fix FIXME task !"/> - </module> - - <module name="RegexpSingleline"> - <property name="format" value="//TODO"/> - <property name="message" value="Recommended fix TODO task !"/> - </module> - - <module name="RegexpSingleline"> - <property name="format" value="@alibaba"/> - <property name="message" value="Recommended remove @alibaba keyword!"/> - </module> - - <module name="RegexpSingleline"> - <property name="format" - value=".*[\u3400-\u4DB5\u4E00-\u9FA5\u9FA6-\u9FBB\uF900-\uFA2D\uFA30-\uFA6A\uFA70-\uFAD9\uFF00-\uFFEF\u2E80-\u2EFF\u3000-\u303F\u31C0-\u31EF]+.*"/> - <property name="message" value="Not allow chinese character !"/> - </module> - - <module name="FileLength"> - <property name="max" value="2000"/> - </module> - - <module name="TreeWalker"> - - <module name="UnusedImports"> - <property name="processJavadoc" value="true"/> - </module> - <module name="RedundantImport"/> - - <!--<module name="IllegalImport" />--> - - <!--Checks that classes that override equals() also override hashCode()--> - <module name="EqualsHashCode"/> - <!--Checks for over-complicated boolean expressions. Currently finds code like if (topic == true), topic || true, !false, etc.--> - <module name="SimplifyBooleanExpression"/> - <module name="OneStatementPerLine"/> - <module name="UnnecessaryParentheses"/> - <!--Checks for over-complicated boolean return statements. For example the following code--> - <module name="SimplifyBooleanReturn"/> - - <!--Check that the default is after all the cases in producerGroup switch statement--> - <module name="DefaultComesLast"/> - <!--Detects empty statements (standalone ";" semicolon)--> - <module name="EmptyStatement"/> - <!--Checks that long constants are defined with an upper ell--> - <module name="UpperEll"/> - <module name="ConstantName"> - <property name="format" value="(^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$)|(^log$)"/> - </module> - <!--Checks that local, non-final variable names conform to producerGroup format specified by the format property--> - <module name="LocalVariableName"/> - <!--Validates identifiers for local, final variables, including catch parameters--> - <module name="LocalFinalVariableName"/> - <!--Validates identifiers for non-static fields--> - <module name="MemberName"/> - <!--Validates identifiers for class type parameters--> - <module name="ClassTypeParameterName"> - <property name="format" value="^[A-Z0-9]*$"/> - </module> - <!--Validates identifiers for method type parameters--> - <module name="MethodTypeParameterName"> - <property name="format" value="^[A-Z0-9]*$"/> - </module> - <module name="PackageName"/> - <module name="ParameterName"/> - <module name="StaticVariableName"/> - <module name="TypeName"/> - <!--Checks that there are no import statements that use the * notation--> - <!-- - <module name="AvoidStarImport"/> - --> - - <!--whitespace--> - <module name="GenericWhitespace"/> - <module name="NoWhitespaceBefore"/> - <module name="WhitespaceAfter"/> - <module name="NoWhitespaceAfter"/> - <module name="WhitespaceAround"> - <property name="allowEmptyConstructors" value="true"/> - <property name="allowEmptyMethods" value="true"/> - </module> - <module name="Indentation"/> - <module name="MethodParamPad"/> - <module name="ParenPad"/> - <module name="TypecastParenPad"/> - </module> -</module> http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/853b167b/client/src/main/java/org/apache/rocketmq/client/ClientConfig.java ---------------------------------------------------------------------- diff --git a/client/src/main/java/org/apache/rocketmq/client/ClientConfig.java b/client/src/main/java/org/apache/rocketmq/client/ClientConfig.java index 9c7a0cd..1c80a2b 100644 --- a/client/src/main/java/org/apache/rocketmq/client/ClientConfig.java +++ b/client/src/main/java/org/apache/rocketmq/client/ClientConfig.java @@ -22,7 +22,6 @@ import org.apache.rocketmq.remoting.common.RemotingUtil; /** * Client Common configuration - * */ public class ClientConfig { public static final String SEND_MESSAGE_WITH_VIP_CHANNEL_PROPERTY = "com.rocketmq.sendMessageWithVIPChannel"; http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/853b167b/client/src/main/java/org/apache/rocketmq/client/MQAdmin.java ---------------------------------------------------------------------- diff --git a/client/src/main/java/org/apache/rocketmq/client/MQAdmin.java b/client/src/main/java/org/apache/rocketmq/client/MQAdmin.java index 7697520..b8d5b23 100644 --- a/client/src/main/java/org/apache/rocketmq/client/MQAdmin.java +++ b/client/src/main/java/org/apache/rocketmq/client/MQAdmin.java @@ -24,19 +24,14 @@ import org.apache.rocketmq.remoting.exception.RemotingException; /** * Base interface for MQ management - * */ public interface MQAdmin { /** * Creates an topic * - * @param key - * accesskey - * @param newTopic - * topic name - * @param queueNum - * topic's queue number - * + * @param key accesskey + * @param newTopic topic name + * @param queueNum topic's queue number * @throws MQClientException */ void createTopic(final String key, final String newTopic, final int queueNum) @@ -45,15 +40,10 @@ public interface MQAdmin { /** * Creates an topic * - * @param key - * accesskey - * @param newTopic - * topic name - * @param queueNum - * topic's queue number - * @param topicSysFlag - * topic system flag - * + * @param key accesskey + * @param newTopic topic name + * @param queueNum topic's queue number + * @param topicSysFlag topic system flag * @throws MQClientException */ void createTopic(String key, String newTopic, int queueNum, int topicSysFlag) @@ -63,13 +53,9 @@ public interface MQAdmin { * Gets the message queue offset according to some time in milliseconds<br> * be cautious to call because of more IO overhead * - * @param mq - * Instance of MessageQueue - * @param timestamp - * from when in milliseconds. - * + * @param mq Instance of MessageQueue + * @param timestamp from when in milliseconds. * @return offset - * * @throws MQClientException */ long searchOffset(final MessageQueue mq, final long timestamp) throws MQClientException; @@ -77,11 +63,8 @@ public interface MQAdmin { /** * Gets the max offset * - * @param mq - * Instance of MessageQueue - * + * @param mq Instance of MessageQueue * @return the max offset - * * @throws MQClientException */ long maxOffset(final MessageQueue mq) throws MQClientException; @@ -89,11 +72,8 @@ public interface MQAdmin { /** * Gets the minimum offset * - * @param mq - * Instance of MessageQueue - * + * @param mq Instance of MessageQueue * @return the minimum offset - * * @throws MQClientException */ long minOffset(final MessageQueue mq) throws MQClientException; @@ -101,11 +81,8 @@ public interface MQAdmin { /** * Gets the earliest stored message time * - * @param mq - * Instance of MessageQueue - * + * @param mq Instance of MessageQueue * @return the time in microseconds - * * @throws MQClientException */ long earliestMsgStoreTime(final MessageQueue mq) throws MQClientException; @@ -113,11 +90,8 @@ public interface MQAdmin { /** * Query message according tto message id * - * @param offsetMsgId - * message id - * + * @param offsetMsgId message id * @return message - * * @throws InterruptedException * @throws MQBrokerException * @throws RemotingException @@ -129,19 +103,12 @@ public interface MQAdmin { /** * Query messages * - * @param topic - * message topic - * @param key - * message key index word - * @param maxNum - * max message number - * @param begin - * from when - * @param end - * to when - * + * @param topic message topic + * @param key message key index word + * @param maxNum max message number + * @param begin from when + * @param end to when * @return Instance of QueryResult - * * @throws MQClientException * @throws InterruptedException */ @@ -149,7 +116,6 @@ public interface MQAdmin { final long end) throws MQClientException, InterruptedException; /** - * @param topic * @param msgId * @return The {@code MessageExt} of given msgId http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/853b167b/client/src/main/java/org/apache/rocketmq/client/Validators.java ---------------------------------------------------------------------- diff --git a/client/src/main/java/org/apache/rocketmq/client/Validators.java b/client/src/main/java/org/apache/rocketmq/client/Validators.java index fa9e4e6..845886a 100644 --- a/client/src/main/java/org/apache/rocketmq/client/Validators.java +++ b/client/src/main/java/org/apache/rocketmq/client/Validators.java @@ -28,7 +28,6 @@ import org.apache.rocketmq.common.protocol.ResponseCode; /** * Common Validator - * */ public class Validators { public static final String VALID_PATTERN_STR = "^[%|a-zA-Z0-9_-]+$"; @@ -38,7 +37,6 @@ public class Validators { /** * @param origin * @param patternStr - * * @return The resulting {@code String} */ public static String getGroupWithRegularExpression(String origin, String patternStr) { @@ -54,7 +52,6 @@ public class Validators { * Validate group * * @param group - * * @throws MQClientException */ public static void checkGroup(String group) throws MQClientException { @@ -74,9 +71,7 @@ public class Validators { /** * @param origin * @param pattern - * - * @return <tt>true</tt> if, and only if, the entire origin sequence - * matches this matcher's pattern + * @return <tt>true</tt> if, and only if, the entire origin sequence matches this matcher's pattern */ public static boolean regularExpressionMatcher(String origin, Pattern pattern) { if (pattern == null) { @@ -91,7 +86,6 @@ public class Validators { * * @param msg * @param defaultMQProducer - * * @throws MQClientException */ public static void checkMessage(Message msg, DefaultMQProducer defaultMQProducer) @@ -120,7 +114,6 @@ public class Validators { * Validate topic * * @param topic - * * @throws MQClientException */ public static void checkTopic(String topic) throws MQClientException { http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/853b167b/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 8eb1258..e438b61 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 @@ -35,7 +35,6 @@ import org.apache.rocketmq.remoting.exception.RemotingException; /** * Default pulling consumer - * */ public class DefaultMQPullConsumer extends ClientConfig implements MQPullConsumer { protected final transient DefaultMQPullConsumerImpl defaultMQPullConsumerImpl; http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/853b167b/client/src/main/java/org/apache/rocketmq/client/consumer/MQConsumer.java ---------------------------------------------------------------------- diff --git a/client/src/main/java/org/apache/rocketmq/client/consumer/MQConsumer.java b/client/src/main/java/org/apache/rocketmq/client/consumer/MQConsumer.java index 343a0a2..ee145e7 100644 --- a/client/src/main/java/org/apache/rocketmq/client/consumer/MQConsumer.java +++ b/client/src/main/java/org/apache/rocketmq/client/consumer/MQConsumer.java @@ -26,7 +26,6 @@ import org.apache.rocketmq.remoting.exception.RemotingException; /** * Message queue consumer interface - * */ public interface MQConsumer extends MQAdmin { /** @@ -34,7 +33,6 @@ public interface MQConsumer extends MQAdmin { * * @param msg * @param delayLevel - * * @throws InterruptedException * @throws MQBrokerException * @throws RemotingException @@ -50,7 +48,6 @@ public interface MQConsumer extends MQAdmin { * @param msg * @param delayLevel * @param brokerName - * * @throws RemotingException * @throws MQBrokerException * @throws InterruptedException @@ -62,11 +59,8 @@ public interface MQConsumer extends MQAdmin { /** * Fetch message queues from consumer cache according to the topic * - * @param topic - * message topic - * + * @param topic message topic * @return queue set - * * @throws MQClientException */ Set<MessageQueue> fetchSubscribeMessageQueues(final String topic) throws MQClientException; http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/853b167b/client/src/main/java/org/apache/rocketmq/client/consumer/MQPullConsumer.java ---------------------------------------------------------------------- diff --git a/client/src/main/java/org/apache/rocketmq/client/consumer/MQPullConsumer.java b/client/src/main/java/org/apache/rocketmq/client/consumer/MQPullConsumer.java index d199f8a..1bca536 100644 --- a/client/src/main/java/org/apache/rocketmq/client/consumer/MQPullConsumer.java +++ b/client/src/main/java/org/apache/rocketmq/client/consumer/MQPullConsumer.java @@ -25,7 +25,6 @@ import org.apache.rocketmq.remoting.exception.RemotingException; /** * Pulling consumer interface - * */ public interface MQPullConsumer extends MQConsumer { /** @@ -51,18 +50,12 @@ public interface MQPullConsumer extends MQConsumer { /** * Pulling the messages,not blocking * - * @param mq - * from which message queue - * @param subExpression - * subscription expression.it only support or operation such as "tag1 || tag2 || tag3" <br> - * if null or * expression,meaning subscribe all - * @param offset - * from where to pull - * @param maxNums - * max pulling numbers - * + * @param mq from which message queue + * @param subExpression subscription expression.it only support or operation such as "tag1 || tag2 || tag3" <br> if null or * expression,meaning subscribe + * all + * @param offset from where to pull + * @param maxNums max pulling numbers * @return The resulting {@code PullRequest} - * * @throws MQClientException * @throws InterruptedException * @throws MQBrokerException @@ -80,9 +73,7 @@ public interface MQPullConsumer extends MQConsumer { * @param offset * @param maxNums * @param timeout - * * @return The resulting {@code PullRequest} - * * @throws MQClientException * @throws RemotingException * @throws MQBrokerException @@ -100,7 +91,6 @@ public interface MQPullConsumer extends MQConsumer { * @param offset * @param maxNums * @param pullCallback - * * @throws MQClientException * @throws RemotingException * @throws InterruptedException @@ -118,7 +108,6 @@ public interface MQPullConsumer extends MQConsumer { * @param maxNums * @param pullCallback * @param timeout - * * @throws MQClientException * @throws RemotingException * @throws InterruptedException @@ -134,9 +123,7 @@ public interface MQPullConsumer extends MQConsumer { * @param subExpression * @param offset * @param maxNums - * * @return The resulting {@code PullRequest} - * * @throws MQClientException * @throws RemotingException * @throws MQBrokerException @@ -154,7 +141,6 @@ public interface MQPullConsumer extends MQConsumer { * @param offset * @param maxNums * @param pullCallback - * * @throws MQClientException * @throws RemotingException * @throws InterruptedException @@ -168,7 +154,6 @@ public interface MQPullConsumer extends MQConsumer { * * @param mq * @param offset - * * @throws MQClientException */ void updateConsumeOffset(final MessageQueue mq, final long offset) throws MQClientException; @@ -178,9 +163,7 @@ public interface MQPullConsumer extends MQConsumer { * * @param mq * @param fromStore - * * @return The fetched offset of given queue - * * @throws MQClientException */ long fetchConsumeOffset(final MessageQueue mq, final boolean fromStore) throws MQClientException; @@ -188,11 +171,8 @@ public interface MQPullConsumer extends MQConsumer { /** * Fetch the message queues according to the topic * - * @param topic - * message topic - * + * @param topic message topic * @return message queue set - * * @throws MQClientException */ Set<MessageQueue> fetchMessageQueuesInBalance(final String topic) throws MQClientException; @@ -205,7 +185,6 @@ public interface MQPullConsumer extends MQConsumer { * @param delayLevel * @param brokerName * @param consumerGroup - * * @throws RemotingException * @throws MQBrokerException * @throws InterruptedException http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/853b167b/client/src/main/java/org/apache/rocketmq/client/consumer/MQPushConsumer.java ---------------------------------------------------------------------- diff --git a/client/src/main/java/org/apache/rocketmq/client/consumer/MQPushConsumer.java b/client/src/main/java/org/apache/rocketmq/client/consumer/MQPushConsumer.java index 1b969bd..cef8507 100644 --- a/client/src/main/java/org/apache/rocketmq/client/consumer/MQPushConsumer.java +++ b/client/src/main/java/org/apache/rocketmq/client/consumer/MQPushConsumer.java @@ -23,7 +23,6 @@ import org.apache.rocketmq.client.exception.MQClientException; /** * Push consumer - * */ public interface MQPushConsumer extends MQConsumer { /** @@ -54,11 +53,8 @@ public interface MQPushConsumer extends MQConsumer { * Subscribe some topic * * @param topic - * @param subExpression - * subscription expression.it only support or operation such as - * "tag1 || tag2 || tag3" <br> - * if null or * expression,meaning subscribe all - * + * @param subExpression subscription expression.it only support or operation such as "tag1 || tag2 || tag3" <br> if null or * expression,meaning subscribe + * all * @throws MQClientException */ void subscribe(final String topic, final String subExpression) throws MQClientException; @@ -67,13 +63,8 @@ public interface MQPushConsumer extends MQConsumer { * Subscribe some topic * * @param topic - * @param fullClassName - * full class name,must extend - * org.apache.rocketmq.common.filter. MessageFilter - * @param filterClassSource - * class source code,used UTF-8 file encoding,must be responsible - * for your code safety - * + * @param fullClassName full class name,must extend org.apache.rocketmq.common.filter. MessageFilter + * @param filterClassSource class source code,used UTF-8 file encoding,must be responsible for your code safety * @throws MQClientException */ void subscribe(final String topic, final String fullClassName, final String filterClassSource) throws MQClientException; @@ -81,8 +72,7 @@ public interface MQPushConsumer extends MQConsumer { /** * Unsubscribe consumption some topic * - * @param topic - * message topic + * @param topic message topic */ void unsubscribe(final String topic); http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/853b167b/client/src/main/java/org/apache/rocketmq/client/consumer/MessageQueueListener.java ---------------------------------------------------------------------- diff --git a/client/src/main/java/org/apache/rocketmq/client/consumer/MessageQueueListener.java b/client/src/main/java/org/apache/rocketmq/client/consumer/MessageQueueListener.java index 0cc2dc4..66e8757 100644 --- a/client/src/main/java/org/apache/rocketmq/client/consumer/MessageQueueListener.java +++ b/client/src/main/java/org/apache/rocketmq/client/consumer/MessageQueueListener.java @@ -21,16 +21,12 @@ import org.apache.rocketmq.common.message.MessageQueue; /** * A MessageQueueListener is implemented by the application and may be specified when a message queue changed - * */ public interface MessageQueueListener { /** - * @param topic - * message topic - * @param mqAll - * all queues in this message topic - * @param mqDivided - * collection of queues,assigned to the current consumer + * @param topic message topic + * @param mqAll all queues in this message topic + * @param mqDivided collection of queues,assigned to the current consumer */ void messageQueueChanged(final String topic, final Set<MessageQueue> mqAll, final Set<MessageQueue> mqDivided); http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/853b167b/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 06e47d9..cfbc83e 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 @@ -18,7 +18,6 @@ package org.apache.rocketmq.client.consumer; /** * Async message pulling interface - * */ public interface PullCallback { void onSuccess(final PullResult pullResult); http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/853b167b/client/src/main/java/org/apache/rocketmq/client/consumer/listener/ConsumeOrderlyContext.java ---------------------------------------------------------------------- diff --git a/client/src/main/java/org/apache/rocketmq/client/consumer/listener/ConsumeOrderlyContext.java b/client/src/main/java/org/apache/rocketmq/client/consumer/listener/ConsumeOrderlyContext.java index 405781b..7280ff4 100644 --- a/client/src/main/java/org/apache/rocketmq/client/consumer/listener/ConsumeOrderlyContext.java +++ b/client/src/main/java/org/apache/rocketmq/client/consumer/listener/ConsumeOrderlyContext.java @@ -20,7 +20,6 @@ import org.apache.rocketmq.common.message.MessageQueue; /** * Consumer Orderly consumption context - * */ public class ConsumeOrderlyContext { private final MessageQueue messageQueue; http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/853b167b/client/src/main/java/org/apache/rocketmq/client/consumer/listener/MessageListener.java ---------------------------------------------------------------------- diff --git a/client/src/main/java/org/apache/rocketmq/client/consumer/listener/MessageListener.java b/client/src/main/java/org/apache/rocketmq/client/consumer/listener/MessageListener.java index 2a9e5c9..338c156 100644 --- a/client/src/main/java/org/apache/rocketmq/client/consumer/listener/MessageListener.java +++ b/client/src/main/java/org/apache/rocketmq/client/consumer/listener/MessageListener.java @@ -18,7 +18,6 @@ package org.apache.rocketmq.client.consumer.listener; /** * A MessageListener object is used to receive asynchronously delivered messages. - * */ public interface MessageListener { } http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/853b167b/client/src/main/java/org/apache/rocketmq/client/consumer/listener/MessageListenerConcurrently.java ---------------------------------------------------------------------- diff --git a/client/src/main/java/org/apache/rocketmq/client/consumer/listener/MessageListenerConcurrently.java b/client/src/main/java/org/apache/rocketmq/client/consumer/listener/MessageListenerConcurrently.java index c083157..fcf0e74 100644 --- a/client/src/main/java/org/apache/rocketmq/client/consumer/listener/MessageListenerConcurrently.java +++ b/client/src/main/java/org/apache/rocketmq/client/consumer/listener/MessageListenerConcurrently.java @@ -21,17 +21,13 @@ import org.apache.rocketmq.common.message.MessageExt; /** * A MessageListenerConcurrently object is used to receive asynchronously delivered messages concurrently - * */ public interface MessageListenerConcurrently extends MessageListener { /** * It is not recommend to throw exception,rather than returning ConsumeConcurrentlyStatus.RECONSUME_LATER if consumption failure * - * @param msgs - * msgs.size() >= 1<br> - * DefaultMQPushConsumer.consumeMessageBatchMaxSize=1,you can modify here + * @param msgs msgs.size() >= 1<br> DefaultMQPushConsumer.consumeMessageBatchMaxSize=1,you can modify here * @param context - * * @return The consume status */ ConsumeConcurrentlyStatus consumeMessage(final List<MessageExt> msgs, http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/853b167b/client/src/main/java/org/apache/rocketmq/client/consumer/listener/MessageListenerOrderly.java ---------------------------------------------------------------------- diff --git a/client/src/main/java/org/apache/rocketmq/client/consumer/listener/MessageListenerOrderly.java b/client/src/main/java/org/apache/rocketmq/client/consumer/listener/MessageListenerOrderly.java index 57a553a..5db8462 100644 --- a/client/src/main/java/org/apache/rocketmq/client/consumer/listener/MessageListenerOrderly.java +++ b/client/src/main/java/org/apache/rocketmq/client/consumer/listener/MessageListenerOrderly.java @@ -21,17 +21,13 @@ import org.apache.rocketmq.common.message.MessageExt; /** * A MessageListenerConcurrently object is used to receive asynchronously delivered messages orderly.one queue,one thread - * */ public interface MessageListenerOrderly extends MessageListener { /** * It is not recommend to throw exception,rather than returning ConsumeOrderlyStatus.SUSPEND_CURRENT_QUEUE_A_MOMENT if consumption failure * - * @param msgs - * msgs.size() >= 1<br> - * DefaultMQPushConsumer.consumeMessageBatchMaxSize=1,you can modify here + * @param msgs msgs.size() >= 1<br> DefaultMQPushConsumer.consumeMessageBatchMaxSize=1,you can modify here * @param context - * * @return The consume status */ ConsumeOrderlyStatus consumeMessage(final List<MessageExt> msgs,
