Add non-boxing adapters and corresponding utility functions

Author: jeffgbutler

src/main/java/org/mybatis/dynamic/sql/util/mybatis3/MyBatis3DeleteHelper.java

@@ -18,7 +18,6 @@
 import java.util.function.Function;
 
 import org.mybatis.dynamic.sql.delete.DeleteDSL;
-import org.mybatis.dynamic.sql.delete.MyBatis3DeleteModelAdapter;
 import org.mybatis.dynamic.sql.util.Buildable;
 
 /**
@@ -62,7 +61,7 @@
  */
 @FunctionalInterface
 public interface MyBatis3DeleteHelper extends
-        Function<DeleteDSL<MyBatis3DeleteModelAdapter<Integer>>, Buildable<MyBatis3DeleteModelAdapter<Integer>>> {
+        Function<DeleteDSL<MyBatis3DeleteModelToIntAdapter>, Buildable<MyBatis3DeleteModelToIntAdapter>> {
 
     /**
      * Returns a helper that can be used to delete every row in a table.

src/main/java/org/mybatis/dynamic/sql/util/mybatis3/MyBatis3DeleteModelToIntAdapter.java

@@ -0,0 +1,59 @@
+/**
+ *    Copyright 2016-2019 the original author or authors.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package org.mybatis.dynamic.sql.util.mybatis3;
+
+import java.util.Objects;
+import java.util.function.ToIntFunction;
+
+import org.mybatis.dynamic.sql.delete.DeleteModel;
+import org.mybatis.dynamic.sql.delete.MyBatis3DeleteModelAdapter;
+import org.mybatis.dynamic.sql.delete.render.DeleteStatementProvider;
+import org.mybatis.dynamic.sql.render.RenderingStrategy;
+
+/**
+ * This adapter will render the underlying delete model for MyBatis3, and then call a MyBatis mapper method.
+ * This version of the adapter is preferred over {@link MyBatis3DeleteModelAdapter} because it is not generic
+ * and does not force a box/unbox for mappers that always return a primitive int.
+ * 
+ * @see MyBatis3Utils
+ * 
+ * @author Jeff Butler
+ *
+ */
+public class MyBatis3DeleteModelToIntAdapter {
+
+    private DeleteModel deleteModel;
+    private ToIntFunction<DeleteStatementProvider> mapperMethod;
+    
+    private MyBatis3DeleteModelToIntAdapter(DeleteModel deleteModel,
+            ToIntFunction<DeleteStatementProvider> mapperMethod) {
+        this.deleteModel = Objects.requireNonNull(deleteModel);
+        this.mapperMethod = Objects.requireNonNull(mapperMethod);
+    }
+    
+    public int execute() {
+        return mapperMethod.applyAsInt(deleteStatement());
+    }
+    
+    private DeleteStatementProvider deleteStatement() {
+        return deleteModel.render(RenderingStrategy.MYBATIS3);
+    }
+    
+    public static MyBatis3DeleteModelToIntAdapter of(DeleteModel deleteModel,
+            ToIntFunction<DeleteStatementProvider> mapperMethod) {
+        return new MyBatis3DeleteModelToIntAdapter(deleteModel, mapperMethod);
+    }
+}

src/main/java/org/mybatis/dynamic/sql/util/mybatis3/MyBatis3UpdateHelper.java

@@ -17,7 +17,6 @@
 
 import java.util.function.Function;
 
-import org.mybatis.dynamic.sql.update.MyBatis3UpdateModelAdapter;
 import org.mybatis.dynamic.sql.update.UpdateDSL;
 import org.mybatis.dynamic.sql.util.Buildable;
 
@@ -86,5 +85,5 @@
  */
 @FunctionalInterface
 public interface MyBatis3UpdateHelper extends
-        Function<UpdateDSL<MyBatis3UpdateModelAdapter<Integer>>, Buildable<MyBatis3UpdateModelAdapter<Integer>>> {
+        Function<UpdateDSL<MyBatis3UpdateModelToIntAdapter>, Buildable<MyBatis3UpdateModelToIntAdapter>> {
 }

src/main/java/org/mybatis/dynamic/sql/util/mybatis3/MyBatis3UpdateModelToIntAdapter.java

@@ -0,0 +1,59 @@
+/**
+ *    Copyright 2016-2019 the original author or authors.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package org.mybatis.dynamic.sql.util.mybatis3;
+
+import java.util.Objects;
+import java.util.function.ToIntFunction;
+
+import org.mybatis.dynamic.sql.render.RenderingStrategy;
+import org.mybatis.dynamic.sql.update.MyBatis3UpdateModelAdapter;
+import org.mybatis.dynamic.sql.update.UpdateModel;
+import org.mybatis.dynamic.sql.update.render.UpdateStatementProvider;
+
+/**
+ * This adapter will render the underlying update model for MyBatis3, and then call a MyBatis mapper method.
+ * This version of the adapter is preferred over {@link MyBatis3UpdateModelAdapter} because it is not generic
+ * and does not force a box/unbox for mappers that always return a primitive int.
+ * 
+ * @see MyBatis3Utils
+ * 
+ * @author Jeff Butler
+ *
+ */
+public class MyBatis3UpdateModelToIntAdapter {
+
+    private UpdateModel updateModel;
+    private ToIntFunction<UpdateStatementProvider> mapperMethod;
+    
+    private MyBatis3UpdateModelToIntAdapter(UpdateModel updateModel,
+            ToIntFunction<UpdateStatementProvider> mapperMethod) {
+        this.updateModel = Objects.requireNonNull(updateModel);
+        this.mapperMethod = Objects.requireNonNull(mapperMethod);
+    }
+    
+    public int execute() {
+        return mapperMethod.applyAsInt(updateStatement());
+    }
+    
+    private UpdateStatementProvider updateStatement() {
+        return updateModel.render(RenderingStrategy.MYBATIS3);
+    }
+    
+    public static MyBatis3UpdateModelToIntAdapter of(UpdateModel updateModel,
+            ToIntFunction<UpdateStatementProvider> mapperMethod) {
+        return new MyBatis3UpdateModelToIntAdapter(updateModel, mapperMethod);
+    }
+}

src/main/java/org/mybatis/dynamic/sql/util/mybatis3/MyBatis3Utils.java

@@ -0,0 +1,58 @@
+/**
+ *    Copyright 2016-2019 the original author or authors.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package org.mybatis.dynamic.sql.util.mybatis3;
+
+import java.util.function.ToIntFunction;
+
+import org.mybatis.dynamic.sql.SqlTable;
+import org.mybatis.dynamic.sql.delete.DeleteDSL;
+import org.mybatis.dynamic.sql.delete.render.DeleteStatementProvider;
+import org.mybatis.dynamic.sql.update.UpdateDSL;
+import org.mybatis.dynamic.sql.update.render.UpdateStatementProvider;
+
+/**
+ * Utility functions for building MyBatis3 mappers
+ * 
+ * @author Jeff Butler
+ *
+ */
+public class MyBatis3Utils {
+    private MyBatis3Utils() {}
+
+    /**
+     * Initiates a delete statement using the non-boxing adapter
+     * 
+     * @param mapper a MyBatis3 mapper delete method
+     * @param table the table to delete from
+     * @return a partially completed DeleteDSL
+     */
+    public static DeleteDSL<MyBatis3DeleteModelToIntAdapter> deleteFrom(ToIntFunction<DeleteStatementProvider> mapper,
+            SqlTable table) {
+        return DeleteDSL.deleteFrom(dm -> MyBatis3DeleteModelToIntAdapter.of(dm, mapper), table);
+    }
+
+    /**
+     * Initiates an update statement using the non-boxing adapter
+     * 
+     * @param mapper a MyBatis3 mapper update method
+     * @param table the table to update
+     * @return a partially completed UpdateDSL
+     */
+    public static UpdateDSL<MyBatis3UpdateModelToIntAdapter> update(ToIntFunction<UpdateStatementProvider> mapper,
+            SqlTable table) {
+        return UpdateDSL.update(um -> MyBatis3UpdateModelToIntAdapter.of(um, mapper), table);
+    }
+}

src/site/markdown/docs/mybatis3.md

@@ -55,7 +55,7 @@ This is a standard method for MyBatis Dynamic SQL that executes a delete and ret
 
 ```java
 default int delete(MyBatis3DeleteHelper helper) {
-    return helper.apply(DeleteDSL.deleteFromWithMapper(this::delete, simpleTable))
+    return helper.apply(MyBatis3Utils.deleteFrom(this::delete, simpleTable))
             .build()
             .execute();
 }
@@ -172,7 +172,7 @@ This is a standard method for MyBatis Dynamic SQL that executes a query and retu
 
 ```java
 default int update(MyBatis3UpdateHelper helper) {
-    return helper.apply(UpdateDSL.updateWithMapper(this::update, simpleTable))
+    return helper.apply(MyBatis3Utils.update(this::update, simpleTable))
             .build()
             .execute();
 }

src/test/java/examples/simple/newstyle/SimpleTableMapperNewStyle.java

@@ -31,21 +31,21 @@
 import org.apache.ibatis.annotations.UpdateProvider;
 import org.apache.ibatis.type.JdbcType;
 import org.mybatis.dynamic.sql.SqlBuilder;
-import org.mybatis.dynamic.sql.delete.DeleteDSL;
 import org.mybatis.dynamic.sql.delete.render.DeleteStatementProvider;
 import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
 import org.mybatis.dynamic.sql.insert.render.MultiRowInsertStatementProvider;
 import org.mybatis.dynamic.sql.render.RenderingStrategy;
 import org.mybatis.dynamic.sql.select.SelectDSL;
 import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
-import org.mybatis.dynamic.sql.update.MyBatis3UpdateModelAdapter;
 import org.mybatis.dynamic.sql.update.UpdateDSL;
 import org.mybatis.dynamic.sql.update.render.UpdateStatementProvider;
 import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
 import org.mybatis.dynamic.sql.util.mybatis3.MyBatis3CountHelper;
 import org.mybatis.dynamic.sql.util.mybatis3.MyBatis3DeleteHelper;
 import org.mybatis.dynamic.sql.util.mybatis3.MyBatis3SelectHelper;
 import org.mybatis.dynamic.sql.util.mybatis3.MyBatis3UpdateHelper;
+import org.mybatis.dynamic.sql.util.mybatis3.MyBatis3UpdateModelToIntAdapter;
+import org.mybatis.dynamic.sql.util.mybatis3.MyBatis3Utils;
 
 import examples.simple.LastNameTypeHandler;
 import examples.simple.SimpleTableRecord;
@@ -98,7 +98,7 @@ default long count(MyBatis3CountHelper helper) {
     }
 
     default int delete(MyBatis3DeleteHelper helper) {
-        return helper.apply(DeleteDSL.deleteFromWithMapper(this::delete, simpleTable))
+        return helper.apply(MyBatis3Utils.deleteFrom(this::delete, simpleTable))
                 .build()
                 .execute();
     }
@@ -171,12 +171,13 @@ default Optional<SimpleTableRecord> selectByPrimaryKey(Integer id_) {
     }
 
     default int update(MyBatis3UpdateHelper helper) {
-        return helper.apply(UpdateDSL.updateWithMapper(this::update, simpleTable))
+        return helper.apply(MyBatis3Utils.update(this::update, simpleTable))
                 .build()
                 .execute();
     }
 
-    static UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> setAll(SimpleTableRecord record, UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> dsl) {
+    static UpdateDSL<MyBatis3UpdateModelToIntAdapter> setAll(SimpleTableRecord record,
+            UpdateDSL<MyBatis3UpdateModelToIntAdapter> dsl) {
         return dsl.set(id).equalTo(record::getId)
                 .set(firstName).equalTo(record::getFirstName)
                 .set(lastName).equalTo(record::getLastName)
@@ -185,8 +186,8 @@ static UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> setAll(SimpleTableRecord r
                 .set(occupation).equalTo(record::getOccupation);
     }
 
-    static UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> setSelective(SimpleTableRecord record,
-            UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> dsl) {
+    static UpdateDSL<MyBatis3UpdateModelToIntAdapter> setSelective(SimpleTableRecord record,
+            UpdateDSL<MyBatis3UpdateModelToIntAdapter> dsl) {
         return dsl.set(id).equalToWhenPresent(record::getId)
                 .set(firstName).equalToWhenPresent(record::getFirstName)
                 .set(lastName).equalToWhenPresent(record::getLastName)