Skip to content

Commit 5013d44

Browse files
jeffgbutlerjeffgbutler
committed
Convert to record
1 parent 80e939a commit 5013d44

File tree

4 files changed

+30
-65
lines changed

4 files changed

+30
-65
lines changed

Diff for: ‎src/test/java/examples/joins/JoinMapperTest.java

+16-16
Original file line numberDiff line numberDiff line change
@@ -98,15 +98,15 @@ void testSingleTableJoin1() {
9898
assertThat(orderMaster.getId()).isEqualTo(1);
9999
assertThat(orderMaster.getDetails()).hasSize(2);
100100
OrderDetail orderDetail = orderMaster.getDetails().get(0);
101-
assertThat(orderDetail.getLineNumber()).isEqualTo(1);
101+
assertThat(orderDetail.lineNumber()).isEqualTo(1);
102102
orderDetail = orderMaster.getDetails().get(1);
103-
assertThat(orderDetail.getLineNumber()).isEqualTo(2);
103+
assertThat(orderDetail.lineNumber()).isEqualTo(2);
104104

105105
orderMaster = rows.get(1);
106106
assertThat(orderMaster.getId()).isEqualTo(2);
107107
assertThat(orderMaster.getDetails()).hasSize(1);
108108
orderDetail = orderMaster.getDetails().get(0);
109-
assertThat(orderDetail.getLineNumber()).isEqualTo(1);
109+
assertThat(orderDetail.lineNumber()).isEqualTo(1);
110110
}
111111
}
112112

@@ -132,15 +132,15 @@ void testSingleTableJoin2() {
132132
assertThat(orderMaster.getId()).isEqualTo(1);
133133
assertThat(orderMaster.getDetails()).hasSize(2);
134134
OrderDetail orderDetail = orderMaster.getDetails().get(0);
135-
assertThat(orderDetail.getLineNumber()).isEqualTo(1);
135+
assertThat(orderDetail.lineNumber()).isEqualTo(1);
136136
orderDetail = orderMaster.getDetails().get(1);
137-
assertThat(orderDetail.getLineNumber()).isEqualTo(2);
137+
assertThat(orderDetail.lineNumber()).isEqualTo(2);
138138

139139
orderMaster = rows.get(1);
140140
assertThat(orderMaster.getId()).isEqualTo(2);
141141
assertThat(orderMaster.getDetails()).hasSize(1);
142142
orderDetail = orderMaster.getDetails().get(0);
143-
assertThat(orderDetail.getLineNumber()).isEqualTo(1);
143+
assertThat(orderDetail.lineNumber()).isEqualTo(1);
144144
}
145145
}
146146

@@ -255,9 +255,9 @@ void testMultipleTableJoinWithWhereClause() {
255255
assertThat(orderMaster.getId()).isEqualTo(2);
256256
assertThat(orderMaster.getDetails()).hasSize(2);
257257
OrderDetail orderDetail = orderMaster.getDetails().get(0);
258-
assertThat(orderDetail.getLineNumber()).isEqualTo(1);
258+
assertThat(orderDetail.lineNumber()).isEqualTo(1);
259259
orderDetail = orderMaster.getDetails().get(1);
260-
assertThat(orderDetail.getLineNumber()).isEqualTo(2);
260+
assertThat(orderDetail.lineNumber()).isEqualTo(2);
261261
}
262262
}
263263

@@ -286,9 +286,9 @@ void testMultipleTableJoinWithApplyWhere() {
286286
assertThat(orderMaster.getId()).isEqualTo(2);
287287
assertThat(orderMaster.getDetails()).hasSize(2);
288288
OrderDetail orderDetail = orderMaster.getDetails().get(0);
289-
assertThat(orderDetail.getLineNumber()).isEqualTo(1);
289+
assertThat(orderDetail.lineNumber()).isEqualTo(1);
290290
orderDetail = orderMaster.getDetails().get(1);
291-
assertThat(orderDetail.getLineNumber()).isEqualTo(2);
291+
assertThat(orderDetail.lineNumber()).isEqualTo(2);
292292
}
293293
}
294294

@@ -317,7 +317,7 @@ void testMultipleTableJoinWithComplexWhereClause() {
317317
assertThat(orderMaster.getId()).isEqualTo(2);
318318
assertThat(orderMaster.getDetails()).hasSize(1);
319319
OrderDetail orderDetail = orderMaster.getDetails().get(0);
320-
assertThat(orderDetail.getLineNumber()).isEqualTo(2);
320+
assertThat(orderDetail.lineNumber()).isEqualTo(2);
321321
}
322322
}
323323

@@ -346,15 +346,15 @@ void testMultipleTableJoinWithOrderBy() {
346346
assertThat(orderMaster.getId()).isEqualTo(1);
347347
assertThat(orderMaster.getDetails()).hasSize(1);
348348
OrderDetail orderDetail = orderMaster.getDetails().get(0);
349-
assertThat(orderDetail.getLineNumber()).isEqualTo(1);
349+
assertThat(orderDetail.lineNumber()).isEqualTo(1);
350350

351351
orderMaster = rows.get(1);
352352
assertThat(orderMaster.getId()).isEqualTo(2);
353353
assertThat(orderMaster.getDetails()).hasSize(2);
354354
orderDetail = orderMaster.getDetails().get(0);
355-
assertThat(orderDetail.getLineNumber()).isEqualTo(1);
355+
assertThat(orderDetail.lineNumber()).isEqualTo(1);
356356
orderDetail = orderMaster.getDetails().get(1);
357-
assertThat(orderDetail.getLineNumber()).isEqualTo(2);
357+
assertThat(orderDetail.lineNumber()).isEqualTo(2);
358358
}
359359
}
360360

@@ -385,9 +385,9 @@ void testMultipleTableJoinNoAliasWithOrderBy() {
385385
assertThat(orderMaster.getId()).isEqualTo(2);
386386
assertThat(orderMaster.getDetails()).hasSize(2);
387387
OrderDetail orderDetail = orderMaster.getDetails().get(0);
388-
assertThat(orderDetail.getLineNumber()).isEqualTo(1);
388+
assertThat(orderDetail.lineNumber()).isEqualTo(1);
389389
orderDetail = orderMaster.getDetails().get(1);
390-
assertThat(orderDetail.getLineNumber()).isEqualTo(2);
390+
assertThat(orderDetail.lineNumber()).isEqualTo(2);
391391
}
392392
}
393393

Diff for: ‎src/test/java/examples/joins/JoinSubQueryTest.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -97,15 +97,15 @@ void testSingleTableJoin1() {
9797
assertThat(orderMaster.getId()).isEqualTo(1);
9898
assertThat(orderMaster.getDetails()).hasSize(2);
9999
OrderDetail orderDetail = orderMaster.getDetails().get(0);
100-
assertThat(orderDetail.getLineNumber()).isEqualTo(1);
100+
assertThat(orderDetail.lineNumber()).isEqualTo(1);
101101
orderDetail = orderMaster.getDetails().get(1);
102-
assertThat(orderDetail.getLineNumber()).isEqualTo(2);
102+
assertThat(orderDetail.lineNumber()).isEqualTo(2);
103103

104104
orderMaster = rows.get(1);
105105
assertThat(orderMaster.getId()).isEqualTo(2);
106106
assertThat(orderMaster.getDetails()).hasSize(1);
107107
orderDetail = orderMaster.getDetails().get(0);
108-
assertThat(orderDetail.getLineNumber()).isEqualTo(1);
108+
assertThat(orderDetail.lineNumber()).isEqualTo(1);
109109
}
110110
}
111111

@@ -143,9 +143,9 @@ void testMultipleTableJoinWithWhereClause() {
143143
assertThat(orderMaster.getId()).isEqualTo(2);
144144
assertThat(orderMaster.getDetails()).hasSize(2);
145145
OrderDetail orderDetail = orderMaster.getDetails().get(0);
146-
assertThat(orderDetail.getLineNumber()).isEqualTo(1);
146+
assertThat(orderDetail.lineNumber()).isEqualTo(1);
147147
orderDetail = orderMaster.getDetails().get(1);
148-
assertThat(orderDetail.getLineNumber()).isEqualTo(2);
148+
assertThat(orderDetail.lineNumber()).isEqualTo(2);
149149
}
150150
}
151151

@@ -180,10 +180,10 @@ void testMultipleTableJoinWithSelectStar() {
180180
assertThat(orderMaster.getDetails()).hasSize(2);
181181

182182
OrderDetail orderDetail = orderMaster.getDetails().get(0);
183-
assertThat(orderDetail.getLineNumber()).isEqualTo(1);
183+
assertThat(orderDetail.lineNumber()).isEqualTo(1);
184184

185185
orderDetail = orderMaster.getDetails().get(1);
186-
assertThat(orderDetail.getLineNumber()).isEqualTo(2);
186+
assertThat(orderDetail.lineNumber()).isEqualTo(2);
187187
}
188188
}
189189

Diff for: ‎src/test/java/examples/joins/OrderDetail.java

+1-38
Original file line numberDiff line numberDiff line change
@@ -15,41 +15,4 @@
1515
*/
1616
package examples.joins;
1717

18-
public class OrderDetail {
19-
private Integer orderId;
20-
private Integer lineNumber;
21-
private String description;
22-
private Integer quantity;
23-
24-
public Integer getOrderId() {
25-
return orderId;
26-
}
27-
28-
public void setOrderId(Integer orderId) {
29-
this.orderId = orderId;
30-
}
31-
32-
public Integer getLineNumber() {
33-
return lineNumber;
34-
}
35-
36-
public void setLineNumber(Integer lineNumber) {
37-
this.lineNumber = lineNumber;
38-
}
39-
40-
public String getDescription() {
41-
return description;
42-
}
43-
44-
public void setDescription(String description) {
45-
this.description = description;
46-
}
47-
48-
public Integer getQuantity() {
49-
return quantity;
50-
}
51-
52-
public void setQuantity(Integer quantity) {
53-
this.quantity = quantity;
54-
}
55-
}
18+
public record OrderDetail (Integer orderId, Integer lineNumber, String description, Integer quantity) {}

Diff for: ‎src/test/resources/examples/joins/JoinMapper.xml

+6-4
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,12 @@
2222
<id column="order_id" jdbcType="INTEGER" property="id" />
2323
<result column="order_date" jdbcType="DATE" property="orderDate" />
2424
<collection property="details" ofType="examples.joins.OrderDetail">
25-
<id column="order_id" jdbcType="INTEGER" property="orderId"/>
26-
<id column="line_number" jdbcType="INTEGER" property="lineNumber"/>
27-
<result column="description" jdbcType="VARCHAR" property="description"/>
28-
<result column="quantity" jdbcType="INTEGER" property="quantity"/>
25+
<constructor>
26+
<idArg column="order_id" jdbcType="INTEGER" javaType="Integer" />
27+
<idArg column="line_number" jdbcType="INTEGER" javaType="Integer" />
28+
<arg column="description" jdbcType="VARCHAR" javaType="String" />
29+
<arg column="quantity" jdbcType="INTEGER" javaType="Integer" />
30+
</constructor>
2931
</collection>
3032
</resultMap>
3133
</mapper>

0 commit comments

Comments
 (0)