From 516043b225d9164db72af97c8077480266360747 Mon Sep 17 00:00:00 2001
From: Jeff Butler <jeffgbutler@gmail.com>
Date: Fri, 11 Feb 2022 09:18:18 -0500
Subject: [PATCH 1/9] Update Dependency

---
 core/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index efd4d9f860..bc6c454410 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2006-2021 the original author or authors.
+       Copyright 2006-2022 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.
@@ -273,7 +273,7 @@
       <dependency>
         <groupId>org.mybatis.dynamic-sql</groupId>
         <artifactId>mybatis-dynamic-sql</artifactId>
-        <version>1.3.1</version>
+        <version>1.4.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.jetbrains.kotlin</groupId>

From 19aa3aa5f34b8b083bc4207a53d01aaea9ad4902 Mon Sep 17 00:00:00 2001
From: Jeff Butler <jeffgbutler@gmail.com>
Date: Fri, 11 Feb 2022 09:19:07 -0500
Subject: [PATCH 2/9] Use new Kotlin Where DSL

---
 .../DeleteByPrimaryKeyMethodGenerator.java    |  3 +-
 .../elements/KotlinFragmentGenerator.java     | 26 +++---
 .../SelectByPrimaryKeyMethodGenerator.java    |  3 +-
 .../test/mb3/dsql/kotlin/DynamicSqlTest.kt    | 93 ++++++++++---------
 .../mb3/dsql/kotlin/UpdateByExampleTest.kt    | 83 ++++++++---------
 .../miscellaneous/GeneratedAlwaysTest.kt      | 27 +++---
 .../kotlin/miscellaneous/MiscellaneousTest.kt | 44 ++++-----
 7 files changed, 138 insertions(+), 141 deletions(-)

diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/runtime/kotlin/elements/DeleteByPrimaryKeyMethodGenerator.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/runtime/kotlin/elements/DeleteByPrimaryKeyMethodGenerator.java
index b7d91a5b87..6af8aeb279 100644
--- a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/runtime/kotlin/elements/DeleteByPrimaryKeyMethodGenerator.java
+++ b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/runtime/kotlin/elements/DeleteByPrimaryKeyMethodGenerator.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2006-2021 the original author or authors.
+ *    Copyright 2006-2022 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.
@@ -42,7 +42,6 @@ public KotlinFunctionAndImports generateMethodAndImports() {
                 KotlinFunction.newOneLineFunction(mapperName + ".deleteByPrimaryKey") //$NON-NLS-1$
                 .withCodeLine("delete {") //$NON-NLS-1$
                 .build())
-                .withImport("org.mybatis.dynamic.sql.util.kotlin.elements.isEqualTo") //$NON-NLS-1$
                 .build();
 
         addFunctionComment(functionAndImports);
diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/runtime/kotlin/elements/KotlinFragmentGenerator.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/runtime/kotlin/elements/KotlinFragmentGenerator.java
index 061cc3243f..c78c5f570a 100644
--- a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/runtime/kotlin/elements/KotlinFragmentGenerator.java
+++ b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/runtime/kotlin/elements/KotlinFragmentGenerator.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2006-2021 the original author or authors.
+ *    Copyright 2006-2022 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.
@@ -65,14 +65,14 @@ public KotlinFunctionParts getPrimaryKeyWhereClauseAndParameters() {
                     .withDataType(kt.getShortNameWithTypeArguments())
                     .build());
             if (first) {
-                builder.withCodeLine("    where(" + fieldNameAndImport.fieldName() //$NON-NLS-1$
-                        + ", isEqualTo(" + argName //$NON-NLS-1$
-                        + "))"); //$NON-NLS-1$
+                builder.withCodeLine("    where { " + fieldNameAndImport.fieldName() //$NON-NLS-1$
+                        + " isEqualTo " + argName //$NON-NLS-1$
+                        + " }"); //$NON-NLS-1$
                 first = false;
             } else {
-                builder.withCodeLine("    and(" + fieldNameAndImport.fieldName() //$NON-NLS-1$
-                        + ", isEqualTo(" + argName //$NON-NLS-1$
-                        + "))"); //$NON-NLS-1$
+                builder.withCodeLine("    and { " + fieldNameAndImport.fieldName() //$NON-NLS-1$
+                        + " isEqualTo " + argName //$NON-NLS-1$
+                        + " }"); //$NON-NLS-1$
             }
         }
         builder.withCodeLine("}"); //$NON-NLS-1$
@@ -91,14 +91,14 @@ public KotlinFunctionParts getPrimaryKeyWhereClauseForUpdate() {
 
             builder.withImport(fieldNameAndImport.importString());
             if (first) {
-                builder.withCodeLine("    where(" + fieldNameAndImport.fieldName() //$NON-NLS-1$
-                        + ", isEqualTo(row." + column.getJavaProperty() //$NON-NLS-1$
-                        + "!!))"); //$NON-NLS-1$
+                builder.withCodeLine("    where { " + fieldNameAndImport.fieldName() //$NON-NLS-1$
+                        + " isEqualTo row." + column.getJavaProperty() //$NON-NLS-1$
+                        + "!! }"); //$NON-NLS-1$
                 first = false;
             } else {
-                builder.withCodeLine("    and(" + fieldNameAndImport.fieldName() //$NON-NLS-1$
-                        + ", isEqualTo(row." + column.getJavaProperty() //$NON-NLS-1$
-                        + "!!))"); //$NON-NLS-1$
+                builder.withCodeLine("    and {" + fieldNameAndImport.fieldName() //$NON-NLS-1$
+                        + " isEqualTo row." + column.getJavaProperty() //$NON-NLS-1$
+                        + "!! }"); //$NON-NLS-1$
             }
         }
         builder.withCodeLine("}"); //$NON-NLS-1$
diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/runtime/kotlin/elements/SelectByPrimaryKeyMethodGenerator.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/runtime/kotlin/elements/SelectByPrimaryKeyMethodGenerator.java
index 3b906c2f22..304e7e42f6 100644
--- a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/runtime/kotlin/elements/SelectByPrimaryKeyMethodGenerator.java
+++ b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/runtime/kotlin/elements/SelectByPrimaryKeyMethodGenerator.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2006-2021 the original author or authors.
+ *    Copyright 2006-2022 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.
@@ -39,7 +39,6 @@ public KotlinFunctionAndImports generateMethodAndImports() {
                 KotlinFunction.newOneLineFunction(mapperName + ".selectByPrimaryKey") //$NON-NLS-1$
                 .withCodeLine("selectOne {") //$NON-NLS-1$
                 .build())
-                .withImport("org.mybatis.dynamic.sql.util.kotlin.elements.isEqualTo") //$NON-NLS-1$
                 .build();
 
         addFunctionComment(functionAndImports);
diff --git a/core/mybatis-generator-systests-kotlin/src/test/kotlin/mbg/test/mb3/dsql/kotlin/DynamicSqlTest.kt b/core/mybatis-generator-systests-kotlin/src/test/kotlin/mbg/test/mb3/dsql/kotlin/DynamicSqlTest.kt
index 7e3b9dbd8f..fd9b720f8d 100644
--- a/core/mybatis-generator-systests-kotlin/src/test/kotlin/mbg/test/mb3/dsql/kotlin/DynamicSqlTest.kt
+++ b/core/mybatis-generator-systests-kotlin/src/test/kotlin/mbg/test/mb3/dsql/kotlin/DynamicSqlTest.kt
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2006-2021 the original author or authors.
+ *    Copyright 2006-2022 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.
@@ -34,7 +34,6 @@ import org.assertj.core.api.Assertions.within
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.Test
-import org.mybatis.dynamic.sql.SqlBuilder.*
 import java.math.BigDecimal
 import java.time.LocalDate
 import java.time.LocalDateTime
@@ -53,7 +52,7 @@ class DynamicSqlTest : AbstractTest() {
             mapper.insert(Fieldsonly(5, 11.22, 33.44))
 
             val answer = mapper.select {
-                where(fieldsonly.integerfield, isEqualTo(5))
+                where { fieldsonly.integerfield isEqualTo 5 }
             }
             assertThat(answer).hasSize(1)
 
@@ -75,7 +74,7 @@ class DynamicSqlTest : AbstractTest() {
             mapper.insert(Fieldsonly(9, 88.99, 100.111))
 
             var answer = mapper.select {
-                where(fieldsonly.integerfield, isGreaterThan(5))
+                where { fieldsonly.integerfield isGreaterThan 5 }
             }
             assertThat(answer).hasSize(2)
 
@@ -98,7 +97,7 @@ class DynamicSqlTest : AbstractTest() {
             mapper.insertMultiple(record1, record2, record3)
 
             var answer = mapper.select {
-                where(fieldsonly.integerfield, isGreaterThan(5))
+                where { fieldsonly.integerfield isGreaterThan 5 }
             }
             assertThat(answer).hasSize(2)
 
@@ -127,7 +126,7 @@ class DynamicSqlTest : AbstractTest() {
             mapper.insert(Fieldsonly(9, 88.99, 100.111))
 
             var answer = mapper.selectDistinct {
-                where(fieldsonly.integerfield, isEqualTo(5))
+                where { fieldsonly.integerfield isEqualTo 5 }
             }
             assertThat(answer).hasSize(1)
 
@@ -160,7 +159,7 @@ class DynamicSqlTest : AbstractTest() {
             mapper.insert(Fieldsonly(9, 88.99, 100.111))
 
             val rows = mapper.delete {
-                where(fieldsonly.integerfield, isGreaterThan(5))
+                where { fieldsonly.integerfield isGreaterThan 5 }
             }
             assertThat(rows).isEqualTo(2)
 
@@ -178,7 +177,7 @@ class DynamicSqlTest : AbstractTest() {
             mapper.insert(Fieldsonly(9, 88.99, 100.111))
 
             var rows = mapper.count {
-                where(fieldsonly.integerfield, isGreaterThan(5))
+                where { fieldsonly.integerfield isGreaterThan 5 }
             }
             assertThat(rows).isEqualTo(2)
 
@@ -231,7 +230,7 @@ class DynamicSqlTest : AbstractTest() {
             mapper.insert(Pkonly(7, 8))
 
             val rows = mapper.delete {
-                where(pkonly.id, isGreaterThan(4))
+                where { pkonly.id isGreaterThan 4 }
             }
             assertThat(rows).isEqualTo(2)
 
@@ -249,7 +248,7 @@ class DynamicSqlTest : AbstractTest() {
             mapper.insert(Pkonly(7, 8))
 
             val answer = mapper.select {
-                where(pkonly.id, isGreaterThan(4))
+                where { pkonly.id isGreaterThan 4 }
                 orderBy(pkonly.id)
             }
             assertThat(answer).hasSize(2)
@@ -267,7 +266,7 @@ class DynamicSqlTest : AbstractTest() {
             mapper.insertMultiple(Pkonly(1, 3), Pkonly(5, 6), Pkonly(7, 8))
 
             val answer = mapper.select {
-                where(pkonly.id, isGreaterThan(4))
+                where { pkonly.id isGreaterThan 4 }
                 orderBy(pkonly.id)
             }
             assertThat(answer).hasSize(2)
@@ -287,7 +286,7 @@ class DynamicSqlTest : AbstractTest() {
             mapper.insert(Pkonly(7, 8))
 
             val answer = mapper.select {
-                where(pkonly.id, isGreaterThan(4))
+                where { pkonly.id isGreaterThan 4 }
                 orderBy(pkonly.id)
             }
 
@@ -308,7 +307,7 @@ class DynamicSqlTest : AbstractTest() {
             mapper.insert(Pkonly(7, 8))
 
             val answer = mapper.select {
-                where(pkonly.id, isGreaterThan(4))
+                where { pkonly.id isGreaterThan 4 }
                 orderBy(pkonly.id)
             }
 
@@ -342,7 +341,7 @@ class DynamicSqlTest : AbstractTest() {
             mapper.insert(Pkonly(7, 8))
 
             var rows = mapper.count {
-                where(pkonly.id, isGreaterThan(4))
+                where { pkonly.id isGreaterThan 4 }
             }
             assertThat(rows).isEqualTo(2)
 
@@ -465,7 +464,7 @@ class DynamicSqlTest : AbstractTest() {
             assertThat(answer).hasSize(2)
 
             val rows = mapper.delete {
-                where(pkfields.lastname, isLike("J%"))
+                where { pkfields.lastname isLike "J%" }
             }
             assertThat(rows).isEqualTo(1)
 
@@ -507,7 +506,7 @@ class DynamicSqlTest : AbstractTest() {
             mapper.insert(Pkfields(id1 = 2, id2 = 3, firstname = "Bamm Bamm", lastname = "Rubble"))
 
             val answer = mapper.select {
-                where(pkfields.firstname, isLike("B%"))
+                where { pkfields.firstname isLike "B%" }
                 orderBy(pkfields.id1, pkfields.id2)
             }
 
@@ -533,7 +532,7 @@ class DynamicSqlTest : AbstractTest() {
             mapper.insert(Pkfields(id1 = 2, id2 = 3, firstname = "Bamm Bamm", lastname = "Rubble"))
 
             val answer = mapper.select {
-                where(pkfields.firstname, isNotLike("B%"))
+                where { pkfields.firstname isNotLike "B%" }
                 orderBy(pkfields.id1, pkfields.id2)
             }
 
@@ -559,10 +558,11 @@ class DynamicSqlTest : AbstractTest() {
             mapper.insert(Pkfields(id1 = 2, id2 = 3, firstname = "Bamm Bamm", lastname = "Rubble"))
 
             val answer = mapper.select {
-                where(pkfields.firstname, isLike("B%")) {
-                    and(pkfields.id2, isEqualTo(3))
+                where {
+                    pkfields.firstname isLike "B%"
+                    and { pkfields.id2 isEqualTo 3 }
                 }
-                or(pkfields.firstname, isLike("Wi%"))
+                or { pkfields.firstname isLike "Wi%" }
                 orderBy(pkfields.id1, pkfields.id2)
             }
 
@@ -586,7 +586,7 @@ class DynamicSqlTest : AbstractTest() {
             mapper.insert(Pkfields(id1 = 2, id2 = 3, firstname = "Bamm Bamm", lastname = "Rubble"))
 
             val answer = mapper.select {
-                where(pkfields.id2, isIn(1, 3))
+                where { pkfields.id2.isIn(1, 3) }
                 orderBy(pkfields.id1, pkfields.id2)
             }
 
@@ -614,7 +614,7 @@ class DynamicSqlTest : AbstractTest() {
             mapper.insert(Pkfields(id1 = 2, id2 = 3, firstname = "Bamm Bamm", lastname = "Rubble"))
 
             val answer = mapper.select {
-                where(pkfields.id2, isBetween(1).and(3))
+                where { pkfields.id2 isBetween 1 and 3 }
                 orderBy(pkfields.id1, pkfields.id2)
             }
             assertThat(answer).hasSize(6)
@@ -678,8 +678,8 @@ class DynamicSqlTest : AbstractTest() {
             mapper.insert(Pkfields(id1 = 2, id2 = 3, firstname = "Bamm Bamm", lastname = "Rubble", wierdField = 66))
 
             val answer = mapper.select {
-                where(pkfields.wierdField, isLessThan(40))
-                and(pkfields.wierdField, isIn(11, 22))
+                where { pkfields.wierdField isLessThan 40 }
+                and { pkfields.wierdField.isIn(11, 22) }
                 orderBy(pkfields.id1, pkfields.id2)
             }
 
@@ -695,7 +695,7 @@ class DynamicSqlTest : AbstractTest() {
             mapper.insert(Pkfields(id1 = 3, id2 = 4, firstname = "Bob", lastname = "Jones"))
 
             var rows = mapper.count {
-                where(pkfields.lastname, isLike("J%"))
+                where { pkfields.lastname isLike "J%" }
             }
 
             assertThat(rows).isEqualTo(1)
@@ -791,7 +791,7 @@ class DynamicSqlTest : AbstractTest() {
             var answer = mapper.select { allRows() }
             assertThat(answer).hasSize(2)
 
-            val rows = mapper.delete { where(pkblobs.id, isLessThan(4)) }
+            val rows = mapper.delete { where { pkblobs.id isLessThan 4 } }
             assertThat(rows).isEqualTo(1)
 
             answer = mapper.select { allRows() }
@@ -842,7 +842,7 @@ class DynamicSqlTest : AbstractTest() {
             record.blob2 = generateRandomBlob()
             mapper.insert(record)
 
-            val answer = mapper.select { where(pkblobs.id, isGreaterThan(4)) }
+            val answer = mapper.select { where { pkblobs.id isGreaterThan 4 } }
 
             assertEquals(1, answer.size)
 
@@ -875,7 +875,7 @@ class DynamicSqlTest : AbstractTest() {
             val recordsInserted = mapper.insertMultiple(records)
             assertEquals(2, recordsInserted)
 
-            val answer = mapper.select { where(pkblobs.id, isGreaterThan(4)) }
+            val answer = mapper.select { where { pkblobs.id isGreaterThan 4 } }
 
             assertEquals(1, answer.size)
 
@@ -903,7 +903,7 @@ class DynamicSqlTest : AbstractTest() {
             record.blob2 = generateRandomBlob()
             mapper.insert(record)
 
-            var rows = mapper.count { where(pkblobs.id, isLessThan(4)) }
+            var rows = mapper.count { where { pkblobs.id isLessThan 4 } }
             assertEquals(1, rows)
 
             rows = mapper.count { allRows() }
@@ -1061,7 +1061,7 @@ class DynamicSqlTest : AbstractTest() {
             var answer = mapper.select { allRows() }
             assertEquals(2, answer.size)
 
-            val rows = mapper.delete { where(pkfieldsblobs.id1, isNotEqualTo(3)) }
+            val rows = mapper.delete { where { pkfieldsblobs.id1 isNotEqualTo 3 } }
             assertEquals(1, rows)
 
             answer = mapper.select { allRows() }
@@ -1127,7 +1127,7 @@ class DynamicSqlTest : AbstractTest() {
             record.blob1 = generateRandomBlob()
             mapper.insert(record)
 
-            val answer = mapper.select { where(pkfieldsblobs.id2, isEqualTo(6)) }
+            val answer = mapper.select { where { pkfieldsblobs.id2 isEqualTo 6 } }
             assertEquals(1, answer.size)
 
             val newRecord = answer[0]
@@ -1165,7 +1165,7 @@ class DynamicSqlTest : AbstractTest() {
             val rowsInserted = mapper.insertMultiple(records)
             assertEquals(2, rowsInserted)
 
-            val answer = mapper.select { where(pkfieldsblobs.id2, isEqualTo(6)) }
+            val answer = mapper.select { where { pkfieldsblobs.id2 isEqualTo 6 } }
             assertEquals(1, answer.size)
 
             val newRecord = answer[0]
@@ -1250,7 +1250,7 @@ class DynamicSqlTest : AbstractTest() {
             var answer = mapper.select { allRows() }
             assertEquals(2, answer.size)
 
-            val rows = mapper.delete { where(fieldsblobs.firstname, isLike("S%")) }
+            val rows = mapper.delete { where { fieldsblobs.firstname isLike "S%" } }
             assertEquals(1, rows)
 
             answer = mapper.select { allRows() }
@@ -1277,7 +1277,7 @@ class DynamicSqlTest : AbstractTest() {
             record.blob2 = generateRandomBlob()
             mapper.insert(record)
 
-            val answer = mapper.select { where(fieldsblobs.firstname, isLike("S%")) }
+            val answer = mapper.select { where { fieldsblobs.firstname isLike "S%" } }
             assertEquals(1, answer.size)
 
             val newRecord = answer[0]
@@ -1312,7 +1312,7 @@ class DynamicSqlTest : AbstractTest() {
             val rowsInserted = mapper.insertMultiple(records)
             assertEquals(2, rowsInserted)
 
-            val answer = mapper.select { where(fieldsblobs.firstname, isLike("S%")) }
+            val answer = mapper.select { where { fieldsblobs.firstname isLike "S%" } }
             assertEquals(1, answer.size)
 
             val newRecord = answer[0]
@@ -1368,7 +1368,7 @@ class DynamicSqlTest : AbstractTest() {
             record.blob1 = generateRandomBlob()
             mapper.insert(record)
 
-            var rows = mapper.count { where(pkfieldsblobs.id1, isNotEqualTo(3)) }
+            var rows = mapper.count { where { pkfieldsblobs.id1 isNotEqualTo 3 } }
             assertEquals(1, rows)
 
             rows = mapper.count { allRows() }
@@ -1621,7 +1621,7 @@ class DynamicSqlTest : AbstractTest() {
             var answer = mapper.select { allRows() }
             assertEquals(2, answer.size)
 
-            val rows = mapper.delete { where(awfulTable.eMail, isLike("fred@%")) }
+            val rows = mapper.delete { where { awfulTable.eMail isLike "fred@%" } }
             assertEquals(1, rows)
 
             answer = mapper.select { allRows() }
@@ -1775,7 +1775,7 @@ class DynamicSqlTest : AbstractTest() {
             mapper.insert(record)
 
             val answer = mapper.select {
-                where(awfulTable.firstFirstName, isLike("b%"))
+                where { awfulTable.firstFirstName isLike "b%" }
                 orderBy(awfulTable.customerId)
             }
             assertEquals(3, answer.size)
@@ -1899,7 +1899,7 @@ class DynamicSqlTest : AbstractTest() {
             assertEquals(62, records[5].customerId)
 
             val answer = mapper.select {
-                where(awfulTable.firstFirstName, isLike("b%"))
+                where { awfulTable.firstFirstName isLike "b%" }
                 orderBy(awfulTable.customerId)
             }
             assertEquals(3, answer.size)
@@ -2010,7 +2010,7 @@ class DynamicSqlTest : AbstractTest() {
             mapper.insert(record)
 
             val answer = mapper.select {
-                where(awfulTable.firstFirstName, isNotLike("b%"))
+                where { awfulTable.firstFirstName isNotLike "b%" }
                 orderBy(awfulTable.customerId)
             }
             assertEquals(3, answer.size)
@@ -2116,10 +2116,11 @@ class DynamicSqlTest : AbstractTest() {
             mapper.insert(record)
 
             val answer = mapper.select {
-                where(awfulTable.firstFirstName, isLike("b%")) {
-                    and(awfulTable.id2, isEqualTo(222222))
+                where {
+                    awfulTable.firstFirstName isLike "b%"
+                    and { awfulTable.id2 isEqualTo 222222 }
                 }
-                or(awfulTable.firstFirstName, isLike("wi%"))
+                or { awfulTable.firstFirstName isLike "wi%" }
                 orderBy(awfulTable.customerId)
             }
 
@@ -2223,7 +2224,7 @@ class DynamicSqlTest : AbstractTest() {
             mapper.insert(record)
 
             val answer = mapper.select {
-                where(awfulTable.id1, isIn(1, 11))
+                where { awfulTable.id1.isIn(1, 11) }
                 orderBy(awfulTable.customerId)
             }
 
@@ -2326,7 +2327,7 @@ class DynamicSqlTest : AbstractTest() {
             record.thirdFirstName = "bammbamm3"
             mapper.insert(record)
 
-            val answer = mapper.select { where(awfulTable.id1, isBetween(1).and(1000)) }
+            val answer = mapper.select { where { awfulTable.id1 isBetween 1 and 1000 } }
             assertEquals(3, answer.size)
         }
     }
@@ -2474,7 +2475,7 @@ class DynamicSqlTest : AbstractTest() {
 
             mapper.insert(record)
 
-            var rows = mapper.count { where(awfulTable.eMail, isLike("fred@%")) }
+            var rows = mapper.count { where { awfulTable.eMail isLike "fred@%" } }
             assertEquals(1, rows)
 
             rows = mapper.count { allRows() }
diff --git a/core/mybatis-generator-systests-kotlin/src/test/kotlin/mbg/test/mb3/dsql/kotlin/UpdateByExampleTest.kt b/core/mybatis-generator-systests-kotlin/src/test/kotlin/mbg/test/mb3/dsql/kotlin/UpdateByExampleTest.kt
index e1d12fae9a..5071915726 100644
--- a/core/mybatis-generator-systests-kotlin/src/test/kotlin/mbg/test/mb3/dsql/kotlin/UpdateByExampleTest.kt
+++ b/core/mybatis-generator-systests-kotlin/src/test/kotlin/mbg/test/mb3/dsql/kotlin/UpdateByExampleTest.kt
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2006-2021 the original author or authors.
+ *    Copyright 2006-2022 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.
@@ -30,7 +30,6 @@ import org.assertj.core.api.Assertions.assertThat
 import org.assertj.core.data.Offset
 import org.junit.jupiter.api.Assertions.*
 import org.junit.jupiter.api.Test
-import org.mybatis.dynamic.sql.SqlBuilder.*
 
 /**
  *
@@ -49,13 +48,13 @@ class UpdateByExampleTest : AbstractTest() {
 
             val rows = mapper.update {
                 updateSelectiveColumns(Fieldsonly(doublefield = 99.0))
-                where(fieldsonly.integerfield, isGreaterThan(5))
+                where { fieldsonly.integerfield isGreaterThan 5 }
             }
 
             assertThat(rows).isEqualTo(2)
 
             var answer = mapper.select {
-                where(fieldsonly.integerfield, isEqualTo(5))
+                where { fieldsonly.integerfield isEqualTo 5 }
             }
 
             assertThat(answer).hasSize(1)
@@ -66,7 +65,7 @@ class UpdateByExampleTest : AbstractTest() {
             }
 
             answer = mapper.select {
-                where(fieldsonly.integerfield, isEqualTo(8))
+                where { fieldsonly.integerfield isEqualTo 8 }
             }
 
             assertThat(answer).hasSize(1)
@@ -78,7 +77,7 @@ class UpdateByExampleTest : AbstractTest() {
             }
 
             answer = mapper.select {
-                where(fieldsonly.integerfield, isEqualTo(9))
+                where { fieldsonly.integerfield isEqualTo 9 }
             }
             assertThat(answer).hasSize(1)
             with(answer[0]) {
@@ -115,11 +114,11 @@ class UpdateByExampleTest : AbstractTest() {
 
             val rows = mapper.update {
                 updateAllColumns(updateRecord)
-                where(fieldsonly.integerfield, isEqualTo(5))
+                where { fieldsonly.integerfield isEqualTo 5 }
             }
             assertEquals(1, rows)
 
-            val answer = mapper.select { where(fieldsonly.integerfield, isEqualTo(22)) }
+            val answer = mapper.select { where { fieldsonly.integerfield isEqualTo 22 } }
             assertEquals(1, answer.size)
             record = answer[0]
             assertNull(record.doublefield)
@@ -145,19 +144,19 @@ class UpdateByExampleTest : AbstractTest() {
 
             val rows = mapper.update {
                 updateSelectiveColumns(updateKey)
-                where(pkonly.id, isGreaterThan(4))
+                where { pkonly.id isGreaterThan 4 }
             }
             assertEquals(2, rows)
 
             var returnedRows = mapper.count {
-                where(pkonly.id, isEqualTo(5))
-                and(pkonly.seqNum, isEqualTo(3))
+                where { pkonly.id isEqualTo 5 }
+                and { pkonly.seqNum isEqualTo 3 }
             }
             assertEquals(1, returnedRows)
 
             returnedRows = mapper.count {
-                where(pkonly.id, isEqualTo(7))
-                and(pkonly.seqNum, isEqualTo(3))
+                where { pkonly.id isEqualTo 7 }
+                and { pkonly.seqNum isEqualTo 3 }
             }
             assertEquals(1, returnedRows)
         }
@@ -180,13 +179,13 @@ class UpdateByExampleTest : AbstractTest() {
 
             val rows = mapper.update {
                 updateAllColumns(updateKey)
-                where(pkonly.id, isEqualTo(7))
+                where { pkonly.id isEqualTo 7 }
             }
             assertEquals(1, rows)
 
             val returnedRows = mapper.count {
-                where(pkonly.id, isEqualTo(22))
-                and(pkonly.seqNum, isEqualTo(3))
+                where { pkonly.id isEqualTo 22 }
+                and { pkonly.seqNum isEqualTo 3 }
             }
             assertEquals(1, returnedRows)
         }
@@ -215,15 +214,15 @@ class UpdateByExampleTest : AbstractTest() {
 
             val rows = mapper.update {
                 updateSelectiveColumns(updateRecord)
-                where(pkfields.lastname, isLike("J%"))
+                where { pkfields.lastname isLike "J%" }
             }
             assertEquals(1, rows)
 
             val returnedRows = mapper.count {
-                where(pkfields.firstname, isEqualTo("Fred"))
-                and(pkfields.lastname, isEqualTo("Jones"))
-                and(pkfields.id1, isEqualTo(3))
-                and(pkfields.id2, isEqualTo(4))
+                where { pkfields.firstname isEqualTo "Fred" }
+                and { pkfields.lastname isEqualTo "Jones" }
+                and { pkfields.id1 isEqualTo 3 }
+                and { pkfields.id2 isEqualTo 4 }
             }
             assertEquals(1, returnedRows)
         }
@@ -252,15 +251,15 @@ class UpdateByExampleTest : AbstractTest() {
 
             val rows = mapper.update {
                 updateAllColumns(updateRecord)
-                where(pkfields.id1, isEqualTo(3))
-                and(pkfields.id2, isEqualTo(4))
+                where { pkfields.id1 isEqualTo 3 }
+                and { pkfields.id2 isEqualTo 4 }
             }
             assertEquals(1, rows)
 
             val returnedRows = mapper.count {
-                where(pkfields.firstname, isEqualTo("Fred"))
-                and(pkfields.id1, isEqualTo(3))
-                and(pkfields.id2, isEqualTo(4))
+                where { pkfields.firstname isEqualTo "Fred" }
+                and { pkfields.id1 isEqualTo 3 }
+                and { pkfields.id2 isEqualTo 4 }
             }
             assertEquals(1, returnedRows)
         }
@@ -286,11 +285,11 @@ class UpdateByExampleTest : AbstractTest() {
 
             val rows = mapper.update {
                 updateSelectiveColumns(newRecord)
-                where(pkblobs.id, isGreaterThan(4))
+                where { pkblobs.id isGreaterThan 4 }
             }
             assertEquals(1, rows)
 
-            val answer = mapper.select { where(pkblobs.id, isGreaterThan(4)) }
+            val answer = mapper.select { where { pkblobs.id isGreaterThan 4 } }
             assertEquals(1, answer.size)
 
             val returnedRecord = answer[0]
@@ -321,11 +320,11 @@ class UpdateByExampleTest : AbstractTest() {
 
             val rows = mapper.update {
                 updateAllColumns(newRecord)
-                where(pkblobs.id, isGreaterThan(4))
+                where { pkblobs.id isGreaterThan 4 }
             }
             assertEquals(1, rows)
 
-            val answer = mapper.select { where(pkblobs.id, isGreaterThan(4)) }
+            val answer = mapper.select { where { pkblobs.id isGreaterThan 4 } }
             assertEquals(1, answer.size)
 
             val returnedRecord = answer[0]
@@ -360,11 +359,11 @@ class UpdateByExampleTest : AbstractTest() {
 
             val rows = mapper.update {
                 updateSelectiveColumns(newRecord)
-                where(pkfieldsblobs.id1, isNotEqualTo(3))
+                where { pkfieldsblobs.id1 isNotEqualTo 3 }
             }
             assertEquals(1, rows)
 
-            val answer = mapper.select { where(pkfieldsblobs.id1, isNotEqualTo(3)) }
+            val answer = mapper.select { where { pkfieldsblobs.id1 isNotEqualTo 3 } }
             assertEquals(1, answer.size)
 
             val returnedRecord = answer[0]
@@ -404,11 +403,11 @@ class UpdateByExampleTest : AbstractTest() {
 
             val rows = mapper.update {
                 updateAllColumns(newRecord)
-                where(pkfieldsblobs.id1, isEqualTo(3))
+                where { pkfieldsblobs.id1 isEqualTo 3 }
             }
             assertEquals(1, rows)
 
-            val answer = mapper.select { where(pkfieldsblobs.id1, isEqualTo(3)) }
+            val answer = mapper.select { where { pkfieldsblobs.id1 isEqualTo 3 } }
             assertEquals(1, answer.size)
 
             val returnedRecord = answer[0]
@@ -443,11 +442,11 @@ class UpdateByExampleTest : AbstractTest() {
 
             val rows = mapper.update {
                 updateSelectiveColumns(newRecord)
-                where(fieldsblobs.firstname, isLike("S%"))
+                where { fieldsblobs.firstname isLike "S%" }
             }
             assertEquals(1, rows)
 
-            val answer = mapper.select { where(fieldsblobs.firstname, isLike("S%")) }
+            val answer = mapper.select { where { fieldsblobs.firstname isLike "S%" } }
             assertEquals(1, answer.size)
 
             val returnedRecord = answer[0]
@@ -483,11 +482,11 @@ class UpdateByExampleTest : AbstractTest() {
 
             val rows = mapper.update {
                 updateAllColumns(newRecord)
-                where(fieldsblobs.firstname, isLike("S%"))
+                where { fieldsblobs.firstname isLike "S%" }
             }
             assertEquals(1, rows)
 
-            val answer = mapper.select { where(fieldsblobs.firstname, isLike("S%")) }
+            val answer = mapper.select { where { fieldsblobs.firstname isLike "S%" } }
             assertEquals(1, answer.size)
 
             val returnedRecord = answer[0]
@@ -537,11 +536,11 @@ class UpdateByExampleTest : AbstractTest() {
 
             val rows = mapper.update {
                 updateSelectiveColumns(newRecord)
-                where(awfulTable.eMail, isLike("fred2@%"))
+                where { awfulTable.eMail isLike "fred2@%" }
             }
             assertEquals(1, rows)
 
-            val answer = mapper.select { where(awfulTable.eMail, isLike("fred2@%")) }
+            val answer = mapper.select { where { awfulTable.eMail isLike "fred2@%" } }
             assertEquals(1, answer.size)
 
             val returnedRecord = answer[0]
@@ -606,11 +605,11 @@ class UpdateByExampleTest : AbstractTest() {
 
             val rows = mapper.update {
                 updateAllColumns(newRecord)
-                where(awfulTable.eMail, isLike("fred2@%"))
+                where { awfulTable.eMail isLike "fred2@%" }
             }
             assertEquals(1, rows)
 
-            val answer = mapper.select { where(awfulTable.customerId, isEqualTo(58)) }
+            val answer = mapper.select { where { awfulTable.customerId isEqualTo 58 } }
             assertEquals(1, answer.size)
 
             val returnedRecord = answer[0]
diff --git a/core/mybatis-generator-systests-kotlin/src/test/kotlin/mbg/test/mb3/dsql/kotlin/miscellaneous/GeneratedAlwaysTest.kt b/core/mybatis-generator-systests-kotlin/src/test/kotlin/mbg/test/mb3/dsql/kotlin/miscellaneous/GeneratedAlwaysTest.kt
index da3fc3926d..3d944533fd 100644
--- a/core/mybatis-generator-systests-kotlin/src/test/kotlin/mbg/test/mb3/dsql/kotlin/miscellaneous/GeneratedAlwaysTest.kt
+++ b/core/mybatis-generator-systests-kotlin/src/test/kotlin/mbg/test/mb3/dsql/kotlin/miscellaneous/GeneratedAlwaysTest.kt
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2006-2021 the original author or authors.
+ *    Copyright 2006-2022 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.
@@ -23,7 +23,6 @@ import org.junit.jupiter.api.Test
 import mbg.test.mb3.generated.dsql.kotlin.miscellaneous.model.Generatedalwaystest
 import mbg.test.mb3.generated.dsql.kotlin.miscellaneous.mapper.GeneratedalwaystestDynamicSqlSupport.generatedalwaystest
 import org.junit.jupiter.api.Assertions.*
-import org.mybatis.dynamic.sql.SqlBuilder.isEqualTo
 
 class GeneratedAlwaysTest : AbstractAnnotatedMiscellaneousTest() {
 
@@ -99,14 +98,14 @@ class GeneratedAlwaysTest : AbstractAnnotatedMiscellaneousTest() {
 
             rows = mapper.update {
                 updateAllColumns(gaTest)
-                where(generatedalwaystest.idPlus1, isEqualTo(2))
-                and(generatedalwaystest.idPlus2, isEqualTo(3))
+                where { generatedalwaystest.idPlus1 isEqualTo 2 }
+                and { generatedalwaystest.idPlus2 isEqualTo 3 }
             }
             assertEquals(1, rows)
 
             val returnedRecords = mapper.select {
-                where(generatedalwaystest.idPlus1, isEqualTo(2))
-                and(generatedalwaystest.idPlus2, isEqualTo(3))
+                where { generatedalwaystest.idPlus1 isEqualTo 2 }
+                and { generatedalwaystest.idPlus2 isEqualTo 3 }
             }
             assertEquals(1, returnedRecords.size)
 
@@ -141,14 +140,14 @@ class GeneratedAlwaysTest : AbstractAnnotatedMiscellaneousTest() {
 
             rows = mapper.update {
                 updateSelectiveColumns(gaTest)
-                where(generatedalwaystest.idPlus1, isEqualTo(2))
-                and(generatedalwaystest.idPlus2, isEqualTo(3))
+                where { generatedalwaystest.idPlus1 isEqualTo 2 }
+                and { generatedalwaystest.idPlus2  isEqualTo 3 }
             }
             assertEquals(1, rows)
 
             val returnedRecords = mapper.select {
-                where(generatedalwaystest.idPlus1, isEqualTo(2))
-                and(generatedalwaystest.idPlus2, isEqualTo(3))
+                where { generatedalwaystest.idPlus1 isEqualTo 2 }
+                and { generatedalwaystest.idPlus2  isEqualTo 3 }
             }
             assertEquals(1, returnedRecords.size)
 
@@ -182,14 +181,14 @@ class GeneratedAlwaysTest : AbstractAnnotatedMiscellaneousTest() {
 
             rows = mapper.update {
                 updateAllColumns(gaTest)
-                where(generatedalwaystest.idPlus1, isEqualTo(2))
-                and(generatedalwaystest.idPlus2, isEqualTo(3))
+                where { generatedalwaystest.idPlus1 isEqualTo 2 }
+                and { generatedalwaystest.idPlus2 isEqualTo 3 }
             }
             assertEquals(1, rows)
 
             val returnedRecords = mapper.select {
-                where(generatedalwaystest.idPlus1, isEqualTo(2))
-                and(generatedalwaystest.idPlus2, isEqualTo(3))
+                where { generatedalwaystest.idPlus1 isEqualTo 2 }
+                and { generatedalwaystest.idPlus2 isEqualTo 3 }
             }
             assertEquals(1, returnedRecords.size)
 
diff --git a/core/mybatis-generator-systests-kotlin/src/test/kotlin/mbg/test/mb3/dsql/kotlin/miscellaneous/MiscellaneousTest.kt b/core/mybatis-generator-systests-kotlin/src/test/kotlin/mbg/test/mb3/dsql/kotlin/miscellaneous/MiscellaneousTest.kt
index 1912f19ee8..65e1ef46cd 100644
--- a/core/mybatis-generator-systests-kotlin/src/test/kotlin/mbg/test/mb3/dsql/kotlin/miscellaneous/MiscellaneousTest.kt
+++ b/core/mybatis-generator-systests-kotlin/src/test/kotlin/mbg/test/mb3/dsql/kotlin/miscellaneous/MiscellaneousTest.kt
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2006-2021 the original author or authors.
+ *    Copyright 2006-2022 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.
@@ -33,7 +33,6 @@ import mbg.test.mb3.generated.dsql.kotlin.miscellaneous.mapper.*
 import mbg.test.mb3.generated.dsql.kotlin.miscellaneous.mapper.MyObjectDynamicSqlSupport.myObject
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Assertions.*
-import org.mybatis.dynamic.sql.SqlBuilder.*
 
 
 /**
@@ -210,7 +209,7 @@ class MiscellaneousTest : AbstractAnnotatedMiscellaneousTest() {
             var answer = mapper.select { allRows() }
             assertEquals(2, answer.size)
 
-            val rows = mapper.delete { where(myObject.lastname, isLike("J%")) }
+            val rows = mapper.delete { where { myObject.lastname isLike "J%" } }
 
             assertEquals(1, rows)
 
@@ -315,7 +314,7 @@ class MiscellaneousTest : AbstractAnnotatedMiscellaneousTest() {
             fn1.value = "B%"
 
             val answer = mapper.select {
-                where(myObject.firstname, isLike(fn1))
+                where { myObject.firstname isLike fn1 }
                 orderBy(myObject.id1, myObject.id2)
             }
 
@@ -394,7 +393,7 @@ class MiscellaneousTest : AbstractAnnotatedMiscellaneousTest() {
             fn1.value = "B%"
 
             val answer = mapper.select {
-                where(myObject.firstname, isNotLike(fn1))
+                where { myObject.firstname isNotLike fn1 }
                 orderBy(myObject.id1, myObject.id2)
             }
 
@@ -446,10 +445,11 @@ class MiscellaneousTest : AbstractAnnotatedMiscellaneousTest() {
             fn2.value = "W%"
 
             val answer = mapper.select {
-                where(myObject.firstname, isLike(fn1)) {
-                    and(myObject.id2, isEqualTo(3))
+                where {
+                    myObject.firstname isLike fn1
+                    and { myObject.id2 isEqualTo 3 }
                 }
-                or(myObject.firstname, isLike(fn2))
+                or { myObject.firstname isLike fn2 }
                 orderBy(myObject.id1, myObject.id2)
             }
 
@@ -521,12 +521,10 @@ class MiscellaneousTest : AbstractAnnotatedMiscellaneousTest() {
             record.id2 = 3
             mapper.insert(record)
 
-            val ids = ArrayList<Int>()
-            ids.add(1)
-            ids.add(3)
+            val ids = listOf(1, 3)
 
             val answer = mapper.select {
-                where(myObject.id2, isIn(ids))
+                where { myObject.id2 isIn ids }
                 orderBy(myObject.id1, myObject.id2)
             }
             assertEquals(4, answer.size)
@@ -611,7 +609,7 @@ class MiscellaneousTest : AbstractAnnotatedMiscellaneousTest() {
             mapper.insert(record)
 
             val answer = mapper.select {
-                where(myObject.id2, isBetween(1).and(3))
+                where { myObject.id2 isBetween 1 and 3 }
                 orderBy(myObject.id1, myObject.id2)
             }
             assertEquals(6, answer.size)
@@ -643,7 +641,7 @@ class MiscellaneousTest : AbstractAnnotatedMiscellaneousTest() {
 
             mapper.insert(record)
 
-            val results = mapper.select { where(myObject.timefield, isEqualTo(myTime)) }
+            val results = mapper.select { where { myObject.timefield isEqualTo myTime } }
             assertEquals(1, results.size)
 
             val returnedRecord = results[0]
@@ -696,11 +694,11 @@ class MiscellaneousTest : AbstractAnnotatedMiscellaneousTest() {
 
             val rows = mapper.update {
                 updateSelectiveColumns(newRecord)
-                where(myObject.firstname, isLike(fn1))
+                where { myObject.firstname isLike fn1 }
             }
             assertEquals(1, rows)
 
-            val answer = mapper.select { where(myObject.firstname, isLike(fn1)) }
+            val answer = mapper.select { where { myObject.firstname isLike fn1 } }
             assertEquals(1, answer.size)
 
             val returnedRecord = answer[0]
@@ -741,15 +739,17 @@ class MiscellaneousTest : AbstractAnnotatedMiscellaneousTest() {
 
             val rows = mapper.update {
                 updateAllColumns(newRecord)
-                where(myObject.id1, isEqualTo(3)) {
-                    and(myObject.id2, isEqualTo(4))
+                where {
+                    myObject.id1 isEqualTo 3
+                    and { myObject.id2 isEqualTo 4 }
                 }
             }
             assertEquals(1, rows)
 
             val answer = mapper.select {
-                where(myObject.id1, isEqualTo(3)) {
-                    and(myObject.id2, isEqualTo(4))
+                where {
+                    myObject.id1 isEqualTo 3
+                    and { myObject.id2 isEqualTo 4 }
                 }
             }
             assertEquals(1, answer.size)
@@ -906,12 +906,12 @@ class MiscellaneousTest : AbstractAnnotatedMiscellaneousTest() {
             mapper.insert(record)
 
             var answer = mapper.select {
-                where(myObject.lastname, isLike("RU%"))
+                where { myObject.lastname isLike "RU%" }
                 orderBy(myObject.id1, myObject.id2)
             }
             assertEquals(0, answer.size)
 
-            answer = mapper.select { where(myObject.lastname, isLikeCaseInsensitive("RU%")) }
+            answer = mapper.select { where { myObject.lastname isLikeCaseInsensitive "RU%" } }
             assertEquals(3, answer.size)
 
             var returnedRecord = answer[0]

From 3d6333cb4caa01f65abbf4e93dfaf388b67b4ad0 Mon Sep 17 00:00:00 2001
From: Jeff Butler <jeffgbutler@gmail.com>
Date: Fri, 11 Feb 2022 09:19:56 -0500
Subject: [PATCH 3/9] Copyright

---
 core/.mvn/extensions.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/.mvn/extensions.xml b/core/.mvn/extensions.xml
index 3ee39f2494..cab1b82b6e 100644
--- a/core/.mvn/extensions.xml
+++ b/core/.mvn/extensions.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2006-2021 the original author or authors.
+       Copyright 2006-2022 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.

From 45bb69a2d60d4cff03b89aff7e4a5e6140f8bc90 Mon Sep 17 00:00:00 2001
From: Jeff Butler <jeffgbutler@gmail.com>
Date: Fri, 11 Feb 2022 09:29:46 -0500
Subject: [PATCH 4/9] Use Infix methods on updates

---
 .../runtime/kotlin/elements/KotlinFragmentGenerator.java    | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/runtime/kotlin/elements/KotlinFragmentGenerator.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/runtime/kotlin/elements/KotlinFragmentGenerator.java
index c78c5f570a..1bf6f59cf5 100644
--- a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/runtime/kotlin/elements/KotlinFragmentGenerator.java
+++ b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/runtime/kotlin/elements/KotlinFragmentGenerator.java
@@ -224,8 +224,7 @@ public KotlinFunctionParts getSetEqualLines(List<IntrospectedColumn> columnList)
             builder.withImport(fieldNameAndImport.importString());
 
             builder.withCodeLine("    set(" + fieldNameAndImport.fieldName() //$NON-NLS-1$
-                    + ").equalToOrNull(row::" + column.getJavaProperty() //$NON-NLS-1$
-                    + ")"); //$NON-NLS-1$
+                    + ") equalToOrNull row::" + column.getJavaProperty()); //$NON-NLS-1$
         }
 
         return builder.build();
@@ -243,8 +242,7 @@ public KotlinFunctionParts getSetEqualWhenPresentLines(List<IntrospectedColumn>
             builder.withImport(fieldNameAndImport.importString());
 
             builder.withCodeLine("    set(" + fieldNameAndImport.fieldName() //$NON-NLS-1$
-                    + ").equalToWhenPresent(row::" + column.getJavaProperty() //$NON-NLS-1$
-                    + ")"); //$NON-NLS-1$
+                    + ") equalToWhenPresent row::" + column.getJavaProperty()); //$NON-NLS-1$
         }
 
         return builder.build();

From b52c845bad7791a427c4ed406c12e612a4a71067 Mon Sep 17 00:00:00 2001
From: Jeff Butler <jeffgbutler@gmail.com>
Date: Fri, 11 Feb 2022 09:41:16 -0500
Subject: [PATCH 5/9] Kotlin style cleanup

---
 .../test/mb3/dsql/kotlin/DynamicSqlTest.kt    | 60 +++++++++----------
 .../kotlin/miscellaneous/MiscellaneousTest.kt | 12 ++--
 2 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/core/mybatis-generator-systests-kotlin/src/test/kotlin/mbg/test/mb3/dsql/kotlin/DynamicSqlTest.kt b/core/mybatis-generator-systests-kotlin/src/test/kotlin/mbg/test/mb3/dsql/kotlin/DynamicSqlTest.kt
index fd9b720f8d..b69bd4fb8d 100644
--- a/core/mybatis-generator-systests-kotlin/src/test/kotlin/mbg/test/mb3/dsql/kotlin/DynamicSqlTest.kt
+++ b/core/mybatis-generator-systests-kotlin/src/test/kotlin/mbg/test/mb3/dsql/kotlin/DynamicSqlTest.kt
@@ -372,7 +372,7 @@ class DynamicSqlTest : AbstractTest() {
 
             val returnedRecord = mapper.selectByPrimaryKey(2, 1)
 
-            assertThat(returnedRecord).isNotNull()
+            assertThat(returnedRecord).isNotNull
             assertThat(returnedRecord).usingRecursiveComparison().ignoringFields("timestampfield").isEqualTo(record)
             assertThat(returnedRecord?.timestampfield).isCloseTo(record.timestampfield, within(1, ChronoUnit.MILLIS))
         }
@@ -398,7 +398,7 @@ class DynamicSqlTest : AbstractTest() {
 
             val record2 = mapper.selectByPrimaryKey(2, 1)
 
-            assertThat(record2).isNotNull()
+            assertThat(record2).isNotNull
             if (record2 != null) {
                 assertEquals(record.firstname, record2.firstname)
                 assertEquals(record.lastname, record2.lastname)
@@ -421,7 +421,7 @@ class DynamicSqlTest : AbstractTest() {
 
             val returnedRecord = mapper.selectByPrimaryKey(2, 1)
 
-            assertThat(returnedRecord).isNotNull()
+            assertThat(returnedRecord).isNotNull
             if(returnedRecord != null) {
                 assertEquals(record.datefield, returnedRecord.datefield)
                 assertEquals(record.decimal100field, returnedRecord.decimal100field)
@@ -484,7 +484,7 @@ class DynamicSqlTest : AbstractTest() {
 
             val newRecord = mapper.selectByPrimaryKey(4, 3)
 
-            assertThat(newRecord).isNotNull()
+            assertThat(newRecord).isNotNull
             if (newRecord != null) {
                 assertEquals(record1.firstname, newRecord.firstname)
                 assertEquals(record1.lastname, newRecord.lastname)
@@ -720,8 +720,8 @@ class DynamicSqlTest : AbstractTest() {
 
             with(answer[0]) {
                 assertThat(id).isEqualTo(record.id!!)
-                assertThat(blobsAreEqual(blob1, record.blob1)).isTrue()
-                assertThat(blobsAreEqual(blob2, record.blob2)).isTrue()
+                assertThat(blobsAreEqual(blob1, record.blob1)).isTrue
+                assertThat(blobsAreEqual(blob2, record.blob2)).isTrue
             }
         }
     }
@@ -738,10 +738,10 @@ class DynamicSqlTest : AbstractTest() {
 
             val newRecord = mapper.selectByPrimaryKey(3)
 
-            assertThat(newRecord).isNotNull()
+            assertThat(newRecord).isNotNull
             assertThat(newRecord!!.id).isEqualTo(record1.id)
-            assertThat(blobsAreEqual(newRecord.blob1, record1.blob1)).isTrue()
-            assertThat(blobsAreEqual(newRecord.blob2, record1.blob2)).isTrue()
+            assertThat(blobsAreEqual(newRecord.blob1, record1.blob1)).isTrue
+            assertThat(blobsAreEqual(newRecord.blob2, record1.blob2)).isTrue
         }
     }
 
@@ -757,10 +757,10 @@ class DynamicSqlTest : AbstractTest() {
 
             val returnedRecord = mapper.selectByPrimaryKey(3)
 
-            assertThat(returnedRecord).isNotNull()
+            assertThat(returnedRecord).isNotNull
             assertThat(returnedRecord!!.id).isEqualTo(record.id)
-            assertThat(blobsAreEqual(returnedRecord.blob1, record.blob1)).isTrue()
-            assertThat(blobsAreEqual(returnedRecord.blob2, newRecord.blob2)).isTrue()
+            assertThat(blobsAreEqual(returnedRecord.blob1, record.blob1)).isTrue
+            assertThat(blobsAreEqual(returnedRecord.blob2, newRecord.blob2)).isTrue
         }
     }
 
@@ -817,11 +817,11 @@ class DynamicSqlTest : AbstractTest() {
 
             val newRecord = mapper.selectByPrimaryKey(6)
 
-            assertThat(newRecord).isNotNull()
+            assertThat(newRecord).isNotNull
             if (newRecord != null) {
                 assertThat(newRecord.id).isEqualTo(record1.id!!)
-                assertThat(blobsAreEqual(newRecord.blob1, record1.blob1)).isTrue()
-                assertThat(blobsAreEqual(newRecord.blob2, record1.blob2)).isTrue()
+                assertThat(blobsAreEqual(newRecord.blob1, record1.blob1)).isTrue
+                assertThat(blobsAreEqual(newRecord.blob2, record1.blob2)).isTrue
             }
         }
     }
@@ -962,7 +962,7 @@ class DynamicSqlTest : AbstractTest() {
 
             val newRecord = mapper.selectByPrimaryKey(3, 4)
 
-            assertThat(newRecord).isNotNull()
+            assertThat(newRecord).isNotNull
             if (newRecord != null) {
                 assertEquals(updateRecord.firstname, newRecord.firstname)
                 assertEquals(updateRecord.lastname, newRecord.lastname)
@@ -996,7 +996,7 @@ class DynamicSqlTest : AbstractTest() {
 
             val returnedRecord = mapper.selectByPrimaryKey(3, 4)
 
-            assertThat(returnedRecord).isNotNull()
+            assertThat(returnedRecord).isNotNull
             assertEquals(record.firstname, returnedRecord!!.firstname)
             assertEquals(updateRecord.lastname, returnedRecord.lastname)
             assertEquals(record.id1!!, returnedRecord.id1)
@@ -1095,7 +1095,7 @@ class DynamicSqlTest : AbstractTest() {
 
             val newRecord = mapper.selectByPrimaryKey(5, 6)
 
-            assertThat(newRecord).isNotNull()
+            assertThat(newRecord).isNotNull
             if (newRecord != null) {
                 assertEquals(record1.id1!!, newRecord.id1)
                 assertEquals(record1.id2!!, newRecord.id2)
@@ -1404,7 +1404,7 @@ class DynamicSqlTest : AbstractTest() {
             val returnedRecord = mapper
                     .selectByPrimaryKey(generatedCustomerId)
 
-            assertThat(returnedRecord).isNotNull()
+            assertThat(returnedRecord).isNotNull
             if (returnedRecord != null) {
                 assertEquals(generatedCustomerId, returnedRecord.customerId)
                 assertEquals(record.eMail, returnedRecord.eMail)
@@ -1418,8 +1418,8 @@ class DynamicSqlTest : AbstractTest() {
                 assertEquals(record.id7!!, returnedRecord.id7)
                 assertEquals(record.secondFirstName, returnedRecord.secondFirstName)
                 assertEquals(record.thirdFirstName, returnedRecord.thirdFirstName)
-                assertThat(returnedRecord.active).isTrue()
-                assertThat(returnedRecord.active1).isFalse()
+                assertThat(returnedRecord.active).isTrue
+                assertThat(returnedRecord.active1).isFalse
                 assertEquals(3, returnedRecord.active2!!.size)
                 assertEquals(-128, returnedRecord.active2!![0])
                 assertEquals(127, returnedRecord.active2!![1])
@@ -1453,7 +1453,7 @@ class DynamicSqlTest : AbstractTest() {
             val returnedRecord = mapper
                     .selectByPrimaryKey(generatedCustomerId)
 
-            assertThat(returnedRecord).isNotNull()
+            assertThat(returnedRecord).isNotNull
             if (returnedRecord != null) {
                 assertThat(returnedRecord.customerId).isEqualTo(generatedCustomerId)
                 assertThat(returnedRecord.eMail).isEqualTo(record.eMail)
@@ -1500,7 +1500,7 @@ class DynamicSqlTest : AbstractTest() {
 
             val returnedRecord = mapper.selectByPrimaryKey(generatedCustomerId)
 
-            assertThat(returnedRecord).isNotNull()
+            assertThat(returnedRecord).isNotNull
             assertThat(returnedRecord).usingRecursiveComparison().isEqualTo(record)
         }
     }
@@ -1536,7 +1536,7 @@ class DynamicSqlTest : AbstractTest() {
 
             val returnedRecord = mapper.selectByPrimaryKey(generatedCustomerId)
 
-            assertThat(returnedRecord).isNotNull()
+            assertThat(returnedRecord).isNotNull
             if (returnedRecord != null) {
                 assertEquals(generatedCustomerId, returnedRecord.customerId)
                 assertEquals(record.eMail, returnedRecord.eMail)
@@ -1667,7 +1667,7 @@ class DynamicSqlTest : AbstractTest() {
 
             val returnedRecord = mapper.selectByPrimaryKey(generatedKey)
 
-            assertThat(returnedRecord).isNotNull()
+            assertThat(returnedRecord).isNotNull
             if (returnedRecord != null) {
                 assertEquals(record1.customerId!!, returnedRecord.customerId)
                 assertEquals(record1.eMail, returnedRecord.eMail)
@@ -2496,7 +2496,7 @@ class DynamicSqlTest : AbstractTest() {
 
             var returnedRecord = mapper.selectByPrimaryKey(2)
 
-            assertThat(returnedRecord).isNotNull()
+            assertThat(returnedRecord).isNotNull
             if (returnedRecord != null) {
                 assertEquals(t1.id, returnedRecord.id)
                 assertEquals(t1.translation, returnedRecord.translation)
@@ -2506,7 +2506,7 @@ class DynamicSqlTest : AbstractTest() {
             mapper.updateByPrimaryKey(t1)
 
             returnedRecord = mapper.selectByPrimaryKey(2)
-            assertThat(returnedRecord).isNotNull()
+            assertThat(returnedRecord).isNotNull
             if (returnedRecord != null) {
                 assertEquals(t1.id, returnedRecord.id)
                 assertEquals(t1.translation, returnedRecord.translation)
@@ -2530,7 +2530,7 @@ class DynamicSqlTest : AbstractTest() {
             mapper.insert(id1)
 
             var returnedRecord = mapper.selectByPrimaryKey(2)
-            assertThat(returnedRecord).isNotNull()
+            assertThat(returnedRecord).isNotNull
             if (returnedRecord != null) {
                 assertEquals(id1.id!!, returnedRecord.id)
                 assertEquals(id1.description, returnedRecord.description)
@@ -2541,7 +2541,7 @@ class DynamicSqlTest : AbstractTest() {
 
             returnedRecord = mapper.selectByPrimaryKey(2)
 
-            assertThat(returnedRecord).isNotNull()
+            assertThat(returnedRecord).isNotNull
             if (returnedRecord != null) {
                 assertEquals(id1.id!!, returnedRecord.id)
                 assertEquals(id1.description, returnedRecord.description)
@@ -2552,7 +2552,7 @@ class DynamicSqlTest : AbstractTest() {
     @Test
     fun testEquals1() {
         val pkfields1 = Pkfields()
-        assertThat(pkfields1).isNotNull()
+        assertThat(pkfields1).isNotNull
     }
 
     @Test
diff --git a/core/mybatis-generator-systests-kotlin/src/test/kotlin/mbg/test/mb3/dsql/kotlin/miscellaneous/MiscellaneousTest.kt b/core/mybatis-generator-systests-kotlin/src/test/kotlin/mbg/test/mb3/dsql/kotlin/miscellaneous/MiscellaneousTest.kt
index 65e1ef46cd..9c8d665f49 100644
--- a/core/mybatis-generator-systests-kotlin/src/test/kotlin/mbg/test/mb3/dsql/kotlin/miscellaneous/MiscellaneousTest.kt
+++ b/core/mybatis-generator-systests-kotlin/src/test/kotlin/mbg/test/mb3/dsql/kotlin/miscellaneous/MiscellaneousTest.kt
@@ -67,7 +67,7 @@ class MiscellaneousTest : AbstractAnnotatedMiscellaneousTest() {
 
             val returnedRecord = mapper.selectByPrimaryKey(2, 1)
 
-            assertThat(returnedRecord).isNotNull()
+            assertThat(returnedRecord).isNotNull
             if (returnedRecord != null) {
                 assertTrue(datesAreEqual(record.startDate, returnedRecord.startDate))
                 assertEquals(record.decimal100field!!, returnedRecord.decimal100field)
@@ -107,7 +107,7 @@ class MiscellaneousTest : AbstractAnnotatedMiscellaneousTest() {
 
             val record2 = mapper.selectByPrimaryKey(2, 1)
 
-            assertThat(record2).isNotNull()
+            assertThat(record2).isNotNull
             if (record2 != null) {
                 assertEquals(record.firstname, record2.firstname)
                 assertEquals(record.lastname, record2.lastname)
@@ -145,7 +145,7 @@ class MiscellaneousTest : AbstractAnnotatedMiscellaneousTest() {
 
             val returnedRecord = mapper.selectByPrimaryKey(2, 1)
 
-            assertThat(returnedRecord).isNotNull()
+            assertThat(returnedRecord).isNotNull
             if (returnedRecord != null) {
                 assertTrue(datesAreEqual(newRecord.startDate, returnedRecord.startDate))
                 assertEquals(record.decimal100field, returnedRecord.decimal100field)
@@ -242,7 +242,7 @@ class MiscellaneousTest : AbstractAnnotatedMiscellaneousTest() {
 
             val newRecord = mapper.selectByPrimaryKey(4, 3)
 
-            assertThat(newRecord).isNotNull()
+            assertThat(newRecord).isNotNull
             if (newRecord != null) {
                 assertEquals(record1.firstname, newRecord.firstname)
                 assertEquals(record1.lastname, newRecord.lastname)
@@ -815,7 +815,7 @@ class MiscellaneousTest : AbstractAnnotatedMiscellaneousTest() {
 
             val returnedRecord = mapper.selectByPrimaryKey(1)
 
-            assertThat(returnedRecord).isNotNull()
+            assertThat(returnedRecord).isNotNull
             if(returnedRecord != null) {
                 assertEquals(record.address, returnedRecord.address)
                 assertEquals(1, returnedRecord.id)
@@ -837,7 +837,7 @@ class MiscellaneousTest : AbstractAnnotatedMiscellaneousTest() {
 
             val returnedRecord = mapper.selectByPrimaryKey(1)
 
-            assertThat(returnedRecord).isNotNull()
+            assertThat(returnedRecord).isNotNull
             if(returnedRecord != null) {
                 assertNull(returnedRecord.address)
                 assertEquals(record.id, returnedRecord.id)

From 2f7325f75a4edc332e837588db5e02c41d600722 Mon Sep 17 00:00:00 2001
From: Jeff Butler <jeffgbutler@gmail.com>
Date: Fri, 11 Feb 2022 10:24:10 -0500
Subject: [PATCH 6/9] Documentation

---
 .../src/site/xhtml/index.xhtml                      |  4 ++--
 .../src/site/xhtml/whatsNew.xhtml                   | 13 +++++++++----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/core/mybatis-generator-core/src/site/xhtml/index.xhtml b/core/mybatis-generator-core/src/site/xhtml/index.xhtml
index a6b43a2dcc..29a8f229a3 100644
--- a/core/mybatis-generator-core/src/site/xhtml/index.xhtml
+++ b/core/mybatis-generator-core/src/site/xhtml/index.xhtml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2006-2021 the original author or authors.
+       Copyright 2006-2022 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.
@@ -149,7 +149,7 @@ DatabaseMetaData interface, especially the <code>getColumns</code> and
         <td>MyBatis3DynamicSQL, MyBatis3Kotlin</td>
         <td>1.4.1+</td>
         <td>3.4.2+</td>
-        <td>1.3.1+</td>
+        <td>1.4.0+</td>
     </tr>
 </table>
 
diff --git a/core/mybatis-generator-core/src/site/xhtml/whatsNew.xhtml b/core/mybatis-generator-core/src/site/xhtml/whatsNew.xhtml
index 644eacd80a..e97376c87b 100644
--- a/core/mybatis-generator-core/src/site/xhtml/whatsNew.xhtml
+++ b/core/mybatis-generator-core/src/site/xhtml/whatsNew.xhtml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2006-2021 the original author or authors.
+       Copyright 2006-2022 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.
@@ -27,15 +27,15 @@
 <h1>What's New in MyBatis Generator</h1>
 <h2>Version 1.4.1</h2>
 <p>This release is primarily focused on updating the runtimes for MyBatis Dynamic SQL ("MyBatis3DynamicSQL" and
-"MyBatis3Kotlin"). The generated code is now dependent on MyBatis Dynamic SQL version 1.3.1 or later
+"MyBatis3Kotlin"). The generated code is now dependent on MyBatis Dynamic SQL version 1.4.0 or later
 and makes use of newer features in that library. See below for details about that change.
 See the GitHub page for milestone 1.4.1 for details other changes in this release:
 <a target="_blank" href="https://github.com/mybatis/generator/issues?q=milestone%3A1.4.1">Milestone 1.4.1</a>.</p>
 
 <h3>Updated MyBatis Dynamic SQL Runtimes</h3>
 <p>The MyBatis3DynamicSQL and MyBatis3Kotlin runtimes have been updated to generate code that requires
-version 1.3.1 or later of MyBatis Dynamic SQL. This should be a relatively minor change for most <b>Java</b> users
-and should simply require updating the MyBatis Dynamic SQL version to 1.3.1 or later.</p>
+version 1.4.0 or later of MyBatis Dynamic SQL. This should be a relatively minor change for most <b>Java</b> users
+and should simply require updating the MyBatis Dynamic SQL version to 1.4.0 or later.</p>
 
 <p>For both Java and Kotlin users, the new database model classes (a.k.a. the "support" classes) now extend
     <code>AliasableSqlTable</code>. This allows you to specify a table alias directly within an instance
@@ -115,6 +115,11 @@ required:</p>
     }
 </pre>
 
+<p>Lastly, the generated code uses upgraded DSL features that should be mostly transparent. But you will notice that any
+    "where" clauses you write will likely have deprecation warnings. This is due to a change in MyBatis Dynamic SQL. You
+    can read about remediation of these warnings in the documentation for that project.
+</p>
+
 <h3>Other Enhancements</h3>
 <ul>
     <li>Added capabilities to the SerializablePlugin for Kotlin</li>

From 52bb803bddc7becea899bacac68546acab1c9890 Mon Sep 17 00:00:00 2001
From: Jeff Butler <jeffgbutler@gmail.com>
Date: Sun, 20 Feb 2022 14:13:01 -0500
Subject: [PATCH 7/9] Kotlin Style Updates

---
 .../test/mb3/common/FirstNameTypeHandler.kt   | 29 ++++------
 .../mbg/test/mb3/common/MyTimeTypeHandler.kt  | 53 ++++++++-----------
 .../mb3/common/StringBooleanTypeHandler.kt    | 31 ++++++-----
 .../kotlin/miscellaneous/MiscellaneousTest.kt | 39 +++++++-------
 4 files changed, 65 insertions(+), 87 deletions(-)

diff --git a/core/mybatis-generator-systests-kotlin/src/main/kotlin/mbg/test/mb3/common/FirstNameTypeHandler.kt b/core/mybatis-generator-systests-kotlin/src/main/kotlin/mbg/test/mb3/common/FirstNameTypeHandler.kt
index 19366fb413..c3ba6aee49 100644
--- a/core/mybatis-generator-systests-kotlin/src/main/kotlin/mbg/test/mb3/common/FirstNameTypeHandler.kt
+++ b/core/mybatis-generator-systests-kotlin/src/main/kotlin/mbg/test/mb3/common/FirstNameTypeHandler.kt
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2006-2020 the original author or authors.
+ *    Copyright 2006-2022 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.
@@ -27,26 +27,19 @@ import java.sql.ResultSet
  */
 class FirstNameTypeHandler : TypeHandler<FirstName> {
 
-    override fun getResult(cs: CallableStatement, columnIndex: Int): FirstName? {
-        val value = cs.getString(columnIndex)
-        return value?.let {makeFirstName(it)}
-    }
+    override fun getResult(cs: CallableStatement, columnIndex: Int): FirstName? =
+        cs.getString(columnIndex)?.toFirstName()
 
-    override fun getResult(rs: ResultSet, columnName: String): FirstName? {
-        val value = rs.getString(columnName)
-        return value?.let {makeFirstName(it)}
-    }
+    override fun getResult(rs: ResultSet, columnName: String): FirstName? =
+        rs.getString(columnName)?.toFirstName()
 
-    override fun getResult(rs: ResultSet, columnIndex: Int): FirstName? {
-        val value = rs.getString(columnIndex)
-        return value?.let {makeFirstName(it)}
-    }
+    override fun getResult(rs: ResultSet, columnIndex: Int): FirstName? =
+        rs.getString(columnIndex)?.toFirstName()
 
-    private fun makeFirstName(value: String): FirstName {
-        val answer = FirstName()
-        answer.value = value
-        return answer
-    }
+    private fun String.toFirstName(): FirstName =
+        FirstName().also {
+            it.value = this
+        }
 
     override fun setParameter(ps: PreparedStatement, i: Int, parameter: FirstName?,
                               jdbcType: JdbcType) {
diff --git a/core/mybatis-generator-systests-kotlin/src/main/kotlin/mbg/test/mb3/common/MyTimeTypeHandler.kt b/core/mybatis-generator-systests-kotlin/src/main/kotlin/mbg/test/mb3/common/MyTimeTypeHandler.kt
index 05e59ffb7a..33b2b9b299 100644
--- a/core/mybatis-generator-systests-kotlin/src/main/kotlin/mbg/test/mb3/common/MyTimeTypeHandler.kt
+++ b/core/mybatis-generator-systests-kotlin/src/main/kotlin/mbg/test/mb3/common/MyTimeTypeHandler.kt
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2006-2020 the original author or authors.
+ *    Copyright 2006-2022 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.
@@ -18,7 +18,6 @@ package mbg.test.mb3.common
 import java.sql.CallableStatement
 import java.sql.PreparedStatement
 import java.sql.ResultSet
-import java.sql.SQLException
 import java.sql.Time
 import java.util.Calendar
 
@@ -35,46 +34,36 @@ import org.apache.ibatis.type.TypeHandler
  */
 class MyTimeTypeHandler : TypeHandler<MyTime> {
 
-    override fun getResult(cs: CallableStatement, columnIndex: Int): MyTime? {
-        val time = cs.getTime(columnIndex)
-        return time?.let { makeTime(it) }
-    }
+    override fun getResult(cs: CallableStatement, columnIndex: Int): MyTime? =
+        cs.getTime(columnIndex)?.toMyTime()
 
-    override fun getResult(rs: ResultSet, columnName: String): MyTime? {
-        val time = rs.getTime(columnName)
-        return time?.let { makeTime(it) }
-    }
+    override fun getResult(rs: ResultSet, columnName: String): MyTime? =
+        rs.getTime(columnName)?.toMyTime()
 
-    override fun getResult(rs: ResultSet, columnIndex: Int): MyTime? {
-        val time = rs.getTime(columnIndex)
-        return time?.let { makeTime(it) }
-    }
+    override fun getResult(rs: ResultSet, columnIndex: Int): MyTime? =
+        rs.getTime(columnIndex)?.toMyTime()
 
-    private fun makeTime(time: Time): MyTime {
-        val answer = MyTime()
-
-        val c = Calendar.getInstance()
-        c.time = time
+    private fun Time.toMyTime(): MyTime =
+        MyTime().also {
+            val c = Calendar.getInstance()
+            c.time = this
 
-        answer.hours = c.get(Calendar.HOUR_OF_DAY)
-        answer.minutes = c.get(Calendar.MINUTE)
-        answer.seconds = c.get(Calendar.SECOND)
-        return answer
-    }
+            it.hours = c.get(Calendar.HOUR_OF_DAY)
+            it.minutes = c.get(Calendar.MINUTE)
+            it.seconds = c.get(Calendar.SECOND)
+        }
 
     override fun setParameter(ps: PreparedStatement, i: Int, parameter: MyTime?,
                               jdbcType: JdbcType) {
         if (parameter == null) {
             ps.setNull(i, jdbcType.TYPE_CODE)
         } else {
-            val c = Calendar.getInstance()
-            c.set(Calendar.HOUR_OF_DAY, parameter.hours)
-            c.set(Calendar.MINUTE, parameter.minutes)
-            c.set(Calendar.SECOND, parameter.seconds)
-
-            val time = Time(c.time.time)
-
-            ps.setTime(i, time)
+            with(Calendar.getInstance()) {
+                set(Calendar.HOUR_OF_DAY, parameter.hours)
+                set(Calendar.MINUTE, parameter.minutes)
+                set(Calendar.SECOND, parameter.seconds)
+                ps.setTime(i, Time(timeInMillis))
+            }
         }
     }
 }
diff --git a/core/mybatis-generator-systests-kotlin/src/main/kotlin/mbg/test/mb3/common/StringBooleanTypeHandler.kt b/core/mybatis-generator-systests-kotlin/src/main/kotlin/mbg/test/mb3/common/StringBooleanTypeHandler.kt
index eefc6dd1c0..9d5ff0b721 100644
--- a/core/mybatis-generator-systests-kotlin/src/main/kotlin/mbg/test/mb3/common/StringBooleanTypeHandler.kt
+++ b/core/mybatis-generator-systests-kotlin/src/main/kotlin/mbg/test/mb3/common/StringBooleanTypeHandler.kt
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2006-2020 the original author or authors.
+ *    Copyright 2006-2022 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.
@@ -18,31 +18,30 @@ package mbg.test.mb3.common
 import java.sql.CallableStatement
 import java.sql.PreparedStatement
 import java.sql.ResultSet
-import java.sql.SQLException
 
 import org.apache.ibatis.type.JdbcType
 import org.apache.ibatis.type.TypeHandler
 
 class StringBooleanTypeHandler : TypeHandler<Boolean> {
 
-    override fun getResult(cs: CallableStatement, columnIndex: Int): Boolean? {
-        val s = cs.getString(columnIndex)
-        return "Y" == s
-    }
+    override fun getResult(cs: CallableStatement, columnIndex: Int): Boolean =
+        cs.getString(columnIndex).isTrue()
 
-    override fun getResult(rs: ResultSet, columnName: String): Boolean? {
-        val s = rs.getString(columnName)
-        return "Y" == s
-    }
+    override fun getResult(rs: ResultSet, columnName: String): Boolean =
+        rs.getString(columnName).isTrue()
+
+    override fun getResult(rs: ResultSet, columnIndex: Int): Boolean =
+        rs.getString(columnIndex).isTrue()
+
+    private fun String?.isTrue(): Boolean = this?.equals("Y")?: false
 
     override fun setParameter(ps: PreparedStatement, columnIndex: Int, parameter: Boolean?,
                               jdbcType: JdbcType) {
-        val s = if (parameter == null) "N" else if (parameter) "Y" else "N"
+        val s = when(parameter) {
+            true -> "Y"
+            false -> "N"
+            null -> "N"
+        }
         ps.setString(columnIndex, s)
     }
-
-    override fun getResult(rs: ResultSet, columnIndex: Int): Boolean? {
-        val s = rs.getString(columnIndex)
-        return "Y" == s
-    }
 }
diff --git a/core/mybatis-generator-systests-kotlin/src/test/kotlin/mbg/test/mb3/dsql/kotlin/miscellaneous/MiscellaneousTest.kt b/core/mybatis-generator-systests-kotlin/src/test/kotlin/mbg/test/mb3/dsql/kotlin/miscellaneous/MiscellaneousTest.kt
index 9c8d665f49..4ab25c941e 100644
--- a/core/mybatis-generator-systests-kotlin/src/test/kotlin/mbg/test/mb3/dsql/kotlin/miscellaneous/MiscellaneousTest.kt
+++ b/core/mybatis-generator-systests-kotlin/src/test/kotlin/mbg/test/mb3/dsql/kotlin/miscellaneous/MiscellaneousTest.kt
@@ -17,23 +17,21 @@ package mbg.test.mb3.dsql.kotlin.miscellaneous
 
 import mbg.test.common.FirstName
 import mbg.test.common.MyTime
+import mbg.test.common.util.TestUtilities.datesAreEqual
 import mbg.test.mb3.common.TestEnum
+import mbg.test.mb3.generated.dsql.kotlin.miscellaneous.mapper.MyObjectMapper
+import mbg.test.mb3.generated.dsql.kotlin.miscellaneous.mapper.*
+import mbg.test.mb3.generated.dsql.kotlin.miscellaneous.mapper.MyObjectDynamicSqlSupport.myObject
 import mbg.test.mb3.generated.dsql.kotlin.miscellaneous.model.Enumtest
 import mbg.test.mb3.generated.dsql.kotlin.miscellaneous.model.MyObject
 import mbg.test.mb3.generated.dsql.kotlin.miscellaneous.model.Regexrename
 import org.apache.ibatis.session.RowBounds
+import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.Assertions.*
 import org.mybatis.dynamic.sql.insert.render.MultiRowInsertStatementProvider
 import org.mybatis.dynamic.sql.select.render.SelectStatementProvider
-
-import java.util.*
-
-import mbg.test.common.util.TestUtilities.datesAreEqual
-import mbg.test.mb3.generated.dsql.kotlin.miscellaneous.mapper.*
-import mbg.test.mb3.generated.dsql.kotlin.miscellaneous.mapper.MyObjectDynamicSqlSupport.myObject
-import org.assertj.core.api.Assertions.assertThat
-import org.junit.jupiter.api.Assertions.*
-
+import java.util.Date
 
 /**
  * @author Jeff Butler
@@ -103,7 +101,7 @@ class MiscellaneousTest : AbstractAnnotatedMiscellaneousTest() {
             record.lastname = "Jones"
 
             val rows = mapper.updateByPrimaryKey(record)
-            assertEquals(1, rows)
+            assertThat(rows).isEqualTo(1)
 
             val record2 = mapper.selectByPrimaryKey(2, 1)
 
@@ -950,17 +948,16 @@ class MiscellaneousTest : AbstractAnnotatedMiscellaneousTest() {
     fun testEnumInsertMultiple() {
         openSession().use { sqlSession ->
             val mapper = sqlSession.getMapper(EnumtestMapper::class.java)
-            val records = mutableListOf<Enumtest>()
-
-            var enumTest = Enumtest()
-            enumTest.id = 1
-            enumTest.name = TestEnum.FRED
-            records.add(enumTest)
-
-            enumTest = Enumtest()
-            enumTest.id = 2
-            enumTest.name = TestEnum.BARNEY
-            records.add(enumTest)
+            val records = listOf(
+                Enumtest().apply {
+                    id = 1
+                    name = TestEnum.FRED
+                },
+                Enumtest().apply {
+                    id = 2
+                    name = TestEnum.BARNEY
+                }
+            )
 
             val rows = mapper.insertMultiple(records)
             assertEquals(2, rows)

From 3e9490528d0e8e79eef0e3daffe4060c92ec8773 Mon Sep 17 00:00:00 2001
From: Jeff Butler <jeffgbutler@gmail.com>
Date: Sun, 20 Feb 2022 14:31:02 -0500
Subject: [PATCH 8/9] Use infix methods on inserts

---
 .../runtime/kotlin/elements/InsertMethodGenerator.java      | 6 +++---
 .../kotlin/elements/InsertMultipleMethodGenerator.java      | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/runtime/kotlin/elements/InsertMethodGenerator.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/runtime/kotlin/elements/InsertMethodGenerator.java
index d5fd90d1a8..7036100efc 100644
--- a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/runtime/kotlin/elements/InsertMethodGenerator.java
+++ b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/runtime/kotlin/elements/InsertMethodGenerator.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2006-2021 the original author or authors.
+ *    Copyright 2006-2022 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.
@@ -64,8 +64,8 @@ public KotlinFunctionAndImports generateMethodAndImports() {
             functionAndImports.getImports().add(fieldNameAndImport.importString());
 
             function.addCodeLine("    map(" + fieldNameAndImport.fieldName() //$NON-NLS-1$
-                    + ").toProperty(\"" + column.getJavaProperty() //$NON-NLS-1$
-                    + "\")"); //$NON-NLS-1$
+                    + ") toProperty \"" + column.getJavaProperty() //$NON-NLS-1$
+                    + "\""); //$NON-NLS-1$
         }
 
         function.addCodeLine("}"); //$NON-NLS-1$
diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/runtime/kotlin/elements/InsertMultipleMethodGenerator.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/runtime/kotlin/elements/InsertMultipleMethodGenerator.java
index 287da12b49..287627066e 100644
--- a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/runtime/kotlin/elements/InsertMultipleMethodGenerator.java
+++ b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/runtime/kotlin/elements/InsertMultipleMethodGenerator.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2006-2021 the original author or authors.
+ *    Copyright 2006-2022 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.
@@ -85,8 +85,8 @@ public KotlinFunctionAndImports generateMethodAndImports() {
             functionAndImports.getImports().add(fieldNameAndImport.importString());
 
             function.addCodeLine("    map(" + fieldNameAndImport.fieldName() //$NON-NLS-1$
-                    + ").toProperty(\"" + column.getJavaProperty() //$NON-NLS-1$
-                    + "\")"); //$NON-NLS-1$
+                    + ") toProperty \"" + column.getJavaProperty() //$NON-NLS-1$
+                    + "\""); //$NON-NLS-1$
         }
 
         function.addCodeLine("}"); //$NON-NLS-1$

From e83996674633df3d76025ca317ec12a44d0dab55 Mon Sep 17 00:00:00 2001
From: Jeff Butler <jeffgbutler@gmail.com>
Date: Mon, 21 Feb 2022 09:09:59 -0500
Subject: [PATCH 9/9] Documentation

---
 .../src/site/xhtml/index.xhtml                      |  8 +++++++-
 .../src/site/xhtml/whatsNew.xhtml                   | 13 +++++++------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/core/mybatis-generator-core/src/site/xhtml/index.xhtml b/core/mybatis-generator-core/src/site/xhtml/index.xhtml
index 29a8f229a3..7189de7e98 100644
--- a/core/mybatis-generator-core/src/site/xhtml/index.xhtml
+++ b/core/mybatis-generator-core/src/site/xhtml/index.xhtml
@@ -146,7 +146,13 @@ DatabaseMetaData interface, especially the <code>getColumns</code> and
         <td>1.1.3+</td>
     </tr>
     <tr>
-        <td>MyBatis3DynamicSQL, MyBatis3Kotlin</td>
+        <td>MyBatis3DynamicSQL</td>
+        <td>1.4.1+</td>
+        <td>3.4.2+</td>
+        <td>1.3.1+</td>
+    </tr>
+    <tr>
+        <td>MyBatis3Kotlin</td>
         <td>1.4.1+</td>
         <td>3.4.2+</td>
         <td>1.4.0+</td>
diff --git a/core/mybatis-generator-core/src/site/xhtml/whatsNew.xhtml b/core/mybatis-generator-core/src/site/xhtml/whatsNew.xhtml
index e97376c87b..d363fe87e1 100644
--- a/core/mybatis-generator-core/src/site/xhtml/whatsNew.xhtml
+++ b/core/mybatis-generator-core/src/site/xhtml/whatsNew.xhtml
@@ -27,15 +27,16 @@
 <h1>What's New in MyBatis Generator</h1>
 <h2>Version 1.4.1</h2>
 <p>This release is primarily focused on updating the runtimes for MyBatis Dynamic SQL ("MyBatis3DynamicSQL" and
-"MyBatis3Kotlin"). The generated code is now dependent on MyBatis Dynamic SQL version 1.4.0 or later
-and makes use of newer features in that library. See below for details about that change.
-See the GitHub page for milestone 1.4.1 for details other changes in this release:
+"MyBatis3Kotlin"). The generated Java code is now dependent on MyBatis Dynamic SQL version 1.3.1 or later. The
+generated Kotlin code is now dependent on MyBatis Dynamic SQL version 1.4.0 or later. See below for details about these
+changes. See the GitHub page for milestone 1.4.1 for details other changes in this release:
 <a target="_blank" href="https://github.com/mybatis/generator/issues?q=milestone%3A1.4.1">Milestone 1.4.1</a>.</p>
 
 <h3>Updated MyBatis Dynamic SQL Runtimes</h3>
-<p>The MyBatis3DynamicSQL and MyBatis3Kotlin runtimes have been updated to generate code that requires
-version 1.4.0 or later of MyBatis Dynamic SQL. This should be a relatively minor change for most <b>Java</b> users
-and should simply require updating the MyBatis Dynamic SQL version to 1.4.0 or later.</p>
+<p>The MyBatis3DynamicSQL and MyBatis3Kotlin runtimes have been updated to generate code that requires updated versions
+of MyBatis Dynamic SQL. Generated Java code requires version 1.3.1 or later, generated Kotlin code requires version
+1.4.0 or later. This should be a relatively minor change for most <b>Java</b> users
+and should simply require updating the MyBatis Dynamic SQL version to 1.3.1 or later.</p>
 
 <p>For both Java and Kotlin users, the new database model classes (a.k.a. the "support" classes) now extend
     <code>AliasableSqlTable</code>. This allows you to specify a table alias directly within an instance