Skip to content

Commit c04c3b6

Browse files
jeffgbutlerjeffgbutler
authored
Merge pull request #862 from jeffgbutler/remove-deprecations
Cleanup Various Sonar Warnings
2 parents d819167 + d401491 commit c04c3b6

22 files changed

+303
-1849
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/emptywhere/EmptyWhereTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ void testJoinThreeConditions() {
170170
String lName = "Flintstone";
171171

172172
QueryExpressionDSL<SelectModel>.QueryExpressionWhereBuilder builder = select(id, firstName, PersonDynamicSqlSupport.lastName, orderDate)
173-
.from(person).join(order).on(person.id, equalTo(order.personId))
173+
.from(person).join(order).on(person.id, isEqualTo(order.personId))
174174
.where(id, isEqualTo(3));
175175

176176
builder.and(firstName, isEqualTo(fName).filter(Objects::nonNull));
@@ -192,7 +192,7 @@ void testJoinThreeConditions() {
192192
@MethodSource("joinWhereVariations")
193193
void testJoinVariations(Variation variation) {
194194
QueryExpressionDSL<SelectModel>.QueryExpressionWhereBuilder builder = select(id, firstName, PersonDynamicSqlSupport.lastName, orderDate)
195-
.from(person).join(order).on(person.id, equalTo(order.personId))
195+
.from(person).join(order).on(person.id, isEqualTo(order.personId))
196196
.where();
197197

198198
builder.and(firstName, isEqualTo(variation.firstName).filter(Objects::nonNull));

‎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/groupby/GroupByTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ void testGroupByAfterJoin() {
126126
CommonSelectMapper mapper = session.getMapper(CommonSelectMapper.class);
127127

128128
SelectStatementProvider selectStatement = select(lastName, streetAddress, count().as("count"))
129-
.from(person, "p").join(address, "a").on(person.addressId, equalTo(address.id))
129+
.from(person, "p").join(address, "a").on(person.addressId, isEqualTo(address.id))
130130
.groupBy(lastName, streetAddress)
131131
.build()
132132
.render(RenderingStrategies.MYBATIS3);
@@ -156,10 +156,10 @@ void testUnionAfterJoin() {
156156
CommonSelectMapper mapper = session.getMapper(CommonSelectMapper.class);
157157

158158
SelectStatementProvider selectStatement = select(lastName, firstName, streetAddress)
159-
.from(person, "p").join(address, "a").on(person.addressId, equalTo(address.id))
159+
.from(person, "p").join(address, "a").on(person.addressId, isEqualTo(address.id))
160160
.union()
161161
.select(person2.lastName, person2.firstName, streetAddress)
162-
.from(person2, "p").join(address, "a").on(person2.addressId, equalTo(address.id))
162+
.from(person2, "p").join(address, "a").on(person2.addressId, isEqualTo(address.id))
163163
.orderBy(lastName, firstName)
164164
.build()
165165
.render(RenderingStrategies.MYBATIS3);
@@ -192,10 +192,10 @@ void testUnionAllAfterJoin() {
192192
CommonSelectMapper mapper = session.getMapper(CommonSelectMapper.class);
193193

194194
SelectStatementProvider selectStatement = select(lastName, firstName, streetAddress)
195-
.from(person, "p").join(address, "a").on(person.addressId, equalTo(address.id))
195+
.from(person, "p").join(address, "a").on(person.addressId, isEqualTo(address.id))
196196
.unionAll()
197197
.select(person2.lastName, person2.firstName, streetAddress)
198-
.from(person2, "p").join(address, "a").on(person2.addressId, equalTo(address.id))
198+
.from(person2, "p").join(address, "a").on(person2.addressId, isEqualTo(address.id))
199199
.orderBy(lastName, firstName)
200200
.build()
201201
.render(RenderingStrategies.MYBATIS3);

0 commit comments

Comments
 (0)