Remove Deprecated Kotlin Where DSL

Author: jeffgbutler

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

@@ -15,14 +15,10 @@
  */
 package org.mybatis.dynamic.sql.util.kotlin
 
-import org.mybatis.dynamic.sql.BindableColumn
 import org.mybatis.dynamic.sql.AndOrCriteriaGroup
-import org.mybatis.dynamic.sql.ExistsPredicate
 import org.mybatis.dynamic.sql.SqlTable
-import org.mybatis.dynamic.sql.VisitableCondition
 import org.mybatis.dynamic.sql.configuration.StatementConfiguration
 import org.mybatis.dynamic.sql.select.AbstractQueryExpressionDSL
-import org.mybatis.dynamic.sql.where.AbstractWhereDSL
 import org.mybatis.dynamic.sql.where.AbstractWhereSupport
 
 @Target(AnnotationTarget.CLASS, AnnotationTarget.TYPE)
@@ -73,96 +69,6 @@ abstract class KotlinBaseBuilder<D : AbstractWhereSupport<*,*>> {
 
     fun applyWhere(whereApplier: WhereApplier) = whereApplier.invoke(this)
 
-    @Deprecated("Deprecated in favor of the new where clause DSL. Update by moving the column and condition " +
-            "into a lambda and rewriting the condition to use an infix function.")
-    fun <T> where(column: BindableColumn<T>, condition: VisitableCondition<T>): Unit =
-        applyToWhere {
-            where(column, condition)
-        }
-
-    @Deprecated("Deprecated in favor of the new where clause DSL. Update by moving the column and condition " +
-            "inside the lambda and rewriting the condition to use an infix function.")
-    fun <T> where(column: BindableColumn<T>, condition: VisitableCondition<T>, subCriteria: CriteriaReceiver): Unit =
-        applyToWhere(subCriteria) { sc ->
-            where(column, condition, sc)
-        }
-
-    @Deprecated(
-        message = "Deprecated in favor of the new where clause DSL.",
-        replaceWith = ReplaceWith("where { existsPredicate }")
-    )
-    fun where(existsPredicate: ExistsPredicate): Unit =
-        applyToWhere {
-            where(existsPredicate)
-        }
-
-    @Deprecated("Deprecated in favor of the new where clause DSL. Update by moving the exists expression " +
-            "into the lambda.")
-    fun where(existsPredicate: ExistsPredicate, subCriteria: CriteriaReceiver): Unit =
-        applyToWhere(subCriteria) { sc ->
-            where(existsPredicate, sc)
-        }
-
-    @Deprecated("Deprecated in favor of the new where clause DSL. Update by moving the column and condition " +
-            "into a lambda and rewriting the condition to use an infix function.")
-    fun <T> and(column: BindableColumn<T>, condition: VisitableCondition<T>): Unit =
-        applyToWhere {
-            and(column, condition)
-        }
-
-    @Deprecated("Deprecated in favor of the new where clause DSL. Update by moving the column and condition " +
-            "inside the lambda and rewriting the condition to use an infix function.")
-    fun <T> and(column: BindableColumn<T>, condition: VisitableCondition<T>, subCriteria: CriteriaReceiver): Unit =
-        applyToWhere(subCriteria) { sc ->
-            and(column, condition, sc)
-        }
-
-    @Deprecated(
-        message = "Deprecated in favor of the new where clause DSL.",
-        replaceWith = ReplaceWith("and { existsPredicate }")
-    )
-    fun and(existsPredicate: ExistsPredicate): Unit =
-        applyToWhere {
-            and(existsPredicate)
-        }
-
-    @Deprecated("Deprecated in favor of the new where clause DSL. Update by moving the exists expression " +
-            "into the lambda.")
-    fun and(existsPredicate: ExistsPredicate, subCriteria: CriteriaReceiver): Unit =
-        applyToWhere(subCriteria) { sc ->
-            and(existsPredicate, sc)
-        }
-
-    @Deprecated("Deprecated in favor of the new where clause DSL. Update by moving the column and condition " +
-            "into a lambda and rewriting the condition to use an infix function.")
-    fun <T> or(column: BindableColumn<T>, condition: VisitableCondition<T>): Unit =
-        applyToWhere {
-            or(column, condition)
-        }
-
-    @Deprecated("Deprecated in favor of the new where clause DSL. Update by moving the column and condition " +
-            "inside the lambda and rewriting the condition to use an infix function.")
-    fun <T> or(column: BindableColumn<T>, condition: VisitableCondition<T>, subCriteria: CriteriaReceiver): Unit =
-        applyToWhere(subCriteria) { sc ->
-            or(column, condition, sc)
-        }
-
-    @Deprecated(
-        message = "Deprecated in favor of the new where clause DSL.",
-        replaceWith = ReplaceWith("or { existsPredicate }")
-    )
-    fun or(existsPredicate: ExistsPredicate): Unit =
-        applyToWhere {
-            or(existsPredicate)
-        }
-
-    @Deprecated("Deprecated in favor of the new where clause DSL. Update by moving the exists expression " +
-            "into the lambda.")
-    fun or(existsPredicate: ExistsPredicate, subCriteria: CriteriaReceiver): Unit =
-        applyToWhere(subCriteria) { sc ->
-            or(existsPredicate, sc)
-        }
-
     /**
      * This function does nothing, but it can be used to make some code snippets more understandable.
      *
@@ -179,17 +85,6 @@ abstract class KotlinBaseBuilder<D : AbstractWhereSupport<*,*>> {
         // intentionally empty - this function exists for code beautification and clarity only
     }
 
-    private fun applyToWhere(block: AbstractWhereDSL<*>.() -> Unit) {
-        getDsl().where().apply(block)
-    }
-
-    private fun applyToWhere(
-        subCriteria: CriteriaReceiver,
-        block: AbstractWhereDSL<*>.(List<AndOrCriteriaGroup>) -> Unit
-    ) {
-        getDsl().where().block(CriteriaCollector().apply(subCriteria).criteria)
-    }
-
     protected abstract fun getDsl(): D
 }