From 691b71216744a97ce4c7845a78029e0e27454f38 Mon Sep 17 00:00:00 2001 From: Hu Zongtang Date: Mon, 7 Jan 2019 19:03:54 +0800 Subject: [PATCH] [ISSUE#662]capitalizing the first letter in comments and removing the unless comments for acl and msg trace feature codes. (#669) * [ISSUE#662]capitalizing the first letter in comments and removing the unless comments for acl and msg trace feature codes. * [ISSUE#662]polish the acl feature codes. --- .../apache/rocketmq/acl/AccessValidator.java | 3 ++- .../rocketmq/acl/common/AclClientRPCHook.java | 7 +++--- .../rocketmq/acl/common/AclException.java | 8 +------ .../rocketmq/acl/common/Permission.java | 6 ++--- .../acl/plain/PlainAccessResource.java | 2 +- .../acl/plain/PlainAccessValidator.java | 2 +- .../acl/plain/PlainPermissionLoader.java | 12 +++++----- .../acl/plain/RemoteAddressStrategy.java | 2 +- .../consumer/DefaultMQPushConsumer.java | 18 +++++++------- .../client/producer/DefaultMQProducer.java | 16 ++++++------- .../client/trace/AsyncTraceDispatcher.java | 24 +++++++++---------- .../client/trace/TraceDataEncoder.java | 4 ++-- .../client/trace/TraceDispatcher.java | 6 ++--- .../client/trace/TraceTransferBean.java | 2 +- .../hook/ConsumeMessageTraceHookImpl.java | 6 ++--- .../rocketmq/example/simple/AclClient.java | 2 +- .../tracemessage/TracePushConsumer.java | 4 ++-- pom.xml | 3 --- .../tools/command/MQAdminStartup.java | 2 +- 19 files changed, 61 insertions(+), 68 deletions(-) diff --git a/acl/src/main/java/org/apache/rocketmq/acl/AccessValidator.java b/acl/src/main/java/org/apache/rocketmq/acl/AccessValidator.java index 0b1b0823..c915cf35 100644 --- a/acl/src/main/java/org/apache/rocketmq/acl/AccessValidator.java +++ b/acl/src/main/java/org/apache/rocketmq/acl/AccessValidator.java @@ -24,7 +24,8 @@ public interface AccessValidator { * Parse to get the AccessResource(user, resource, needed permission) * * @param request - * @return + * @param remoteAddr + * @return Plain access resource result,include access key,signature and some other access attributes. */ AccessResource parse(RemotingCommand request, String remoteAddr); diff --git a/acl/src/main/java/org/apache/rocketmq/acl/common/AclClientRPCHook.java b/acl/src/main/java/org/apache/rocketmq/acl/common/AclClientRPCHook.java index dd8ce1e2..9e5bf1fb 100644 --- a/acl/src/main/java/org/apache/rocketmq/acl/common/AclClientRPCHook.java +++ b/acl/src/main/java/org/apache/rocketmq/acl/common/AclClientRPCHook.java @@ -44,7 +44,8 @@ public class AclClientRPCHook implements RPCHook { String signature = AclUtils.calSignature(total, sessionCredentials.getSecretKey()); request.addExtField(SIGNATURE, signature); request.addExtField(ACCESS_KEY, sessionCredentials.getAccessKey()); - + + // The SecurityToken value is unneccessary,user can choose this one. if (sessionCredentials.getSecurityToken() != null) { request.addExtField(SECURITY_TOKEN, sessionCredentials.getSecurityToken()); } @@ -57,14 +58,14 @@ public class AclClientRPCHook implements RPCHook { protected SortedMap parseRequestContent(RemotingCommand request, String ak, String securityToken) { CommandCustomHeader header = request.readCustomHeader(); - // sort property + // Sort property SortedMap map = new TreeMap(); map.put(ACCESS_KEY, ak); if (securityToken != null) { map.put(SECURITY_TOKEN, securityToken); } try { - // add header properties + // Add header properties if (null != header) { Field[] fields = fieldCache.get(header.getClass()); if (null == fields) { diff --git a/acl/src/main/java/org/apache/rocketmq/acl/common/AclException.java b/acl/src/main/java/org/apache/rocketmq/acl/common/AclException.java index 0bc97db9..54579d48 100644 --- a/acl/src/main/java/org/apache/rocketmq/acl/common/AclException.java +++ b/acl/src/main/java/org/apache/rocketmq/acl/common/AclException.java @@ -17,7 +17,7 @@ package org.apache.rocketmq.acl.common; public class AclException extends RuntimeException { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = -7256002576788700354L; private String status; private int code; @@ -34,12 +34,6 @@ public class AclException extends RuntimeException { this.code = code; } - public AclException(String status, int code, Throwable throwable) { - super(throwable); - this.status = status; - this.code = code; - } - public AclException(String message) { super(message); } 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 7a95ee05..0acc8e95 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 @@ -33,11 +33,11 @@ public class Permission { public static final Set ADMIN_CODE = new HashSet(); static { - // UPDATE_AND_CREATE_TOPIC + // UPDATE_AND_CREATE_TOPIC ADMIN_CODE.add(RequestCode.UPDATE_AND_CREATE_TOPIC); - // UPDATE_BROKER_CONFIG + // UPDATE_BROKER_CONFIG ADMIN_CODE.add(RequestCode.UPDATE_BROKER_CONFIG); - // DELETE_TOPIC_IN_BROKER + // DELETE_TOPIC_IN_BROKER ADMIN_CODE.add(RequestCode.DELETE_TOPIC_IN_BROKER); // UPDATE_AND_CREATE_SUBSCRIPTIONGROUP ADMIN_CODE.add(RequestCode.UPDATE_AND_CREATE_SUBSCRIPTIONGROUP); diff --git a/acl/src/main/java/org/apache/rocketmq/acl/plain/PlainAccessResource.java b/acl/src/main/java/org/apache/rocketmq/acl/plain/PlainAccessResource.java index 9017bf22..00072e8e 100644 --- a/acl/src/main/java/org/apache/rocketmq/acl/plain/PlainAccessResource.java +++ b/acl/src/main/java/org/apache/rocketmq/acl/plain/PlainAccessResource.java @@ -24,7 +24,7 @@ import org.apache.rocketmq.common.MixAll; public class PlainAccessResource implements AccessResource { - //identify the user + // Identify the user private String accessKey; private String secretKey; diff --git a/acl/src/main/java/org/apache/rocketmq/acl/plain/PlainAccessValidator.java b/acl/src/main/java/org/apache/rocketmq/acl/plain/PlainAccessValidator.java index bb1c0a11..34bb1b43 100644 --- a/acl/src/main/java/org/apache/rocketmq/acl/plain/PlainAccessValidator.java +++ b/acl/src/main/java/org/apache/rocketmq/acl/plain/PlainAccessValidator.java @@ -111,7 +111,7 @@ public class PlainAccessValidator implements AccessValidator { } catch (Throwable t) { throw new AclException(t.getMessage(), t); } - // content + // Content SortedMap map = new TreeMap(); for (Map.Entry entry : request.getExtFields().entrySet()) { if (!SessionCredentials.SIGNATURE.equals(entry.getKey())) { diff --git a/acl/src/main/java/org/apache/rocketmq/acl/plain/PlainPermissionLoader.java b/acl/src/main/java/org/apache/rocketmq/acl/plain/PlainPermissionLoader.java index 9a5fea73..1da7380b 100644 --- a/acl/src/main/java/org/apache/rocketmq/acl/plain/PlainPermissionLoader.java +++ b/acl/src/main/java/org/apache/rocketmq/acl/plain/PlainPermissionLoader.java @@ -119,7 +119,7 @@ public class PlainPermissionLoader { Map ownedPermMap = ownedAccess.getResourcePermMap(); if (needCheckedPermMap == null) { - //if the needCheckedPermMap is null,then return + // If the needCheckedPermMap is null,then return return; } @@ -129,7 +129,7 @@ public class PlainPermissionLoader { boolean isGroup = PlainAccessResource.isRetryTopic(resource); if (!ownedPermMap.containsKey(resource)) { - //Check the default perm + // Check the default perm byte ownedPerm = isGroup ? needCheckedAccess.getDefaultGroupPerm() : needCheckedAccess.getDefaultTopicPerm(); if (!Permission.checkPermission(neededPerm, ownedPerm)) { @@ -178,7 +178,7 @@ public class PlainPermissionLoader { public void validate(PlainAccessResource plainAccessResource) { - //Step 1, check the global white remote addr + // Check the global white remote addr for (RemoteAddressStrategy remoteAddressStrategy : globalWhiteRemoteAddressStrategy) { if (remoteAddressStrategy.match(plainAccessResource)) { return; @@ -193,18 +193,18 @@ public class PlainPermissionLoader { throw new AclException(String.format("No acl config for %s", plainAccessResource.getAccessKey())); } - //Step 2, check the white addr for accesskey + // Check the white addr for accesskey PlainAccessResource ownedAccess = plainAccessResourceMap.get(plainAccessResource.getAccessKey()); if (ownedAccess.getRemoteAddressStrategy().match(plainAccessResource)) { return; } - //Step 3, check the signature + // Check the signature String signature = AclUtils.calSignature(plainAccessResource.getContent(), ownedAccess.getSecretKey()); if (!signature.equals(plainAccessResource.getSignature())) { throw new AclException(String.format("Check signature failed for accessKey=%s", plainAccessResource.getAccessKey())); } - //Step 4, check perm of each resource + // Check perm of each resource checkPerm(plainAccessResource, ownedAccess); } diff --git a/acl/src/main/java/org/apache/rocketmq/acl/plain/RemoteAddressStrategy.java b/acl/src/main/java/org/apache/rocketmq/acl/plain/RemoteAddressStrategy.java index 60e92960..8eab40c9 100644 --- a/acl/src/main/java/org/apache/rocketmq/acl/plain/RemoteAddressStrategy.java +++ b/acl/src/main/java/org/apache/rocketmq/acl/plain/RemoteAddressStrategy.java @@ -18,5 +18,5 @@ package org.apache.rocketmq.acl.plain; public interface RemoteAddressStrategy { - public boolean match(PlainAccessResource plainAccessResource); + boolean match(PlainAccessResource plainAccessResource); } 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 3ebcb76a..6cd2ad18 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 @@ -270,7 +270,7 @@ public class DefaultMQPushConsumer extends ClientConfig implements MQPushConsume * * @param consumerGroup Consume queue. * @param rpcHook RPC hook to execute before each remoting command. - * @param allocateMessageQueueStrategy message queue allocating algorithm. + * @param allocateMessageQueueStrategy Message queue allocating algorithm. */ public DefaultMQPushConsumer(final String consumerGroup, RPCHook rpcHook, AllocateMessageQueueStrategy allocateMessageQueueStrategy) { @@ -280,13 +280,13 @@ public class DefaultMQPushConsumer extends ClientConfig implements MQPushConsume } /** - * Constructor specifying consumer group, RPC hook and message queue allocating algorithm. + * Constructor specifying consumer group, RPC hook, message queue allocating algorithm, enabled msg trace flag and customized trace topic name. * * @param consumerGroup Consume queue. * @param rpcHook RPC hook to execute before each remoting command. * @param allocateMessageQueueStrategy message queue allocating algorithm. - * @param enableMsgTrace switch flag instance for message trace. - * @param customizedTraceTopic the name value of message trace topic.If you don't config,you can use the default trace topic name. + * @param enableMsgTrace Switch flag instance for message trace. + * @param customizedTraceTopic The name value of message trace topic.If you don't config,you can use the default trace topic name. */ public DefaultMQPushConsumer(final String consumerGroup, RPCHook rpcHook, AllocateMessageQueueStrategy allocateMessageQueueStrategy, boolean enableMsgTrace, final String customizedTraceTopic) { @@ -317,21 +317,21 @@ public class DefaultMQPushConsumer extends ClientConfig implements MQPushConsume /** - * Constructor specifying consumer group. + * Constructor specifying consumer group and enabled msg trace flag. * * @param consumerGroup Consumer group. - * @param enableMsgTrace switch flag instance for message trace. + * @param enableMsgTrace Switch flag instance for message trace. */ public DefaultMQPushConsumer(final String consumerGroup, boolean enableMsgTrace) { this(consumerGroup, null, new AllocateMessageQueueAveragely(), enableMsgTrace, null); } /** - * Constructor specifying consumer group. + * Constructor specifying consumer group, enabled msg trace flag and customized trace topic name. * * @param consumerGroup Consumer group. - * @param enableMsgTrace switch flag instance for message trace. - * @param customizedTraceTopic the name value of message trace topic.If you don't config,you can use the default trace topic name. + * @param enableMsgTrace Switch flag instance for message trace. + * @param customizedTraceTopic The name value of message trace topic.If you don't config,you can use the default trace topic name. */ public DefaultMQPushConsumer(final String consumerGroup, boolean enableMsgTrace, final String customizedTraceTopic) { this(consumerGroup, null, new AllocateMessageQueueAveragely(), enableMsgTrace, customizedTraceTopic); diff --git a/client/src/main/java/org/apache/rocketmq/client/producer/DefaultMQProducer.java b/client/src/main/java/org/apache/rocketmq/client/producer/DefaultMQProducer.java index 8b4027c4..23391426 100644 --- a/client/src/main/java/org/apache/rocketmq/client/producer/DefaultMQProducer.java +++ b/client/src/main/java/org/apache/rocketmq/client/producer/DefaultMQProducer.java @@ -150,12 +150,12 @@ public class DefaultMQProducer extends ClientConfig implements MQProducer { } /** - * Constructor specifying both producer group and RPC hook. + * Constructor specifying producer group, RPC hook, enabled msgTrace flag and customized trace topic name. * * @param producerGroup Producer group, see the name-sake field. * @param rpcHook RPC hook to execute per each remoting command execution. - * @param enableMsgTrace switch flag instance for message trace. - * @param customizedTraceTopic the name value of message trace topic.If you don't config,you can use the default trace topic name. + * @param enableMsgTrace Switch flag instance for message trace. + * @param customizedTraceTopic The name value of message trace topic.If you don't config,you can use the default trace topic name. */ public DefaultMQProducer(final String producerGroup, RPCHook rpcHook, boolean enableMsgTrace,final String customizedTraceTopic) { this.producerGroup = producerGroup; @@ -184,10 +184,10 @@ public class DefaultMQProducer extends ClientConfig implements MQProducer { } /** - * Constructor specifying producer group. + * Constructor specifying producer group and enabled msg trace flag. * * @param producerGroup Producer group, see the name-sake field. - * @param enableMsgTrace switch flag instance for message trace. + * @param enableMsgTrace Switch flag instance for message trace. */ public DefaultMQProducer(final String producerGroup, boolean enableMsgTrace) { this(producerGroup, null, enableMsgTrace, null); @@ -195,11 +195,11 @@ public class DefaultMQProducer extends ClientConfig implements MQProducer { /** - * Constructor specifying producer group. + * Constructor specifying producer group, enabled msgTrace flag and customized trace topic name. * * @param producerGroup Producer group, see the name-sake field. - * @param enableMsgTrace switch flag instance for message trace. - * @param customizedTraceTopic the name value of message trace topic.If you don't config,you can use the default trace topic name. + * @param enableMsgTrace Switch flag instance for message trace. + * @param customizedTraceTopic The name value of message trace topic.If you don't config,you can use the default trace topic name. */ public DefaultMQProducer(final String producerGroup, boolean enableMsgTrace, final String customizedTraceTopic) { this(producerGroup, null, enableMsgTrace, customizedTraceTopic); diff --git a/client/src/main/java/org/apache/rocketmq/client/trace/AsyncTraceDispatcher.java b/client/src/main/java/org/apache/rocketmq/client/trace/AsyncTraceDispatcher.java index 04ef8e09..55423244 100644 --- a/client/src/main/java/org/apache/rocketmq/client/trace/AsyncTraceDispatcher.java +++ b/client/src/main/java/org/apache/rocketmq/client/trace/AsyncTraceDispatcher.java @@ -58,7 +58,7 @@ public class AsyncTraceDispatcher implements TraceDispatcher { private final int maxMsgSize; private final DefaultMQProducer traceProducer; private final ThreadPoolExecutor traceExecuter; - // the last discard number of log + // The last discard number of log private AtomicLong discardCount; private Thread worker; private ArrayBlockingQueue traceContextQueue; @@ -143,7 +143,7 @@ public class AsyncTraceDispatcher implements TraceDispatcher { traceProducerInstance.setSendMsgTimeout(5000); traceProducerInstance.setInstanceName(TRACE_INSTANCE_NAME); traceProducerInstance.setVipChannelEnabled(false); - //the max size of message is 128K + // The max size of message is 128K traceProducerInstance.setMaxMessageSize(maxMsgSize - 10 * 1000); } return traceProducerInstance; @@ -160,7 +160,7 @@ public class AsyncTraceDispatcher implements TraceDispatcher { @Override public void flush() throws IOException { - // the maximum waiting time for refresh,avoid being written all the time, resulting in failure to return. + // The maximum waiting time for refresh,avoid being written all the time, resulting in failure to return. long end = System.currentTimeMillis() + 500; while (traceContextQueue.size() > 0 || appenderQueue.size() > 0 && System.currentTimeMillis() <= end) { try { @@ -263,9 +263,9 @@ public class AsyncTraceDispatcher implements TraceDispatcher { if (context.getTraceBeans().isEmpty()) { continue; } - //1.topic value corresponding to original message entity content + // Topic value corresponding to original message entity content String topic = context.getTraceBeans().get(0).getTopic(); - //2.use original message entity's topic as key + // Use original message entity's topic as key String key = topic; List transBeanList = transBeanMap.get(key); if (transBeanList == null) { @@ -281,26 +281,26 @@ public class AsyncTraceDispatcher implements TraceDispatcher { } /** - * batch sending data actually + * Batch sending data actually */ private void flushData(List transBeanList) { if (transBeanList.size() == 0) { return; } - // temporary buffer + // Temporary buffer StringBuilder buffer = new StringBuilder(1024); int count = 0; Set keySet = new HashSet(); for (TraceTransferBean bean : transBeanList) { - // keyset of message trace includes msgId of or original message + // Keyset of message trace includes msgId of or original message keySet.addAll(bean.getTransKey()); buffer.append(bean.getTransData()); count++; // Ensure that the size of the package should not exceed the upper limit. if (buffer.length() >= traceProducer.getMaxMessageSize()) { sendTraceDataByMQ(keySet, buffer.toString()); - // clear temporary buffer after finishing + // Clear temporary buffer after finishing buffer.delete(0, buffer.length()); keySet.clear(); count = 0; @@ -313,7 +313,7 @@ public class AsyncTraceDispatcher implements TraceDispatcher { } /** - * send message trace data + * Send message trace data * * @param keySet the keyset in this batch(including msgId in original message not offsetMsgId) * @param data the message trace data in this batch @@ -322,7 +322,7 @@ public class AsyncTraceDispatcher implements TraceDispatcher { String topic = traceTopicName; final Message message = new Message(topic, data.getBytes()); - //keyset of message trace includes msgId of or original message + // Keyset of message trace includes msgId of or original message message.setKeys(keySet); try { Set traceBrokerSet = tryGetMessageQueueBrokerSet(traceProducer.getDefaultMQProducerImpl(), topic); @@ -337,7 +337,7 @@ public class AsyncTraceDispatcher implements TraceDispatcher { } }; if (traceBrokerSet.isEmpty()) { - //no cross set + // No cross set traceProducer.send(message, callback, 5000); } else { traceProducer.send(message, new MessageQueueSelector() { diff --git a/client/src/main/java/org/apache/rocketmq/client/trace/TraceDataEncoder.java b/client/src/main/java/org/apache/rocketmq/client/trace/TraceDataEncoder.java index 2ed89402..5a1afaf3 100644 --- a/client/src/main/java/org/apache/rocketmq/client/trace/TraceDataEncoder.java +++ b/client/src/main/java/org/apache/rocketmq/client/trace/TraceDataEncoder.java @@ -22,12 +22,12 @@ import java.util.ArrayList; import java.util.List; /** - * encode/decode for Trace Data + * Encode/decode for Trace Data */ public class TraceDataEncoder { /** - * resolving traceContext list From trace data String + * Resolving traceContext list From trace data String * * @param traceData * @return diff --git a/client/src/main/java/org/apache/rocketmq/client/trace/TraceDispatcher.java b/client/src/main/java/org/apache/rocketmq/client/trace/TraceDispatcher.java index 2b0f4530..275e6a32 100644 --- a/client/src/main/java/org/apache/rocketmq/client/trace/TraceDispatcher.java +++ b/client/src/main/java/org/apache/rocketmq/client/trace/TraceDispatcher.java @@ -30,21 +30,21 @@ public interface TraceDispatcher { void start(String nameSrvAddr) throws MQClientException; /** - * append the transfering data + * Append the transfering data * @param ctx data infomation * @return */ boolean append(Object ctx); /** - * write flush action + * Write flush action * * @throws IOException */ void flush() throws IOException; /** - * close the trace Hook + * Close the trace Hook */ void shutdown(); } diff --git a/client/src/main/java/org/apache/rocketmq/client/trace/TraceTransferBean.java b/client/src/main/java/org/apache/rocketmq/client/trace/TraceTransferBean.java index 2e054ee1..052ca365 100644 --- a/client/src/main/java/org/apache/rocketmq/client/trace/TraceTransferBean.java +++ b/client/src/main/java/org/apache/rocketmq/client/trace/TraceTransferBean.java @@ -20,7 +20,7 @@ import java.util.HashSet; import java.util.Set; /** - * trace transfering bean + * Trace transfering bean */ public class TraceTransferBean { private String transData; diff --git a/client/src/main/java/org/apache/rocketmq/client/trace/hook/ConsumeMessageTraceHookImpl.java b/client/src/main/java/org/apache/rocketmq/client/trace/hook/ConsumeMessageTraceHookImpl.java index 7fbad369..38ec8b97 100644 --- a/client/src/main/java/org/apache/rocketmq/client/trace/hook/ConsumeMessageTraceHookImpl.java +++ b/client/src/main/java/org/apache/rocketmq/client/trace/hook/ConsumeMessageTraceHookImpl.java @@ -61,7 +61,7 @@ public class ConsumeMessageTraceHookImpl implements ConsumeMessageHook { String traceOn = msg.getProperty(MessageConst.PROPERTY_TRACE_SWITCH); if (traceOn != null && traceOn.equals("false")) { - // if trace switch is false ,skip it + // If trace switch is false ,skip it continue; } TraceBean traceBean = new TraceBean(); @@ -90,7 +90,7 @@ public class ConsumeMessageTraceHookImpl implements ConsumeMessageHook { TraceContext subBeforeContext = (TraceContext) context.getMqTraceContext(); if (subBeforeContext.getTraceBeans() == null || subBeforeContext.getTraceBeans().size() < 1) { - // if subbefore bean is null ,skip it + // If subbefore bean is null ,skip it return; } TraceContext subAfterContext = new TraceContext(); @@ -100,7 +100,7 @@ public class ConsumeMessageTraceHookImpl implements ConsumeMessageHook { subAfterContext.setRequestId(subBeforeContext.getRequestId());// subAfterContext.setSuccess(context.isSuccess());// - //caculate the cost time for processing messages + // Caculate the cost time for processing messages int costTime = (int) ((System.currentTimeMillis() - subBeforeContext.getTimeStamp()) / context.getMsgList().size()); subAfterContext.setCostTime(costTime);// subAfterContext.setTraceBeans(subBeforeContext.getTraceBeans()); diff --git a/example/src/main/java/org/apache/rocketmq/example/simple/AclClient.java b/example/src/main/java/org/apache/rocketmq/example/simple/AclClient.java index f4cb4e4b..0c97cd33 100644 --- a/example/src/main/java/org/apache/rocketmq/example/simple/AclClient.java +++ b/example/src/main/java/org/apache/rocketmq/example/simple/AclClient.java @@ -84,7 +84,7 @@ public class AclClient { consumer.setNamesrvAddr("127.0.0.1:9876"); consumer.subscribe("TopicTest", "*"); consumer.setConsumeFromWhere(ConsumeFromWhere.CONSUME_FROM_FIRST_OFFSET); - //wrong time format 2017_0422_221800 + // Wrong time format 2017_0422_221800 consumer.setConsumeTimestamp("20180422221800"); consumer.registerMessageListener(new MessageListenerConcurrently() { diff --git a/example/src/main/java/org/apache/rocketmq/example/tracemessage/TracePushConsumer.java b/example/src/main/java/org/apache/rocketmq/example/tracemessage/TracePushConsumer.java index a89661d5..47335196 100644 --- a/example/src/main/java/org/apache/rocketmq/example/tracemessage/TracePushConsumer.java +++ b/example/src/main/java/org/apache/rocketmq/example/tracemessage/TracePushConsumer.java @@ -28,11 +28,11 @@ import org.apache.rocketmq.common.message.MessageExt; public class TracePushConsumer { public static void main(String[] args) throws InterruptedException, MQClientException { - //here,we use the default message track trace topic name + // Here,we use the default message track trace topic name DefaultMQPushConsumer consumer = new DefaultMQPushConsumer("CID_JODIE_1",true); consumer.subscribe("TopicTest", "*"); consumer.setConsumeFromWhere(ConsumeFromWhere.CONSUME_FROM_FIRST_OFFSET); - //wrong time format 2017_0422_221800 + // Wrong time format 2017_0422_221800 consumer.setConsumeTimestamp("20181109221800"); consumer.registerMessageListener(new MessageListenerConcurrently() { diff --git a/pom.xml b/pom.xml index ff96c4cb..5de0465b 100644 --- a/pom.xml +++ b/pom.xml @@ -216,9 +216,6 @@ generate-effective-dependencies-pom generate-resources - ${project.build.directory}/effective-pom/effective-dependencies.xml 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 989f8d77..2ca60aa8 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 @@ -256,7 +256,7 @@ public class MQAdminStartup { System.out.printf(" Cannot find conf file %s, acl is not be enabled.%n" ,fileHome + fileName); return null; } - // admin ak sk + String accessKey = yamlDataObject.getString("accessKey"); String secretKey = yamlDataObject.getString("secretKey"); -- GitLab