Add common mappers with reusable methods for MyBatis

Author: jeffgbutler

src/main/java/org/mybatis/dynamic/sql/util/mybatis3/GeneralMapper.java renamed to src/main/java/org/mybatis/dynamic/sql/util/mybatis3/CommonSelectMapper.java

@@ -46,7 +46,7 @@
  *
  * @author Jeff Butler
  */
-public interface GeneralMapper {
+public interface CommonSelectMapper {
     /**
      * Select a single row as a Map of values. The row may have any number of columns.
      * The Map key will be the column name as returned from the
@@ -67,7 +67,7 @@ public interface GeneralMapper {
      * the row values into a Map, and then a row mapper can retrieve values from the Map and use them
      * to construct a custom object.
      *
-     * <p>See {@link GeneralMapper#selectOneMappedRow(SelectStatementProvider)} for details about
+     * <p>See {@link CommonSelectMapper#selectOneMappedRow(SelectStatementProvider)} for details about
      * how MyBatis will construct the Map of values.
      *
      * @param selectStatement the select statement

src/site/markdown/docs/mybatis3.md

@@ -10,18 +10,18 @@ MyBatis is very good at mapping result sets to objects - this is one of its prim
 that you predefine the mappings for every possibility. This presents a challenge if you want very dynamic column lists
 in a query. This library provides a generalized MyBatis mapper that can assist with that problem.
 
-The general mapper is `org.mybatis.dynamic.sql.util.mybatis3.GeneralMapper`. This mapper can be injected into a MyBatis configuration
+The general mapper is `org.mybatis.dynamic.sql.util.mybatis3.CommonSelectMapper`. This mapper can be injected into a MyBatis configuration
 as is, or it can be extended by an existing mapper. If you are using MyBatis Spring support and auto scanning for mappers,
 you can create an extension in your application's mapper package as follows:
 
 ```java
 package foo.mapper;
 
 import org.apache.ibatis.annotations.Mapper;
-import org.mybatis.dynamic.sql.util.mybatis3.GeneralMapper;
+import org.mybatis.dynamic.sql.util.mybatis3.CommonSelectMapper;
 
 @Mapper
-public interface MyGeneralMapper extends GeneralMapper {
+public interface MyGeneralMapper extends CommonSelectMapper {
 }
 ```
 
@@ -45,11 +45,11 @@ import java.util.List;
 import java.util.Map;
 import org.mybatis.dynamic.sql.render.RenderingStrategies;
 import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
-import org.mybatis.dynamic.sql.util.mybatis3.GeneralMapper;
+import org.mybatis.dynamic.sql.util.mybatis3.CommonSelectMapper;
 
 public class MyService {
     public List<Map<String,Object>> generalSearch() {
-        GeneralMapper mapper = getGeneralMapper(); // not shown
+        CommonSelectMapper mapper = getGeneralMapper(); // not shown
 
         SelectStatementProvider selectStatement = select(id, description)
             .from(foo)
@@ -76,11 +76,11 @@ import static org.mybatis.dynamic.sql.SqlBuilder.*;
 import java.util.List;
 import org.mybatis.dynamic.sql.render.RenderingStrategies;
 import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
-import org.mybatis.dynamic.sql.util.mybatis3.GeneralMapper;
+import org.mybatis.dynamic.sql.util.mybatis3.CommonSelectMapper;
 
 public class MyService {
     public List<TableCode> generalSearch() {
-        GeneralMapper mapper = getGeneralMapper(); // not shown
+        CommonSelectMapper mapper = getGeneralMapper(); // not shown
 
         SelectStatementProvider selectStatement = select(id, description)
             .from(foo)
@@ -108,11 +108,11 @@ import static org.mybatis.dynamic.sql.SqlBuilder.*;
 
 import org.mybatis.dynamic.sql.render.RenderingStrategies;
 import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
-import org.mybatis.dynamic.sql.util.mybatis3.GeneralMapper;
+import org.mybatis.dynamic.sql.util.mybatis3.CommonSelectMapper;
 
 public class MyService {
     public Long getCount() {
-        GeneralMapper mapper = getGeneralMapper(); // not shown
+        CommonSelectMapper mapper = getGeneralMapper(); // not shown
 
         SelectStatementProvider selectStatement = countFrom(foo)
             .where(description. isLike("%bar%"))

src/test/java/examples/animal/data/AnimalDataMapper.java

@@ -17,25 +17,20 @@
 
 import java.util.List;
 
-import org.apache.ibatis.annotations.DeleteProvider;
-import org.apache.ibatis.annotations.InsertProvider;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Result;
 import org.apache.ibatis.annotations.ResultMap;
 import org.apache.ibatis.annotations.Results;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.SelectProvider;
-import org.apache.ibatis.annotations.UpdateProvider;
-import org.mybatis.dynamic.sql.delete.render.DeleteStatementProvider;
-import org.mybatis.dynamic.sql.insert.render.GeneralInsertStatementProvider;
-import org.mybatis.dynamic.sql.insert.render.InsertSelectStatementProvider;
-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.CommonDeleteMapper;
+import org.mybatis.dynamic.sql.util.mybatis3.CommonInsertMapper;
+import org.mybatis.dynamic.sql.util.mybatis3.CommonUpdateMapper;
 import org.mybatis.dynamic.sql.where.render.WhereClauseProvider;
 
-public interface AnimalDataMapper {
+public interface AnimalDataMapper extends CommonDeleteMapper, CommonInsertMapper<AnimalData>, CommonUpdateMapper {
 
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     @Results(id="AnimalDataResult", value={
@@ -50,21 +45,6 @@ public interface AnimalDataMapper {
     @ResultMap("AnimalDataResult")
     AnimalData selectOne(SelectStatementProvider selectStatement);
 
-    @DeleteProvider(type=SqlProviderAdapter.class, method="delete")
-    int delete(DeleteStatementProvider deleteStatement);
-
-    @UpdateProvider(type=SqlProviderAdapter.class, method="update")
-    int update(UpdateStatementProvider updateStatement);
-
-    @InsertProvider(type=SqlProviderAdapter.class, method="insert")
-    int insert(InsertStatementProvider<AnimalData> insertStatement);
-
-    @InsertProvider(type=SqlProviderAdapter.class, method="generalInsert")
-    int generalInsert(GeneralInsertStatementProvider insertStatement);
-
-    @InsertProvider(type=SqlProviderAdapter.class, method="insertSelect")
-    int insertSelect(InsertSelectStatementProvider insertSelectStatement);
-
     @Select({
         "select id, animal_name, brain_weight, body_weight",
         "from AnimalData",