diff --git a/client/src/main/java/org/apache/rocketmq/client/impl/producer/DefaultMQProducerImpl.java b/client/src/main/java/org/apache/rocketmq/client/impl/producer/DefaultMQProducerImpl.java index b54091e3ced..790d6aeb0d1 100644 --- a/client/src/main/java/org/apache/rocketmq/client/impl/producer/DefaultMQProducerImpl.java +++ b/client/src/main/java/org/apache/rocketmq/client/impl/producer/DefaultMQProducerImpl.java @@ -376,7 +376,7 @@ public void run() { TransactionCheckListener transactionCheckListener = DefaultMQProducerImpl.this.checkListener(); TransactionListener transactionListener = getCheckListener(); if (transactionCheckListener != null || transactionListener != null) { - LocalTransactionState localTransactionState = LocalTransactionState.UNKNOW; + LocalTransactionState localTransactionState = LocalTransactionState.UNKNOWN; Throwable exception = null; try { if (transactionCheckListener != null) { @@ -427,7 +427,7 @@ private void processTransactionState( thisHeader.setCommitOrRollback(MessageSysFlag.TRANSACTION_ROLLBACK_TYPE); log.warn("when broker check, client rollback this transaction, {}", thisHeader); break; - case UNKNOW: + case UNKNOWN: thisHeader.setCommitOrRollback(MessageSysFlag.TRANSACTION_NOT_TYPE); log.warn("when broker check, client does not know this transaction state, {}", thisHeader); break; @@ -1452,7 +1452,7 @@ public TransactionSendResult sendMessageInTransaction(final Message msg, throw new MQClientException("send message Exception", e); } - LocalTransactionState localTransactionState = LocalTransactionState.UNKNOW; + LocalTransactionState localTransactionState = LocalTransactionState.UNKNOWN; Throwable localException = null; switch (sendResult.getSendStatus()) { case SEND_OK: { @@ -1471,7 +1471,7 @@ public TransactionSendResult sendMessageInTransaction(final Message msg, localTransactionState = transactionListener.executeLocalTransaction(msg, arg); } if (null == localTransactionState) { - localTransactionState = LocalTransactionState.UNKNOW; + localTransactionState = LocalTransactionState.UNKNOWN; } if (localTransactionState != LocalTransactionState.COMMIT_MESSAGE) { @@ -1544,7 +1544,7 @@ public void endTransaction( case ROLLBACK_MESSAGE: requestHeader.setCommitOrRollback(MessageSysFlag.TRANSACTION_ROLLBACK_TYPE); break; - case UNKNOW: + case UNKNOWN: requestHeader.setCommitOrRollback(MessageSysFlag.TRANSACTION_NOT_TYPE); break; default: diff --git a/client/src/main/java/org/apache/rocketmq/client/producer/LocalTransactionState.java b/client/src/main/java/org/apache/rocketmq/client/producer/LocalTransactionState.java index 9656fb23f2b..5e37163c734 100644 --- a/client/src/main/java/org/apache/rocketmq/client/producer/LocalTransactionState.java +++ b/client/src/main/java/org/apache/rocketmq/client/producer/LocalTransactionState.java @@ -19,5 +19,5 @@ public enum LocalTransactionState { COMMIT_MESSAGE, ROLLBACK_MESSAGE, - UNKNOW, + UNKNOWN, } diff --git a/docs/cn/RocketMQ_Example.md b/docs/cn/RocketMQ_Example.md index 77c1bd7b270..24ce6b7661e 100644 --- a/docs/cn/RocketMQ_Example.md +++ b/docs/cn/RocketMQ_Example.md @@ -757,7 +757,7 @@ public class TransactionListenerImpl implements TransactionListener { int value = transactionIndex.getAndIncrement(); int status = value % 3; localTrans.put(msg.getTransactionId(), status); - return LocalTransactionState.UNKNOW; + return LocalTransactionState.UNKNOWN; } @Override public LocalTransactionState checkLocalTransaction(MessageExt msg) { @@ -765,7 +765,7 @@ public class TransactionListenerImpl implements TransactionListener { if (null != status) { switch (status) { case 0: - return LocalTransactionState.UNKNOW; + return LocalTransactionState.UNKNOWN; case 1: return LocalTransactionState.COMMIT_MESSAGE; case 2: diff --git a/docs/en/Example_Transaction.md b/docs/en/Example_Transaction.md index e2170738e9d..f1d2a862285 100644 --- a/docs/en/Example_Transaction.md +++ b/docs/en/Example_Transaction.md @@ -4,7 +4,7 @@ There are three states for transaction message: - LocalTransactionState.COMMIT_MESSAGE: commit transaction, it means that allow consumers to consume this message. - LocalTransactionState.ROLLBACK_MESSAGE: rollback transaction, it means that the message will be deleted and not allowed to consume. -- LocalTransactionState.UNKNOW: intermediate state, it means that MQ is needed to check back to determine the status. +- LocalTransactionState.UNKNOWN: intermediate state, it means that MQ is needed to check back to determine the status. ## 2 Send transactional message example @@ -66,7 +66,7 @@ public class TransactionListenerImpl implements TransactionListener { int value = transactionIndex.getAndIncrement(); int status = value % 3; localTrans.put(msg.getTransactionId(), status); - return LocalTransactionState.UNKNOW; + return LocalTransactionState.UNKNOWN; } @Override public LocalTransactionState checkLocalTransaction(MessageExt msg) { @@ -74,7 +74,7 @@ public class TransactionListenerImpl implements TransactionListener { if (null != status) { switch (status) { case 0: - return LocalTransactionState.UNKNOW; + return LocalTransactionState.UNKNOWN; case 1: return LocalTransactionState.COMMIT_MESSAGE; case 2: diff --git a/example/src/main/java/org/apache/rocketmq/example/benchmark/TransactionProducer.java b/example/src/main/java/org/apache/rocketmq/example/benchmark/TransactionProducer.java index 7b6350e3bd1..e80e6af8bea 100644 --- a/example/src/main/java/org/apache/rocketmq/example/benchmark/TransactionProducer.java +++ b/example/src/main/java/org/apache/rocketmq/example/benchmark/TransactionProducer.java @@ -214,7 +214,7 @@ private static Message buildMessage(TxSendConfig config) { if (r.nextDouble() < config.sendRollbackRate) { buf.put((byte) LocalTransactionState.ROLLBACK_MESSAGE.ordinal()); } else if (r.nextDouble() < config.sendUnknownRate) { - buf.put((byte) LocalTransactionState.UNKNOW.ordinal()); + buf.put((byte) LocalTransactionState.UNKNOWN.ordinal()); } else { buf.put((byte) LocalTransactionState.COMMIT_MESSAGE.ordinal()); } @@ -224,7 +224,7 @@ private static Message buildMessage(TxSendConfig config) { if (r.nextDouble() < config.checkRollbackRate) { buf.put((byte) LocalTransactionState.ROLLBACK_MESSAGE.ordinal()); } else if (r.nextDouble() < config.checkUnknownRate) { - buf.put((byte) LocalTransactionState.UNKNOW.ordinal()); + buf.put((byte) LocalTransactionState.UNKNOWN.ordinal()); } else { buf.put((byte) LocalTransactionState.COMMIT_MESSAGE.ordinal()); } @@ -366,7 +366,7 @@ public LocalTransactionState checkLocalTransaction(MessageExt msg) { if (dup) { statBenchmark.getDuplicatedCheckCount().increment(); } - if (msgMeta.sendResult != LocalTransactionState.UNKNOW) { + if (msgMeta.sendResult != LocalTransactionState.UNKNOWN) { System.out.printf("%s unexpected check: msgId=%s,txId=%s,checkTimes=%s,sendResult=%s\n", new SimpleDateFormat("HH:mm:ss,SSS").format(new Date()), msg.getMsgId(), msg.getTransactionId(), @@ -378,7 +378,7 @@ public LocalTransactionState checkLocalTransaction(MessageExt msg) { for (int i = 0; i < times - 1; i++) { LocalTransactionState s = msgMeta.checkResult.get(i); - if (s != LocalTransactionState.UNKNOW) { + if (s != LocalTransactionState.UNKNOWN) { System.out.printf("%s unexpected check: msgId=%s,txId=%s,checkTimes=%s,sendResult,lastCheckResult=%s\n", new SimpleDateFormat("HH:mm:ss,SSS").format(new Date()), msg.getMsgId(), msg.getTransactionId(), diff --git a/example/src/main/java/org/apache/rocketmq/example/transaction/TransactionListenerImpl.java b/example/src/main/java/org/apache/rocketmq/example/transaction/TransactionListenerImpl.java index cb066d21d39..fd67755be28 100644 --- a/example/src/main/java/org/apache/rocketmq/example/transaction/TransactionListenerImpl.java +++ b/example/src/main/java/org/apache/rocketmq/example/transaction/TransactionListenerImpl.java @@ -34,7 +34,7 @@ public LocalTransactionState executeLocalTransaction(Message msg, Object arg) { int value = transactionIndex.getAndIncrement(); int status = value % 3; localTrans.put(msg.getTransactionId(), status); - return LocalTransactionState.UNKNOW; + return LocalTransactionState.UNKNOWN; } @Override @@ -43,7 +43,7 @@ public LocalTransactionState checkLocalTransaction(MessageExt msg) { if (null != status) { switch (status) { case 0: - return LocalTransactionState.UNKNOW; + return LocalTransactionState.UNKNOWN; case 1: return LocalTransactionState.COMMIT_MESSAGE; case 2: diff --git a/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/ResponseCode.java b/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/ResponseCode.java index 68f77ab31be..513a6d6e161 100644 --- a/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/ResponseCode.java +++ b/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/ResponseCode.java @@ -61,7 +61,7 @@ public class ResponseCode extends RemotingSysResponseCode { public static final int TRANSACTION_SHOULD_ROLLBACK = 201; - public static final int TRANSACTION_STATE_UNKNOW = 202; + public static final int TRANSACTION_STATE_UNKNOWN = 202; public static final int TRANSACTION_STATE_GROUP_WRONG = 203; public static final int NO_BUYER_ID = 204; diff --git a/test/src/test/java/org/apache/rocketmq/test/client/producer/transaction/TransactionalMsgIT.java b/test/src/test/java/org/apache/rocketmq/test/client/producer/transaction/TransactionalMsgIT.java index ab1d2c12488..346fc1130a2 100644 --- a/test/src/test/java/org/apache/rocketmq/test/client/producer/transaction/TransactionalMsgIT.java +++ b/test/src/test/java/org/apache/rocketmq/test/client/producer/transaction/TransactionalMsgIT.java @@ -85,7 +85,7 @@ static Pair getTransactionHandle(int msgIndex) { return new Pair<>(false, LocalTransactionState.ROLLBACK_MESSAGE); case 4: default: - return new Pair<>(false, LocalTransactionState.UNKNOW); + return new Pair<>(false, LocalTransactionState.UNKNOWN); } } @@ -100,7 +100,7 @@ public LocalTransactionState executeLocalTransaction(Message msg, Object arg) { return transactionHandle.getObject2(); } else { checkStatus.put(msg.getTransactionId(), transactionHandle.getObject2()); - return LocalTransactionState.UNKNOW; + return LocalTransactionState.UNKNOWN; } } @@ -108,7 +108,7 @@ public LocalTransactionState executeLocalTransaction(Message msg, Object arg) { public LocalTransactionState checkLocalTransaction(MessageExt msg) { LocalTransactionState state = checkStatus.get(msg.getTransactionId()); if (state == null) { - return LocalTransactionState.UNKNOW; + return LocalTransactionState.UNKNOWN; } else { return state; } diff --git a/test/src/test/java/org/apache/rocketmq/test/container/TransactionListenerImpl.java b/test/src/test/java/org/apache/rocketmq/test/container/TransactionListenerImpl.java index 177d91ee13b..03ab94e0a33 100644 --- a/test/src/test/java/org/apache/rocketmq/test/container/TransactionListenerImpl.java +++ b/test/src/test/java/org/apache/rocketmq/test/container/TransactionListenerImpl.java @@ -38,7 +38,7 @@ public void setShouldReturnUnknownState(boolean shouldReturnUnknownState) { @Override public LocalTransactionState executeLocalTransaction(Message msg, Object arg) { if (shouldReturnUnknownState) { - return LocalTransactionState.UNKNOW; + return LocalTransactionState.UNKNOWN; } else { return LocalTransactionState.COMMIT_MESSAGE; } @@ -47,7 +47,7 @@ public LocalTransactionState executeLocalTransaction(Message msg, Object arg) { @Override public LocalTransactionState checkLocalTransaction(MessageExt msg) { if (shouldReturnUnknownState) { - return LocalTransactionState.UNKNOW; + return LocalTransactionState.UNKNOWN; } else { return LocalTransactionState.COMMIT_MESSAGE; }