Use the common mappers where possible

jeffgbutler · jeffgbutler · commit d2081da312b8 · 2024-06-03T10:08:56.000-04:00
diff --git a/src/test/java/examples/array/NamesTableMapper.java b/src/test/java/examples/array/NamesTableMapper.java
@@ -18,16 +18,15 @@
 import java.util.List;
 import java.util.Optional;
 
-import org.apache.ibatis.annotations.InsertProvider;
 import org.apache.ibatis.annotations.Result;
 import org.apache.ibatis.annotations.ResultMap;
 import org.apache.ibatis.annotations.Results;
 import org.apache.ibatis.annotations.SelectProvider;
-import org.mybatis.dynamic.sql.insert.render.GeneralInsertStatementProvider;
 import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
 import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
+import org.mybatis.dynamic.sql.util.mybatis3.CommonGeneralInsertMapper;
 
-public interface NamesTableMapper {
+public interface NamesTableMapper extends CommonGeneralInsertMapper {
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     @Results(id="NamesTableResult", value={
             @Result(column="id", property="id", id=true),
@@ -38,7 +37,4 @@ public interface NamesTableMapper {
     @SelectProvider(type = SqlProviderAdapter.class, method = "select")
     @ResultMap("NamesTableResult")
     Optional<NamesRecord> selectOne(SelectStatementProvider selectStatement);
-
-    @InsertProvider(type = SqlProviderAdapter.class, method = "generalInsert")
-    int generalInsert(GeneralInsertStatementProvider insertStatement);
 }
diff --git a/src/test/java/examples/schema_supplier/UserMapper.java b/src/test/java/examples/schema_supplier/UserMapper.java
@@ -19,24 +19,20 @@
 
 import java.util.List;
 
-import org.apache.ibatis.annotations.InsertProvider;
 import org.apache.ibatis.annotations.Result;
 import org.apache.ibatis.annotations.Results;
 import org.apache.ibatis.annotations.SelectProvider;
 import org.apache.ibatis.type.JdbcType;
 import org.mybatis.dynamic.sql.BasicColumn;
 import org.mybatis.dynamic.sql.SqlBuilder;
-import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
 import org.mybatis.dynamic.sql.render.RenderingStrategies;
 import org.mybatis.dynamic.sql.select.SelectDSLCompleter;
 import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
 import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
+import org.mybatis.dynamic.sql.util.mybatis3.CommonInsertMapper;
 import org.mybatis.dynamic.sql.util.mybatis3.MyBatis3Utils;
 
-public interface UserMapper {
-
-    @InsertProvider(type=SqlProviderAdapter.class, method="insert")
-    int insert(InsertStatementProvider<User> insertStatement);
+public interface UserMapper extends CommonInsertMapper<User> {
 
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     @Results(id="UserResult", value= {
diff --git a/src/test/java/examples/simple/PersonWithAddressMapper.java b/src/test/java/examples/simple/PersonWithAddressMapper.java
@@ -44,13 +44,14 @@
 import org.mybatis.dynamic.sql.select.SelectModel;
 import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
 import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
+import org.mybatis.dynamic.sql.util.mybatis3.CommonCountMapper;
 import org.mybatis.dynamic.sql.util.mybatis3.MyBatis3Utils;
 
 /**
  * This is a mapper that shows coding a join
  */
 @Mapper
-public interface PersonWithAddressMapper {
+public interface PersonWithAddressMapper extends CommonCountMapper {
 
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     @Results(id="PersonWithAddressResult", value= {
@@ -73,9 +74,6 @@ public interface PersonWithAddressMapper {
     @ResultMap("PersonWithAddressResult")
     Optional<PersonWithAddress> selectOne(SelectStatementProvider selectStatement);
 
-    @SelectProvider(type=SqlProviderAdapter.class, method="select")
-    long count(SelectStatementProvider selectStatement);
-
     BasicColumn[] selectList =
             BasicColumn.columnList(id.as("A_ID"), firstName, lastName, birthDate, employed, occupation, address.id,
                     address.streetAddress, address.city, address.state, address.addressType);
diff --git a/src/test/java/examples/springbatch/mapper/PersonMapper.java b/src/test/java/examples/springbatch/mapper/PersonMapper.java
@@ -18,22 +18,19 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.ibatis.annotations.InsertProvider;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Result;
 import org.apache.ibatis.annotations.Results;
 import org.apache.ibatis.annotations.SelectProvider;
-import org.apache.ibatis.annotations.UpdateProvider;
-import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
-import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
-import org.mybatis.dynamic.sql.update.render.UpdateStatementProvider;
-import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
+import org.mybatis.dynamic.sql.util.mybatis3.CommonCountMapper;
+import org.mybatis.dynamic.sql.util.mybatis3.CommonInsertMapper;
+import org.mybatis.dynamic.sql.util.mybatis3.CommonUpdateMapper;
 import org.mybatis.dynamic.sql.util.springbatch.SpringBatchProviderAdapter;
 
 import examples.springbatch.common.PersonRecord;
 
 @Mapper
-public interface PersonMapper {
+public interface PersonMapper extends CommonCountMapper, CommonInsertMapper<PersonRecord>, CommonUpdateMapper {
 
     @SelectProvider(type=SpringBatchProviderAdapter.class, method="select")
     @Results({
@@ -42,13 +39,4 @@ public interface PersonMapper {
         @Result(column="last_name", property="lastName")
     })
     List<PersonRecord> selectMany(Map<String, Object> parameterValues);
-
-    @UpdateProvider(type=SqlProviderAdapter.class, method="update")
-    int update(UpdateStatementProvider updateStatement);
-
-    @SelectProvider(type=SqlProviderAdapter.class, method="select")
-    long count(SelectStatementProvider selectStatement);
-
-    @InsertProvider(type=SqlProviderAdapter.class, method="insert")
-    int insert(InsertStatementProvider<PersonRecord> insertStatement);
 }
diff --git a/src/test/java/examples/type_conversion/MyFilesMapper.java b/src/test/java/examples/type_conversion/MyFilesMapper.java
@@ -15,19 +15,7 @@
  */
 package examples.type_conversion;
 
-import java.util.Map;
+import org.mybatis.dynamic.sql.util.mybatis3.CommonGeneralInsertMapper;
+import org.mybatis.dynamic.sql.util.mybatis3.CommonSelectMapper;
 
-import org.apache.ibatis.annotations.InsertProvider;
-import org.apache.ibatis.annotations.SelectProvider;
-import org.mybatis.dynamic.sql.insert.render.GeneralInsertStatementProvider;
-import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
-import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
-
-public interface MyFilesMapper {
-
-    @InsertProvider(type = SqlProviderAdapter.class, method = "generalInsert")
-    int insert(GeneralInsertStatementProvider insertStatement);
-
-    @SelectProvider(type = SqlProviderAdapter.class, method = "select")
-    Map<String, Object> generalSelect(SelectStatementProvider selectStatement);
-}
+public interface MyFilesMapper extends CommonGeneralInsertMapper, CommonSelectMapper { }
diff --git a/src/test/java/examples/type_conversion/TypeConversionTest.java b/src/test/java/examples/type_conversion/TypeConversionTest.java
@@ -83,7 +83,7 @@ void testFunctionInSelect() {
                     .build()
                     .render(RenderingStrategies.MYBATIS3);
 
-            int rows = mapper.insert(insertStatement);
+            int rows = mapper.generalInsert(insertStatement);
             assertThat(rows).isEqualTo(1);
 
             SelectStatementProvider selectStatement = select(fileId, fileContents)
@@ -92,7 +92,7 @@ void testFunctionInSelect() {
                     .build()
                     .render(RenderingStrategies.MYBATIS3);
 
-            Map<String, Object> row = mapper.generalSelect(selectStatement);
+            Map<String, Object> row = mapper.selectOneMappedRow(selectStatement);
             assertThat(row).containsExactly(entry("FILE_ID", 1), entry("FILE_CONTENTS", randomBlob));
 
             selectStatement = select(fileId, toBase64(fileContents).as("checksum"))
@@ -105,7 +105,7 @@ void testFunctionInSelect() {
                     + "where file_id = #{parameters.p1,jdbcType=INTEGER}";
             assertThat(selectStatement.getSelectStatement()).isEqualTo(expected);
 
-            row = mapper.generalSelect(selectStatement);
+            row = mapper.selectOneMappedRow(selectStatement);
 
             String base64 = Base64.getEncoder().encodeToString(randomBlob);
             assertThat(row).contains(entry("FILE_ID", 1), entry("CHECKSUM", base64));
@@ -127,7 +127,7 @@ void testFunctionInWhere() {
                     .build()
                     .render(RenderingStrategies.MYBATIS3);
 
-            int rows = mapper.insert(insertStatement);
+            int rows = mapper.generalInsert(insertStatement);
             assertThat(rows).isEqualTo(1);
 
             SelectStatementProvider selectStatement = select(fileId, fileContents)
@@ -136,7 +136,7 @@ void testFunctionInWhere() {
                     .build()
                     .render(RenderingStrategies.MYBATIS3);
 
-            Map<String, Object> row = mapper.generalSelect(selectStatement);
+            Map<String, Object> row = mapper.selectOneMappedRow(selectStatement);
             assertThat(row).contains(entry("FILE_ID", 1), entry("FILE_CONTENTS", randomBlob));
 
             String base64 = Base64.getEncoder().encodeToString(randomBlob);
@@ -150,7 +150,7 @@ void testFunctionInWhere() {
                     + "where TO_BASE64(file_contents) = #{parameters.p1,jdbcType=VARCHAR}";
             assertThat(selectStatement.getSelectStatement()).isEqualTo(expected);
 
-            row = mapper.generalSelect(selectStatement);
+            row = mapper.selectOneMappedRow(selectStatement);
 
             assertThat(row).contains(entry("FILE_ID", 1), entry("FILE_CONTENTS", randomBlob));
         }
