Skip to content

Commit d2081da

Browse files
jeffgbutlerjeffgbutler
committed
Use the common mappers where possible
1 parent 5f498fa commit d2081da

File tree

6 files changed

+19
-53
lines changed

6 files changed

+19
-53
lines changed

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,15 @@
1818
import java.util.List;
1919
import java.util.Optional;
2020

21-
import org.apache.ibatis.annotations.InsertProvider;
2221
import org.apache.ibatis.annotations.Result;
2322
import org.apache.ibatis.annotations.ResultMap;
2423
import org.apache.ibatis.annotations.Results;
2524
import org.apache.ibatis.annotations.SelectProvider;
26-
import org.mybatis.dynamic.sql.insert.render.GeneralInsertStatementProvider;
2725
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
2826
import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
27+
import org.mybatis.dynamic.sql.util.mybatis3.CommonGeneralInsertMapper;
2928

30-
public interface NamesTableMapper {
29+
public interface NamesTableMapper extends CommonGeneralInsertMapper {
3130
@SelectProvider(type=SqlProviderAdapter.class, method="select")
3231
@Results(id="NamesTableResult", value={
3332
@Result(column="id", property="id", id=true),
@@ -38,7 +37,4 @@ public interface NamesTableMapper {
3837
@SelectProvider(type = SqlProviderAdapter.class, method = "select")
3938
@ResultMap("NamesTableResult")
4039
Optional<NamesRecord> selectOne(SelectStatementProvider selectStatement);
41-
42-
@InsertProvider(type = SqlProviderAdapter.class, method = "generalInsert")
43-
int generalInsert(GeneralInsertStatementProvider insertStatement);
4440
}

‎src/test/java/examples/schema_supplier/UserMapper.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,24 +19,20 @@
1919

2020
import java.util.List;
2121

22-
import org.apache.ibatis.annotations.InsertProvider;
2322
import org.apache.ibatis.annotations.Result;
2423
import org.apache.ibatis.annotations.Results;
2524
import org.apache.ibatis.annotations.SelectProvider;
2625
import org.apache.ibatis.type.JdbcType;
2726
import org.mybatis.dynamic.sql.BasicColumn;
2827
import org.mybatis.dynamic.sql.SqlBuilder;
29-
import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
3028
import org.mybatis.dynamic.sql.render.RenderingStrategies;
3129
import org.mybatis.dynamic.sql.select.SelectDSLCompleter;
3230
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
3331
import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
32+
import org.mybatis.dynamic.sql.util.mybatis3.CommonInsertMapper;
3433
import org.mybatis.dynamic.sql.util.mybatis3.MyBatis3Utils;
3534

36-
public interface UserMapper {
37-
38-
@InsertProvider(type=SqlProviderAdapter.class, method="insert")
39-
int insert(InsertStatementProvider<User> insertStatement);
35+
public interface UserMapper extends CommonInsertMapper<User> {
4036

4137
@SelectProvider(type=SqlProviderAdapter.class, method="select")
4238
@Results(id="UserResult", value= {

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,14 @@
4444
import org.mybatis.dynamic.sql.select.SelectModel;
4545
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
4646
import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
47+
import org.mybatis.dynamic.sql.util.mybatis3.CommonCountMapper;
4748
import org.mybatis.dynamic.sql.util.mybatis3.MyBatis3Utils;
4849

4950
/**
5051
* This is a mapper that shows coding a join
5152
*/
5253
@Mapper
53-
public interface PersonWithAddressMapper {
54+
public interface PersonWithAddressMapper extends CommonCountMapper {
5455

5556
@SelectProvider(type=SqlProviderAdapter.class, method="select")
5657
@Results(id="PersonWithAddressResult", value= {
@@ -73,9 +74,6 @@ public interface PersonWithAddressMapper {
7374
@ResultMap("PersonWithAddressResult")
7475
Optional<PersonWithAddress> selectOne(SelectStatementProvider selectStatement);
7576

76-
@SelectProvider(type=SqlProviderAdapter.class, method="select")
77-
long count(SelectStatementProvider selectStatement);
78-
7977
BasicColumn[] selectList =
8078
BasicColumn.columnList(id.as("A_ID"), firstName, lastName, birthDate, employed, occupation, address.id,
8179
address.streetAddress, address.city, address.state, address.addressType);

‎src/test/java/examples/springbatch/mapper/PersonMapper.java

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,19 @@
1818
import java.util.List;
1919
import java.util.Map;
2020

21-
import org.apache.ibatis.annotations.InsertProvider;
2221
import org.apache.ibatis.annotations.Mapper;
2322
import org.apache.ibatis.annotations.Result;
2423
import org.apache.ibatis.annotations.Results;
2524
import org.apache.ibatis.annotations.SelectProvider;
26-
import org.apache.ibatis.annotations.UpdateProvider;
27-
import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
28-
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
29-
import org.mybatis.dynamic.sql.update.render.UpdateStatementProvider;
30-
import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
25+
import org.mybatis.dynamic.sql.util.mybatis3.CommonCountMapper;
26+
import org.mybatis.dynamic.sql.util.mybatis3.CommonInsertMapper;
27+
import org.mybatis.dynamic.sql.util.mybatis3.CommonUpdateMapper;
3128
import org.mybatis.dynamic.sql.util.springbatch.SpringBatchProviderAdapter;
3229

3330
import examples.springbatch.common.PersonRecord;
3431

3532
@Mapper
36-
public interface PersonMapper {
33+
public interface PersonMapper extends CommonCountMapper, CommonInsertMapper<PersonRecord>, CommonUpdateMapper {
3734

3835
@SelectProvider(type=SpringBatchProviderAdapter.class, method="select")
3936
@Results({
@@ -42,13 +39,4 @@ public interface PersonMapper {
4239
@Result(column="last_name", property="lastName")
4340
})
4441
List<PersonRecord> selectMany(Map<String, Object> parameterValues);
45-
46-
@UpdateProvider(type=SqlProviderAdapter.class, method="update")
47-
int update(UpdateStatementProvider updateStatement);
48-
49-
@SelectProvider(type=SqlProviderAdapter.class, method="select")
50-
long count(SelectStatementProvider selectStatement);
51-
52-
@InsertProvider(type=SqlProviderAdapter.class, method="insert")
53-
int insert(InsertStatementProvider<PersonRecord> insertStatement);
5442
}

‎src/test/java/examples/type_conversion/MyFilesMapper.java

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,7 @@
1515
*/
1616
package examples.type_conversion;
1717

18-
import java.util.Map;
18+
import org.mybatis.dynamic.sql.util.mybatis3.CommonGeneralInsertMapper;
19+
import org.mybatis.dynamic.sql.util.mybatis3.CommonSelectMapper;
1920

20-
import org.apache.ibatis.annotations.InsertProvider;
21-
import org.apache.ibatis.annotations.SelectProvider;
22-
import org.mybatis.dynamic.sql.insert.render.GeneralInsertStatementProvider;
23-
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
24-
import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
25-
26-
public interface MyFilesMapper {
27-
28-
@InsertProvider(type = SqlProviderAdapter.class, method = "generalInsert")
29-
int insert(GeneralInsertStatementProvider insertStatement);
30-
31-
@SelectProvider(type = SqlProviderAdapter.class, method = "select")
32-
Map<String, Object> generalSelect(SelectStatementProvider selectStatement);
33-
}
21+
public interface MyFilesMapper extends CommonGeneralInsertMapper, CommonSelectMapper { }

‎src/test/java/examples/type_conversion/TypeConversionTest.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ void testFunctionInSelect() {
8383
.build()
8484
.render(RenderingStrategies.MYBATIS3);
8585

86-
int rows = mapper.insert(insertStatement);
86+
int rows = mapper.generalInsert(insertStatement);
8787
assertThat(rows).isEqualTo(1);
8888

8989
SelectStatementProvider selectStatement = select(fileId, fileContents)
@@ -92,7 +92,7 @@ void testFunctionInSelect() {
9292
.build()
9393
.render(RenderingStrategies.MYBATIS3);
9494

95-
Map<String, Object> row = mapper.generalSelect(selectStatement);
95+
Map<String, Object> row = mapper.selectOneMappedRow(selectStatement);
9696
assertThat(row).containsExactly(entry("FILE_ID", 1), entry("FILE_CONTENTS", randomBlob));
9797

9898
selectStatement = select(fileId, toBase64(fileContents).as("checksum"))
@@ -105,7 +105,7 @@ void testFunctionInSelect() {
105105
+ "where file_id = #{parameters.p1,jdbcType=INTEGER}";
106106
assertThat(selectStatement.getSelectStatement()).isEqualTo(expected);
107107

108-
row = mapper.generalSelect(selectStatement);
108+
row = mapper.selectOneMappedRow(selectStatement);
109109

110110
String base64 = Base64.getEncoder().encodeToString(randomBlob);
111111
assertThat(row).contains(entry("FILE_ID", 1), entry("CHECKSUM", base64));
@@ -127,7 +127,7 @@ void testFunctionInWhere() {
127127
.build()
128128
.render(RenderingStrategies.MYBATIS3);
129129

130-
int rows = mapper.insert(insertStatement);
130+
int rows = mapper.generalInsert(insertStatement);
131131
assertThat(rows).isEqualTo(1);
132132

133133
SelectStatementProvider selectStatement = select(fileId, fileContents)
@@ -136,7 +136,7 @@ void testFunctionInWhere() {
136136
.build()
137137
.render(RenderingStrategies.MYBATIS3);
138138

139-
Map<String, Object> row = mapper.generalSelect(selectStatement);
139+
Map<String, Object> row = mapper.selectOneMappedRow(selectStatement);
140140
assertThat(row).contains(entry("FILE_ID", 1), entry("FILE_CONTENTS", randomBlob));
141141

142142
String base64 = Base64.getEncoder().encodeToString(randomBlob);
@@ -150,7 +150,7 @@ void testFunctionInWhere() {
150150
+ "where TO_BASE64(file_contents) = #{parameters.p1,jdbcType=VARCHAR}";
151151
assertThat(selectStatement.getSelectStatement()).isEqualTo(expected);
152152

153-
row = mapper.generalSelect(selectStatement);
153+
row = mapper.selectOneMappedRow(selectStatement);
154154

155155
assertThat(row).contains(entry("FILE_ID", 1), entry("FILE_CONTENTS", randomBlob));
156156
}

0 commit comments

Comments
 (0)