[Kotlin] Better name for where

Author: jeffgbutler

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

@@ -69,7 +69,7 @@ abstract class KotlinBaseBuilder<D : AbstractWhereSupport<*,*>> {
         getDsl().where().or(criteria)
     }
 
-    @Deprecated("Please use independentWhere to create a standalone where clause, then pass it to the where method")
+    @Deprecated("Please create an independent where clause, then pass it to the \"where\" method")
     fun applyWhere(whereApplier: WhereApplier) = whereApplier.invoke(this)
 
     /**

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

@@ -77,21 +77,21 @@ import org.mybatis.dynamic.sql.where.condition.IsNotNull
 import org.mybatis.dynamic.sql.where.condition.IsNull
 
 /**
- * No-Op function for code beautification. This allows creation of an independent where clause
+ * Simple function for code beautification. This allows creation of an independent where clause
  * that can be reused in different statements. For example:
  *
- * val independentWhereClause = independentWhere { id isEqualTo 3 }
+ * val whereClause = where { id isEqualTo 3 }
  *
  * val rows = countFrom(foo) {
- *   where(independentWhereClause)
+ *   where(whereClause)
  * }
  *
  * Use of this function is optional. You can also write code like this:
  *
- * val independentWhereClause: GroupingCriteriaReceiver = { id isEqualTo 3 }
+ * val whereClause: GroupingCriteriaReceiver = { id isEqualTo 3 }
  *
  */
-fun independentWhere(receiver: GroupingCriteriaReceiver): GroupingCriteriaReceiver = receiver
+fun where(receiver: GroupingCriteriaReceiver): GroupingCriteriaReceiver = receiver
 
 // support for criteria without initial conditions
 fun and(receiver: GroupingCriteriaReceiver): AndOrCriteriaGroup =

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

@@ -28,7 +28,7 @@ import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
 import org.mybatis.dynamic.sql.util.kotlin.WhereApplier
 import org.mybatis.dynamic.sql.util.kotlin.andThen
-import org.mybatis.dynamic.sql.util.kotlin.elements.independentWhere
+import org.mybatis.dynamic.sql.util.kotlin.elements.where
 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 = independentWhere {
+    private val commonWhereClause = where {
         id isEqualTo 1
         or { occupation.isNull() }
     }