Skip to content

Commit d401491

Browse files
jeffgbutlerjeffgbutler
committed
Various Sonar warning cleanup
1 parent 7e0c665 commit d401491

File tree

8 files changed

+46
-49
lines changed

8 files changed

+46
-49
lines changed

‎src/test/java/examples/array/StringArrayTypeHandler.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import java.sql.SQLException;
2323
import java.util.Arrays;
2424
import java.util.List;
25-
import java.util.stream.Collectors;
2625

2726
import org.apache.ibatis.type.BaseTypeHandler;
2827
import org.apache.ibatis.type.JdbcType;
@@ -59,7 +58,7 @@ private String[] extractArray(Array array) throws SQLException {
5958

6059
List<String> stringList = Arrays.stream(objArray)
6160
.map(Object::toString)
62-
.collect(Collectors.toList());
61+
.toList();
6362

6463
String[] stringArray = new String[stringList.size()];
6564
return stringList.toArray(stringArray);

‎src/test/java/examples/complexquery/GroupingTest.java‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -33,26 +33,26 @@
3333

3434
class GroupingTest {
3535
private static class Foo extends SqlTable {
36-
public SqlColumn<Integer> A = column("A");
37-
public SqlColumn<Integer> B = column("B");
38-
public SqlColumn<Integer> C = column("C");
36+
public SqlColumn<Integer> columnA = column("A");
37+
public SqlColumn<Integer> columnB = column("B");
38+
public SqlColumn<Integer> columnC = column("C");
3939

4040
public Foo() {
4141
super("Foo");
4242
}
4343
}
4444

4545
private static final Foo foo = new Foo();
46-
private static final SqlColumn<Integer> A = foo.A;
47-
private static final SqlColumn<Integer> B = foo.B;
48-
private static final SqlColumn<Integer> C = foo.C;
46+
private static final SqlColumn<Integer> columnA = foo.columnA;
47+
private static final SqlColumn<Integer> columnB = foo.columnB;
48+
private static final SqlColumn<Integer> columnC = foo.columnC;
4949

5050
@Test
5151
void testSimpleGrouping() {
52-
SelectStatementProvider selectStatement = select(A, B, C)
52+
SelectStatementProvider selectStatement = select(columnA, columnB, columnC)
5353
.from(foo)
54-
.where(A, isEqualTo(1), or(A, isEqualTo(2)))
55-
.and(B, isEqualTo(3))
54+
.where(columnA, isEqualTo(1), or(columnA, isEqualTo(2)))
55+
.and(columnB, isEqualTo(3))
5656
.build()
5757
.render(RenderingStrategies.MYBATIS3);
5858

@@ -68,14 +68,14 @@ void testSimpleGrouping() {
6868

6969
@Test
7070
void testComplexGrouping() {
71-
SelectStatementProvider selectStatement = select(A, B, C)
71+
SelectStatementProvider selectStatement = select(columnA, columnB, columnC)
7272
.from(foo)
7373
.where(
74-
group(A, isEqualTo(1), or(A, isGreaterThan(5))),
75-
and(B, isEqualTo(1)),
76-
or(A, isLessThan(0), and(B, isEqualTo(2)))
74+
group(columnA, isEqualTo(1), or(columnA, isGreaterThan(5))),
75+
and(columnB, isEqualTo(1)),
76+
or(columnA, isLessThan(0), and(columnB, isEqualTo(2)))
7777
)
78-
.and(C, isEqualTo(1))
78+
.and(columnC, isEqualTo(1))
7979
.build()
8080
.render(RenderingStrategies.MYBATIS3);
8181

@@ -94,14 +94,14 @@ void testComplexGrouping() {
9494

9595
@Test
9696
void testGroupAndExists() {
97-
SelectStatementProvider selectStatement = select(A, B, C)
97+
SelectStatementProvider selectStatement = select(columnA, columnB, columnC)
9898
.from(foo)
9999
.where(
100-
group(exists(select(foo.allColumns()).from(foo).where(A, isEqualTo(3))), and (A, isEqualTo(1)), or(A, isGreaterThan(5))),
101-
and(B, isEqualTo(1)),
102-
or(A, isLessThan(0), and(B, isEqualTo(2)))
100+
group(exists(select(foo.allColumns()).from(foo).where(columnA, isEqualTo(3))), and (columnA, isEqualTo(1)), or(columnA, isGreaterThan(5))),
101+
and(columnB, isEqualTo(1)),
102+
or(columnA, isLessThan(0), and(columnB, isEqualTo(2)))
103103
)
104-
.and(C, isEqualTo(1))
104+
.and(columnC, isEqualTo(1))
105105
.build()
106106
.render(RenderingStrategies.MYBATIS3);
107107

@@ -121,14 +121,14 @@ void testGroupAndExists() {
121121

122122
@Test
123123
void testNestedGrouping() {
124-
SelectStatementProvider selectStatement = select(A, B, C)
124+
SelectStatementProvider selectStatement = select(columnA, columnB, columnC)
125125
.from(foo)
126126
.where(
127-
group(group(A, isEqualTo(1), or(A, isGreaterThan(5))), and(A, isGreaterThan(5))),
128-
and(group(A, isEqualTo(1), or(A, isGreaterThan(5))), or(B, isEqualTo(1))),
129-
or(group(A, isEqualTo(1), or(A, isGreaterThan(5))), and(A, isLessThan(0), and(B, isEqualTo(2))))
127+
group(group(columnA, isEqualTo(1), or(columnA, isGreaterThan(5))), and(columnA, isGreaterThan(5))),
128+
and(group(columnA, isEqualTo(1), or(columnA, isGreaterThan(5))), or(columnB, isEqualTo(1))),
129+
or(group(columnA, isEqualTo(1), or(columnA, isGreaterThan(5))), and(columnA, isLessThan(0), and(columnB, isEqualTo(2))))
130130
)
131-
.and(C, isEqualTo(1))
131+
.and(columnC, isEqualTo(1))
132132
.build()
133133
.render(RenderingStrategies.MYBATIS3);
134134

@@ -152,12 +152,12 @@ void testNestedGrouping() {
152152

153153
@Test
154154
void testAndOrCriteriaGroups() {
155-
SelectStatementProvider selectStatement = select(A, B, C)
155+
SelectStatementProvider selectStatement = select(columnA, columnB, columnC)
156156
.from(foo)
157-
.where(A, isEqualTo(6))
158-
.and(C, isEqualTo(1))
159-
.and(group(A, isEqualTo(1), or(A, isGreaterThan(5))), or(B, isEqualTo(1)))
160-
.or(group(A, isEqualTo(1), or(A, isGreaterThan(5))), and(A, isLessThan(0), and(B, isEqualTo(2))))
157+
.where(columnA, isEqualTo(6))
158+
.and(columnC, isEqualTo(1))
159+
.and(group(columnA, isEqualTo(1), or(columnA, isGreaterThan(5))), or(columnB, isEqualTo(1)))
160+
.or(group(columnA, isEqualTo(1), or(columnA, isGreaterThan(5))), and(columnA, isLessThan(0), and(columnB, isEqualTo(2))))
161161
.build()
162162
.render(RenderingStrategies.MYBATIS3);
163163

‎src/test/java/examples/generated/always/mybatis/GeneratedAlwaysMapper.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ default List<GeneratedAlwaysRecord> select(SelectDSLCompleter completer) {
7676
return MyBatis3Utils.selectList(this::selectMany, selectList, generatedAlways, completer);
7777
}
7878

79-
default Optional<GeneratedAlwaysRecord> selectByPrimaryKey(Integer _id) {
80-
return selectOne(c -> c.where(id, isEqualTo(_id)));
79+
default Optional<GeneratedAlwaysRecord> selectByPrimaryKey(Integer recordId) {
80+
return selectOne(c -> c.where(id, isEqualTo(recordId)));
8181
}
8282

8383
default int insert(GeneratedAlwaysRecord row) {

‎src/test/java/examples/simple/PersonMapper.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,9 @@ default int delete(DeleteDSLCompleter completer) {
9090
return MyBatis3Utils.deleteFrom(this::delete, person, completer);
9191
}
9292

93-
default int deleteByPrimaryKey(Integer id_) {
93+
default int deleteByPrimaryKey(Integer recordId) {
9494
return delete(c ->
95-
c.where(id, isEqualTo(id_))
95+
c.where(id, isEqualTo(recordId))
9696
);
9797
}
9898

@@ -152,9 +152,9 @@ default List<PersonRecord> selectDistinct(SelectDSLCompleter completer) {
152152
return MyBatis3Utils.selectDistinct(this::selectMany, selectList, person, completer);
153153
}
154154

155-
default Optional<PersonRecord> selectByPrimaryKey(Integer id_) {
155+
default Optional<PersonRecord> selectByPrimaryKey(Integer recordId) {
156156
return selectOne(c ->
157-
c.where(id, isEqualTo(id_))
157+
c.where(id, isEqualTo(recordId))
158158
);
159159
}
160160

‎src/test/java/examples/simple/PersonWithAddressMapper.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,9 @@ default List<PersonWithAddress> select(SelectDSLCompleter completer) {
9090
return MyBatis3Utils.selectList(this::selectMany, start, completer);
9191
}
9292

93-
default Optional<PersonWithAddress> selectByPrimaryKey(Integer id_) {
93+
default Optional<PersonWithAddress> selectByPrimaryKey(Integer recordId) {
9494
return selectOne(c ->
95-
c.where(id, isEqualTo(id_))
95+
c.where(id, isEqualTo(recordId))
9696
);
9797
}
9898

‎src/test/java/examples/spring/SpringMapToRowTest.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import static org.mybatis.dynamic.sql.SqlBuilder.insertMultiple;
2525
import static org.mybatis.dynamic.sql.SqlBuilder.select;
2626

27-
import java.util.ArrayList;
2827
import java.util.List;
2928
import java.util.stream.IntStream;
3029

‎src/test/java/issues/gh324/NameTableMapper.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ default Optional<NameRecord> selectOne(SelectDSLCompleter completer) {
4949
return MyBatis3Utils.selectOne(this::selectOne, selectList, nameTable, completer);
5050
}
5151

52-
default Optional<NameRecord> selectByPrimaryKey(Integer id_) {
52+
default Optional<NameRecord> selectByPrimaryKey(Integer recordId) {
5353
return selectOne(c ->
54-
c.where(id, isEqualTo(id_))
54+
c.where(id, isEqualTo(recordId))
5555
);
5656
}
5757

‎src/test/java/org/mybatis/dynamic/sql/where/condition/FilterAndMapTest.java‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020

2121
import java.util.List;
2222
import java.util.Objects;
23-
import java.util.stream.Collectors;
2423

2524
import org.junit.jupiter.api.Test;
2625
import org.mybatis.dynamic.sql.SqlBuilder;
@@ -432,7 +431,7 @@ void testIsInRenderableMapShouldReturnMappedObject() {
432431
IsIn<String> cond = SqlBuilder.isIn("Fred", "Wilma");
433432
assertThat(cond.isEmpty()).isFalse();
434433
IsIn<String> mapped = cond.map(String::toUpperCase);
435-
List<String> mappedValues = mapped.values().collect(Collectors.toList());
434+
List<String> mappedValues = mapped.values().toList();
436435
assertThat(mappedValues).containsExactly("FRED", "WILMA");
437436
}
438437

@@ -441,31 +440,31 @@ void testIsNotInRenderableMapShouldReturnMappedObject() {
441440
IsNotIn<String> cond = SqlBuilder.isNotIn("Fred", "Wilma");
442441
assertThat(cond.isEmpty()).isFalse();
443442
IsNotIn<String> mapped = cond.map(String::toUpperCase);
444-
List<String> mappedValues = mapped.values().collect(Collectors.toList());
443+
List<String> mappedValues = mapped.values().toList();
445444
assertThat(mappedValues).containsExactly("FRED", "WILMA");
446445
}
447446

448447
@Test
449448
void testIsNotInCaseInsensitiveRenderableMapShouldReturnMappedObject() {
450449
IsNotInCaseInsensitive cond = SqlBuilder.isNotInCaseInsensitive("Fred ", "Wilma ");
451-
List<String> values = cond.values().collect(Collectors.toList());
450+
List<String> values = cond.values().toList();
452451
assertThat(values).containsExactly("FRED ", "WILMA ");
453452
assertThat(cond.isEmpty()).isFalse();
454453

455454
IsNotInCaseInsensitive mapped = cond.map(String::trim);
456-
List<String> mappedValues = mapped.values().collect(Collectors.toList());
455+
List<String> mappedValues = mapped.values().toList();
457456
assertThat(mappedValues).containsExactly("FRED", "WILMA");
458457
}
459458

460459
@Test
461460
void testIsInCaseInsensitiveRenderableMapShouldReturnMappedObject() {
462461
IsInCaseInsensitive cond = SqlBuilder.isInCaseInsensitive("Fred ", "Wilma ");
463-
List<String> values = cond.values().collect(Collectors.toList());
462+
List<String> values = cond.values().toList();
464463
assertThat(values).containsExactly("FRED ", "WILMA ");
465464
assertThat(cond.isEmpty()).isFalse();
466465

467466
IsInCaseInsensitive mapped = cond.map(String::trim);
468-
List<String> mappedValues = mapped.values().collect(Collectors.toList());
467+
List<String> mappedValues = mapped.values().toList();
469468
assertThat(mappedValues).containsExactly("FRED", "WILMA");
470469
}
471470

0 commit comments

Comments
 (0)