Repackage the MyBatis3 Example - prepring for a Spring example

jeffgbutler · jeffgbutler · commit 797f6f566318 · 2019-09-03T16:21:53.000-04:00
diff --git a/src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/mybatis3/MapperSupportFunctions.kt b/src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/mybatis3/MapperSupportFunctions.kt
@@ -24,10 +24,7 @@ import org.mybatis.dynamic.sql.select.QueryExpressionDSL
 import org.mybatis.dynamic.sql.select.SelectModel
 import org.mybatis.dynamic.sql.select.render.SelectStatementProvider
 import org.mybatis.dynamic.sql.update.render.UpdateStatementProvider
-import org.mybatis.dynamic.sql.util.kotlin.CountCompleter
-import org.mybatis.dynamic.sql.util.kotlin.DeleteCompleter
-import org.mybatis.dynamic.sql.util.kotlin.SelectCompleter
-import org.mybatis.dynamic.sql.util.kotlin.UpdateCompleter
+import org.mybatis.dynamic.sql.util.kotlin.*
 
 fun count(mapper: (SelectStatementProvider) -> Long, table: SqlTable, completer: CountCompleter) =
     mapper(count(table, completer))
diff --git a/src/site/markdown/docs/kotlin.md b/src/site/markdown/docs/kotlin.md
@@ -3,7 +3,7 @@ MyBatis Dynamic SQL includes Kotlin extension methods that enable an SQL DSL for
 
 The standard usage patterns for MyBatis Dynamic SQL and MyBatis3 in Java must be modified somewhat for Kotlin. Kotlin interfaces can contain both abstract and non-abstract methods (somewhat similar to Java's default methods in an interface). But using these methods in Kotlin based mapper interfaces will cause a failure with MyBatis because of the underlying Kotlin implementation.
 
-This page will show our recommended pattern for using the MyBatis Dynamic SQL with Kotlin. The code shown on this page is from the `src/test/kotlin/examples/kotlin/canonical` directory in this repository. That directory contains a complete example of using this library with Kotlin.
+This page will show our recommended pattern for using the MyBatis Dynamic SQL with Kotlin. The code shown on this page is from the `src/test/kotlin/examples/kotlin/mybatis3/canonical` directory in this repository. That directory contains a complete example of using this library with Kotlin.
 
 All Kotlin support is available in two packages:
 
diff --git a/src/test/kotlin/examples/kotlin/mybatis3/canonical/AddressDynamicSqlSupport.kt b/src/test/kotlin/examples/kotlin/mybatis3/canonical/AddressDynamicSqlSupport.kt
@@ -13,7 +13,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package examples.kotlin.canonical
+package examples.kotlin.mybatis3.canonical
 
 import org.mybatis.dynamic.sql.SqlTable
 import java.sql.JDBCType
diff --git a/src/test/kotlin/examples/kotlin/mybatis3/canonical/AddressRecord.kt b/src/test/kotlin/examples/kotlin/mybatis3/canonical/AddressRecord.kt
@@ -13,6 +13,6 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package examples.kotlin.canonical
+package examples.kotlin.mybatis3.canonical
 
 data class AddressRecord(var id: Int? = null, var streetAddress: String? = null, var city: String? = null, var state: String? = null)
diff --git a/src/test/kotlin/examples/kotlin/mybatis3/canonical/LastName.kt b/src/test/kotlin/examples/kotlin/mybatis3/canonical/LastName.kt
@@ -13,6 +13,6 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package examples.kotlin.canonical
+package examples.kotlin.mybatis3.canonical
 
 data class LastName(var name: String)
diff --git a/src/test/kotlin/examples/kotlin/mybatis3/canonical/LastNameTypeHandler.kt b/src/test/kotlin/examples/kotlin/mybatis3/canonical/LastNameTypeHandler.kt
@@ -13,7 +13,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package examples.kotlin.canonical
+package examples.kotlin.mybatis3.canonical
 
 import org.apache.ibatis.type.JdbcType
 import org.apache.ibatis.type.TypeHandler
diff --git a/src/test/kotlin/examples/kotlin/mybatis3/canonical/PersonDynamicSqlSupport.kt b/src/test/kotlin/examples/kotlin/mybatis3/canonical/PersonDynamicSqlSupport.kt
@@ -13,7 +13,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package examples.kotlin.canonical
+package examples.kotlin.mybatis3.canonical
 
 import org.mybatis.dynamic.sql.SqlTable
 import java.sql.JDBCType
@@ -23,9 +23,9 @@ object PersonDynamicSqlSupport {
     object Person : SqlTable("Person") {
         val id = column<Int>("id", JDBCType.INTEGER)
         val firstName = column<String>("first_name", JDBCType.VARCHAR)
-        val lastName = column<LastName>("last_name", JDBCType.VARCHAR, "examples.kotlin.canonical.LastNameTypeHandler")
+        val lastName = column<LastName>("last_name", JDBCType.VARCHAR, "examples.kotlin.mybatis3.canonical.LastNameTypeHandler")
         val birthDate = column<Date>("birth_date", JDBCType.DATE)
-        val employed = column<Boolean>("employed", JDBCType.VARCHAR, "examples.kotlin.canonical.YesNoTypeHandler")
+        val employed = column<Boolean>("employed", JDBCType.VARCHAR, "examples.kotlin.mybatis3.canonical.YesNoTypeHandler")
         val occupation = column<String>("occupation", JDBCType.VARCHAR)
         val addressId = column<Int>("address_id", JDBCType.INTEGER)
     }
diff --git a/src/test/kotlin/examples/kotlin/mybatis3/canonical/PersonMapper.kt b/src/test/kotlin/examples/kotlin/mybatis3/canonical/PersonMapper.kt
@@ -13,7 +13,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package examples.kotlin.canonical
+package examples.kotlin.mybatis3.canonical
 
 import org.apache.ibatis.annotations.*
 import org.apache.ibatis.type.JdbcType
diff --git a/src/test/kotlin/examples/kotlin/mybatis3/canonical/PersonMapperExtensions.kt b/src/test/kotlin/examples/kotlin/mybatis3/canonical/PersonMapperExtensions.kt
@@ -13,16 +13,16 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package examples.kotlin.canonical
-
-import examples.kotlin.canonical.PersonDynamicSqlSupport.Person
-import examples.kotlin.canonical.PersonDynamicSqlSupport.Person.addressId
-import examples.kotlin.canonical.PersonDynamicSqlSupport.Person.birthDate
-import examples.kotlin.canonical.PersonDynamicSqlSupport.Person.employed
-import examples.kotlin.canonical.PersonDynamicSqlSupport.Person.firstName
-import examples.kotlin.canonical.PersonDynamicSqlSupport.Person.id
-import examples.kotlin.canonical.PersonDynamicSqlSupport.Person.lastName
-import examples.kotlin.canonical.PersonDynamicSqlSupport.Person.occupation
+package examples.kotlin.mybatis3.canonical
+
+import examples.kotlin.mybatis3.canonical.PersonDynamicSqlSupport.Person
+import examples.kotlin.mybatis3.canonical.PersonDynamicSqlSupport.Person.addressId
+import examples.kotlin.mybatis3.canonical.PersonDynamicSqlSupport.Person.birthDate
+import examples.kotlin.mybatis3.canonical.PersonDynamicSqlSupport.Person.employed
+import examples.kotlin.mybatis3.canonical.PersonDynamicSqlSupport.Person.firstName
+import examples.kotlin.mybatis3.canonical.PersonDynamicSqlSupport.Person.id
+import examples.kotlin.mybatis3.canonical.PersonDynamicSqlSupport.Person.lastName
+import examples.kotlin.mybatis3.canonical.PersonDynamicSqlSupport.Person.occupation
 import org.mybatis.dynamic.sql.SqlBuilder.isEqualTo
 import org.mybatis.dynamic.sql.update.UpdateDSL
 import org.mybatis.dynamic.sql.update.UpdateModel
diff --git a/src/test/kotlin/examples/kotlin/mybatis3/canonical/PersonMapperTest.kt b/src/test/kotlin/examples/kotlin/mybatis3/canonical/PersonMapperTest.kt
@@ -13,13 +13,13 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package examples.kotlin.canonical
+package examples.kotlin.mybatis3.canonical
 
-import examples.kotlin.canonical.PersonDynamicSqlSupport.Person.employed
-import examples.kotlin.canonical.PersonDynamicSqlSupport.Person.firstName
-import examples.kotlin.canonical.PersonDynamicSqlSupport.Person.id
-import examples.kotlin.canonical.PersonDynamicSqlSupport.Person.lastName
-import examples.kotlin.canonical.PersonDynamicSqlSupport.Person.occupation
+import examples.kotlin.mybatis3.canonical.PersonDynamicSqlSupport.Person.employed
+import examples.kotlin.mybatis3.canonical.PersonDynamicSqlSupport.Person.firstName
+import examples.kotlin.mybatis3.canonical.PersonDynamicSqlSupport.Person.id
+import examples.kotlin.mybatis3.canonical.PersonDynamicSqlSupport.Person.lastName
+import examples.kotlin.mybatis3.canonical.PersonDynamicSqlSupport.Person.occupation
 import org.apache.ibatis.datasource.unpooled.UnpooledDataSource
 import org.apache.ibatis.jdbc.ScriptRunner
 import org.apache.ibatis.mapping.Environment
@@ -41,7 +41,7 @@ import java.util.*
 class PersonMapperTest {
     private fun newSession(): SqlSession {
         Class.forName(JDBC_DRIVER)
-        val script = javaClass.getResourceAsStream("/examples/kotlin/CreateSimpleDB.sql")
+        val script = javaClass.getResourceAsStream("/examples/kotlin/mybatis3/CreateSimpleDB.sql")
         DriverManager.getConnection(JDBC_URL, "sa", "").use { connection ->
             val sr = ScriptRunner(connection)
             sr.setLogWriter(null)
diff --git a/src/test/kotlin/examples/kotlin/mybatis3/canonical/PersonRecord.kt b/src/test/kotlin/examples/kotlin/mybatis3/canonical/PersonRecord.kt
@@ -13,7 +13,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package examples.kotlin.canonical
+package examples.kotlin.mybatis3.canonical
 
 import java.util.*
 
diff --git a/src/test/kotlin/examples/kotlin/mybatis3/canonical/PersonWithAddress.kt b/src/test/kotlin/examples/kotlin/mybatis3/canonical/PersonWithAddress.kt
@@ -13,7 +13,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package examples.kotlin.canonical
+package examples.kotlin.mybatis3.canonical
 
 import java.util.*
 
diff --git a/src/test/kotlin/examples/kotlin/mybatis3/canonical/PersonWithAddressMapper.kt b/src/test/kotlin/examples/kotlin/mybatis3/canonical/PersonWithAddressMapper.kt
@@ -13,7 +13,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package examples.kotlin.canonical
+package examples.kotlin.mybatis3.canonical
 
 import org.apache.ibatis.annotations.*
 import org.apache.ibatis.type.JdbcType
diff --git a/src/test/kotlin/examples/kotlin/mybatis3/canonical/PersonWithAddressMapperExtensions.kt b/src/test/kotlin/examples/kotlin/mybatis3/canonical/PersonWithAddressMapperExtensions.kt
@@ -13,16 +13,16 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package examples.kotlin.canonical
+package examples.kotlin.mybatis3.canonical
 
-import examples.kotlin.canonical.AddressDynamicSqlSupport.Address
-import examples.kotlin.canonical.PersonDynamicSqlSupport.Person
-import examples.kotlin.canonical.PersonDynamicSqlSupport.Person.birthDate
-import examples.kotlin.canonical.PersonDynamicSqlSupport.Person.employed
-import examples.kotlin.canonical.PersonDynamicSqlSupport.Person.firstName
-import examples.kotlin.canonical.PersonDynamicSqlSupport.Person.id
-import examples.kotlin.canonical.PersonDynamicSqlSupport.Person.lastName
-import examples.kotlin.canonical.PersonDynamicSqlSupport.Person.occupation
+import examples.kotlin.mybatis3.canonical.AddressDynamicSqlSupport.Address
+import examples.kotlin.mybatis3.canonical.PersonDynamicSqlSupport.Person
+import examples.kotlin.mybatis3.canonical.PersonDynamicSqlSupport.Person.birthDate
+import examples.kotlin.mybatis3.canonical.PersonDynamicSqlSupport.Person.employed
+import examples.kotlin.mybatis3.canonical.PersonDynamicSqlSupport.Person.firstName
+import examples.kotlin.mybatis3.canonical.PersonDynamicSqlSupport.Person.id
+import examples.kotlin.mybatis3.canonical.PersonDynamicSqlSupport.Person.lastName
+import examples.kotlin.mybatis3.canonical.PersonDynamicSqlSupport.Person.occupation
 import org.mybatis.dynamic.sql.SqlBuilder.*
 import org.mybatis.dynamic.sql.util.kotlin.SelectCompleter
 import org.mybatis.dynamic.sql.util.kotlin.from
diff --git a/src/test/kotlin/examples/kotlin/mybatis3/canonical/YesNoTypeHandler.kt b/src/test/kotlin/examples/kotlin/mybatis3/canonical/YesNoTypeHandler.kt
@@ -13,7 +13,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package examples.kotlin.canonical
+package examples.kotlin.mybatis3.canonical
 
 import org.apache.ibatis.type.JdbcType
 import org.apache.ibatis.type.TypeHandler
diff --git a/src/test/kotlin/examples/kotlin/mybatis3/general/GeneralKotlinTest.kt b/src/test/kotlin/examples/kotlin/mybatis3/general/GeneralKotlinTest.kt
@@ -13,18 +13,18 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package examples.kotlin.general
-
-import examples.kotlin.canonical.*
-import examples.kotlin.canonical.AddressDynamicSqlSupport.Address
-import examples.kotlin.canonical.PersonDynamicSqlSupport.Person
-import examples.kotlin.canonical.PersonDynamicSqlSupport.Person.addressId
-import examples.kotlin.canonical.PersonDynamicSqlSupport.Person.birthDate
-import examples.kotlin.canonical.PersonDynamicSqlSupport.Person.employed
-import examples.kotlin.canonical.PersonDynamicSqlSupport.Person.firstName
-import examples.kotlin.canonical.PersonDynamicSqlSupport.Person.id
-import examples.kotlin.canonical.PersonDynamicSqlSupport.Person.lastName
-import examples.kotlin.canonical.PersonDynamicSqlSupport.Person.occupation
+package examples.kotlin.mybatis3.general
+
+import examples.kotlin.mybatis3.canonical.*
+import examples.kotlin.mybatis3.canonical.AddressDynamicSqlSupport.Address
+import examples.kotlin.mybatis3.canonical.PersonDynamicSqlSupport.Person
+import examples.kotlin.mybatis3.canonical.PersonDynamicSqlSupport.Person.addressId
+import examples.kotlin.mybatis3.canonical.PersonDynamicSqlSupport.Person.birthDate
+import examples.kotlin.mybatis3.canonical.PersonDynamicSqlSupport.Person.employed
+import examples.kotlin.mybatis3.canonical.PersonDynamicSqlSupport.Person.firstName
+import examples.kotlin.mybatis3.canonical.PersonDynamicSqlSupport.Person.id
+import examples.kotlin.mybatis3.canonical.PersonDynamicSqlSupport.Person.lastName
+import examples.kotlin.mybatis3.canonical.PersonDynamicSqlSupport.Person.occupation
 import org.apache.ibatis.datasource.unpooled.UnpooledDataSource
 import org.apache.ibatis.jdbc.ScriptRunner
 import org.apache.ibatis.mapping.Environment
@@ -45,7 +45,7 @@ import java.sql.DriverManager
 class GeneralKotlinTest {
     private fun newSession(): SqlSession {
         Class.forName(PersonMapperTest.JDBC_DRIVER)
-        val script = javaClass.getResourceAsStream("/examples/kotlin/CreateSimpleDB.sql")
+        val script = javaClass.getResourceAsStream("/examples/kotlin/mybatis3/CreateSimpleDB.sql")
         DriverManager.getConnection(PersonMapperTest.JDBC_URL, "sa", "").use { connection ->
             val sr = ScriptRunner(connection)
             sr.setLogWriter(null)
@@ -132,7 +132,7 @@ class GeneralKotlinTest {
             val expected = "delete from Person" +
                 " where (id < #{parameters.p1,jdbcType=INTEGER} or occupation is not null)" +
                 " and employed =" +
-                " #{parameters.p2,jdbcType=VARCHAR,typeHandler=examples.kotlin.canonical.YesNoTypeHandler}"
+                " #{parameters.p2,jdbcType=VARCHAR,typeHandler=examples.kotlin.mybatis3.canonical.YesNoTypeHandler}"
 
             assertThat(deleteStatement.deleteStatement).isEqualTo(expected)
 
@@ -157,7 +157,7 @@ class GeneralKotlinTest {
             val expected = "delete from Person" +
                 " where id < #{parameters.p1,jdbcType=INTEGER} or (occupation is not null" +
                 " and employed =" +
-                " #{parameters.p2,jdbcType=VARCHAR,typeHandler=examples.kotlin.canonical.YesNoTypeHandler})"
+                " #{parameters.p2,jdbcType=VARCHAR,typeHandler=examples.kotlin.mybatis3.canonical.YesNoTypeHandler})"
 
             assertThat(deleteStatement.deleteStatement).isEqualTo(expected)
 
@@ -182,7 +182,7 @@ class GeneralKotlinTest {
             val expected = "delete from Person where id < #{parameters.p1,jdbcType=INTEGER}" +
                 " and (occupation is not null and" +
                 " employed =" +
-                " #{parameters.p2,jdbcType=VARCHAR,typeHandler=examples.kotlin.canonical.YesNoTypeHandler})"
+                " #{parameters.p2,jdbcType=VARCHAR,typeHandler=examples.kotlin.mybatis3.canonical.YesNoTypeHandler})"
 
             assertThat(deleteStatement.deleteStatement).isEqualTo(expected)
 
diff --git a/src/test/kotlin/examples/kotlin/mybatis3/joins/Domain.kt b/src/test/kotlin/examples/kotlin/mybatis3/joins/Domain.kt
@@ -13,7 +13,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package examples.kotlin.joins
+package examples.kotlin.mybatis3.joins
 
 import java.util.*
 
diff --git a/src/test/kotlin/examples/kotlin/mybatis3/joins/ItemMasterDynamicSQLSupport.kt b/src/test/kotlin/examples/kotlin/mybatis3/joins/ItemMasterDynamicSQLSupport.kt
@@ -13,7 +13,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package examples.kotlin.joins
+package examples.kotlin.mybatis3.joins
 
 import org.mybatis.dynamic.sql.SqlTable
 import java.sql.JDBCType
diff --git a/src/test/kotlin/examples/kotlin/mybatis3/joins/JoinMapper.kt b/src/test/kotlin/examples/kotlin/mybatis3/joins/JoinMapper.kt
@@ -13,7 +13,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package examples.kotlin.joins
+package examples.kotlin.mybatis3.joins
 
 import org.apache.ibatis.annotations.ResultMap
 import org.apache.ibatis.annotations.SelectProvider
diff --git a/src/test/kotlin/examples/kotlin/mybatis3/joins/JoinMapperTest.kt b/src/test/kotlin/examples/kotlin/mybatis3/joins/JoinMapperTest.kt
@@ -13,12 +13,12 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package examples.kotlin.joins
+package examples.kotlin.mybatis3.joins
 
-import examples.kotlin.joins.ItemMasterDynamicSQLSupport.ItemMaster
-import examples.kotlin.joins.OrderDetailDynamicSQLSupport.OrderDetail
-import examples.kotlin.joins.OrderLineDynamicSQLSupport.OrderLine
-import examples.kotlin.joins.OrderMasterDynamicSQLSupport.OrderMaster
+import examples.kotlin.mybatis3.joins.ItemMasterDynamicSQLSupport.ItemMaster
+import examples.kotlin.mybatis3.joins.OrderDetailDynamicSQLSupport.OrderDetail
+import examples.kotlin.mybatis3.joins.OrderLineDynamicSQLSupport.OrderLine
+import examples.kotlin.mybatis3.joins.OrderMasterDynamicSQLSupport.OrderMaster
 import org.apache.ibatis.datasource.unpooled.UnpooledDataSource
 import org.apache.ibatis.jdbc.ScriptRunner
 import org.apache.ibatis.mapping.Environment
@@ -41,7 +41,7 @@ class JoinMapperTest {
 
     private fun newSession(): SqlSession {
         Class.forName(JDBC_DRIVER)
-        val script = javaClass.getResourceAsStream("/examples/kotlin/joins/CreateJoinDB.sql")
+        val script = javaClass.getResourceAsStream("/examples/kotlin/mybatis3/joins/CreateJoinDB.sql")
 
         DriverManager.getConnection(JDBC_URL, "sa", "").use { connection ->
             val sr = ScriptRunner(connection)
diff --git a/src/test/kotlin/examples/kotlin/mybatis3/joins/OrderDetailDynamicSQLSupport.kt b/src/test/kotlin/examples/kotlin/mybatis3/joins/OrderDetailDynamicSQLSupport.kt
@@ -13,7 +13,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package examples.kotlin.joins
+package examples.kotlin.mybatis3.joins
 
 import org.mybatis.dynamic.sql.SqlTable
 
diff --git a/src/test/kotlin/examples/kotlin/mybatis3/joins/OrderLineDynamicSQLSupport.kt b/src/test/kotlin/examples/kotlin/mybatis3/joins/OrderLineDynamicSQLSupport.kt
@@ -13,7 +13,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package examples.kotlin.joins
+package examples.kotlin.mybatis3.joins
 
 import org.mybatis.dynamic.sql.SqlTable
 
diff --git a/src/test/kotlin/examples/kotlin/mybatis3/joins/OrderMasterDynamicSQLSupport.kt b/src/test/kotlin/examples/kotlin/mybatis3/joins/OrderMasterDynamicSQLSupport.kt
@@ -13,7 +13,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package examples.kotlin.joins
+package examples.kotlin.mybatis3.joins
 
 import org.mybatis.dynamic.sql.SqlTable
 import java.sql.JDBCType
diff --git a/src/test/kotlin/examples/kotlin/mybatis3/joins/UserDynamicSQLSupport.kt b/src/test/kotlin/examples/kotlin/mybatis3/joins/UserDynamicSQLSupport.kt
@@ -13,7 +13,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package examples.kotlin.joins
+package examples.kotlin.mybatis3.joins
 
 import org.mybatis.dynamic.sql.SqlTable
 
diff --git a/src/test/resources/examples/kotlin/mybatis3/CreateSimpleDB.sql b/src/test/resources/examples/kotlin/mybatis3/CreateSimpleDB.sql
diff --git a/src/test/resources/examples/kotlin/mybatis3/joins/CreateJoinDB.sql b/src/test/resources/examples/kotlin/mybatis3/joins/CreateJoinDB.sql
diff --git a/src/test/resources/examples/kotlin/mybatis3/joins/JoinMapper.xml b/src/test/resources/examples/kotlin/mybatis3/joins/JoinMapper.xml
@@ -17,11 +17,11 @@
 
 -->
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="examples.kotlin.joins.JoinMapper">
-  <resultMap id="SimpleJoinResult" type="examples.kotlin.joins.OrderMaster">
+<mapper namespace="examples.kotlin.mybatis3.joins.JoinMapper">
+  <resultMap id="SimpleJoinResult" type="examples.kotlin.mybatis3.joins.OrderMaster">
     <id column="order_id" jdbcType="INTEGER" property="id" />
     <result column="order_date" jdbcType="DATE" property="orderDate" />
-    <collection property="details" ofType="examples.kotlin.joins.OrderDetail">
+    <collection property="details" ofType="examples.kotlin.mybatis3.joins.OrderDetail">
       <id column="order_id" jdbcType="INTEGER" property="orderId"/>
       <id column="line_number" jdbcType="INTEGER" property="lineNumber"/>
       <result column="description" jdbcType="VARCHAR" property="description"/>
