This is an automated email from the ASF dual-hosted git repository.
aaronai pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/rocketmq.git
The following commit(s) were added to refs/heads/develop by this push:
new 94db42ade [ISSUE #6292] fix typos (#6293)
94db42ade is described below
commit 94db42ade7b4001860f5c7eefd026629bf5859fd
Author: hardyfish <[email protected]>
AuthorDate: Wed Mar 15 15:41:01 2023 +0800
[ISSUE #6292] fix typos (#6293)
* fix typos
* fix typos
* fix typos
---
.../org/apache/rocketmq/acl/AccessValidator.java | 2 +-
.../rocketmq/acl/plain/PlainAccessValidator.java | 4 +--
.../rocketmq/acl/plain/PlainPermissionManager.java | 18 +++++-----
.../broker/processor/AdminBrokerProcessor.java | 8 ++---
.../broker/schedule/ScheduleMessageService.java | 10 +++---
.../java/org/apache/rocketmq/client/MQAdmin.java | 8 ++---
.../client/producer/DefaultMQProducer.java | 4 +--
...Multiple_ACL_Files_\350\256\276\350\256\241.md" | 4 +--
.../rocketmq/store/timer/TimerMessageStore.java | 42 +++++++++++-----------
.../store/timer/TimerMessageStoreTest.java | 6 ++--
.../command/acl/DeleteAccessConfigSubCommand.java | 4 +--
11 files changed, 55 insertions(+), 55 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 2b5a8826c..315184c61 100644
--- a/acl/src/main/java/org/apache/rocketmq/acl/AccessValidator.java
+++ b/acl/src/main/java/org/apache/rocketmq/acl/AccessValidator.java
@@ -65,7 +65,7 @@ public interface AccessValidator {
*
* @return
*/
- boolean deleteAccessConfig(String accesskey);
+ boolean deleteAccessConfig(String accessKey);
/**
* Get the access resource config version information
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 09d3daf28..a7015eaca 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
@@ -56,8 +56,8 @@ public class PlainAccessValidator implements AccessValidator {
}
@Override
- public boolean deleteAccessConfig(String accesskey) {
- return aclPlugEngine.deleteAccessConfig(accesskey);
+ public boolean deleteAccessConfig(String accessKey) {
+ return aclPlugEngine.deleteAccessConfig(accessKey);
}
@Override
diff --git
a/acl/src/main/java/org/apache/rocketmq/acl/plain/PlainPermissionManager.java
b/acl/src/main/java/org/apache/rocketmq/acl/plain/PlainPermissionManager.java
index 7a8390f52..fcaba1dda 100644
---
a/acl/src/main/java/org/apache/rocketmq/acl/plain/PlainPermissionManager.java
+++
b/acl/src/main/java/org/apache/rocketmq/acl/plain/PlainPermissionManager.java
@@ -439,27 +439,27 @@ public class PlainPermissionManager {
return newAccountsMap;
}
- public boolean deleteAccessConfig(String accesskey) {
- if (StringUtils.isEmpty(accesskey)) {
- log.error("Parameter value accesskey is null or empty
String,Please check your parameter");
+ public boolean deleteAccessConfig(String accessKey) {
+ if (StringUtils.isEmpty(accessKey)) {
+ log.error("Parameter value accessKey is null or empty
String,Please check your parameter");
return false;
}
- if (accessKeyTable.containsKey(accesskey)) {
- String aclFileName = accessKeyTable.get(accesskey);
+ if (accessKeyTable.containsKey(accessKey)) {
+ String aclFileName = accessKeyTable.get(accessKey);
Map<String, Object> aclAccessConfigMap =
AclUtils.getYamlDataObject(aclFileName,
Map.class);
if (aclAccessConfigMap == null || aclAccessConfigMap.isEmpty()) {
- log.warn("No data found in {} when deleting access config of
{}", aclFileName, accesskey);
+ log.warn("No data found in {} when deleting access config of
{}", aclFileName, accessKey);
return true;
}
List<Map<String, Object>> accounts = (List<Map<String, Object>>)
aclAccessConfigMap.get("accounts");
Iterator<Map<String, Object>> itemIterator = accounts.iterator();
while (itemIterator.hasNext()) {
- if
(itemIterator.next().get(AclConstants.CONFIG_ACCESS_KEY).equals(accesskey)) {
+ if
(itemIterator.next().get(AclConstants.CONFIG_ACCESS_KEY).equals(accessKey)) {
// Delete the related acl config element
itemIterator.remove();
- accessKeyTable.remove(accesskey);
+ accessKeyTable.remove(accessKey);
aclAccessConfigMap.put(AclConstants.CONFIG_ACCOUNTS,
accounts);
return AclUtils.writeDataObject(aclFileName,
updateAclConfigFileVersion(aclFileName, aclAccessConfigMap));
}
@@ -618,7 +618,7 @@ public class PlainPermissionManager {
throw new AclException(String.format("No acl config for %s",
plainAccessResource.getAccessKey()));
}
- // Check the white addr for accesskey
+ // Check the white addr for accessKey
String aclFileName =
accessKeyTable.get(plainAccessResource.getAccessKey());
PlainAccessResource ownedAccess =
aclPlainAccessResourceMap.get(aclFileName).get(plainAccessResource.getAccessKey());
if (null == ownedAccess) {
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 f3e446a65..f74ab330b 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
@@ -558,14 +558,14 @@ public class AdminBrokerProcessor implements
NettyRequestProcessor {
response.setRemark(null);
NettyRemotingAbstract.writeResponse(ctx.channel(), request,
response);
} else {
- String errorMsg = "The accesskey[" +
requestHeader.getAccessKey() + "] corresponding to accessConfig has been
updated failed.";
+ String errorMsg = "The accessKey[" +
requestHeader.getAccessKey() + "] corresponding to accessConfig has been
updated failed.";
LOGGER.warn(errorMsg);
response.setCode(ResponseCode.UPDATE_AND_CREATE_ACL_CONFIG_FAILED);
response.setRemark(errorMsg);
return response;
}
} catch (Exception e) {
- LOGGER.error("Failed to generate a proper update accessvalidator
response", e);
+ LOGGER.error("Failed to generate a proper update accessValidator
response", e);
response.setCode(ResponseCode.UPDATE_AND_CREATE_ACL_CONFIG_FAILED);
response.setRemark(e.getMessage());
return response;
@@ -592,7 +592,7 @@ public class AdminBrokerProcessor implements
NettyRequestProcessor {
response.setRemark(null);
NettyRemotingAbstract.writeResponse(ctx.channel(), request,
response);
} else {
- String errorMsg = "The accesskey[" +
requestHeader.getAccessKey() + "] corresponding to accessConfig has been
deleted failed.";
+ String errorMsg = "The accessKey[" +
requestHeader.getAccessKey() + "] corresponding to accessConfig has been
deleted failed.";
LOGGER.warn(errorMsg);
response.setCode(ResponseCode.DELETE_ACL_CONFIG_FAILED);
response.setRemark(errorMsg);
@@ -600,7 +600,7 @@ public class AdminBrokerProcessor implements
NettyRequestProcessor {
}
} catch (Exception e) {
- LOGGER.error("Failed to generate a proper delete accessvalidator
response", e);
+ LOGGER.error("Failed to generate a proper delete accessValidator
response", e);
response.setCode(ResponseCode.DELETE_ACL_CONFIG_FAILED);
response.setRemark(e.getMessage());
return response;
diff --git
a/broker/src/main/java/org/apache/rocketmq/broker/schedule/ScheduleMessageService.java
b/broker/src/main/java/org/apache/rocketmq/broker/schedule/ScheduleMessageService.java
index e91c32b55..196b78f83 100644
---
a/broker/src/main/java/org/apache/rocketmq/broker/schedule/ScheduleMessageService.java
+++
b/broker/src/main/java/org/apache/rocketmq/broker/schedule/ScheduleMessageService.java
@@ -332,7 +332,7 @@ public class ScheduleMessageService extends ConfigManager {
return true;
}
- private MessageExtBrokerInner messageTimeup(MessageExt msgExt) {
+ private MessageExtBrokerInner messageTimeUp(MessageExt msgExt) {
MessageExtBrokerInner msgInner = new MessageExtBrokerInner();
msgInner.setBody(msgExt.getBody());
msgInner.setFlag(msgExt.getFlag());
@@ -381,7 +381,7 @@ public class ScheduleMessageService extends ConfigManager {
}
} catch (Exception e) {
// XXX: warn and notify me
- log.error("ScheduleMessageService, executeOnTimeup exception",
e);
+ log.error("ScheduleMessageService, executeOnTimeUp exception",
e);
this.scheduleNextTimerTask(this.offset, DELAY_FOR_A_PERIOD);
}
}
@@ -460,7 +460,7 @@ public class ScheduleMessageService extends ConfigManager {
continue;
}
- MessageExtBrokerInner msgInner =
ScheduleMessageService.this.messageTimeup(msgExt);
+ MessageExtBrokerInner msgInner =
ScheduleMessageService.this.messageTimeUp(msgExt);
if
(TopicValidator.RMQ_SYS_TRANS_HALF_TOPIC.equals(msgInner.getTopic())) {
log.error("[BUG] the real topic of schedule msg is {},
discard the msg. msg={}",
msgInner.getTopic(), msgInner);
@@ -480,7 +480,7 @@ public class ScheduleMessageService extends ConfigManager {
}
}
} catch (Exception e) {
- log.error("ScheduleMessageService, messageTimeup execute
error, offset = {}", nextOffset, e);
+ log.error("ScheduleMessageService, messageTimeUp execute
error, offset = {}", nextOffset, e);
} finally {
bufferCQ.release();
}
@@ -780,7 +780,7 @@ public class ScheduleMessageService extends ConfigManager {
return;
}
- MessageExtBrokerInner msgInner =
ScheduleMessageService.this.messageTimeup(msgExt);
+ MessageExtBrokerInner msgInner =
ScheduleMessageService.this.messageTimeUp(msgExt);
PutMessageResult result =
ScheduleMessageService.this.brokerController.getEscapeBridge().putMessage(msgInner);
this.handleResult(result);
if (result != null && result.getPutMessageStatus() ==
PutMessageStatus.PUT_OK) {
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 79386bd47..c2e936be4 100644
--- a/client/src/main/java/org/apache/rocketmq/client/MQAdmin.java
+++ b/client/src/main/java/org/apache/rocketmq/client/MQAdmin.java
@@ -29,8 +29,8 @@ import java.util.Map;
*/
public interface MQAdmin {
/**
- * Creates an topic
- * @param key accesskey
+ * Creates a topic
+ * @param key accessKey
* @param newTopic topic name
* @param queueNum topic's queue number
* @param attributes
@@ -39,8 +39,8 @@ public interface MQAdmin {
throws MQClientException;
/**
- * Creates an topic
- * @param key accesskey
+ * Creates a topic
+ * @param key accessKey
* @param newTopic topic name
* @param queueNum topic's queue number
* @param topicSysFlag topic system flag
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 db5b1d62c..6e9ffed8c 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
@@ -769,7 +769,7 @@ public class DefaultMQProducer extends ClientConfig
implements MQProducer {
/**
* This method will be removed in a certain version after April 5, 2020,
so please do not use this method.
*
- * @param key accesskey
+ * @param key accessKey
* @param newTopic topic name
* @param queueNum topic's queue number
* @param attributes
@@ -785,7 +785,7 @@ public class DefaultMQProducer extends ClientConfig
implements MQProducer {
* Create a topic on broker. This method will be removed in a certain
version after April 5, 2020, so please do not
* use this method.
*
- * @param key accesskey
+ * @param key accessKey
* @param newTopic topic name
* @param queueNum topic's queue number
* @param topicSysFlag topic system flag
diff --git
"a/docs/cn/acl/RocketMQ_Multiple_ACL_Files_\350\256\276\350\256\241.md"
"b/docs/cn/acl/RocketMQ_Multiple_ACL_Files_\350\256\276\350\256\241.md"
index 9e11be554..2475cfa48 100644
--- "a/docs/cn/acl/RocketMQ_Multiple_ACL_Files_\350\256\276\350\256\241.md"
+++ "b/docs/cn/acl/RocketMQ_Multiple_ACL_Files_\350\256\276\350\256\241.md"
@@ -69,9 +69,9 @@ ACL配置文件的数量aclFilesNum、所有ACL配置文件绝对路径fileList
再根据该路径更新aclPlainAccessResourceMap中缓存的数据，最后将该ACL配置文件中的数据写回原文件；如果不包含则会将数据写到"rocketmq.acl.plain.file"配置文件中，
然后更新accessKeyTable和aclPlainAccessResourceMap，最后最后将该ACL配置文件中的数据写回原文件。
-（3）deleteAccessConfig(String accesskey)
+（3）deleteAccessConfig(String accessKey)
-将该方法原有的逻辑修改为：判断accessKeyTable中是否存在accesskey，如果不存在则返回false，否则将其删除并将修改后的数据写回原文件。
+将该方法原有的逻辑修改为：判断accessKeyTable中是否存在accessKey，如果不存在则返回false，否则将其删除并将修改后的数据写回原文件。
（4）getAllAclConfig()
diff --git
a/store/src/main/java/org/apache/rocketmq/store/timer/TimerMessageStore.java
b/store/src/main/java/org/apache/rocketmq/store/timer/TimerMessageStore.java
index c6ab81df4..72c402d20 100644
--- a/store/src/main/java/org/apache/rocketmq/store/timer/TimerMessageStore.java
+++ b/store/src/main/java/org/apache/rocketmq/store/timer/TimerMessageStore.java
@@ -74,13 +74,13 @@ public class TimerMessageStore {
public static final String TIMER_ENQUEUE_MS =
MessageConst.PROPERTY_TIMER_ENQUEUE_MS;
public static final String TIMER_DEQUEUE_MS =
MessageConst.PROPERTY_TIMER_DEQUEUE_MS;
public static final String TIMER_ROLL_TIMES =
MessageConst.PROPERTY_TIMER_ROLL_TIMES;
- public static final String TIMER_DELETE_UNIQKEY =
MessageConst.PROPERTY_TIMER_DEL_UNIQKEY;
+ public static final String TIMER_DELETE_UNIQUE_KEY =
MessageConst.PROPERTY_TIMER_DEL_UNIQKEY;
public static final Random RANDOM = new Random();
public static final int PUT_OK = 0, PUT_NEED_RETRY = 1, PUT_NO_RETRY = 2;
public static final int DAY_SECS = 24 * 3600;
// The total days in the timer wheel when precision is 1000ms.
// If the broker shutdown last more than the configured days, will cause
message loss
- public static final int TIMER_WHELL_TTL_DAY = 7;
+ public static final int TIMER_WHEEL_TTL_DAY = 7;
public static final int TIMER_BLANK_SLOTS = 60;
public static final int MAGIC_DEFAULT = 1;
public static final int MAGIC_ROLL = 1 << 1;
@@ -152,7 +152,7 @@ public class TimerMessageStore {
this.timerLogFileSize = storeConfig.getMappedFileSizeTimerLog();
this.precisionMs = storeConfig.getTimerPrecisionMs();
// TimerWheel contains the fixed number of slots regardless of
precision.
- this.slotsTotal = TIMER_WHELL_TTL_DAY * DAY_SECS;
+ this.slotsTotal = TIMER_WHEEL_TTL_DAY * DAY_SECS;
this.timerWheel = new
TimerWheel(getTimerWheelPath(storeConfig.getStorePathRootDir()),
this.slotsTotal, precisionMs);
this.timerLog = new
TimerLog(getTimerLogPath(storeConfig.getStorePathRootDir()), timerLogFileSize);
@@ -274,8 +274,8 @@ public class TimerMessageStore {
if (currReadTimeMs < nextReadTimeMs) {
currReadTimeMs = nextReadTimeMs;
}
- //the timer wheel may contain physical offset bigger than timerlog
- //This will only happen when the timerlog is damaged
+ //the timer wheel may contain physical offset bigger than timerLog
+ //This will only happen when the timerLog is damaged
//hard to test
long minFirst = timerWheel.checkPhyPos(currReadTimeMs, processOffset);
if (debug) {
@@ -353,10 +353,10 @@ public class TimerMessageStore {
}
}
- //recover timerlog and revise timerwheel
+ //recover timerLog and revise timerWheel
//return process offset
private long recoverAndRevise(long beginOffset, boolean checkTimerLog) {
- LOGGER.info("Begin to recover timerlog offset:{} check:{}",
beginOffset, checkTimerLog);
+ LOGGER.info("Begin to recover timerLog offset:{} check:{}",
beginOffset, checkTimerLog);
MappedFile lastFile =
timerLog.getMappedFileQueue().getLastMappedFile();
if (null == lastFile) {
return 0;
@@ -398,7 +398,7 @@ public class TimerMessageStore {
timerWheel.reviseSlot(delayTime, TimerWheel.IGNORE,
sbr.getStartOffset() + position, true);
}
} catch (Exception e) {
- LOGGER.error("Recover timerlog error", e);
+ LOGGER.error("Recover timerLog error", e);
stopCheck = true;
break;
}
@@ -445,7 +445,7 @@ public class TimerMessageStore {
int checkOffset = timerLog.getOffsetForLastUnit();
timerLog.getMappedFileQueue().deleteExpiredFileByOffsetForTimerLog(minPy,
checkOffset, TimerLog.UNIT_SIZE);
} catch (Exception e) {
- LOGGER.error("Error in cleaning timerlog", e);
+ LOGGER.error("Error in cleaning timerLog", e);
}
}
}, 30, 30, TimeUnit.SECONDS);
@@ -470,7 +470,7 @@ public class TimerMessageStore {
}
}
} catch (Exception e) {
- LOGGER.error("Error in cleaning timerlog", e);
+ LOGGER.error("Error in cleaning timerLog", e);
}
}
}, 45, 45, TimeUnit.MINUTES);
@@ -692,7 +692,7 @@ public class TimerMessageStore {
delayedTime = tmpWriteTimeMs + timerRollWindowSlots *
precisionMs;
}
}
- boolean isDelete = messageExt.getProperty(TIMER_DELETE_UNIQKEY) !=
null;
+ boolean isDelete = messageExt.getProperty(TIMER_DELETE_UNIQUE_KEY) !=
null;
if (isDelete) {
magic = magic | MAGIC_DELETE;
}
@@ -909,7 +909,7 @@ public class TimerMessageStore {
}
}
if (deleteMsgStack.size() == 0 && normalMsgStack.size() == 0) {
- LOGGER.warn("dequeue time:{} but read nothing from timerlog",
currReadTimeMs);
+ LOGGER.warn("dequeue time:{} but read nothing from timerLog",
currReadTimeMs);
}
for (SelectMappedBufferResult sbr : sbrs) {
if (null != sbr) {
@@ -1000,7 +1000,7 @@ public class TimerMessageStore {
msgExt = MessageDecoder.decode(bufferLocal.get(), true, false,
false);
}
if (null == msgExt) {
- LOGGER.warn("Fail to read msg from commitlog offsetPy:{}
sizePy:{}", offsetPy, sizePy);
+ LOGGER.warn("Fail to read msg from commitLog offsetPy:{}
sizePy:{}", offsetPy, sizePy);
} else {
return msgExt;
}
@@ -1144,14 +1144,14 @@ public class TimerMessageStore {
//check the hash collision between small ons and big ons
for (Map.Entry<String, TimerMetrics.Metric> bjgEntry :
bigOnes.entrySet()) {
if
(smallHashs.containsKey(hashTopicForMetrics(bjgEntry.getKey()))) {
- Iterator<Map.Entry<String, TimerMetrics.Metric>> smalllIt =
smallOnes.entrySet().iterator();
- while (smalllIt.hasNext()) {
- Map.Entry<String, TimerMetrics.Metric> smallEntry =
smalllIt.next();
+ Iterator<Map.Entry<String, TimerMetrics.Metric>> smallIt =
smallOnes.entrySet().iterator();
+ while (smallIt.hasNext()) {
+ Map.Entry<String, TimerMetrics.Metric> smallEntry =
smallIt.next();
if (hashTopicForMetrics(smallEntry.getKey()) ==
hashTopicForMetrics(bjgEntry.getKey())) {
LOGGER.warn("[CheckAndReviseMetrics]Metric hash
collision between small-big code:{} small topic:{}{} big topic:{}{}",
hashTopicForMetrics(smallEntry.getKey()),
smallEntry.getKey(), smallEntry.getValue(),
bjgEntry.getKey(), bjgEntry.getValue());
- smalllIt.remove();
+ smallIt.remove();
}
}
}
@@ -1494,11 +1494,11 @@ public class TimerMessageStore {
tr.idempotentRelease();
doRes = true;
} else {
- String uniqkey =
MessageClientIDSetter.getUniqID(msgExt);
- if (null == uniqkey) {
- LOGGER.warn("No uniqkey for msg:{}",
msgExt);
+ String uniqueKey =
MessageClientIDSetter.getUniqID(msgExt);
+ if (null == uniqueKey) {
+ LOGGER.warn("No uniqueKey for msg:{}",
msgExt);
}
- if (null != uniqkey && tr.getDeleteList()
!= null && tr.getDeleteList().size() > 0 &&
tr.getDeleteList().contains(uniqkey)) {
+ if (null != uniqueKey &&
tr.getDeleteList() != null && tr.getDeleteList().size() > 0 &&
tr.getDeleteList().contains(uniqueKey)) {
doRes = true;
tr.idempotentRelease();
perfs.getCounter("dequeue_delete").flow(1);
diff --git
a/store/src/test/java/org/apache/rocketmq/store/timer/TimerMessageStoreTest.java
b/store/src/test/java/org/apache/rocketmq/store/timer/TimerMessageStoreTest.java
index c56c8c4b4..7ace2d9fe 100644
---
a/store/src/test/java/org/apache/rocketmq/store/timer/TimerMessageStoreTest.java
+++
b/store/src/test/java/org/apache/rocketmq/store/timer/TimerMessageStoreTest.java
@@ -305,7 +305,7 @@ public class TimerMessageStoreTest {
MessageExtBrokerInner delMsg = buildMessage(delayMs, topic, false);
transformTimerMessage(timerMessageStore,delMsg);
- MessageAccessor.putProperty(delMsg,
TimerMessageStore.TIMER_DELETE_UNIQKEY, uniqKey);
+ MessageAccessor.putProperty(delMsg,
TimerMessageStore.TIMER_DELETE_UNIQUE_KEY, uniqKey);
delMsg.setPropertiesString(MessageDecoder.messageProperties2String(delMsg.getProperties()));
assertEquals(PutMessageStatus.PUT_OK,
messageStore.putMessage(delMsg).getPutMessageStatus());
@@ -338,7 +338,7 @@ public class TimerMessageStoreTest {
MessageExtBrokerInner delMsg = buildMessage(delayMs, topic, false);
transformTimerMessage(timerMessageStore,delMsg);
- MessageAccessor.putProperty(delMsg,
TimerMessageStore.TIMER_DELETE_UNIQKEY, "XXX");
+ MessageAccessor.putProperty(delMsg,
TimerMessageStore.TIMER_DELETE_UNIQUE_KEY, "XXX");
delMsg.setPropertiesString(MessageDecoder.messageProperties2String(delMsg.getProperties()));
assertEquals(PutMessageStatus.PUT_OK,
messageStore.putMessage(delMsg).getPutMessageStatus());
@@ -361,7 +361,7 @@ public class TimerMessageStoreTest {
// Test put expired delete msg.
MessageExtBrokerInner expiredInner =
buildMessage(System.currentTimeMillis() - 100, topic, false);
- MessageAccessor.putProperty(expiredInner,
TimerMessageStore.TIMER_DELETE_UNIQKEY, "XXX");
+ MessageAccessor.putProperty(expiredInner,
TimerMessageStore.TIMER_DELETE_UNIQUE_KEY, "XXX");
PutMessageResult putMessageResult =
transformTimerMessage(timerMessageStore,expiredInner);
assertEquals(PutMessageStatus.WHEEL_TIMER_MSG_ILLEGAL,
putMessageResult.getPutMessageStatus());
}
diff --git
a/tools/src/main/java/org/apache/rocketmq/tools/command/acl/DeleteAccessConfigSubCommand.java
b/tools/src/main/java/org/apache/rocketmq/tools/command/acl/DeleteAccessConfigSubCommand.java
index c42f9c49b..fd3a92fff 100644
---
a/tools/src/main/java/org/apache/rocketmq/tools/command/acl/DeleteAccessConfigSubCommand.java
+++
b/tools/src/main/java/org/apache/rocketmq/tools/command/acl/DeleteAccessConfigSubCommand.java
@@ -83,7 +83,7 @@ public class DeleteAccessConfigSubCommand implements
SubCommand {
defaultMQAdminExt.deletePlainAccessConfig(addr, accessKey);
System.out.printf("delete plain access config account from %s
success.%n", addr);
- System.out.printf("account's accesskey is:%s", accessKey);
+ System.out.printf("account's accessKey is:%s", accessKey);
return;
} else if (commandLine.hasOption('c')) {
@@ -98,7 +98,7 @@ public class DeleteAccessConfigSubCommand implements
SubCommand {
System.out.printf("delete plain access config account from
%s success.%n", addr);
}
- System.out.printf("account's accesskey is:%s", accessKey);
+ System.out.printf("account's accessKey is:%s", accessKey);
return;
}
