This is an automated email from the ASF dual-hosted git repository.
jimin pushed a commit to branch 2.x
in repository https://gitbox.apache.org/repos/asf/incubator-seata.git
The following commit(s) were added to refs/heads/2.x by this push:
new b912ab7586 optimize: fix grammatical errors (#7702)
b912ab7586 is described below
commit b912ab75861152bca3bf104aa8cfb9c029f91ea5
Author: lokidundun <[email protected]>
AuthorDate: Fri Oct 17 00:11:00 2025 +0800
optimize: fix grammatical errors (#7702)
---
changes/en-us/2.x.md | 2 ++
changes/zh-cn/2.x.md | 3 ++-
.../main/java/io/seata/rm/tcc/api/BusinessActionContextParameter.java | 2 +-
.../src/main/java/io/seata/rm/tcc/api/TwoPhaseBusinessAction.java | 2 +-
.../seata/spring/annotation/datasource/EnableAutoDataSourceProxy.java | 2 +-
core/src/main/java/org/apache/seata/core/lock/Locker.java | 2 +-
.../java/org/apache/seata/saga/rm/api/CompensationBusinessAction.java | 2 +-
server/src/main/java/org/apache/seata/server/lock/LockManager.java | 2 +-
.../main/java/org/apache/seata/rm/tcc/api/TwoPhaseBusinessAction.java | 2 +-
9 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/changes/en-us/2.x.md b/changes/en-us/2.x.md
index 8f0b685612..83fdc753a5 100644
--- a/changes/en-us/2.x.md
+++ b/changes/en-us/2.x.md
@@ -96,6 +96,7 @@ Add changes here for all PR submitted to the 2.x branch.
- [[#7569](https://github.com/seata/seata/pull/7569)] Add hyperlink to
CONTRIBUTING.md in pull request template
- [[#7605](https://github.com/apache/incubator-seata/pull/7605)] Add the type
of registry as seata in application.yml
- [[#7625](https://github.com/apache/incubator-seata/pull/7625)] Polish
Javadoc for @EnableAutoDataSourceProxy and DefaultFailureHandlerImpl
+- [[#7702](https://github.com/apache/incubator-seata/pull/7702)] change
"whether use" to "whether to use" for correct syntax.
Thanks to these contributors for their code commits. Please report an
unintended omission.
@@ -120,5 +121,6 @@ Thanks to these contributors for their code commits. Please
report an unintended
- [psxjoy](https://github.com/psxjoy)
- [dsomehan](https://github.com/dsomehan)
- [LegendPei](https://github.com/LegendPei)
+- [lokidundun](https://github.com/lokidundun)
Also, we receive many valuable issues, questions and advices from our
community. Thanks for you all.
diff --git a/changes/zh-cn/2.x.md b/changes/zh-cn/2.x.md
index d743479dbe..cb247e0fc6 100644
--- a/changes/zh-cn/2.x.md
+++ b/changes/zh-cn/2.x.md
@@ -94,7 +94,7 @@
- [[#7569](https://github.com/seata/seata/pull/7569)] 在拉取请求模板中添加
CONTRIBUTING.md 超链接
- [[#7605](https://github.com/apache/incubator-seata/pull/7605)]
在application.yml中增加了seata作为注册中心的注释
- [[#7625](https://github.com/apache/incubator-seata/pull/7625)] 改进
@EnableAutoDataSourceProxy 和 DefaultFailureHandlerImpl 的 Javadoc
-
+- [[#7702](https://github.com/apache/incubator-seata/pull/7702)] 修复 JavaDoc
中的语法错误 将 "whether use" 改为 "whether to use"
非常感谢以下 contributors 的代码贡献。若有无意遗漏,请报告。
@@ -118,6 +118,7 @@
- [psxjoy](https://github.com/psxjoy)
- [dsomehan](https://github.com/dsomehan)
- [LegendPei](https://github.com/LegendPei)
+- [lokidundun](https://github.com/lokidundun)
同时,我们收到了社区反馈的很多有价值的issue和建议,非常感谢大家。
diff --git
a/compatible/src/main/java/io/seata/rm/tcc/api/BusinessActionContextParameter.java
b/compatible/src/main/java/io/seata/rm/tcc/api/BusinessActionContextParameter.java
index 1d2806ca6d..4e5225b478 100644
---
a/compatible/src/main/java/io/seata/rm/tcc/api/BusinessActionContextParameter.java
+++
b/compatible/src/main/java/io/seata/rm/tcc/api/BusinessActionContextParameter.java
@@ -60,7 +60,7 @@ public @interface BusinessActionContextParameter {
int index() default -1;
/**
- * whether get the parameter from the property of the object
+ * whether to get the parameter from the property of the object
* if {@code index >= 0}, the object get from the List and then do get the
parameter from the property of the object
*
* @return the boolean
diff --git
a/compatible/src/main/java/io/seata/rm/tcc/api/TwoPhaseBusinessAction.java
b/compatible/src/main/java/io/seata/rm/tcc/api/TwoPhaseBusinessAction.java
index 4811f8d650..7976fa71fa 100644
--- a/compatible/src/main/java/io/seata/rm/tcc/api/TwoPhaseBusinessAction.java
+++ b/compatible/src/main/java/io/seata/rm/tcc/api/TwoPhaseBusinessAction.java
@@ -57,7 +57,7 @@ public @interface TwoPhaseBusinessAction {
boolean isDelayReport() default false;
/**
- * whether use TCC fence (idempotent,non_rollback,suspend)
+ * whether to use TCC fence (idempotent,non_rollback,suspend)
*
* @return the boolean
*/
diff --git
a/compatible/src/main/java/io/seata/spring/annotation/datasource/EnableAutoDataSourceProxy.java
b/compatible/src/main/java/io/seata/spring/annotation/datasource/EnableAutoDataSourceProxy.java
index d9fe2786ef..0faf9b20d9 100644
---
a/compatible/src/main/java/io/seata/spring/annotation/datasource/EnableAutoDataSourceProxy.java
+++
b/compatible/src/main/java/io/seata/spring/annotation/datasource/EnableAutoDataSourceProxy.java
@@ -34,7 +34,7 @@ import java.lang.annotation.Target;
@Documented
public @interface EnableAutoDataSourceProxy {
/**
- * Whether use JDK proxy instead of CGLIB proxy
+ * Whether to use JDK proxy instead of CGLIB proxy
*
* @return useJdkProxy
*/
diff --git a/core/src/main/java/org/apache/seata/core/lock/Locker.java
b/core/src/main/java/org/apache/seata/core/lock/Locker.java
index 63864a1103..541383d8f1 100644
--- a/core/src/main/java/org/apache/seata/core/lock/Locker.java
+++ b/core/src/main/java/org/apache/seata/core/lock/Locker.java
@@ -38,7 +38,7 @@ public interface Locker {
*
* @param rowLock the row lock
* @param autoCommit the auto commit
- * @param skipCheckLock whether skip check lock or not
+ * @param skipCheckLock whether to skip check lock or not
* @return the boolean
*/
boolean acquireLock(List<RowLock> rowLock, boolean autoCommit, boolean
skipCheckLock);
diff --git
a/saga/seata-saga-annotation/src/main/java/org/apache/seata/saga/rm/api/CompensationBusinessAction.java
b/saga/seata-saga-annotation/src/main/java/org/apache/seata/saga/rm/api/CompensationBusinessAction.java
index 8c17eb1d2c..2b479fcf16 100644
---
a/saga/seata-saga-annotation/src/main/java/org/apache/seata/saga/rm/api/CompensationBusinessAction.java
+++
b/saga/seata-saga-annotation/src/main/java/org/apache/seata/saga/rm/api/CompensationBusinessAction.java
@@ -84,7 +84,7 @@ public @interface CompensationBusinessAction {
boolean isDelayReport() default false;
/**
- * whether use fence (idempotent,non_rollback,suspend)
+ * whether to use fence (idempotent,non_rollback,suspend)
*
* @return the boolean
*/
diff --git a/server/src/main/java/org/apache/seata/server/lock/LockManager.java
b/server/src/main/java/org/apache/seata/server/lock/LockManager.java
index 56768f06e9..74eac98c5c 100644
--- a/server/src/main/java/org/apache/seata/server/lock/LockManager.java
+++ b/server/src/main/java/org/apache/seata/server/lock/LockManager.java
@@ -44,7 +44,7 @@ public interface LockManager {
*
* @param branchSession the branch session
* @param autoCommit the auto commit
- * @param skipCheckLock whether skip check lock or not
+ * @param skipCheckLock whether to skip check lock or not
* @return the boolean
* @throws TransactionException the transaction exception
*/
diff --git
a/tcc/src/main/java/org/apache/seata/rm/tcc/api/TwoPhaseBusinessAction.java
b/tcc/src/main/java/org/apache/seata/rm/tcc/api/TwoPhaseBusinessAction.java
index 257dfbc73c..2951f4ac30 100644
--- a/tcc/src/main/java/org/apache/seata/rm/tcc/api/TwoPhaseBusinessAction.java
+++ b/tcc/src/main/java/org/apache/seata/rm/tcc/api/TwoPhaseBusinessAction.java
@@ -75,7 +75,7 @@ public @interface TwoPhaseBusinessAction {
boolean isDelayReport() default false;
/**
- * whether use TCC fence (idempotent,non_rollback,suspend)
+ * whether to use TCC fence (idempotent,non_rollback,suspend)
*
* @return the boolean
*/
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]