Skip to content

Commit 7e0c665

Browse files
jeffgbutlerjeffgbutler
committed
Remove many deprecated method calls
1 parent d819167 commit 7e0c665

15 files changed

+257
-1800
lines changed

‎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/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);

‎src/test/java/examples/joins/JoinMapperTest.java

Lines changed: 56 additions & 56 deletions
Large diffs are not rendered by default.

‎src/test/java/examples/joins/JoinSubQueryTest.java

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import static examples.joins.OrderLineDynamicSQLSupport.orderLine;
2121
import static examples.joins.OrderMasterDynamicSQLSupport.orderMaster;
2222
import static org.assertj.core.api.Assertions.assertThat;
23-
import static org.mybatis.dynamic.sql.SqlBuilder.equalTo;
2423
import static org.mybatis.dynamic.sql.SqlBuilder.isEqualTo;
2524
import static org.mybatis.dynamic.sql.SqlBuilder.select;
2625
import static org.mybatis.dynamic.sql.SqlBuilder.sortColumn;
@@ -82,7 +81,7 @@ void testSingleTableJoin1() {
8281
.from(orderMaster, "om")
8382
.join(select(orderDetail.orderId, orderDetail.lineNumber, orderDetail.description, orderDetail.quantity)
8483
.from(orderDetail),
85-
"od").on(orderMaster.orderId, equalTo(orderDetail.orderId.qualifiedWith("od")))
84+
"od").on(orderMaster.orderId, isEqualTo(orderDetail.orderId.qualifiedWith("od")))
8685
.build()
8786
.render(RenderingStrategies.MYBATIS3);
8887

@@ -121,11 +120,11 @@ void testMultipleTableJoinWithWhereClause() {
121120
.join(select(orderLine.orderId, orderLine.itemId, orderLine.quantity, orderLine.lineNumber)
122121
.from(orderLine),
123122
"ol")
124-
.on(orderMaster.orderId, equalTo(orderLine.orderId.qualifiedWith("ol")))
123+
.on(orderMaster.orderId, isEqualTo(orderLine.orderId.qualifiedWith("ol")))
125124
.join(select(itemMaster.itemId, itemMaster.description)
126125
.from(itemMaster),
127126
"im")
128-
.on(orderLine.itemId.qualifiedWith("ol"), equalTo(itemMaster.itemId.qualifiedWith("im")))
127+
.on(orderLine.itemId.qualifiedWith("ol"), isEqualTo(itemMaster.itemId.qualifiedWith("im")))
129128
.where(orderMaster.orderId, isEqualTo(2))
130129
.build()
131130
.render(RenderingStrategies.MYBATIS3);
@@ -158,9 +157,9 @@ void testMultipleTableJoinWithSelectStar() {
158157
SelectStatementProvider selectStatement = select(orderMaster.orderId, orderMaster.orderDate, orderLine.lineNumber, itemMaster.description, orderLine.quantity)
159158
.from(orderMaster, "om")
160159
.join(select(orderLine.allColumns()).from(orderLine), "ol")
161-
.on(orderMaster.orderId, equalTo(orderLine.orderId.qualifiedWith("ol")))
160+
.on(orderMaster.orderId, isEqualTo(orderLine.orderId.qualifiedWith("ol")))
162161
.join(select(itemMaster.allColumns()).from(itemMaster), "im")
163-
.on(orderLine.itemId.qualifiedWith("ol"), equalTo(itemMaster.itemId.qualifiedWith("im")))
162+
.on(orderLine.itemId.qualifiedWith("ol"), isEqualTo(itemMaster.itemId.qualifiedWith("im")))
164163
.where(orderMaster.orderId, isEqualTo(2))
165164
.orderBy(orderMaster.orderId)
166165
.build()
@@ -197,7 +196,7 @@ void testRightJoin() {
197196
itemMaster.itemId.qualifiedWith("im"), itemMaster.description)
198197
.from(orderLine, "ol")
199198
.rightJoin(select(itemMaster.allColumns()).from(itemMaster), "im")
200-
.on(orderLine.itemId, equalTo(itemMaster.itemId.qualifiedWith("im")))
199+
.on(orderLine.itemId, isEqualTo(itemMaster.itemId.qualifiedWith("im")))
201200
.orderBy(itemMaster.itemId)
202201
.build()
203202
.render(RenderingStrategies.MYBATIS3);
@@ -232,9 +231,9 @@ void testRightJoin2() {
232231
SelectStatementProvider selectStatement = select(orderLine.orderId, orderLine.quantity,
233232
itemMaster.itemId.qualifiedWith(("im")), itemMaster.description)
234233
.from(orderMaster, "om")
235-
.join(orderLine, "ol").on(orderMaster.orderId, equalTo(orderLine.orderId))
234+
.join(orderLine, "ol").on(orderMaster.orderId, isEqualTo(orderLine.orderId))
236235
.rightJoin(select(itemMaster.allColumns()).from(itemMaster), "im")
237-
.on(orderLine.itemId, equalTo(itemMaster.itemId.qualifiedWith("im")))
236+
.on(orderLine.itemId, isEqualTo(itemMaster.itemId.qualifiedWith("im")))
238237
.orderBy(orderLine.orderId, itemMaster.itemId)
239238
.build()
240239
.render(RenderingStrategies.MYBATIS3);
@@ -271,7 +270,7 @@ void testLeftJoin() {
271270
itemMaster.itemId.qualifiedWith("im"), itemMaster.description)
272271
.from(itemMaster, "im")
273272
.leftJoin(select(orderLine.allColumns()).from(orderLine), "ol")
274-
.on(orderLine.itemId.qualifiedWith("ol"), equalTo(itemMaster.itemId))
273+
.on(orderLine.itemId.qualifiedWith("ol"), isEqualTo(itemMaster.itemId))
275274
.orderBy(itemMaster.itemId)
276275
.build()
277276
.render(RenderingStrategies.MYBATIS3);
@@ -307,9 +306,9 @@ void testLeftJoin2() {
307306
SelectStatementProvider selectStatement = select(orderLine.orderId, orderLine.quantity,
308307
itemMaster.itemId.qualifiedWith("im"), itemMaster.description)
309308
.from(orderMaster, "om")
310-
.join(orderLine, "ol").on(orderMaster.orderId, equalTo(orderLine.orderId))
309+
.join(orderLine, "ol").on(orderMaster.orderId, isEqualTo(orderLine.orderId))
311310
.leftJoin(select(itemMaster.allColumns()).from(itemMaster), "im")
312-
.on(orderLine.itemId, equalTo(itemMaster.itemId.qualifiedWith("im")))
311+
.on(orderLine.itemId, isEqualTo(itemMaster.itemId.qualifiedWith("im")))
313312
.orderBy(orderLine.orderId, itemMaster.itemId)
314313
.build()
315314
.render(RenderingStrategies.MYBATIS3);
@@ -346,7 +345,7 @@ void testFullJoin() {
346345
orderLine.itemId.as("ol_itemid").qualifiedWith("ol"), itemMaster.itemId.as("im_itemid"), itemMaster.description)
347346
.from(itemMaster, "im")
348347
.fullJoin(select(orderLine.allColumns()).from(orderLine), "ol")
349-
.on(itemMaster.itemId, equalTo(orderLine.itemId.qualifiedWith("ol")))
348+
.on(itemMaster.itemId, isEqualTo(orderLine.itemId.qualifiedWith("ol")))
350349
.orderBy(orderLine.orderId, sortColumn("im_itemid"))
351350
.build()
352351
.render(RenderingStrategies.MYBATIS3);
@@ -389,9 +388,9 @@ void testFullJoin2() {
389388
SelectStatementProvider selectStatement = select(orderLine.orderId, orderLine.quantity,
390389
itemMaster.itemId.qualifiedWith("im"), itemMaster.description)
391390
.from(orderMaster, "om")
392-
.join(orderLine, "ol").on(orderMaster.orderId, equalTo(orderLine.orderId))
391+
.join(orderLine, "ol").on(orderMaster.orderId, isEqualTo(orderLine.orderId))
393392
.fullJoin(select(itemMaster.allColumns()).from(itemMaster), "im")
394-
.on(orderLine.itemId, equalTo(itemMaster.itemId.qualifiedWith("im")))
393+
.on(orderLine.itemId, isEqualTo(itemMaster.itemId.qualifiedWith("im")))
395394
.orderBy(orderLine.orderId, itemMaster.itemId)
396395
.build()
397396
.render(RenderingStrategies.MYBATIS3);

0 commit comments

Comments
 (0)