Polishing

Author: jeffgbutler

src/main/java/org/mybatis/dynamic/sql/select/MyBatis3SelectModelAdapter.java

@@ -24,7 +24,7 @@
 /**
  * This adapter will render the underlying select model for MyBatis3, and then call a MyBatis mapper method.
  *
- * @deprecated in favor is {@link SelectDSLCompleter}. This class will be removed without direct replacement
+ * @deprecated in favor of {@link SelectDSLCompleter}. This class will be removed without direct replacement
  *     in a future version
  *     
  * @author Jeff Butler

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

@@ -114,16 +114,16 @@ public static <R> int insert(ToIntFunction<InsertStatementProvider<R>> mapper, R
         return mapper.applyAsInt(insert(record, table, completer));
     }
 
-    public static GeneralInsertStatementProvider insert(SqlTable table,
+    public static GeneralInsertStatementProvider generalInsert(SqlTable table,
             UnaryOperator<GeneralInsertDSL> completer) {
         return completer.apply(GeneralInsertDSL.insertInto(table))
                 .build()
                 .render(RenderingStrategies.MYBATIS3);
     }
 
-    public static int insert(ToIntFunction<GeneralInsertStatementProvider> mapper, 
+    public static int generalInsert(ToIntFunction<GeneralInsertStatementProvider> mapper,
             SqlTable table, UnaryOperator<GeneralInsertDSL> completer) {
-        return mapper.applyAsInt(insert(table, completer));
+        return mapper.applyAsInt(generalInsert(table, completer));
     }
 
     public static <R> MultiRowInsertStatementProvider<R> insertMultiple(Collection<R> records, SqlTable table,

src/main/java/org/mybatis/dynamic/sql/util/spring/NamedParameterJdbcTemplateExtensions.java

@@ -29,6 +29,7 @@
 import org.mybatis.dynamic.sql.insert.render.GeneralInsertStatementProvider;
 import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
 import org.mybatis.dynamic.sql.insert.render.MultiRowInsertStatementProvider;
+import org.mybatis.dynamic.sql.render.RenderingStrategies;
 import org.mybatis.dynamic.sql.select.SelectModel;
 import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
 import org.mybatis.dynamic.sql.update.UpdateModel;
@@ -43,40 +44,39 @@
 import org.springframework.jdbc.core.namedparam.SqlParameterSourceUtils;
 import org.springframework.jdbc.support.KeyHolder;
 
-
 public class NamedParameterJdbcTemplateExtensions {
-    private NamedParameterJdbcTemplate template;
+    private final NamedParameterJdbcTemplate template;
 
     public NamedParameterJdbcTemplateExtensions(NamedParameterJdbcTemplate template) {
         this.template = Objects.requireNonNull(template);
     }
 
     public long count(Buildable<SelectModel> countStatement) {
-        return count(SpringUtils.buildSelect(countStatement));
+        return count(countStatement.build().render(RenderingStrategies.SPRING_NAMED_PARAMETER));
     }
 
     public long count(SelectStatementProvider countStatement) {
         return template.queryForObject(countStatement.getSelectStatement(), countStatement.getParameters(), Long.class);
     }
 
     public int delete(Buildable<DeleteModel> deleteStatement) {
-        return delete(SpringUtils.buildDelete(deleteStatement));
+        return delete(deleteStatement.build().render(RenderingStrategies.SPRING_NAMED_PARAMETER));
     }
 
     public int delete(DeleteStatementProvider deleteStatement) {
         return template.update(deleteStatement.getDeleteStatement(), deleteStatement.getParameters());
     }
 
     public int generalInsert(Buildable<GeneralInsertModel> insertStatement) {
-        return generalInsert(SpringUtils.buildGeneralInsert(insertStatement));
+        return generalInsert(insertStatement.build().render(RenderingStrategies.SPRING_NAMED_PARAMETER));
     }
 
     public int generalInsert(GeneralInsertStatementProvider insertStatement) {
         return template.update(insertStatement.getInsertStatement(), insertStatement.getParameters());
     }
 
     public int generalInsert(Buildable<GeneralInsertModel> insertStatement, KeyHolder keyHolder) {
-        return generalInsert(SpringUtils.buildGeneralInsert(insertStatement), keyHolder);
+        return generalInsert(insertStatement.build().render(RenderingStrategies.SPRING_NAMED_PARAMETER), keyHolder);
     }
 
     public int generalInsert(GeneralInsertStatementProvider insertStatement, KeyHolder keyHolder) {
@@ -85,7 +85,7 @@ public int generalInsert(GeneralInsertStatementProvider insertStatement, KeyHold
     }
 
     public <T> int insert(Buildable<InsertModel<T>> insertStatement) {
-        return insert(SpringUtils.buildInsert(insertStatement));
+        return insert(insertStatement.build().render(RenderingStrategies.SPRING_NAMED_PARAMETER));
     }
 
     public <T> int insert(InsertStatementProvider<T> insertStatement) {
@@ -94,7 +94,7 @@ public <T> int insert(InsertStatementProvider<T> insertStatement) {
     }
 
     public <T> int insert(Buildable<InsertModel<T>> insertStatement, KeyHolder keyHolder) {
-        return insert(SpringUtils.buildInsert(insertStatement), keyHolder);
+        return insert(insertStatement.build().render(RenderingStrategies.SPRING_NAMED_PARAMETER), keyHolder);
     }
 
     public <T> int insert(InsertStatementProvider<T> insertStatement, KeyHolder keyHolder) {
@@ -103,7 +103,7 @@ public <T> int insert(InsertStatementProvider<T> insertStatement, KeyHolder keyH
     }
 
     public <T> int[] insertBatch(Buildable<BatchInsertModel<T>> insertStatement) {
-        return insertBatch(SpringUtils.buildBatchInsert(insertStatement));
+        return insertBatch(insertStatement.build().render(RenderingStrategies.SPRING_NAMED_PARAMETER));
     }
 
     public <T> int[] insertBatch(BatchInsert<T> insertStatement) {
@@ -112,7 +112,7 @@ public <T> int[] insertBatch(BatchInsert<T> insertStatement) {
     }
 
     public <T> int insertMultiple(Buildable<MultiRowInsertModel<T>> insertStatement) {
-        return insertMultiple(SpringUtils.buildMultiRowInsert(insertStatement));
+        return insertMultiple(insertStatement.build().render(RenderingStrategies.SPRING_NAMED_PARAMETER));
     }
 
     public <T> int insertMultiple(MultiRowInsertStatementProvider<T> insertStatement) {
@@ -121,7 +121,7 @@ public <T> int insertMultiple(MultiRowInsertStatementProvider<T> insertStatement
     }
 
     public <T> int insertMultiple(Buildable<MultiRowInsertModel<T>> insertStatement, KeyHolder keyHolder) {
-        return insertMultiple(SpringUtils.buildMultiRowInsert(insertStatement), keyHolder);
+        return insertMultiple(insertStatement.build().render(RenderingStrategies.SPRING_NAMED_PARAMETER), keyHolder);
     }
 
     public <T> int insertMultiple(MultiRowInsertStatementProvider<T> insertStatement, KeyHolder keyHolder) {
@@ -130,15 +130,15 @@ public <T> int insertMultiple(MultiRowInsertStatementProvider<T> insertStatement
     }
 
     public <T> List<T> selectList(Buildable<SelectModel> selectStatement, RowMapper<T> rowMapper) {
-        return selectList(SpringUtils.buildSelect(selectStatement), rowMapper);
+        return selectList(selectStatement.build().render(RenderingStrategies.SPRING_NAMED_PARAMETER), rowMapper);
     }
 
     public <T> List<T> selectList(SelectStatementProvider selectStatement, RowMapper<T> rowMapper) {
         return template.query(selectStatement.getSelectStatement(), selectStatement.getParameters(), rowMapper);
     }
 
     public <T> Optional<T> selectOne(Buildable<SelectModel> selectStatement, RowMapper<T> rowMapper) {
-        return selectOne(SpringUtils.buildSelect(selectStatement), rowMapper);
+        return selectOne(selectStatement.build().render(RenderingStrategies.SPRING_NAMED_PARAMETER), rowMapper);
     }
 
     public <T> Optional<T> selectOne(SelectStatementProvider selectStatement, RowMapper<T> rowMapper) {
@@ -154,7 +154,7 @@ public <T> Optional<T> selectOne(SelectStatementProvider selectStatement, RowMap
     }
 
     public int update(Buildable<UpdateModel> updateStatement) {
-        return update(SpringUtils.buildUpdate(updateStatement));
+        return update(updateStatement.build().render(RenderingStrategies.SPRING_NAMED_PARAMETER));
     }
 
     public int update(UpdateStatementProvider updateStatement) {

src/main/java/org/mybatis/dynamic/sql/util/spring/SpringUtils.java

@@ -42,6 +42,9 @@ fun countFrom(table: SqlTable, completer: CountCompleter) =
 fun deleteFrom(table: SqlTable, completer: DeleteCompleter) =
     completer(KotlinDeleteBuilder(SqlBuilder.deleteFrom(table))).build().render(RenderingStrategies.MYBATIS3)
 
+fun insertInto(table: SqlTable, completer: GeneralInsertCompleter) =
+    completer(GeneralInsertDSL.insertInto(table)).build().render(RenderingStrategies.MYBATIS3)
+
 fun <T> InsertDSL.IntoGatherer<T>.into(table: SqlTable, completer: InsertCompleter<T>) =
     completer(into(table)).build().render(RenderingStrategies.MYBATIS3)
 
@@ -62,6 +65,3 @@ fun select(start: QueryExpressionDSL<SelectModel>, completer: SelectCompleter) =
 
 fun update(table: SqlTable, completer: UpdateCompleter) =
     completer(KotlinUpdateBuilder(SqlBuilder.update(table))).build().render(RenderingStrategies.MYBATIS3)
-
-fun insertInto(table: SqlTable, completer: GeneralInsertCompleter) =
-    completer(GeneralInsertDSL.insertInto(table)).build().render(RenderingStrategies.MYBATIS3)

src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/mybatis3/ProviderBuilderFunctions.kt

@@ -64,13 +64,13 @@ fun NamedParameterJdbcTemplate.deleteFrom(table: SqlTable, completer: DeleteComp
     delete(org.mybatis.dynamic.sql.util.kotlin.spring.deleteFrom(table, completer))
 
 // batch insert
-fun <T> NamedParameterJdbcTemplate.insert(insertStatement: BatchInsert<T>): IntArray =
+fun <T> NamedParameterJdbcTemplate.insertBatch(insertStatement: BatchInsert<T>): IntArray =
     batchUpdate(insertStatement.insertStatementSQL, SqlParameterSourceUtils.createBatch(insertStatement.records))
 
-fun <T> NamedParameterJdbcTemplate.insert(vararg records: T) =
-    insert(records.asList())
+fun <T> NamedParameterJdbcTemplate.insertBatch(vararg records: T) =
+    insertBatch(records.asList())
 
-fun <T> NamedParameterJdbcTemplate.insert(records: List<T>) =
+fun <T> NamedParameterJdbcTemplate.insertBatch(records: List<T>) =
     BatchInsertHelper(records, this)
 
 // single record insert
@@ -235,7 +235,7 @@ class KeyHolderHelper(private val keyHolder: KeyHolder, private val template: Na
 @MyBatisDslMarker
 class BatchInsertHelper<T>(private val records: List<T>, private val template: NamedParameterJdbcTemplate) {
     fun into(table: SqlTable, completer: BatchInsertCompleter<T>) =
-        template.insert(SqlBuilder.insert(records).into(table, completer))
+        template.insertBatch(SqlBuilder.insert(records).into(table, completer))
 }
 
 @MyBatisDslMarker

src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/spring/NamedParameterJdbcTemplateExtensions.kt

@@ -46,6 +46,9 @@ fun deleteFrom(table: SqlTable, completer: DeleteCompleter) =
     completer(KotlinDeleteBuilder(SqlBuilder.deleteFrom(table))).build()
         .render(RenderingStrategies.SPRING_NAMED_PARAMETER)
 
+fun insertInto(table: SqlTable, completer: GeneralInsertCompleter) =
+    completer(GeneralInsertDSL.insertInto(table)).build().render(RenderingStrategies.SPRING_NAMED_PARAMETER)
+
 fun <T> BatchInsertDSL.IntoGatherer<T>.into(table: SqlTable, completer: BatchInsertCompleter<T>) =
     completer(into(table)).build().render(RenderingStrategies.SPRING_NAMED_PARAMETER)
 
@@ -66,6 +69,3 @@ fun QueryExpressionDSL.FromGatherer<SelectModel>.from(table: SqlTable, alias: St
 
 fun update(table: SqlTable, completer: UpdateCompleter) =
     completer(KotlinUpdateBuilder(SqlBuilder.update(table))).build().render(RenderingStrategies.SPRING_NAMED_PARAMETER)
-
-fun insertInto(table: SqlTable, completer: GeneralInsertCompleter) =
-    completer(GeneralInsertDSL.insertInto(table)).build().render(RenderingStrategies.SPRING_NAMED_PARAMETER)

src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/spring/ProviderBuilderFunctions.kt

@@ -118,8 +118,8 @@ default int deleteByPrimaryKey(Integer id_) {
         );
     }
 
-    default int insert(UnaryOperator<GeneralInsertDSL> completer) {
-        return MyBatis3Utils.insert(this::generalInsert, person, completer);
+    default int generalInsert(UnaryOperator<GeneralInsertDSL> completer) {
+        return MyBatis3Utils.generalInsert(this::generalInsert, person, completer);
     }
 
     default int insert(PersonRecord record) {

src/test/java/examples/simple/PersonMapper.java

@@ -216,7 +216,7 @@ void testInsert() {
     void testGeneralInsert() {
         try (SqlSession session = sqlSessionFactory.openSession()) {
             PersonMapper mapper = session.getMapper(PersonMapper.class);
-            int rows = mapper.insert(c -> 
+            int rows = mapper.generalInsert(c ->
                 c.set(id).toValue(100)
                 .set(firstName).toValue("Joe")
                 .set(lastName).toValue(LastName.of("Jones"))

src/test/java/examples/simple/PersonMapperTest.java

@@ -233,7 +233,7 @@ class CanonicalSpringKotlinTemplateDirectTest {
         val record1 = PersonRecord(100, "Joe", LastName("Jones"), Date(), true, "Developer", 1)
         val record2 = PersonRecord(101, "Sarah", LastName("Smith"), Date(), true, "Architect", 2)
 
-        val rows = template.insert(record1, record2).into(Person) {
+        val rows = template.insertBatch(record1, record2).into(Person) {
             map(id).toProperty("id")
             map(firstName).toProperty("firstName")
             map(lastName).toProperty("lastNameAsString")