Kotlin extensions for Spring JDBC Template

Author: jeffgbutler

pom.xml

@@ -173,6 +173,13 @@
       <version>${kotlin.version}</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-jdbc</artifactId>
+      <version>5.1.9.RELEASE</version>
+      <scope>provided</scope>
+    </dependency>
+
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>
@@ -191,7 +198,6 @@
       <version>${junit.platform.version}</version>
       <scope>test</scope>
     </dependency>
-
     <dependency>
       <groupId>org.assertj</groupId>
       <artifactId>assertj-core</artifactId>
@@ -216,12 +222,6 @@
       <version>2.5.0</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-jdbc</artifactId>
-      <version>5.1.9.RELEASE</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.springframework.batch</groupId>
       <artifactId>spring-batch-core</artifactId>

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

@@ -0,0 +1,42 @@
+/**
+ *    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.kotlin.spring
+
+import org.mybatis.dynamic.sql.delete.render.DeleteStatementProvider
+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.springframework.jdbc.core.namedparam.BeanPropertySqlParameterSource
+import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate
+import java.sql.ResultSet
+
+fun NamedParameterJdbcTemplate.count(selectStatement: SelectStatementProvider) =
+    queryForObject(selectStatement.selectStatement, selectStatement.parameters, Long::class.java)!!
+
+fun NamedParameterJdbcTemplate.delete(deleteStatement: DeleteStatementProvider) =
+    update(deleteStatement.deleteStatement, deleteStatement.parameters)
+
+fun <T> NamedParameterJdbcTemplate.insert(insertStatement: InsertStatementProvider<T>) =
+    update(insertStatement.insertStatement, BeanPropertySqlParameterSource(insertStatement.record))
+
+fun <T> NamedParameterJdbcTemplate.selectMany(selectStatement: SelectStatementProvider, rowMapper: (rs: ResultSet, rowNum: Int) -> T): List<T> =
+    query(selectStatement.selectStatement, selectStatement.parameters, rowMapper)
+
+fun <T> NamedParameterJdbcTemplate.selectOne(selectStatement: SelectStatementProvider, rowMapper: (rs: ResultSet, rowNum: Int) -> T): T? =
+    queryForObject(selectStatement.selectStatement, selectStatement.parameters, rowMapper)
+
+fun NamedParameterJdbcTemplate.update(updateStatement: UpdateStatementProvider) =
+    update(updateStatement.updateStatement, updateStatement.parameters)

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

@@ -33,9 +33,6 @@ fun deleteFrom(table: SqlTable, completer: DeleteCompleter) =
 fun <T> insert(record: T, table: SqlTable, completer: InsertCompleter<T>): InsertStatementProvider<T> =
     completer(SqlBuilder.insert(record).into(table)).build().render(RenderingStrategies.SPRING_NAMED_PARAMETER)
 
-//fun <T> insertMultiple(records: Collection<T>, table: SqlTable, completer: MultiRowInsertCompleter<T>): MultiRowInsertStatementProvider<T> =
-//    completer(SqlBuilder.insertMultiple(records).into(table)).build().render(RenderingStrategies.SPRING_NAMED_PARAMETER)
-
 fun QueryExpressionDSL.FromGatherer<SelectModel>.from(table: SqlTable, completer: SelectCompleter) =
     completer(from(table)).build().render(RenderingStrategies.SPRING_NAMED_PARAMETER)
 

src/test/kotlin/examples/kotlin/spring/canonical/CanonicalSpringKotlinTest.kt

@@ -25,56 +25,23 @@ import examples.kotlin.spring.canonical.PersonDynamicSqlSupport.Person.id
 import examples.kotlin.spring.canonical.PersonDynamicSqlSupport.Person.lastName
 import examples.kotlin.spring.canonical.PersonDynamicSqlSupport.Person.occupation
 import org.assertj.core.api.Assertions.assertThat
-import org.junit.jupiter.api.AfterEach
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 import org.mybatis.dynamic.sql.SqlBuilder.*
-import org.mybatis.dynamic.sql.delete.render.DeleteStatementProvider
-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.kotlin.*
 import org.mybatis.dynamic.sql.util.kotlin.spring.*
 import org.mybatis.dynamic.sql.util.kotlin.spring.from
-import org.springframework.jdbc.core.namedparam.BeanPropertySqlParameterSource
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate
-import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType
-import java.sql.ResultSet
 import java.util.*
 
-fun NamedParameterJdbcTemplate.count(selectStatement: SelectStatementProvider) =
-    queryForObject(selectStatement.selectStatement, selectStatement.parameters, Long::class.java)
-        ?: 0
-
-fun NamedParameterJdbcTemplate.delete(deleteStatement: DeleteStatementProvider) =
-    update(deleteStatement.deleteStatement, deleteStatement.parameters)
-
-fun <T> NamedParameterJdbcTemplate.insert(insertStatement: InsertStatementProvider<T>) =
-    update(insertStatement.insertStatement, BeanPropertySqlParameterSource(insertStatement.record))
-
-fun <T> NamedParameterJdbcTemplate.selectMany(selectStatement: SelectStatementProvider, rowMapper: (rs: ResultSet, rowNum: Int) -> T): List<T> =
-    query(selectStatement.selectStatement, selectStatement.parameters, rowMapper)
-
-fun <T> NamedParameterJdbcTemplate.selectOne(selectStatement: SelectStatementProvider, rowMapper: (rs: ResultSet, rowNum: Int) -> T): T =
-    queryForObject(selectStatement.selectStatement, selectStatement.parameters, rowMapper)!!
-
-fun NamedParameterJdbcTemplate.update(updateStatement: UpdateStatementProvider) =
-    update(updateStatement.updateStatement, updateStatement.parameters)
-
 class CanonicalSpringKotlinTest {
-    private lateinit var db: EmbeddedDatabase
     private lateinit var template: NamedParameterJdbcTemplate
 
-    @AfterEach
-    fun teardown() {
-        db.shutdown()
-    }
-
     @BeforeEach
     fun setup() {
-        db = EmbeddedDatabaseBuilder()
+        val db = EmbeddedDatabaseBuilder()
             .setType(EmbeddedDatabaseType.HSQL)
             .generateUniqueName(true)
             .addScript("classpath:/examples/kotlin/spring/CreateSimpleDB.sql")
@@ -245,48 +212,6 @@ class CanonicalSpringKotlinTest {
         assertThat(rows).isEqualTo(1)
     }
 
-//    @Test
-//    fun testInsertMultiple() {
-//        val record1 = PersonRecord(100, "Joe", "Jones", Date(), "Yes", "Developer", 1)
-//        val record2 = PersonRecord(101, "Sarah", "Smith", Date(), "Yes", "Architect", 2)
-//
-//        val insertStatement = insertMultiple(listOf(record1, record2), Person) {
-//            map(id).toProperty("id")
-//            map(firstName).toProperty("firstName")
-//            map(lastName).toProperty("lastName")
-//            map(birthDate).toProperty("birthDate")
-//            map(employed).toProperty("employed")
-//            map(occupation).toProperty("occupation")
-//            map(addressId).toProperty("addressId")
-//        }
-//
-//        val expected = "insert into Person (id, first_name, last_name, birth_date, employed, occupation, address_id)" +
-//            " values" +
-//            " (#{records[0].id,jdbcType=INTEGER}," +
-//            " #{records[0].firstName,jdbcType=VARCHAR}," +
-//            " #{records[0].lastName,jdbcType=VARCHAR,typeHandler=examples.kotlin.mybatis3.canonical.LastNameTypeHandler}," +
-//            " #{records[0].birthDate,jdbcType=DATE}," +
-//            " #{records[0].employed,jdbcType=VARCHAR,typeHandler=examples.kotlin.mybatis3.canonical.YesNoTypeHandler}," +
-//            " #{records[0].occupation,jdbcType=VARCHAR}," +
-//            " #{records[0].addressId,jdbcType=INTEGER})" +
-//            ", (#{records[1].id,jdbcType=INTEGER}," +
-//            " #{records[1].firstName,jdbcType=VARCHAR}," +
-//            " #{records[1].lastName,jdbcType=VARCHAR,typeHandler=examples.kotlin.mybatis3.canonical.LastNameTypeHandler}," +
-//            " #{records[1].birthDate,jdbcType=DATE}," +
-//            " #{records[1].employed,jdbcType=VARCHAR,typeHandler=examples.kotlin.mybatis3.canonical.YesNoTypeHandler}," +
-//            " #{records[1].occupation,jdbcType=VARCHAR}," +
-//            " #{records[1].addressId,jdbcType=INTEGER})"
-//
-//        assertThat(insertStatement.insertStatement).isEqualTo(expected)
-//
-//        val b = BeanPropertySqlParameterSource(insertStatement.records)
-//        val names = b.parameterNames
-//
-//        val rows = template.update(insertStatement.insertStatement, BeanPropertySqlParameterSource(insertStatement.records))
-//
-//        assertThat(rows).isEqualTo(2)
-//    }
-
     @Test
     fun testRawSelect() {
         val selectStatement = select(id.`as`("A_ID"), firstName, lastName, birthDate, employed, occupation,
@@ -342,7 +267,7 @@ class CanonicalSpringKotlinTest {
             record
         }
 
-        with(record) {
+        with(record!!) {
             assertThat(id).isEqualTo(1)
             assertThat(firstName).isEqualTo("Fred")
             assertThat(lastName).isEqualTo("Flintstone")