[Kotlin] Better function names

Author: jeffgbutler

src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/GroupingCriteriaCollector.kt

@@ -417,6 +417,27 @@ class GroupingCriteriaCollector : SubCriteriaCollector() {
 
     infix fun BindableColumn<String>.isNotInCaseInsensitiveWhenPresent(values: Collection<String?>?) =
         invoke(org.mybatis.dynamic.sql.util.kotlin.elements.isNotInCaseInsensitiveWhenPresent(values))
+
+    companion object {
+        fun having(receiver: GroupingCriteriaReceiver): GroupingCriteriaReceiver = receiver
+
+        /**
+         * Function for code simplification. This allows creation of an independent where clause
+         * that can be reused in different statements. For example:
+         *
+         * val whereClause = where { id isEqualTo 3 }
+         *
+         * val rows = countFrom(foo) {
+         *   where(whereClause)
+         * }
+         *
+         * Use of this function is optional. You can also write code like this:
+         *
+         * val whereClause: GroupingCriteriaReceiver = { id isEqualTo 3 }
+         *
+         */
+        fun where(receiver: GroupingCriteriaReceiver): GroupingCriteriaReceiver = receiver
+    }
 }
 
 class SecondValueCollector<T> (private val consumer: (T) -> Unit) {

src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/KotlinBaseBuilders.kt

@@ -25,10 +25,10 @@ import org.mybatis.dynamic.sql.where.AbstractWhereStarter
 @DslMarker
 annotation class MyBatisDslMarker
 
-@Deprecated("Please use booleanExpression")
+@Deprecated("Please use GroupingCriteriaCollector.where")
 typealias WhereApplier = KotlinBaseBuilder<*>.() -> Unit
 
-@Deprecated("Please use booleanExpression")
+@Deprecated("Please use GroupingCriteriaCollector.where")
 fun WhereApplier.andThen(after: WhereApplier): WhereApplier = {
     invoke(this)
     after(this)

src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/elements/SqlElements.kt

@@ -77,23 +77,6 @@ import org.mybatis.dynamic.sql.where.condition.IsNotLikeCaseInsensitive
 import org.mybatis.dynamic.sql.where.condition.IsNotNull
 import org.mybatis.dynamic.sql.where.condition.IsNull
 
-/**
- * Function for code simplification. This allows creation of an independent where or having clause
- * that can be reused in different statements. For example:
- *
- * val whereClause = booleanExpression { id isEqualTo 3 }
- *
- * val rows = countFrom(foo) {
- *   where(whereClause)
- * }
- *
- * Use of this function is optional. You can also write code like this:
- *
- * val whereClause: GroupingCriteriaReceiver = { id isEqualTo 3 }
- *
- */
-fun booleanExpression(receiver: GroupingCriteriaReceiver): GroupingCriteriaReceiver = receiver
-
 // support for criteria without initial conditions
 fun and(receiver: GroupingCriteriaReceiver): AndOrCriteriaGroup =
     with(GroupingCriteriaCollector().apply(receiver)) {

src/test/kotlin/examples/kotlin/mybatis3/canonical/ReusableWhereTest.kt

@@ -26,9 +26,9 @@ import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.BeforeAll
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
+import org.mybatis.dynamic.sql.util.kotlin.GroupingCriteriaCollector.Companion.where
 import org.mybatis.dynamic.sql.util.kotlin.WhereApplier
 import org.mybatis.dynamic.sql.util.kotlin.andThen
-import org.mybatis.dynamic.sql.util.kotlin.elements.booleanExpression
 import org.mybatis.dynamic.sql.util.kotlin.mybatis3.select
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
@@ -145,7 +145,7 @@ class ReusableWhereTest {
         or { occupation.isNull() }
     }
 
-    private val commonWhereClause = booleanExpression {
+    private val commonWhereClause = where {
         id isEqualTo 1
         or { occupation.isNull() }
     }

src/test/kotlin/examples/kotlin/mybatis3/general/KGroupingTest.kt

@@ -25,8 +25,8 @@ import org.junit.jupiter.api.Test
 import org.mybatis.dynamic.sql.SqlTable
 import org.mybatis.dynamic.sql.exception.InvalidSqlException
 import org.mybatis.dynamic.sql.util.Messages
+import org.mybatis.dynamic.sql.util.kotlin.GroupingCriteriaCollector.Companion.having
 import org.mybatis.dynamic.sql.util.kotlin.elements.add
-import org.mybatis.dynamic.sql.util.kotlin.elements.booleanExpression
 import org.mybatis.dynamic.sql.util.kotlin.elements.column
 import org.mybatis.dynamic.sql.util.kotlin.elements.count
 import org.mybatis.dynamic.sql.util.kotlin.elements.isBetween
@@ -364,7 +364,7 @@ class KGroupingTest {
 
     @Test
     fun testIndependentHaving() {
-        val havingClause = booleanExpression { count() isGreaterThan 6 }
+        val havingClause = having { count() isGreaterThan 6 }
 
         val selectStatement = select(A, count()) {
             from(foo)