Skip to content

Commit 3f5b363

Browse files
committed
Convert to record
1 parent e827b57 commit 3f5b363

File tree

3 files changed

+17
-36
lines changed

3 files changed

+17
-36
lines changed

src/test/java/examples/column/comparison/ColumnComparisonMapper.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
import java.util.List;
1919

20-
import org.apache.ibatis.annotations.Result;
20+
import org.apache.ibatis.annotations.Arg;
2121
import org.apache.ibatis.annotations.SelectProvider;
2222
import org.mybatis.dynamic.sql.select.SelectDSLCompleter;
2323
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
@@ -27,8 +27,8 @@
2727
public interface ColumnComparisonMapper {
2828

2929
@SelectProvider(type=SqlProviderAdapter.class, method="select")
30-
@Result(column="number1", property="number1", id=true)
31-
@Result(column="number2", property="number2", id=true)
30+
@Arg(column="number1", javaType = int.class, id=true)
31+
@Arg(column="number2", javaType = int.class, id=true)
3232
List<ColumnComparisonRecord> selectMany(SelectStatementProvider selectStatement);
3333

3434
default List<ColumnComparisonRecord> select(SelectDSLCompleter completer) {

src/test/java/examples/column/comparison/ColumnComparisonRecord.java

+1-20
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,4 @@
1515
*/
1616
package examples.column.comparison;
1717

18-
public class ColumnComparisonRecord {
19-
private int number1;
20-
private int number2;
21-
22-
public int getNumber1() {
23-
return number1;
24-
}
25-
26-
public void setNumber1(int number1) {
27-
this.number1 = number1;
28-
}
29-
30-
public int getNumber2() {
31-
return number2;
32-
}
33-
34-
public void setNumber2(int number2) {
35-
this.number2 = number2;
36-
}
37-
}
18+
public record ColumnComparisonRecord (int number1, int number2) {}

src/test/java/examples/column/comparison/ColumnComparisonTest.java

+13-13
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ void testColumnComparisonLessThan() {
5151

5252
assertThat(selectStatement.getSelectStatement()).isEqualTo(expected);
5353
assertThat(records).hasSize(5);
54-
assertThat(records.get(0).getNumber1()).isEqualTo(1);
55-
assertThat(records.get(4).getNumber1()).isEqualTo(5);
54+
assertThat(records.get(0).number1()).isEqualTo(1);
55+
assertThat(records.get(4).number1()).isEqualTo(5);
5656
}
5757

5858
@Test
@@ -73,8 +73,8 @@ void testColumnComparisonLessThanOrEqual() {
7373

7474
assertThat(selectStatement.getSelectStatement()).isEqualTo(expected);
7575
assertThat(records).hasSize(6);
76-
assertThat(records.get(0).getNumber1()).isEqualTo(1);
77-
assertThat(records.get(5).getNumber1()).isEqualTo(6);
76+
assertThat(records.get(0).number1()).isEqualTo(1);
77+
assertThat(records.get(5).number2()).isEqualTo(6);
7878
}
7979

8080
@Test
@@ -95,8 +95,8 @@ void testColumnComparisonGreaterThan() {
9595

9696
assertThat(selectStatement.getSelectStatement()).isEqualTo(expected);
9797
assertThat(records).hasSize(5);
98-
assertThat(records.get(0).getNumber1()).isEqualTo(7);
99-
assertThat(records.get(4).getNumber1()).isEqualTo(11);
98+
assertThat(records.get(0).number1()).isEqualTo(7);
99+
assertThat(records.get(4).number1()).isEqualTo(11);
100100
}
101101

102102
@Test
@@ -117,8 +117,8 @@ void testColumnComparisonGreaterThanOrEqual() {
117117

118118
assertThat(selectStatement.getSelectStatement()).isEqualTo(expected);
119119
assertThat(records).hasSize(6);
120-
assertThat(records.get(0).getNumber1()).isEqualTo(6);
121-
assertThat(records.get(5).getNumber1()).isEqualTo(11);
120+
assertThat(records.get(0).number1()).isEqualTo(6);
121+
assertThat(records.get(5).number1()).isEqualTo(11);
122122
}
123123

124124
@Test
@@ -139,7 +139,7 @@ void testColumnComparisonEqual() {
139139

140140
assertThat(selectStatement.getSelectStatement()).isEqualTo(expected);
141141
assertThat(records).hasSize(1);
142-
assertThat(records.get(0).getNumber1()).isEqualTo(6);
142+
assertThat(records.get(0).number1()).isEqualTo(6);
143143
}
144144

145145
@Test
@@ -160,8 +160,8 @@ void testColumnComparisonNotEqual() {
160160

161161
assertThat(selectStatement.getSelectStatement()).isEqualTo(expected);
162162
assertThat(records).hasSize(10);
163-
assertThat(records.get(0).getNumber1()).isEqualTo(1);
164-
assertThat(records.get(9).getNumber1()).isEqualTo(11);
163+
assertThat(records.get(0).number1()).isEqualTo(1);
164+
assertThat(records.get(9).number1()).isEqualTo(11);
165165
}
166166

167167
@Test
@@ -172,7 +172,7 @@ void testHelperMethod() {
172172
);
173173

174174
assertThat(records).hasSize(10);
175-
assertThat(records.get(0).getNumber1()).isEqualTo(1);
176-
assertThat(records.get(9).getNumber1()).isEqualTo(11);
175+
assertThat(records.get(0).number1()).isEqualTo(1);
176+
assertThat(records.get(9).number1()).isEqualTo(11);
177177
}
178178
}

0 commit comments

Comments
 (0)