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 dbcd5af7b7 optimize: fix some spell errors in code and comments (#7710)
dbcd5af7b7 is described below
commit dbcd5af7b75d7b9732bcb7bf164486c1d42a04d8
Author: jimin <[email protected]>
AuthorDate: Tue Nov 4 23:18:27 2025 +0800
optimize: fix some spell errors in code and comments (#7710)
---
.../seata/common/util/NetAddressValidatorUtil.java | 2 +-
.../core/rpc/netty/NettyRemotingServerTest.java | 2 +-
.../datasource/exec/BatchInsertExecutorTest.java | 170 ++++++++++-----------
.../rm/datasource/exec/DmInsertExecutorTest.java | 24 +--
.../exec/KingbaseInsertExecutorTest.java | 48 +++---
.../datasource/exec/MySQLInsertExecutorTest.java | 18 +--
.../MySQLInsertOnDuplicateUpdateExecutorTest.java | 42 ++---
.../exec/OceanBaseInsertExecutorTest.java | 48 +++---
.../datasource/exec/OracleInsertExecutorTest.java | 48 +++---
.../datasource/exec/OscarInsertExecutorTest.java | 48 +++---
.../boot/autoconfigure/StarterConstants.java | 2 +-
.../main/java/org/apache/seata/server/Server.java | 4 +-
.../java/org/apache/seata/server/ServerRunner.java | 4 +-
.../seata/saga/engine/db/StateMachineDBTests.java | 2 +-
.../seata/tm/DefaultTransactionManagerTest.java | 2 +-
15 files changed, 232 insertions(+), 232 deletions(-)
diff --git
a/common/src/main/java/org/apache/seata/common/util/NetAddressValidatorUtil.java
b/common/src/main/java/org/apache/seata/common/util/NetAddressValidatorUtil.java
index c019e0025f..6a63a57919 100644
---
a/common/src/main/java/org/apache/seata/common/util/NetAddressValidatorUtil.java
+++
b/common/src/main/java/org/apache/seata/common/util/NetAddressValidatorUtil.java
@@ -117,7 +117,7 @@ public class NetAddressValidatorUtil {
/**
* Check if <code>input</code> is an IPv4 address mapped into a IPv6
address. These are
- * starting with "::ffff:" followed by the IPv4 address in a dot-seperated
notation.
+ * starting with "::ffff:" followed by the IPv4 address in a dot-separated
notation.
* The format is '::ffff:d.d.d.d'
*
* @param input ip-address to check
diff --git
a/core/src/test/java/org/apache/seata/core/rpc/netty/NettyRemotingServerTest.java
b/core/src/test/java/org/apache/seata/core/rpc/netty/NettyRemotingServerTest.java
index 8c6b4f4f77..804ef75de8 100644
---
a/core/src/test/java/org/apache/seata/core/rpc/netty/NettyRemotingServerTest.java
+++
b/core/src/test/java/org/apache/seata/core/rpc/netty/NettyRemotingServerTest.java
@@ -81,7 +81,7 @@ public class NettyRemotingServerTest {
}
@Test
- public void destory() {
+ public void destroy() {
nettyRemotingServer.destroy();
Assertions.assertTrue(nettyRemotingServer != null);
}
diff --git
a/rm-datasource/src/test/java/org/apache/seata/rm/datasource/exec/BatchInsertExecutorTest.java
b/rm-datasource/src/test/java/org/apache/seata/rm/datasource/exec/BatchInsertExecutorTest.java
index 9f3f74d793..c037e6b373 100644
---
a/rm-datasource/src/test/java/org/apache/seata/rm/datasource/exec/BatchInsertExecutorTest.java
+++
b/rm-datasource/src/test/java/org/apache/seata/rm/datasource/exec/BatchInsertExecutorTest.java
@@ -189,7 +189,7 @@ public class BatchInsertExecutorTest {
}
private void
mockParameters_with_null_and_insertRows_with_placeholder_null() {
- Map<Integer, ArrayList<Object>> paramters = new HashMap<>();
+ Map<Integer, ArrayList<Object>> parameters = new HashMap<>();
ArrayList arrayList0 = new ArrayList<>();
arrayList0.add("userId1");
ArrayList arrayList1 = new ArrayList<>();
@@ -200,12 +200,12 @@ public class BatchInsertExecutorTest {
arrayList3.add("userId2");
ArrayList arrayList4 = new ArrayList<>();
arrayList4.add("userName2");
- paramters.put(1, arrayList0);
- paramters.put(2, arrayList1);
- paramters.put(3, arrayList2);
- paramters.put(4, arrayList3);
- paramters.put(5, arrayList4);
- when(statementProxy.getParameters()).thenReturn(paramters);
+ parameters.put(1, arrayList0);
+ parameters.put(2, arrayList1);
+ parameters.put(3, arrayList2);
+ parameters.put(4, arrayList3);
+ parameters.put(5, arrayList4);
+ when(statementProxy.getParameters()).thenReturn(parameters);
List<List<Object>> insertRows = new ArrayList<>();
insertRows.add(Arrays.asList("?", "?", "?", "userStatus1"));
@@ -214,7 +214,7 @@ public class BatchInsertExecutorTest {
}
private void
mockParameters_with_number_and_insertRows_with_placeholde_null() {
- Map<Integer, ArrayList<Object>> paramters = new HashMap<>();
+ Map<Integer, ArrayList<Object>> parameters = new HashMap<>();
ArrayList arrayList0 = new ArrayList<>();
arrayList0.add("userId1");
ArrayList arrayList1 = new ArrayList<>();
@@ -225,12 +225,12 @@ public class BatchInsertExecutorTest {
arrayList3.add("userId2");
ArrayList arrayList4 = new ArrayList<>();
arrayList4.add("userName2");
- paramters.put(1, arrayList0);
- paramters.put(2, arrayList1);
- paramters.put(3, arrayList2);
- paramters.put(4, arrayList3);
- paramters.put(5, arrayList4);
- when(statementProxy.getParameters()).thenReturn(paramters);
+ parameters.put(1, arrayList0);
+ parameters.put(2, arrayList1);
+ parameters.put(3, arrayList2);
+ parameters.put(4, arrayList3);
+ parameters.put(5, arrayList4);
+ when(statementProxy.getParameters()).thenReturn(parameters);
List<List<Object>> insertRows = new ArrayList<>();
insertRows.add(Arrays.asList("?", "?", "?", "userStatus1"));
@@ -250,7 +250,7 @@ public class BatchInsertExecutorTest {
private void mockParameters() {
int PK_INDEX = 1;
- Map<Integer, ArrayList<Object>> paramters = new HashMap<>();
+ Map<Integer, ArrayList<Object>> parameters = new HashMap<>();
ArrayList arrayList0 = new ArrayList<>();
arrayList0.add("userId1");
arrayList0.add("userId2");
@@ -276,22 +276,22 @@ public class BatchInsertExecutorTest {
arrayList3.add("userStatus4");
arrayList3.add("userStatus5");
- paramters.put(1, arrayList0);
- paramters.put(2, arrayList1);
- paramters.put(3, arrayList2);
- paramters.put(4, arrayList3);
+ parameters.put(1, arrayList0);
+ parameters.put(2, arrayList1);
+ parameters.put(3, arrayList2);
+ parameters.put(4, arrayList3);
List<List<Object>> insertRows = new ArrayList<>();
insertRows.add(Arrays.asList("?", "?", "?", "?"));
- when(statementProxy.getParameters()).thenReturn(paramters);
+ when(statementProxy.getParameters()).thenReturn(parameters);
when(sqlInsertRecognizer.getInsertRows(pkIndexMap.values())).thenReturn(insertRows);
-
when(statementProxy.getParamsByIndex(PK_INDEX)).thenReturn(paramters.get(PK_INDEX
+ 1));
+
when(statementProxy.getParamsByIndex(PK_INDEX)).thenReturn(parameters.get(PK_INDEX
+ 1));
}
private void mockParametersAllRefOfMysql() {
- Map<Integer, ArrayList<Object>> paramters = new HashMap(20);
+ Map<Integer, ArrayList<Object>> parameters = new HashMap(20);
ArrayList arrayList1 = new ArrayList<>();
arrayList1.add("userId1");
ArrayList arrayList2 = new ArrayList<>();
@@ -337,40 +337,40 @@ public class BatchInsertExecutorTest {
ArrayList arrayList20 = new ArrayList<>();
arrayList20.add("userStatus5");
- paramters.put(1, arrayList1);
- paramters.put(2, arrayList2);
- paramters.put(3, arrayList3);
- paramters.put(4, arrayList4);
- paramters.put(5, arrayList5);
- paramters.put(6, arrayList6);
- paramters.put(7, arrayList7);
- paramters.put(8, arrayList8);
- paramters.put(9, arrayList9);
- paramters.put(10, arrayList10);
- paramters.put(11, arrayList11);
- paramters.put(12, arrayList12);
- paramters.put(13, arrayList13);
- paramters.put(14, arrayList14);
- paramters.put(15, arrayList15);
- paramters.put(16, arrayList16);
- paramters.put(17, arrayList17);
- paramters.put(18, arrayList18);
- paramters.put(19, arrayList19);
- paramters.put(20, arrayList20);
+ parameters.put(1, arrayList1);
+ parameters.put(2, arrayList2);
+ parameters.put(3, arrayList3);
+ parameters.put(4, arrayList4);
+ parameters.put(5, arrayList5);
+ parameters.put(6, arrayList6);
+ parameters.put(7, arrayList7);
+ parameters.put(8, arrayList8);
+ parameters.put(9, arrayList9);
+ parameters.put(10, arrayList10);
+ parameters.put(11, arrayList11);
+ parameters.put(12, arrayList12);
+ parameters.put(13, arrayList13);
+ parameters.put(14, arrayList14);
+ parameters.put(15, arrayList15);
+ parameters.put(16, arrayList16);
+ parameters.put(17, arrayList17);
+ parameters.put(18, arrayList18);
+ parameters.put(19, arrayList19);
+ parameters.put(20, arrayList20);
List<List<Object>> insertRows = new ArrayList<>();
insertRows.add(Arrays.asList("?", "?", "?", "?"));
insertRows.add(Arrays.asList("?", "?", "?", "?"));
insertRows.add(Arrays.asList("?", "?", "?", "?"));
insertRows.add(Arrays.asList("?", "?", "?", "?"));
insertRows.add(Arrays.asList("?", "?", "?", "?"));
- when(statementProxy.getParameters()).thenReturn(paramters);
+ when(statementProxy.getParameters()).thenReturn(parameters);
when(sqlInsertRecognizer.getInsertRows(pkIndexMap.values())).thenReturn(insertRows);
- when(statementProxy.getParameters()).thenReturn(paramters);
+ when(statementProxy.getParameters()).thenReturn(parameters);
}
private void mockParametersWithPkRefOfMysql() {
- Map<Integer, ArrayList<Object>> paramters = new HashMap<>(10);
+ Map<Integer, ArrayList<Object>> parameters = new HashMap<>(10);
ArrayList arrayList1 = new ArrayList<>();
arrayList1.add("userId1");
ArrayList arrayList2 = new ArrayList<>();
@@ -391,30 +391,30 @@ public class BatchInsertExecutorTest {
arrayList9.add("userId5");
ArrayList arrayList10 = new ArrayList<>();
arrayList10.add(100000005);
- paramters.put(1, arrayList1);
- paramters.put(2, arrayList2);
- paramters.put(3, arrayList3);
- paramters.put(4, arrayList4);
- paramters.put(5, arrayList5);
- paramters.put(6, arrayList6);
- paramters.put(7, arrayList7);
- paramters.put(8, arrayList8);
- paramters.put(9, arrayList9);
- paramters.put(10, arrayList10);
+ parameters.put(1, arrayList1);
+ parameters.put(2, arrayList2);
+ parameters.put(3, arrayList3);
+ parameters.put(4, arrayList4);
+ parameters.put(5, arrayList5);
+ parameters.put(6, arrayList6);
+ parameters.put(7, arrayList7);
+ parameters.put(8, arrayList8);
+ parameters.put(9, arrayList9);
+ parameters.put(10, arrayList10);
List<List<Object>> insertRows = new ArrayList<>();
insertRows.add(Arrays.asList("?", "?", "1", "11"));
insertRows.add(Arrays.asList("?", "?", "2", "22"));
insertRows.add(Arrays.asList("?", "?", "3", "33"));
insertRows.add(Arrays.asList("?", "?", "4", "44"));
insertRows.add(Arrays.asList("?", "?", "5", "55"));
- when(statementProxy.getParameters()).thenReturn(paramters);
+ when(statementProxy.getParameters()).thenReturn(parameters);
when(sqlInsertRecognizer.getInsertRows(pkIndexMap.values())).thenReturn(insertRows);
- when(statementProxy.getParameters()).thenReturn(paramters);
+ when(statementProxy.getParameters()).thenReturn(parameters);
}
private void mockParametersWithPkUnRefOfMysql() {
- Map<Integer, ArrayList<Object>> paramters = new HashMap<>(10);
+ Map<Integer, ArrayList<Object>> parameters = new HashMap<>(10);
ArrayList arrayList1 = new ArrayList<>();
arrayList1.add("userId1");
ArrayList arrayList2 = new ArrayList<>();
@@ -435,29 +435,29 @@ public class BatchInsertExecutorTest {
arrayList9.add("userId5");
ArrayList arrayList10 = new ArrayList<>();
arrayList10.add(100000005);
- paramters.put(1, arrayList1);
- paramters.put(2, arrayList2);
- paramters.put(3, arrayList3);
- paramters.put(4, arrayList4);
- paramters.put(5, arrayList5);
- paramters.put(6, arrayList6);
- paramters.put(7, arrayList7);
- paramters.put(8, arrayList8);
- paramters.put(9, arrayList9);
- paramters.put(10, arrayList10);
+ parameters.put(1, arrayList1);
+ parameters.put(2, arrayList2);
+ parameters.put(3, arrayList3);
+ parameters.put(4, arrayList4);
+ parameters.put(5, arrayList5);
+ parameters.put(6, arrayList6);
+ parameters.put(7, arrayList7);
+ parameters.put(8, arrayList8);
+ parameters.put(9, arrayList9);
+ parameters.put(10, arrayList10);
List<List<Object>> insertRows = new ArrayList<>();
insertRows.add(Arrays.asList("?", 100000001, "?", "1"));
insertRows.add(Arrays.asList("?", 100000002, "?", "2"));
insertRows.add(Arrays.asList("?", 100000003, "?", "3"));
insertRows.add(Arrays.asList("?", 100000004, "?", "4"));
insertRows.add(Arrays.asList("?", 100000005, "?", "5"));
- when(statementProxy.getParameters()).thenReturn(paramters);
+ when(statementProxy.getParameters()).thenReturn(parameters);
when(sqlInsertRecognizer.getInsertRows(pkIndexMap.values())).thenReturn(insertRows);
}
private void mockParametersWithAllRefOfJDBC() {
int PK_INDEX = 1;
- Map<Integer, ArrayList<Object>> paramters = new HashMap<>(4);
+ Map<Integer, ArrayList<Object>> parameters = new HashMap<>(4);
ArrayList arrayList0 = new ArrayList<>();
arrayList0.add("userId1");
arrayList0.add("userId2");
@@ -482,21 +482,21 @@ public class BatchInsertExecutorTest {
arrayList3.add("userStatus3");
arrayList3.add("userStatus4");
arrayList3.add("userStatus5");
- paramters.put(1, arrayList0);
- paramters.put(2, arrayList1);
- paramters.put(3, arrayList2);
- paramters.put(4, arrayList3);
+ parameters.put(1, arrayList0);
+ parameters.put(2, arrayList1);
+ parameters.put(3, arrayList2);
+ parameters.put(4, arrayList3);
List<List<Object>> insertRows = new ArrayList<>();
insertRows.add(Arrays.asList("?", "?", "?", "?"));
- when(statementProxy.getParameters()).thenReturn(paramters);
-
when(statementProxy.getParamsByIndex(PK_INDEX)).thenReturn(paramters.get(PK_INDEX
+ 1));
+ when(statementProxy.getParameters()).thenReturn(parameters);
+
when(statementProxy.getParamsByIndex(PK_INDEX)).thenReturn(parameters.get(PK_INDEX
+ 1));
doReturn(insertRows).when(sqlInsertRecognizer).getInsertRows(pkIndexMap.values());
}
private void mockParametersWithPkRefOfJDBC() {
int PK_INDEX = 1;
- Map<Integer, ArrayList<Object>> paramters = new HashMap<>(2);
+ Map<Integer, ArrayList<Object>> parameters = new HashMap<>(2);
ArrayList arrayList0 = new ArrayList<>();
arrayList0.add("userId1");
arrayList0.add("userId2");
@@ -509,28 +509,28 @@ public class BatchInsertExecutorTest {
arrayList1.add(PK_VALUES.get(2));
arrayList1.add(PK_VALUES.get(3));
arrayList1.add(PK_VALUES.get(4));
- paramters.put(1, arrayList0);
- paramters.put(2, arrayList1);
+ parameters.put(1, arrayList0);
+ parameters.put(2, arrayList1);
List<List<Object>> insertRows = new ArrayList<>();
insertRows.add(Arrays.asList("?", "?", "userName1", "userStatus1"));
- when(statementProxy.getParameters()).thenReturn(paramters);
+ when(statementProxy.getParameters()).thenReturn(parameters);
when(sqlInsertRecognizer.getInsertRows(pkIndexMap.values())).thenReturn(insertRows);
-
when(statementProxy.getParamsByIndex(PK_INDEX)).thenReturn(paramters.get(PK_INDEX
+ 1));
+
when(statementProxy.getParamsByIndex(PK_INDEX)).thenReturn(parameters.get(PK_INDEX
+ 1));
}
private void mockParametersWithPkUnRefOfJDBC(int pkId) {
- Map<Integer, ArrayList<Object>> paramters = new HashMap<>(2);
+ Map<Integer, ArrayList<Object>> parameters = new HashMap<>(2);
ArrayList arrayList0 = new ArrayList<>();
arrayList0.add("userId1");
ArrayList arrayList1 = new ArrayList<>();
arrayList1.add("userName1");
- paramters.put(1, arrayList0);
- paramters.put(2, arrayList1);
+ parameters.put(1, arrayList0);
+ parameters.put(2, arrayList1);
List<List<Object>> insertRows = new ArrayList<>();
insertRows.add(Arrays.asList("?", pkId, "?", "userStatus"));
- when(statementProxy.getParameters()).thenReturn(paramters);
+ when(statementProxy.getParameters()).thenReturn(parameters);
when(sqlInsertRecognizer.getInsertRows(pkIndexMap.values())).thenReturn(insertRows);
}
}
diff --git
a/rm-datasource/src/test/java/org/apache/seata/rm/datasource/exec/DmInsertExecutorTest.java
b/rm-datasource/src/test/java/org/apache/seata/rm/datasource/exec/DmInsertExecutorTest.java
index 977fa684c6..9d2c8460c6 100644
---
a/rm-datasource/src/test/java/org/apache/seata/rm/datasource/exec/DmInsertExecutorTest.java
+++
b/rm-datasource/src/test/java/org/apache/seata/rm/datasource/exec/DmInsertExecutorTest.java
@@ -162,7 +162,7 @@ public class DmInsertExecutorTest {
private SqlSequenceExpr mockParametersPkWithSeq() {
SqlSequenceExpr expr = new SqlSequenceExpr("seq", "nextval");
- Map<Integer, ArrayList<Object>> paramters = new HashMap(4);
+ Map<Integer, ArrayList<Object>> parameters = new HashMap(4);
ArrayList arrayList0 = new ArrayList<>();
arrayList0.add(expr);
ArrayList arrayList1 = new ArrayList<>();
@@ -171,12 +171,12 @@ public class DmInsertExecutorTest {
arrayList2.add("userName1");
ArrayList arrayList3 = new ArrayList<>();
arrayList3.add("userStatus1");
- paramters.put(1, arrayList0);
- paramters.put(2, arrayList1);
- paramters.put(3, arrayList2);
- paramters.put(4, arrayList3);
+ parameters.put(1, arrayList0);
+ parameters.put(2, arrayList1);
+ parameters.put(3, arrayList2);
+ parameters.put(4, arrayList3);
PreparedStatementProxy psp = (PreparedStatementProxy)
this.statementProxy;
- when(psp.getParameters()).thenReturn(paramters);
+ when(psp.getParameters()).thenReturn(parameters);
List<List<Object>> rows = new ArrayList<>();
rows.add(Arrays.asList("?", "?", "?"));
@@ -186,7 +186,7 @@ public class DmInsertExecutorTest {
}
private void mockParametersPkWithAuto() {
- Map<Integer, ArrayList<Object>> paramters = new HashMap<>(4);
+ Map<Integer, ArrayList<Object>> parameters = new HashMap<>(4);
ArrayList arrayList0 = new ArrayList<>();
arrayList0.add(Null.get());
ArrayList arrayList1 = new ArrayList<>();
@@ -195,12 +195,12 @@ public class DmInsertExecutorTest {
arrayList2.add("userName1");
ArrayList arrayList3 = new ArrayList<>();
arrayList3.add("userStatus1");
- paramters.put(1, arrayList0);
- paramters.put(2, arrayList1);
- paramters.put(3, arrayList2);
- paramters.put(4, arrayList3);
+ parameters.put(1, arrayList0);
+ parameters.put(2, arrayList1);
+ parameters.put(3, arrayList2);
+ parameters.put(4, arrayList3);
PreparedStatementProxy psp = (PreparedStatementProxy)
this.statementProxy;
- when(psp.getParameters()).thenReturn(paramters);
+ when(psp.getParameters()).thenReturn(parameters);
List<List<Object>> rows = new ArrayList<>();
rows.add(Arrays.asList("?", "?", "?", "?"));
diff --git
a/rm-datasource/src/test/java/org/apache/seata/rm/datasource/exec/KingbaseInsertExecutorTest.java
b/rm-datasource/src/test/java/org/apache/seata/rm/datasource/exec/KingbaseInsertExecutorTest.java
index bdc190b4bc..455e5b7e7d 100644
---
a/rm-datasource/src/test/java/org/apache/seata/rm/datasource/exec/KingbaseInsertExecutorTest.java
+++
b/rm-datasource/src/test/java/org/apache/seata/rm/datasource/exec/KingbaseInsertExecutorTest.java
@@ -360,7 +360,7 @@ public class KingbaseInsertExecutorTest {
private SqlSequenceExpr mockParametersPkWithSeq() {
SqlSequenceExpr expr = new SqlSequenceExpr("seq", "nextval");
- Map<Integer, ArrayList<Object>> paramters = new HashMap(4);
+ Map<Integer, ArrayList<Object>> parameters = new HashMap(4);
ArrayList arrayList0 = new ArrayList<>();
arrayList0.add(expr);
ArrayList arrayList1 = new ArrayList<>();
@@ -369,12 +369,12 @@ public class KingbaseInsertExecutorTest {
arrayList2.add("userName1");
ArrayList arrayList3 = new ArrayList<>();
arrayList3.add("userStatus1");
- paramters.put(1, arrayList0);
- paramters.put(2, arrayList1);
- paramters.put(3, arrayList2);
- paramters.put(4, arrayList3);
+ parameters.put(1, arrayList0);
+ parameters.put(2, arrayList1);
+ parameters.put(3, arrayList2);
+ parameters.put(4, arrayList3);
PreparedStatementProxy psp = (PreparedStatementProxy)
this.statementProxy;
- when(psp.getParameters()).thenReturn(paramters);
+ when(psp.getParameters()).thenReturn(parameters);
List<List<Object>> rows = new ArrayList<>();
rows.add(Arrays.asList("?", "?", "?"));
@@ -385,7 +385,7 @@ public class KingbaseInsertExecutorTest {
private SqlSequenceExpr mockParametersMultiPkWithSeq() {
SqlSequenceExpr expr = new SqlSequenceExpr("seq", "nextval");
- Map<Integer, ArrayList<Object>> paramters = new HashMap(4);
+ Map<Integer, ArrayList<Object>> parameters = new HashMap(4);
ArrayList arrayList0 = new ArrayList<>();
arrayList0.add(expr);
ArrayList arrayList1 = new ArrayList<>();
@@ -394,12 +394,12 @@ public class KingbaseInsertExecutorTest {
arrayList2.add("userName1");
ArrayList arrayList3 = new ArrayList<>();
arrayList3.add("userStatus1");
- paramters.put(1, arrayList0);
- paramters.put(2, arrayList1);
- paramters.put(3, arrayList2);
- paramters.put(4, arrayList3);
+ parameters.put(1, arrayList0);
+ parameters.put(2, arrayList1);
+ parameters.put(3, arrayList2);
+ parameters.put(4, arrayList3);
PreparedStatementProxy psp = (PreparedStatementProxy)
this.statementProxy;
- when(psp.getParameters()).thenReturn(paramters);
+ when(psp.getParameters()).thenReturn(parameters);
List<List<Object>> rows = new ArrayList<>();
rows.add(Arrays.asList("?", "?"));
@@ -409,7 +409,7 @@ public class KingbaseInsertExecutorTest {
}
private void mockParametersPkWithAuto() {
- Map<Integer, ArrayList<Object>> paramters = new HashMap<>(4);
+ Map<Integer, ArrayList<Object>> parameters = new HashMap<>(4);
ArrayList arrayList0 = new ArrayList<>();
arrayList0.add(Null.get());
ArrayList arrayList1 = new ArrayList<>();
@@ -418,12 +418,12 @@ public class KingbaseInsertExecutorTest {
arrayList2.add("userName1");
ArrayList arrayList3 = new ArrayList<>();
arrayList3.add("userStatus1");
- paramters.put(1, arrayList0);
- paramters.put(2, arrayList1);
- paramters.put(3, arrayList2);
- paramters.put(4, arrayList3);
+ parameters.put(1, arrayList0);
+ parameters.put(2, arrayList1);
+ parameters.put(3, arrayList2);
+ parameters.put(4, arrayList3);
PreparedStatementProxy psp = (PreparedStatementProxy)
this.statementProxy;
- when(psp.getParameters()).thenReturn(paramters);
+ when(psp.getParameters()).thenReturn(parameters);
List<List<Object>> rows = new ArrayList<>();
rows.add(Arrays.asList("?", "?", "?", "?"));
@@ -431,7 +431,7 @@ public class KingbaseInsertExecutorTest {
}
private void mockParametersMultiPkWithAuto() {
- Map<Integer, ArrayList<Object>> paramters = new HashMap<>(4);
+ Map<Integer, ArrayList<Object>> parameters = new HashMap<>(4);
ArrayList arrayList0 = new ArrayList<>();
arrayList0.add(Null.get());
ArrayList arrayList1 = new ArrayList<>();
@@ -440,12 +440,12 @@ public class KingbaseInsertExecutorTest {
arrayList2.add("userName1");
ArrayList arrayList3 = new ArrayList<>();
arrayList3.add("userStatus1");
- paramters.put(1, arrayList0);
- paramters.put(2, arrayList1);
- paramters.put(3, arrayList2);
- paramters.put(4, arrayList3);
+ parameters.put(1, arrayList0);
+ parameters.put(2, arrayList1);
+ parameters.put(3, arrayList2);
+ parameters.put(4, arrayList3);
PreparedStatementProxy psp = (PreparedStatementProxy)
this.statementProxy;
- when(psp.getParameters()).thenReturn(paramters);
+ when(psp.getParameters()).thenReturn(parameters);
List<List<Object>> rows = new ArrayList<>();
rows.add(Arrays.asList("?", "?", "?", "?"));
diff --git
a/rm-datasource/src/test/java/org/apache/seata/rm/datasource/exec/MySQLInsertExecutorTest.java
b/rm-datasource/src/test/java/org/apache/seata/rm/datasource/exec/MySQLInsertExecutorTest.java
index a49906716a..512cdb2923 100644
---
a/rm-datasource/src/test/java/org/apache/seata/rm/datasource/exec/MySQLInsertExecutorTest.java
+++
b/rm-datasource/src/test/java/org/apache/seata/rm/datasource/exec/MySQLInsertExecutorTest.java
@@ -836,7 +836,7 @@ public class MySQLInsertExecutorTest {
}
private void mockParameters() {
- Map<Integer, ArrayList<Object>> paramters = new HashMap<>(4);
+ Map<Integer, ArrayList<Object>> parameters = new HashMap<>(4);
ArrayList arrayList0 = new ArrayList<>();
arrayList0.add(PK_VALUE);
ArrayList arrayList1 = new ArrayList<>();
@@ -845,12 +845,12 @@ public class MySQLInsertExecutorTest {
arrayList2.add("userName1");
ArrayList arrayList3 = new ArrayList<>();
arrayList3.add("userStatus1");
- paramters.put(1, arrayList0);
- paramters.put(2, arrayList1);
- paramters.put(3, arrayList2);
- paramters.put(4, arrayList3);
+ parameters.put(1, arrayList0);
+ parameters.put(2, arrayList1);
+ parameters.put(3, arrayList2);
+ parameters.put(4, arrayList3);
PreparedStatementProxy psp = (PreparedStatementProxy)
this.statementProxy;
- when(psp.getParameters()).thenReturn(paramters);
+ when(psp.getParameters()).thenReturn(parameters);
}
private void mockParametersPkWithNull() {
@@ -872,12 +872,12 @@ public class MySQLInsertExecutorTest {
}
private void mockParametersOfOnePk() {
- Map<Integer, ArrayList<Object>> paramters = new HashMap<>(4);
+ Map<Integer, ArrayList<Object>> parameters = new HashMap<>(4);
ArrayList arrayList1 = new ArrayList<>();
arrayList1.add(PK_VALUE);
- paramters.put(1, arrayList1);
+ parameters.put(1, arrayList1);
PreparedStatementProxy psp = (PreparedStatementProxy)
this.statementProxy;
- when(psp.getParameters()).thenReturn(paramters);
+ when(psp.getParameters()).thenReturn(parameters);
}
private void mockInsertRows() {
diff --git
a/rm-datasource/src/test/java/org/apache/seata/rm/datasource/exec/MySQLInsertOnDuplicateUpdateExecutorTest.java
b/rm-datasource/src/test/java/org/apache/seata/rm/datasource/exec/MySQLInsertOnDuplicateUpdateExecutorTest.java
index 5c1a1e7d5d..b18044beef 100644
---
a/rm-datasource/src/test/java/org/apache/seata/rm/datasource/exec/MySQLInsertOnDuplicateUpdateExecutorTest.java
+++
b/rm-datasource/src/test/java/org/apache/seata/rm/datasource/exec/MySQLInsertOnDuplicateUpdateExecutorTest.java
@@ -204,7 +204,7 @@ public class MySQLInsertOnDuplicateUpdateExecutorTest {
* {1=[100], 2=[userId1], 3=[userName1], 4=[userStatus1], 5=[101],
6=[userId2], 7=[userName2], 8=[userStatus2]}
*/
protected void mockParameters() {
- Map<Integer, ArrayList<Object>> paramters = new HashMap<>(4);
+ Map<Integer, ArrayList<Object>> parameters = new HashMap<>(4);
ArrayList arrayList10 = new ArrayList<>();
arrayList10.add(PK_VALUE);
ArrayList arrayList11 = new ArrayList<>();
@@ -213,10 +213,10 @@ public class MySQLInsertOnDuplicateUpdateExecutorTest {
arrayList12.add("userName1");
ArrayList arrayList13 = new ArrayList<>();
arrayList13.add("userStatus1");
- paramters.put(1, arrayList10);
- paramters.put(2, arrayList11);
- paramters.put(3, arrayList12);
- paramters.put(4, arrayList13);
+ parameters.put(1, arrayList10);
+ parameters.put(2, arrayList11);
+ parameters.put(3, arrayList12);
+ parameters.put(4, arrayList13);
ArrayList arrayList20 = new ArrayList<>();
arrayList20.add(PK_VALUE + 1);
ArrayList arrayList21 = new ArrayList<>();
@@ -225,12 +225,12 @@ public class MySQLInsertOnDuplicateUpdateExecutorTest {
arrayList22.add("userName2");
ArrayList arrayList23 = new ArrayList<>();
arrayList23.add("userStatus2");
- paramters.put(5, arrayList20);
- paramters.put(6, arrayList21);
- paramters.put(7, arrayList22);
- paramters.put(8, arrayList23);
+ parameters.put(5, arrayList20);
+ parameters.put(6, arrayList21);
+ parameters.put(7, arrayList22);
+ parameters.put(8, arrayList23);
PreparedStatementProxy psp = (PreparedStatementProxy)
this.statementProxy;
- when(psp.getParameters()).thenReturn(paramters);
+ when(psp.getParameters()).thenReturn(parameters);
}
/**
@@ -238,27 +238,27 @@ public class MySQLInsertOnDuplicateUpdateExecutorTest {
* {1=[100], 2=[userId1], 3=[userName1], 4=[101], 5=[userId2],
6=[userName2]}
*/
protected void mockImageParameterMap_contain_constant() {
- Map<Integer, ArrayList<Object>> paramters = new HashMap<>(4);
+ Map<Integer, ArrayList<Object>> parameters = new HashMap<>(4);
ArrayList arrayList10 = new ArrayList<>();
arrayList10.add(PK_VALUE);
ArrayList arrayList11 = new ArrayList<>();
arrayList11.add("userId1");
ArrayList arrayList12 = new ArrayList<>();
arrayList12.add("userName1");
- paramters.put(1, arrayList10);
- paramters.put(2, arrayList11);
- paramters.put(3, arrayList12);
+ parameters.put(1, arrayList10);
+ parameters.put(2, arrayList11);
+ parameters.put(3, arrayList12);
ArrayList arrayList20 = new ArrayList<>();
arrayList20.add(PK_VALUE + 1);
ArrayList arrayList21 = new ArrayList<>();
arrayList21.add("userId2");
ArrayList arrayList22 = new ArrayList<>();
arrayList22.add("userName2");
- paramters.put(4, arrayList20);
- paramters.put(5, arrayList21);
- paramters.put(6, arrayList22);
+ parameters.put(4, arrayList20);
+ parameters.put(5, arrayList21);
+ parameters.put(6, arrayList22);
PreparedStatementProxy psp = (PreparedStatementProxy)
this.statementProxy;
- when(psp.getParameters()).thenReturn(paramters);
+ when(psp.getParameters()).thenReturn(parameters);
}
protected Map<String, ArrayList<Object>> mockImageParameterMap() {
@@ -283,12 +283,12 @@ public class MySQLInsertOnDuplicateUpdateExecutorTest {
}
protected void mockParametersOfOnePk() {
- Map<Integer, ArrayList<Object>> paramters = new HashMap<>(4);
+ Map<Integer, ArrayList<Object>> parameters = new HashMap<>(4);
ArrayList arrayList1 = new ArrayList<>();
arrayList1.add(PK_VALUE);
- paramters.put(1, arrayList1);
+ parameters.put(1, arrayList1);
PreparedStatementProxy psp = (PreparedStatementProxy)
this.statementProxy;
- when(psp.getParameters()).thenReturn(paramters);
+ when(psp.getParameters()).thenReturn(parameters);
}
protected void mockInsertRows() {
diff --git
a/rm-datasource/src/test/java/org/apache/seata/rm/datasource/exec/OceanBaseInsertExecutorTest.java
b/rm-datasource/src/test/java/org/apache/seata/rm/datasource/exec/OceanBaseInsertExecutorTest.java
index 7591dbd8ea..a9c811a807 100644
---
a/rm-datasource/src/test/java/org/apache/seata/rm/datasource/exec/OceanBaseInsertExecutorTest.java
+++
b/rm-datasource/src/test/java/org/apache/seata/rm/datasource/exec/OceanBaseInsertExecutorTest.java
@@ -360,7 +360,7 @@ public class OceanBaseInsertExecutorTest {
private SqlSequenceExpr mockParametersPkWithSeq() {
SqlSequenceExpr expr = new SqlSequenceExpr("seq", "nextval");
- Map<Integer, ArrayList<Object>> paramters = new HashMap(4);
+ Map<Integer, ArrayList<Object>> parameters = new HashMap(4);
ArrayList arrayList0 = new ArrayList<>();
arrayList0.add(expr);
ArrayList arrayList1 = new ArrayList<>();
@@ -369,12 +369,12 @@ public class OceanBaseInsertExecutorTest {
arrayList2.add("userName1");
ArrayList arrayList3 = new ArrayList<>();
arrayList3.add("userStatus1");
- paramters.put(1, arrayList0);
- paramters.put(2, arrayList1);
- paramters.put(3, arrayList2);
- paramters.put(4, arrayList3);
+ parameters.put(1, arrayList0);
+ parameters.put(2, arrayList1);
+ parameters.put(3, arrayList2);
+ parameters.put(4, arrayList3);
PreparedStatementProxy psp = (PreparedStatementProxy)
this.statementProxy;
- when(psp.getParameters()).thenReturn(paramters);
+ when(psp.getParameters()).thenReturn(parameters);
List<List<Object>> rows = new ArrayList<>();
rows.add(Arrays.asList("?", "?", "?"));
@@ -385,7 +385,7 @@ public class OceanBaseInsertExecutorTest {
private SqlSequenceExpr mockParametersMultiPkWithSeq() {
SqlSequenceExpr expr = new SqlSequenceExpr("seq", "nextval");
- Map<Integer, ArrayList<Object>> paramters = new HashMap(4);
+ Map<Integer, ArrayList<Object>> parameters = new HashMap(4);
ArrayList arrayList0 = new ArrayList<>();
arrayList0.add(expr);
ArrayList arrayList1 = new ArrayList<>();
@@ -394,12 +394,12 @@ public class OceanBaseInsertExecutorTest {
arrayList2.add("userName1");
ArrayList arrayList3 = new ArrayList<>();
arrayList3.add("userStatus1");
- paramters.put(1, arrayList0);
- paramters.put(2, arrayList1);
- paramters.put(3, arrayList2);
- paramters.put(4, arrayList3);
+ parameters.put(1, arrayList0);
+ parameters.put(2, arrayList1);
+ parameters.put(3, arrayList2);
+ parameters.put(4, arrayList3);
PreparedStatementProxy psp = (PreparedStatementProxy)
this.statementProxy;
- when(psp.getParameters()).thenReturn(paramters);
+ when(psp.getParameters()).thenReturn(parameters);
List<List<Object>> rows = new ArrayList<>();
rows.add(Arrays.asList("?", "?"));
@@ -409,7 +409,7 @@ public class OceanBaseInsertExecutorTest {
}
private void mockParametersPkWithAuto() {
- Map<Integer, ArrayList<Object>> paramters = new HashMap<>(4);
+ Map<Integer, ArrayList<Object>> parameters = new HashMap<>(4);
ArrayList arrayList0 = new ArrayList<>();
arrayList0.add(Null.get());
ArrayList arrayList1 = new ArrayList<>();
@@ -418,12 +418,12 @@ public class OceanBaseInsertExecutorTest {
arrayList2.add("userName1");
ArrayList arrayList3 = new ArrayList<>();
arrayList3.add("userStatus1");
- paramters.put(1, arrayList0);
- paramters.put(2, arrayList1);
- paramters.put(3, arrayList2);
- paramters.put(4, arrayList3);
+ parameters.put(1, arrayList0);
+ parameters.put(2, arrayList1);
+ parameters.put(3, arrayList2);
+ parameters.put(4, arrayList3);
PreparedStatementProxy psp = (PreparedStatementProxy)
this.statementProxy;
- when(psp.getParameters()).thenReturn(paramters);
+ when(psp.getParameters()).thenReturn(parameters);
List<List<Object>> rows = new ArrayList<>();
rows.add(Arrays.asList("?", "?", "?", "?"));
@@ -431,7 +431,7 @@ public class OceanBaseInsertExecutorTest {
}
private void mockParametersMultiPkWithAuto() {
- Map<Integer, ArrayList<Object>> paramters = new HashMap<>(4);
+ Map<Integer, ArrayList<Object>> parameters = new HashMap<>(4);
ArrayList arrayList0 = new ArrayList<>();
arrayList0.add(Null.get());
ArrayList arrayList1 = new ArrayList<>();
@@ -440,12 +440,12 @@ public class OceanBaseInsertExecutorTest {
arrayList2.add("userName1");
ArrayList arrayList3 = new ArrayList<>();
arrayList3.add("userStatus1");
- paramters.put(1, arrayList0);
- paramters.put(2, arrayList1);
- paramters.put(3, arrayList2);
- paramters.put(4, arrayList3);
+ parameters.put(1, arrayList0);
+ parameters.put(2, arrayList1);
+ parameters.put(3, arrayList2);
+ parameters.put(4, arrayList3);
PreparedStatementProxy psp = (PreparedStatementProxy)
this.statementProxy;
- when(psp.getParameters()).thenReturn(paramters);
+ when(psp.getParameters()).thenReturn(parameters);
List<List<Object>> rows = new ArrayList<>();
rows.add(Arrays.asList("?", "?", "?", "?"));
diff --git
a/rm-datasource/src/test/java/org/apache/seata/rm/datasource/exec/OracleInsertExecutorTest.java
b/rm-datasource/src/test/java/org/apache/seata/rm/datasource/exec/OracleInsertExecutorTest.java
index 51d34893f4..554ba3f966 100644
---
a/rm-datasource/src/test/java/org/apache/seata/rm/datasource/exec/OracleInsertExecutorTest.java
+++
b/rm-datasource/src/test/java/org/apache/seata/rm/datasource/exec/OracleInsertExecutorTest.java
@@ -358,7 +358,7 @@ public class OracleInsertExecutorTest {
private SqlSequenceExpr mockParametersPkWithSeq() {
SqlSequenceExpr expr = new SqlSequenceExpr("seq", "nextval");
- Map<Integer, ArrayList<Object>> paramters = new HashMap(4);
+ Map<Integer, ArrayList<Object>> parameters = new HashMap(4);
ArrayList arrayList0 = new ArrayList<>();
arrayList0.add(expr);
ArrayList arrayList1 = new ArrayList<>();
@@ -367,12 +367,12 @@ public class OracleInsertExecutorTest {
arrayList2.add("userName1");
ArrayList arrayList3 = new ArrayList<>();
arrayList3.add("userStatus1");
- paramters.put(1, arrayList0);
- paramters.put(2, arrayList1);
- paramters.put(3, arrayList2);
- paramters.put(4, arrayList3);
+ parameters.put(1, arrayList0);
+ parameters.put(2, arrayList1);
+ parameters.put(3, arrayList2);
+ parameters.put(4, arrayList3);
PreparedStatementProxy psp = (PreparedStatementProxy)
this.statementProxy;
- when(psp.getParameters()).thenReturn(paramters);
+ when(psp.getParameters()).thenReturn(parameters);
List<List<Object>> rows = new ArrayList<>();
rows.add(Arrays.asList("?", "?", "?"));
@@ -383,7 +383,7 @@ public class OracleInsertExecutorTest {
private SqlSequenceExpr mockParametersMultiPkWithSeq() {
SqlSequenceExpr expr = new SqlSequenceExpr("seq", "nextval");
- Map<Integer, ArrayList<Object>> paramters = new HashMap(4);
+ Map<Integer, ArrayList<Object>> parameters = new HashMap(4);
ArrayList arrayList0 = new ArrayList<>();
arrayList0.add(expr);
ArrayList arrayList1 = new ArrayList<>();
@@ -392,12 +392,12 @@ public class OracleInsertExecutorTest {
arrayList2.add("userName1");
ArrayList arrayList3 = new ArrayList<>();
arrayList3.add("userStatus1");
- paramters.put(1, arrayList0);
- paramters.put(2, arrayList1);
- paramters.put(3, arrayList2);
- paramters.put(4, arrayList3);
+ parameters.put(1, arrayList0);
+ parameters.put(2, arrayList1);
+ parameters.put(3, arrayList2);
+ parameters.put(4, arrayList3);
PreparedStatementProxy psp = (PreparedStatementProxy)
this.statementProxy;
- when(psp.getParameters()).thenReturn(paramters);
+ when(psp.getParameters()).thenReturn(parameters);
List<List<Object>> rows = new ArrayList<>();
rows.add(Arrays.asList("?", "?"));
@@ -407,7 +407,7 @@ public class OracleInsertExecutorTest {
}
private void mockParametersPkWithAuto() {
- Map<Integer, ArrayList<Object>> paramters = new HashMap<>(4);
+ Map<Integer, ArrayList<Object>> parameters = new HashMap<>(4);
ArrayList arrayList0 = new ArrayList<>();
arrayList0.add(Null.get());
ArrayList arrayList1 = new ArrayList<>();
@@ -416,12 +416,12 @@ public class OracleInsertExecutorTest {
arrayList2.add("userName1");
ArrayList arrayList3 = new ArrayList<>();
arrayList3.add("userStatus1");
- paramters.put(1, arrayList0);
- paramters.put(2, arrayList1);
- paramters.put(3, arrayList2);
- paramters.put(4, arrayList3);
+ parameters.put(1, arrayList0);
+ parameters.put(2, arrayList1);
+ parameters.put(3, arrayList2);
+ parameters.put(4, arrayList3);
PreparedStatementProxy psp = (PreparedStatementProxy)
this.statementProxy;
- when(psp.getParameters()).thenReturn(paramters);
+ when(psp.getParameters()).thenReturn(parameters);
List<List<Object>> rows = new ArrayList<>();
rows.add(Arrays.asList("?", "?", "?", "?"));
@@ -429,7 +429,7 @@ public class OracleInsertExecutorTest {
}
private void mockParametersMultiPkWithAuto() {
- Map<Integer, ArrayList<Object>> paramters = new HashMap<>(4);
+ Map<Integer, ArrayList<Object>> parameters = new HashMap<>(4);
ArrayList arrayList0 = new ArrayList<>();
arrayList0.add(Null.get());
ArrayList arrayList1 = new ArrayList<>();
@@ -438,12 +438,12 @@ public class OracleInsertExecutorTest {
arrayList2.add("userName1");
ArrayList arrayList3 = new ArrayList<>();
arrayList3.add("userStatus1");
- paramters.put(1, arrayList0);
- paramters.put(2, arrayList1);
- paramters.put(3, arrayList2);
- paramters.put(4, arrayList3);
+ parameters.put(1, arrayList0);
+ parameters.put(2, arrayList1);
+ parameters.put(3, arrayList2);
+ parameters.put(4, arrayList3);
PreparedStatementProxy psp = (PreparedStatementProxy)
this.statementProxy;
- when(psp.getParameters()).thenReturn(paramters);
+ when(psp.getParameters()).thenReturn(parameters);
List<List<Object>> rows = new ArrayList<>();
rows.add(Arrays.asList("?", "?", "?", "?"));
diff --git
a/rm-datasource/src/test/java/org/apache/seata/rm/datasource/exec/OscarInsertExecutorTest.java
b/rm-datasource/src/test/java/org/apache/seata/rm/datasource/exec/OscarInsertExecutorTest.java
index f12f72c34c..b1d82be9f4 100644
---
a/rm-datasource/src/test/java/org/apache/seata/rm/datasource/exec/OscarInsertExecutorTest.java
+++
b/rm-datasource/src/test/java/org/apache/seata/rm/datasource/exec/OscarInsertExecutorTest.java
@@ -353,7 +353,7 @@ public class OscarInsertExecutorTest {
private SqlSequenceExpr mockParametersPkWithSeq() {
SqlSequenceExpr expr = new SqlSequenceExpr("seq", "nextval");
- Map<Integer, ArrayList<Object>> paramters = new HashMap(4);
+ Map<Integer, ArrayList<Object>> parameters = new HashMap(4);
ArrayList arrayList0 = new ArrayList<>();
arrayList0.add(expr);
ArrayList arrayList1 = new ArrayList<>();
@@ -362,12 +362,12 @@ public class OscarInsertExecutorTest {
arrayList2.add("userName1");
ArrayList arrayList3 = new ArrayList<>();
arrayList3.add("userStatus1");
- paramters.put(1, arrayList0);
- paramters.put(2, arrayList1);
- paramters.put(3, arrayList2);
- paramters.put(4, arrayList3);
+ parameters.put(1, arrayList0);
+ parameters.put(2, arrayList1);
+ parameters.put(3, arrayList2);
+ parameters.put(4, arrayList3);
PreparedStatementProxy psp = (PreparedStatementProxy)
this.statementProxy;
- when(psp.getParameters()).thenReturn(paramters);
+ when(psp.getParameters()).thenReturn(parameters);
List<List<Object>> rows = new ArrayList<>();
rows.add(Arrays.asList("?", "?", "?"));
@@ -378,7 +378,7 @@ public class OscarInsertExecutorTest {
private SqlSequenceExpr mockParametersMultiPkWithSeq() {
SqlSequenceExpr expr = new SqlSequenceExpr("seq", "nextval");
- Map<Integer, ArrayList<Object>> paramters = new HashMap(4);
+ Map<Integer, ArrayList<Object>> parameters = new HashMap(4);
ArrayList arrayList0 = new ArrayList<>();
arrayList0.add(expr);
ArrayList arrayList1 = new ArrayList<>();
@@ -387,12 +387,12 @@ public class OscarInsertExecutorTest {
arrayList2.add("userName1");
ArrayList arrayList3 = new ArrayList<>();
arrayList3.add("userStatus1");
- paramters.put(1, arrayList0);
- paramters.put(2, arrayList1);
- paramters.put(3, arrayList2);
- paramters.put(4, arrayList3);
+ parameters.put(1, arrayList0);
+ parameters.put(2, arrayList1);
+ parameters.put(3, arrayList2);
+ parameters.put(4, arrayList3);
PreparedStatementProxy psp = (PreparedStatementProxy)
this.statementProxy;
- when(psp.getParameters()).thenReturn(paramters);
+ when(psp.getParameters()).thenReturn(parameters);
List<List<Object>> rows = new ArrayList<>();
rows.add(Arrays.asList("?", "?"));
@@ -402,7 +402,7 @@ public class OscarInsertExecutorTest {
}
private void mockParametersPkWithAuto() {
- Map<Integer, ArrayList<Object>> paramters = new HashMap<>(4);
+ Map<Integer, ArrayList<Object>> parameters = new HashMap<>(4);
ArrayList arrayList0 = new ArrayList<>();
arrayList0.add(Null.get());
ArrayList arrayList1 = new ArrayList<>();
@@ -411,12 +411,12 @@ public class OscarInsertExecutorTest {
arrayList2.add("userName1");
ArrayList arrayList3 = new ArrayList<>();
arrayList3.add("userStatus1");
- paramters.put(1, arrayList0);
- paramters.put(2, arrayList1);
- paramters.put(3, arrayList2);
- paramters.put(4, arrayList3);
+ parameters.put(1, arrayList0);
+ parameters.put(2, arrayList1);
+ parameters.put(3, arrayList2);
+ parameters.put(4, arrayList3);
PreparedStatementProxy psp = (PreparedStatementProxy)
this.statementProxy;
- when(psp.getParameters()).thenReturn(paramters);
+ when(psp.getParameters()).thenReturn(parameters);
List<List<Object>> rows = new ArrayList<>();
rows.add(Arrays.asList("?", "?", "?", "?"));
@@ -424,7 +424,7 @@ public class OscarInsertExecutorTest {
}
private void mockParametersMultiPkWithAuto() {
- Map<Integer, ArrayList<Object>> paramters = new HashMap<>(4);
+ Map<Integer, ArrayList<Object>> parameters = new HashMap<>(4);
ArrayList arrayList0 = new ArrayList<>();
arrayList0.add(Null.get());
ArrayList arrayList1 = new ArrayList<>();
@@ -433,12 +433,12 @@ public class OscarInsertExecutorTest {
arrayList2.add("userName1");
ArrayList arrayList3 = new ArrayList<>();
arrayList3.add("userStatus1");
- paramters.put(1, arrayList0);
- paramters.put(2, arrayList1);
- paramters.put(3, arrayList2);
- paramters.put(4, arrayList3);
+ parameters.put(1, arrayList0);
+ parameters.put(2, arrayList1);
+ parameters.put(3, arrayList2);
+ parameters.put(4, arrayList3);
PreparedStatementProxy psp = (PreparedStatementProxy)
this.statementProxy;
- when(psp.getParameters()).thenReturn(paramters);
+ when(psp.getParameters()).thenReturn(parameters);
List<List<Object>> rows = new ArrayList<>();
rows.add(Arrays.asList("?", "?", "?", "?"));
diff --git
a/seata-spring-autoconfigure/seata-spring-autoconfigure-core/src/main/java/org/apache/seata/spring/boot/autoconfigure/StarterConstants.java
b/seata-spring-autoconfigure/seata-spring-autoconfigure-core/src/main/java/org/apache/seata/spring/boot/autoconfigure/StarterConstants.java
index 2ecab2d10b..64f9c395f9 100644
---
a/seata-spring-autoconfigure/seata-spring-autoconfigure-core/src/main/java/org/apache/seata/spring/boot/autoconfigure/StarterConstants.java
+++
b/seata-spring-autoconfigure/seata-spring-autoconfigure-core/src/main/java/org/apache/seata/spring/boot/autoconfigure/StarterConstants.java
@@ -45,7 +45,7 @@ public interface StarterConstants {
String SAGA_ASYNC_THREAD_POOL_PREFIX = SAGA_STATE_MACHINE_PREFIX +
".async-thread-pool";
String REGISTRY_PREFIX = SEATA_PREFIX + ".registry";
- String REGISTRY_PREFERED_NETWORKS = ConfigurationKeys.FILE_ROOT_REGISTRY +
".preferredNetworks";
+ String REGISTRY_PREFERRED_NETWORKS = ConfigurationKeys.FILE_ROOT_REGISTRY
+ ".preferredNetworks";
String REGISTRY_NACOS_PREFIX = REGISTRY_PREFIX + ".nacos";
String REGISTRY_RAFT_PREFIX = REGISTRY_PREFIX + ".raft";
String REGISTRY_EUREKA_PREFIX = REGISTRY_PREFIX + ".eureka";
diff --git a/server/src/main/java/org/apache/seata/server/Server.java
b/server/src/main/java/org/apache/seata/server/Server.java
index 3880bcc926..44667d0309 100644
--- a/server/src/main/java/org/apache/seata/server/Server.java
+++ b/server/src/main/java/org/apache/seata/server/Server.java
@@ -43,7 +43,7 @@ import java.util.concurrent.TimeUnit;
import static
org.apache.seata.common.Constants.OBJECT_KEY_SPRING_APPLICATION_CONTEXT;
import static
org.apache.seata.spring.boot.autoconfigure.StarterConstants.REGEX_SPLIT_CHAR;
-import static
org.apache.seata.spring.boot.autoconfigure.StarterConstants.REGISTRY_PREFERED_NETWORKS;
+import static
org.apache.seata.spring.boot.autoconfigure.StarterConstants.REGISTRY_PREFERRED_NETWORKS;
/**
* The type Server.
@@ -81,7 +81,7 @@ public class Server {
if (NetUtil.isValidIp(parameterParser.getHost(), false)) {
XID.setIpAddress(parameterParser.getHost());
} else {
- String preferredNetworks =
ConfigurationFactory.getInstance().getConfig(REGISTRY_PREFERED_NETWORKS);
+ String preferredNetworks =
ConfigurationFactory.getInstance().getConfig(REGISTRY_PREFERRED_NETWORKS);
if (StringUtils.isNotBlank(preferredNetworks)) {
XID.setIpAddress(NetUtil.getLocalIp(preferredNetworks.split(REGEX_SPLIT_CHAR)));
} else {
diff --git a/server/src/main/java/org/apache/seata/server/ServerRunner.java
b/server/src/main/java/org/apache/seata/server/ServerRunner.java
index 9d49a16042..94545399a5 100644
--- a/server/src/main/java/org/apache/seata/server/ServerRunner.java
+++ b/server/src/main/java/org/apache/seata/server/ServerRunner.java
@@ -80,14 +80,14 @@ public class ServerRunner implements CommandLineRunner,
DisposableBean, Applicat
public void destroy() throws Exception {
if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("destoryAll starting");
+ LOGGER.debug("destroyAll starting");
}
for (Disposable disposable : DISPOSABLE_LIST) {
disposable.destroy();
}
if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("destoryAll finish");
+ LOGGER.debug("destroyAll finish");
}
DISPOSABLE_LIST.clear();
}
diff --git
a/test/src/test/java/org/apache/seata/saga/engine/db/StateMachineDBTests.java
b/test/src/test/java/org/apache/seata/saga/engine/db/StateMachineDBTests.java
index 619f8468f0..e1c9295c2a 100644
---
a/test/src/test/java/org/apache/seata/saga/engine/db/StateMachineDBTests.java
+++
b/test/src/test/java/org/apache/seata/saga/engine/db/StateMachineDBTests.java
@@ -81,7 +81,7 @@ public class StateMachineDBTests extends AbstractServerTest {
}
@AfterAll
- public static void destory() throws InterruptedException {
+ public static void destroy() throws InterruptedException {
stopSeataServer();
TmNettyRemotingClient.getInstance().destroy();
RmNettyRemotingClient.getInstance().destroy();
diff --git
a/tm/src/test/java/org/apache/seata/tm/DefaultTransactionManagerTest.java
b/tm/src/test/java/org/apache/seata/tm/DefaultTransactionManagerTest.java
index 69e06a7373..f641ab45de 100644
--- a/tm/src/test/java/org/apache/seata/tm/DefaultTransactionManagerTest.java
+++ b/tm/src/test/java/org/apache/seata/tm/DefaultTransactionManagerTest.java
@@ -70,7 +70,7 @@ public class DefaultTransactionManagerTest {
}
@AfterEach
- void destory() {
+ void destroy() {
tmNettyRemotingClientMockedStatic.close();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
