Remove Deprecated Kotlin code

Author: jeffgbutler

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

@@ -25,15 +25,6 @@ import org.mybatis.dynamic.sql.where.AbstractWhereStarter
 @DslMarker
 annotation class MyBatisDslMarker
 
-@Deprecated("Please use GroupingCriteriaCollector.where")
-typealias WhereApplier = KotlinBaseBuilder<*>.() -> Unit
-
-@Deprecated("Please use GroupingCriteriaCollector.where")
-fun WhereApplier.andThen(after: WhereApplier): WhereApplier = {
-    invoke(this)
-    after(this)
-}
-
 @MyBatisDslMarker
 @Suppress("TooManyFunctions")
 abstract class KotlinBaseBuilder<D : AbstractWhereStarter<*,*>> {
@@ -51,31 +42,6 @@ abstract class KotlinBaseBuilder<D : AbstractWhereStarter<*,*>> {
         getDsl().where(criteria)
     }
 
-    @Deprecated("Please move the \"and\" function into the where lambda. If the where lambda has more than one condition, you may need to surround the existing conditions with \"group\" first.")
-    fun and(criteria: GroupingCriteriaReceiver): Unit =
-        GroupingCriteriaCollector().apply(criteria).let {
-            getDsl().where().and(it.initialCriterion, it.subCriteria)
-        }
-
-    @Deprecated("Please move the \"and\" function into the where lambda. If the where lambda has more than one condition, you may need to surround the existing conditions with \"group\" first.")
-    fun and(criteria: List<AndOrCriteriaGroup>) {
-        getDsl().where().and(criteria)
-    }
-
-    @Deprecated("Please move the \"or\" function into the where lambda. If the where lambda has more than one condition, you may need to surround the existing conditions with \"group\" first.")
-    fun or(criteria: GroupingCriteriaReceiver): Unit =
-        GroupingCriteriaCollector().apply(criteria).let {
-            getDsl().where().or(it.initialCriterion, it.subCriteria)
-        }
-
-    @Deprecated("Please move the \"or\" function into the where lambda. If the where lambda has more than one condition, you may need to surround the existing conditions with \"group\" first.")
-    fun or(criteria: List<AndOrCriteriaGroup>) {
-        getDsl().where().or(criteria)
-    }
-
-    @Deprecated("Please use GroupingCriteriaCollector.where, then pass it to the \"where\" method")
-    fun applyWhere(whereApplier: WhereApplier) = whereApplier.invoke(this)
-
     /**
      * This function does nothing, but it can be used to make some code snippets more understandable.
      *

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

@@ -27,7 +27,6 @@ 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.mybatis3.select
 
@@ -44,19 +43,6 @@ class ReusableWhereTest {
         }
     }
 
-    @Test
-    fun testCountWithDeprecatedClause() {
-        sqlSessionFactory.openSession().use { session ->
-            val mapper = session.getMapper(PersonMapper::class.java)
-
-            val rows = mapper.count {
-                applyWhere(commonWhere)
-            }
-
-            assertThat(rows).isEqualTo(3)
-        }
-    }
-
     @Test
     fun testDelete() {
         sqlSessionFactory.openSession().use { session ->
@@ -98,27 +84,6 @@ class ReusableWhereTest {
         }
     }
 
-    @Test
-    fun testDeprecatedComposition() {
-        val composedWhereClause = commonWhere.andThen {
-            and { birthDate.isNotNull() }
-        }.andThen {
-            or { addressId isLessThan 3 }
-        }
-
-        val selectStatement = select(person.allColumns()) {
-            from(person)
-            applyWhere(composedWhereClause)
-        }
-
-        assertThat(selectStatement.selectStatement).isEqualTo(
-            "select * from Person " +
-                "where id = #{parameters.p1,jdbcType=INTEGER} or occupation is null " +
-                "and birth_date is not null " +
-                "or address_id < #{parameters.p2,jdbcType=INTEGER}"
-        )
-    }
-
     @Test
     fun testComposition() {
         val composedWhereClause = commonWhereClause.andThen {
@@ -140,11 +105,6 @@ class ReusableWhereTest {
         )
     }
 
-    private val commonWhere: WhereApplier = {
-        where { id isEqualTo 1 }
-        or { occupation.isNull() }
-    }
-
     private val commonWhereClause = where {
         id isEqualTo 1
         or { occupation.isNull() }

src/test/kotlin/issues/kotlin/gh430/KNoInitialConditionsTest.kt

@@ -175,8 +175,10 @@ class KNoInitialConditionsTest {
 
         val selectStatement = select(column1, column2) {
             from(foo)
-            where { column1 isLessThan Date() }
-            or(criteria)
+            where {
+                column1 isLessThan Date()
+                or(criteria)
+            }
         }
 
         val expected = "select column1, column2 from foo where column1 < :p1 " +
@@ -187,7 +189,9 @@ class KNoInitialConditionsTest {
     private fun buildSelectStatement(criteria: List<AndOrCriteriaGroup>) =
         select(column1, column2) {
             from(foo)
-            where { column1 isLessThan Date() }
-            and(criteria)
+            where {
+                column1 isLessThan Date()
+                and(criteria)
+            }
         }
 }