Skip to content

Commit dbcd5af

Browse files
slievrlyslievrly
authored
optimize: fix some spell errors in code and comments (#7710)
1 parent 0fb5e8f commit dbcd5af

File tree

15 files changed

+232
-232
lines changed

15 files changed

+232
-232
lines changed

‎common/src/main/java/org/apache/seata/common/util/NetAddressValidatorUtil.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ public static boolean isIPv6MixedAddress(final String input) {
117117

118118
/**
119119
* Check if <code>input</code> is an IPv4 address mapped into a IPv6 address. These are
120-
* starting with "::ffff:" followed by the IPv4 address in a dot-seperated notation.
120+
* starting with "::ffff:" followed by the IPv4 address in a dot-separated notation.
121121
* The format is '::ffff:d.d.d.d'
122122
*
123123
* @param input ip-address to check

‎core/src/test/java/org/apache/seata/core/rpc/netty/NettyRemotingServerTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public void testDestroyChannel() {
8181
}
8282

8383
@Test
84-
public void destory() {
84+
public void destroy() {
8585
nettyRemotingServer.destroy();
8686
Assertions.assertTrue(nettyRemotingServer != null);
8787
}

‎rm-datasource/src/test/java/org/apache/seata/rm/datasource/exec/BatchInsertExecutorTest.java‎

Lines changed: 85 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ public void testGetPkValues_NotSupportYetException() {
189189
}
190190

191191
private void mockParameters_with_null_and_insertRows_with_placeholder_null() {
192-
Map<Integer, ArrayList<Object>> paramters = new HashMap<>();
192+
Map<Integer, ArrayList<Object>> parameters = new HashMap<>();
193193
ArrayList arrayList0 = new ArrayList<>();
194194
arrayList0.add("userId1");
195195
ArrayList arrayList1 = new ArrayList<>();
@@ -200,12 +200,12 @@ private void mockParameters_with_null_and_insertRows_with_placeholder_null() {
200200
arrayList3.add("userId2");
201201
ArrayList arrayList4 = new ArrayList<>();
202202
arrayList4.add("userName2");
203-
paramters.put(1, arrayList0);
204-
paramters.put(2, arrayList1);
205-
paramters.put(3, arrayList2);
206-
paramters.put(4, arrayList3);
207-
paramters.put(5, arrayList4);
208-
when(statementProxy.getParameters()).thenReturn(paramters);
203+
parameters.put(1, arrayList0);
204+
parameters.put(2, arrayList1);
205+
parameters.put(3, arrayList2);
206+
parameters.put(4, arrayList3);
207+
parameters.put(5, arrayList4);
208+
when(statementProxy.getParameters()).thenReturn(parameters);
209209

210210
List<List<Object>> insertRows = new ArrayList<>();
211211
insertRows.add(Arrays.asList("?", "?", "?", "userStatus1"));
@@ -214,7 +214,7 @@ private void mockParameters_with_null_and_insertRows_with_placeholder_null() {
214214
}
215215

216216
private void mockParameters_with_number_and_insertRows_with_placeholde_null() {
217-
Map<Integer, ArrayList<Object>> paramters = new HashMap<>();
217+
Map<Integer, ArrayList<Object>> parameters = new HashMap<>();
218218
ArrayList arrayList0 = new ArrayList<>();
219219
arrayList0.add("userId1");
220220
ArrayList arrayList1 = new ArrayList<>();
@@ -225,12 +225,12 @@ private void mockParameters_with_number_and_insertRows_with_placeholde_null() {
225225
arrayList3.add("userId2");
226226
ArrayList arrayList4 = new ArrayList<>();
227227
arrayList4.add("userName2");
228-
paramters.put(1, arrayList0);
229-
paramters.put(2, arrayList1);
230-
paramters.put(3, arrayList2);
231-
paramters.put(4, arrayList3);
232-
paramters.put(5, arrayList4);
233-
when(statementProxy.getParameters()).thenReturn(paramters);
228+
parameters.put(1, arrayList0);
229+
parameters.put(2, arrayList1);
230+
parameters.put(3, arrayList2);
231+
parameters.put(4, arrayList3);
232+
parameters.put(5, arrayList4);
233+
when(statementProxy.getParameters()).thenReturn(parameters);
234234

235235
List<List<Object>> insertRows = new ArrayList<>();
236236
insertRows.add(Arrays.asList("?", "?", "?", "userStatus1"));
@@ -250,7 +250,7 @@ private List<String> mockInsertColumns() {
250250

251251
private void mockParameters() {
252252
int PK_INDEX = 1;
253-
Map<Integer, ArrayList<Object>> paramters = new HashMap<>();
253+
Map<Integer, ArrayList<Object>> parameters = new HashMap<>();
254254
ArrayList arrayList0 = new ArrayList<>();
255255
arrayList0.add("userId1");
256256
arrayList0.add("userId2");
@@ -276,22 +276,22 @@ private void mockParameters() {
276276
arrayList3.add("userStatus4");
277277
arrayList3.add("userStatus5");
278278

279-
paramters.put(1, arrayList0);
280-
paramters.put(2, arrayList1);
281-
paramters.put(3, arrayList2);
282-
paramters.put(4, arrayList3);
279+
parameters.put(1, arrayList0);
280+
parameters.put(2, arrayList1);
281+
parameters.put(3, arrayList2);
282+
parameters.put(4, arrayList3);
283283

284284
List<List<Object>> insertRows = new ArrayList<>();
285285
insertRows.add(Arrays.asList("?", "?", "?", "?"));
286286

287-
when(statementProxy.getParameters()).thenReturn(paramters);
287+
when(statementProxy.getParameters()).thenReturn(parameters);
288288
when(sqlInsertRecognizer.getInsertRows(pkIndexMap.values())).thenReturn(insertRows);
289-
when(statementProxy.getParamsByIndex(PK_INDEX)).thenReturn(paramters.get(PK_INDEX + 1));
289+
when(statementProxy.getParamsByIndex(PK_INDEX)).thenReturn(parameters.get(PK_INDEX + 1));
290290
}
291291

292292
private void mockParametersAllRefOfMysql() {
293293

294-
Map<Integer, ArrayList<Object>> paramters = new HashMap(20);
294+
Map<Integer, ArrayList<Object>> parameters = new HashMap(20);
295295
ArrayList arrayList1 = new ArrayList<>();
296296
arrayList1.add("userId1");
297297
ArrayList arrayList2 = new ArrayList<>();
@@ -337,40 +337,40 @@ private void mockParametersAllRefOfMysql() {
337337
ArrayList arrayList20 = new ArrayList<>();
338338
arrayList20.add("userStatus5");
339339

340-
paramters.put(1, arrayList1);
341-
paramters.put(2, arrayList2);
342-
paramters.put(3, arrayList3);
343-
paramters.put(4, arrayList4);
344-
paramters.put(5, arrayList5);
345-
paramters.put(6, arrayList6);
346-
paramters.put(7, arrayList7);
347-
paramters.put(8, arrayList8);
348-
paramters.put(9, arrayList9);
349-
paramters.put(10, arrayList10);
350-
paramters.put(11, arrayList11);
351-
paramters.put(12, arrayList12);
352-
paramters.put(13, arrayList13);
353-
paramters.put(14, arrayList14);
354-
paramters.put(15, arrayList15);
355-
paramters.put(16, arrayList16);
356-
paramters.put(17, arrayList17);
357-
paramters.put(18, arrayList18);
358-
paramters.put(19, arrayList19);
359-
paramters.put(20, arrayList20);
340+
parameters.put(1, arrayList1);
341+
parameters.put(2, arrayList2);
342+
parameters.put(3, arrayList3);
343+
parameters.put(4, arrayList4);
344+
parameters.put(5, arrayList5);
345+
parameters.put(6, arrayList6);
346+
parameters.put(7, arrayList7);
347+
parameters.put(8, arrayList8);
348+
parameters.put(9, arrayList9);
349+
parameters.put(10, arrayList10);
350+
parameters.put(11, arrayList11);
351+
parameters.put(12, arrayList12);
352+
parameters.put(13, arrayList13);
353+
parameters.put(14, arrayList14);
354+
parameters.put(15, arrayList15);
355+
parameters.put(16, arrayList16);
356+
parameters.put(17, arrayList17);
357+
parameters.put(18, arrayList18);
358+
parameters.put(19, arrayList19);
359+
parameters.put(20, arrayList20);
360360
List<List<Object>> insertRows = new ArrayList<>();
361361
insertRows.add(Arrays.asList("?", "?", "?", "?"));
362362
insertRows.add(Arrays.asList("?", "?", "?", "?"));
363363
insertRows.add(Arrays.asList("?", "?", "?", "?"));
364364
insertRows.add(Arrays.asList("?", "?", "?", "?"));
365365
insertRows.add(Arrays.asList("?", "?", "?", "?"));
366-
when(statementProxy.getParameters()).thenReturn(paramters);
366+
when(statementProxy.getParameters()).thenReturn(parameters);
367367
when(sqlInsertRecognizer.getInsertRows(pkIndexMap.values())).thenReturn(insertRows);
368-
when(statementProxy.getParameters()).thenReturn(paramters);
368+
when(statementProxy.getParameters()).thenReturn(parameters);
369369
}
370370

371371
private void mockParametersWithPkRefOfMysql() {
372372

373-
Map<Integer, ArrayList<Object>> paramters = new HashMap<>(10);
373+
Map<Integer, ArrayList<Object>> parameters = new HashMap<>(10);
374374
ArrayList arrayList1 = new ArrayList<>();
375375
arrayList1.add("userId1");
376376
ArrayList arrayList2 = new ArrayList<>();
@@ -391,30 +391,30 @@ private void mockParametersWithPkRefOfMysql() {
391391
arrayList9.add("userId5");
392392
ArrayList arrayList10 = new ArrayList<>();
393393
arrayList10.add(100000005);
394-
paramters.put(1, arrayList1);
395-
paramters.put(2, arrayList2);
396-
paramters.put(3, arrayList3);
397-
paramters.put(4, arrayList4);
398-
paramters.put(5, arrayList5);
399-
paramters.put(6, arrayList6);
400-
paramters.put(7, arrayList7);
401-
paramters.put(8, arrayList8);
402-
paramters.put(9, arrayList9);
403-
paramters.put(10, arrayList10);
394+
parameters.put(1, arrayList1);
395+
parameters.put(2, arrayList2);
396+
parameters.put(3, arrayList3);
397+
parameters.put(4, arrayList4);
398+
parameters.put(5, arrayList5);
399+
parameters.put(6, arrayList6);
400+
parameters.put(7, arrayList7);
401+
parameters.put(8, arrayList8);
402+
parameters.put(9, arrayList9);
403+
parameters.put(10, arrayList10);
404404
List<List<Object>> insertRows = new ArrayList<>();
405405
insertRows.add(Arrays.asList("?", "?", "1", "11"));
406406
insertRows.add(Arrays.asList("?", "?", "2", "22"));
407407
insertRows.add(Arrays.asList("?", "?", "3", "33"));
408408
insertRows.add(Arrays.asList("?", "?", "4", "44"));
409409
insertRows.add(Arrays.asList("?", "?", "5", "55"));
410-
when(statementProxy.getParameters()).thenReturn(paramters);
410+
when(statementProxy.getParameters()).thenReturn(parameters);
411411
when(sqlInsertRecognizer.getInsertRows(pkIndexMap.values())).thenReturn(insertRows);
412-
when(statementProxy.getParameters()).thenReturn(paramters);
412+
when(statementProxy.getParameters()).thenReturn(parameters);
413413
}
414414

415415
private void mockParametersWithPkUnRefOfMysql() {
416416

417-
Map<Integer, ArrayList<Object>> paramters = new HashMap<>(10);
417+
Map<Integer, ArrayList<Object>> parameters = new HashMap<>(10);
418418
ArrayList arrayList1 = new ArrayList<>();
419419
arrayList1.add("userId1");
420420
ArrayList arrayList2 = new ArrayList<>();
@@ -435,29 +435,29 @@ private void mockParametersWithPkUnRefOfMysql() {
435435
arrayList9.add("userId5");
436436
ArrayList arrayList10 = new ArrayList<>();
437437
arrayList10.add(100000005);
438-
paramters.put(1, arrayList1);
439-
paramters.put(2, arrayList2);
440-
paramters.put(3, arrayList3);
441-
paramters.put(4, arrayList4);
442-
paramters.put(5, arrayList5);
443-
paramters.put(6, arrayList6);
444-
paramters.put(7, arrayList7);
445-
paramters.put(8, arrayList8);
446-
paramters.put(9, arrayList9);
447-
paramters.put(10, arrayList10);
438+
parameters.put(1, arrayList1);
439+
parameters.put(2, arrayList2);
440+
parameters.put(3, arrayList3);
441+
parameters.put(4, arrayList4);
442+
parameters.put(5, arrayList5);
443+
parameters.put(6, arrayList6);
444+
parameters.put(7, arrayList7);
445+
parameters.put(8, arrayList8);
446+
parameters.put(9, arrayList9);
447+
parameters.put(10, arrayList10);
448448
List<List<Object>> insertRows = new ArrayList<>();
449449
insertRows.add(Arrays.asList("?", 100000001, "?", "1"));
450450
insertRows.add(Arrays.asList("?", 100000002, "?", "2"));
451451
insertRows.add(Arrays.asList("?", 100000003, "?", "3"));
452452
insertRows.add(Arrays.asList("?", 100000004, "?", "4"));
453453
insertRows.add(Arrays.asList("?", 100000005, "?", "5"));
454-
when(statementProxy.getParameters()).thenReturn(paramters);
454+
when(statementProxy.getParameters()).thenReturn(parameters);
455455
when(sqlInsertRecognizer.getInsertRows(pkIndexMap.values())).thenReturn(insertRows);
456456
}
457457

458458
private void mockParametersWithAllRefOfJDBC() {
459459
int PK_INDEX = 1;
460-
Map<Integer, ArrayList<Object>> paramters = new HashMap<>(4);
460+
Map<Integer, ArrayList<Object>> parameters = new HashMap<>(4);
461461
ArrayList arrayList0 = new ArrayList<>();
462462
arrayList0.add("userId1");
463463
arrayList0.add("userId2");
@@ -482,21 +482,21 @@ private void mockParametersWithAllRefOfJDBC() {
482482
arrayList3.add("userStatus3");
483483
arrayList3.add("userStatus4");
484484
arrayList3.add("userStatus5");
485-
paramters.put(1, arrayList0);
486-
paramters.put(2, arrayList1);
487-
paramters.put(3, arrayList2);
488-
paramters.put(4, arrayList3);
485+
parameters.put(1, arrayList0);
486+
parameters.put(2, arrayList1);
487+
parameters.put(3, arrayList2);
488+
parameters.put(4, arrayList3);
489489

490490
List<List<Object>> insertRows = new ArrayList<>();
491491
insertRows.add(Arrays.asList("?", "?", "?", "?"));
492-
when(statementProxy.getParameters()).thenReturn(paramters);
493-
when(statementProxy.getParamsByIndex(PK_INDEX)).thenReturn(paramters.get(PK_INDEX + 1));
492+
when(statementProxy.getParameters()).thenReturn(parameters);
493+
when(statementProxy.getParamsByIndex(PK_INDEX)).thenReturn(parameters.get(PK_INDEX + 1));
494494
doReturn(insertRows).when(sqlInsertRecognizer).getInsertRows(pkIndexMap.values());
495495
}
496496

497497
private void mockParametersWithPkRefOfJDBC() {
498498
int PK_INDEX = 1;
499-
Map<Integer, ArrayList<Object>> paramters = new HashMap<>(2);
499+
Map<Integer, ArrayList<Object>> parameters = new HashMap<>(2);
500500
ArrayList arrayList0 = new ArrayList<>();
501501
arrayList0.add("userId1");
502502
arrayList0.add("userId2");
@@ -509,28 +509,28 @@ private void mockParametersWithPkRefOfJDBC() {
509509
arrayList1.add(PK_VALUES.get(2));
510510
arrayList1.add(PK_VALUES.get(3));
511511
arrayList1.add(PK_VALUES.get(4));
512-
paramters.put(1, arrayList0);
513-
paramters.put(2, arrayList1);
512+
parameters.put(1, arrayList0);
513+
parameters.put(2, arrayList1);
514514

515515
List<List<Object>> insertRows = new ArrayList<>();
516516
insertRows.add(Arrays.asList("?", "?", "userName1", "userStatus1"));
517-
when(statementProxy.getParameters()).thenReturn(paramters);
517+
when(statementProxy.getParameters()).thenReturn(parameters);
518518
when(sqlInsertRecognizer.getInsertRows(pkIndexMap.values())).thenReturn(insertRows);
519-
when(statementProxy.getParamsByIndex(PK_INDEX)).thenReturn(paramters.get(PK_INDEX + 1));
519+
when(statementProxy.getParamsByIndex(PK_INDEX)).thenReturn(parameters.get(PK_INDEX + 1));
520520
}
521521

522522
private void mockParametersWithPkUnRefOfJDBC(int pkId) {
523-
Map<Integer, ArrayList<Object>> paramters = new HashMap<>(2);
523+
Map<Integer, ArrayList<Object>> parameters = new HashMap<>(2);
524524
ArrayList arrayList0 = new ArrayList<>();
525525
arrayList0.add("userId1");
526526
ArrayList arrayList1 = new ArrayList<>();
527527
arrayList1.add("userName1");
528-
paramters.put(1, arrayList0);
529-
paramters.put(2, arrayList1);
528+
parameters.put(1, arrayList0);
529+
parameters.put(2, arrayList1);
530530

531531
List<List<Object>> insertRows = new ArrayList<>();
532532
insertRows.add(Arrays.asList("?", pkId, "?", "userStatus"));
533-
when(statementProxy.getParameters()).thenReturn(paramters);
533+
when(statementProxy.getParameters()).thenReturn(parameters);
534534
when(sqlInsertRecognizer.getInsertRows(pkIndexMap.values())).thenReturn(insertRows);
535535
}
536536
}

‎rm-datasource/src/test/java/org/apache/seata/rm/datasource/exec/DmInsertExecutorTest.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ private List<String> mockInsertColumns() {
162162

163163
private SqlSequenceExpr mockParametersPkWithSeq() {
164164
SqlSequenceExpr expr = new SqlSequenceExpr("seq", "nextval");
165-
Map<Integer, ArrayList<Object>> paramters = new HashMap(4);
165+
Map<Integer, ArrayList<Object>> parameters = new HashMap(4);
166166
ArrayList arrayList0 = new ArrayList<>();
167167
arrayList0.add(expr);
168168
ArrayList arrayList1 = new ArrayList<>();
@@ -171,12 +171,12 @@ private SqlSequenceExpr mockParametersPkWithSeq() {
171171
arrayList2.add("userName1");
172172
ArrayList arrayList3 = new ArrayList<>();
173173
arrayList3.add("userStatus1");
174-
paramters.put(1, arrayList0);
175-
paramters.put(2, arrayList1);
176-
paramters.put(3, arrayList2);
177-
paramters.put(4, arrayList3);
174+
parameters.put(1, arrayList0);
175+
parameters.put(2, arrayList1);
176+
parameters.put(3, arrayList2);
177+
parameters.put(4, arrayList3);
178178
PreparedStatementProxy psp = (PreparedStatementProxy) this.statementProxy;
179-
when(psp.getParameters()).thenReturn(paramters);
179+
when(psp.getParameters()).thenReturn(parameters);
180180

181181
List<List<Object>> rows = new ArrayList<>();
182182
rows.add(Arrays.asList("?", "?", "?"));
@@ -186,7 +186,7 @@ private SqlSequenceExpr mockParametersPkWithSeq() {
186186
}
187187

188188
private void mockParametersPkWithAuto() {
189-
Map<Integer, ArrayList<Object>> paramters = new HashMap<>(4);
189+
Map<Integer, ArrayList<Object>> parameters = new HashMap<>(4);
190190
ArrayList arrayList0 = new ArrayList<>();
191191
arrayList0.add(Null.get());
192192
ArrayList arrayList1 = new ArrayList<>();
@@ -195,12 +195,12 @@ private void mockParametersPkWithAuto() {
195195
arrayList2.add("userName1");
196196
ArrayList arrayList3 = new ArrayList<>();
197197
arrayList3.add("userStatus1");
198-
paramters.put(1, arrayList0);
199-
paramters.put(2, arrayList1);
200-
paramters.put(3, arrayList2);
201-
paramters.put(4, arrayList3);
198+
parameters.put(1, arrayList0);
199+
parameters.put(2, arrayList1);
200+
parameters.put(3, arrayList2);
201+
parameters.put(4, arrayList3);
202202
PreparedStatementProxy psp = (PreparedStatementProxy) this.statementProxy;
203-
when(psp.getParameters()).thenReturn(paramters);
203+
when(psp.getParameters()).thenReturn(parameters);
204204

205205
List<List<Object>> rows = new ArrayList<>();
206206
rows.add(Arrays.asList("?", "?", "?", "?"));

0 commit comments

Comments
 (0)