DSL functions are Unit functions

This greatly simplifies the hierarchy.

Author: jeffgbutler

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

@@ -28,7 +28,7 @@ import org.mybatis.dynamic.sql.where.AbstractWhereSupport
 @DslMarker
 annotation class MyBatisDslMarker
 
-typealias WhereApplier = KotlinBaseBuilder<*, *>.() -> Unit
+typealias WhereApplier = KotlinBaseBuilder<*>.() -> Unit
 
 fun WhereApplier.andThen(after: WhereApplier): WhereApplier = {
     invoke(this)
@@ -37,7 +37,7 @@ fun WhereApplier.andThen(after: WhereApplier): WhereApplier = {
 
 @MyBatisDslMarker
 @Suppress("TooManyFunctions")
-abstract class KotlinBaseBuilder<D : AbstractWhereSupport<*>, B : KotlinBaseBuilder<D, B>> {
+abstract class KotlinBaseBuilder<D : AbstractWhereSupport<*>> {
     fun where(criteria: GroupingCriteriaReceiver): Unit =
         with(GroupingCriteriaCollector().apply(criteria)) {
             this@KotlinBaseBuilder.getDsl().where(initialCriterion, subCriteria)
@@ -53,21 +53,18 @@ abstract class KotlinBaseBuilder<D : AbstractWhereSupport<*>, B : KotlinBaseBuil
             this@KotlinBaseBuilder.getDsl().where().or(initialCriterion, subCriteria)
         }
 
-    fun applyWhere(whereApplier: WhereApplier): B =
-        self().apply {
-            whereApplier.invoke(this)
-        }
+    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>): B =
+    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): B =
+    fun <T> where(column: BindableColumn<T>, condition: VisitableCondition<T>, subCriteria: CriteriaReceiver): Unit =
         applyToWhere(subCriteria) { sc ->
             where(column, condition, sc)
         }
@@ -76,28 +73,28 @@ abstract class KotlinBaseBuilder<D : AbstractWhereSupport<*>, B : KotlinBaseBuil
         message = "Deprecated in favor of the new where clause DSL.",
         replaceWith = ReplaceWith("where { existsPredicate }")
     )
-    fun where(existsPredicate: ExistsPredicate): B =
+    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): B =
+    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>): B =
+    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): B =
+    fun <T> and(column: BindableColumn<T>, condition: VisitableCondition<T>, subCriteria: CriteriaReceiver): Unit =
         applyToWhere(subCriteria) { sc ->
             and(column, condition, sc)
         }
@@ -106,28 +103,28 @@ abstract class KotlinBaseBuilder<D : AbstractWhereSupport<*>, B : KotlinBaseBuil
         message = "Deprecated in favor of the new where clause DSL.",
         replaceWith = ReplaceWith("and { existsPredicate }")
     )
-    fun and(existsPredicate: ExistsPredicate): B =
+    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): B =
+    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>): B =
+    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): B =
+    fun <T> or(column: BindableColumn<T>, condition: VisitableCondition<T>, subCriteria: CriteriaReceiver): Unit =
         applyToWhere(subCriteria) { sc ->
             or(column, condition, sc)
         }
@@ -136,125 +133,118 @@ abstract class KotlinBaseBuilder<D : AbstractWhereSupport<*>, B : KotlinBaseBuil
         message = "Deprecated in favor of the new where clause DSL.",
         replaceWith = ReplaceWith("or { existsPredicate }")
     )
-    fun or(existsPredicate: ExistsPredicate): B =
+    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): B =
+    fun or(existsPredicate: ExistsPredicate, subCriteria: CriteriaReceiver): Unit =
         applyToWhere(subCriteria) { sc ->
             or(existsPredicate, sc)
         }
 
-    fun allRows(): B = self()
+    fun allRows() {}
 
-    private fun applyToWhere(block: AbstractWhereDSL<*>.() -> Unit): B {
+    private fun applyToWhere(block: AbstractWhereDSL<*>.() -> Unit): Unit {
         getDsl().where().apply(block)
-        return self()
     }
 
     private fun applyToWhere(
         subCriteria: CriteriaReceiver,
         block: AbstractWhereDSL<*>.(List<AndOrCriteriaGroup>) -> Unit
-    ): B {
+    ): Unit {
         getDsl().where().block(CriteriaCollector().apply(subCriteria).criteria)
-        return self()
     }
 
-    protected abstract fun self(): B
-
     protected abstract fun getDsl(): D
 }
 
 @Suppress("TooManyFunctions")
-abstract class KotlinBaseJoiningBuilder<D : AbstractQueryExpressionDSL<*, *>, B : KotlinBaseJoiningBuilder<D, B>> :
-    KotlinBaseBuilder<D, B>() {
+abstract class KotlinBaseJoiningBuilder<D : AbstractQueryExpressionDSL<*, *>> : KotlinBaseBuilder<D>() {
 
-    fun join(table: SqlTable, joinCriteria: JoinReceiver): B =
+    fun join(table: SqlTable, joinCriteria: JoinReceiver): Unit =
         applyToDsl(joinCriteria) { jc ->
             join(table, jc.onJoinCriterion, jc.andJoinCriteria)
         }
 
-    fun join(table: SqlTable, alias: String, joinCriteria: JoinReceiver): B =
+    fun join(table: SqlTable, alias: String, joinCriteria: JoinReceiver): Unit =
         applyToDsl(joinCriteria) { jc ->
             join(table, alias, jc.onJoinCriterion, jc.andJoinCriteria)
         }
 
     fun join(
         subQuery: KotlinQualifiedSubQueryBuilder.() -> Unit,
         joinCriteria: JoinReceiver
-    ): B =
+    ): Unit =
         applyToDsl(subQuery, joinCriteria) { sq, jc ->
             join(sq, sq.correlationName, jc.onJoinCriterion, jc.andJoinCriteria)
         }
 
-    fun fullJoin(table: SqlTable, joinCriteria: JoinReceiver): B =
+    fun fullJoin(table: SqlTable, joinCriteria: JoinReceiver): Unit =
         applyToDsl(joinCriteria) { jc ->
             fullJoin(table, jc.onJoinCriterion, jc.andJoinCriteria)
         }
 
-    fun fullJoin(table: SqlTable, alias: String, joinCriteria: JoinReceiver): B =
+    fun fullJoin(table: SqlTable, alias: String, joinCriteria: JoinReceiver): Unit =
         applyToDsl(joinCriteria) { jc ->
             fullJoin(table, alias, jc.onJoinCriterion, jc.andJoinCriteria)
         }
 
     fun fullJoin(
         subQuery: KotlinQualifiedSubQueryBuilder.() -> Unit,
         joinCriteria: JoinReceiver
-    ): B =
+    ): Unit =
         applyToDsl(subQuery, joinCriteria) { sq, jc ->
             fullJoin(sq, sq.correlationName, jc.onJoinCriterion, jc.andJoinCriteria)
         }
 
-    fun leftJoin(table: SqlTable, joinCriteria: JoinReceiver): B =
+    fun leftJoin(table: SqlTable, joinCriteria: JoinReceiver): Unit =
         applyToDsl(joinCriteria) { jc ->
             leftJoin(table, jc.onJoinCriterion, jc.andJoinCriteria)
         }
 
-    fun leftJoin(table: SqlTable, alias: String, joinCriteria: JoinReceiver): B =
+    fun leftJoin(table: SqlTable, alias: String, joinCriteria: JoinReceiver): Unit =
         applyToDsl(joinCriteria) { jc ->
             leftJoin(table, alias, jc.onJoinCriterion, jc.andJoinCriteria)
         }
 
     fun leftJoin(
         subQuery: KotlinQualifiedSubQueryBuilder.() -> Unit,
         joinCriteria: JoinReceiver
-    ): B =
+    ): Unit =
         applyToDsl(subQuery, joinCriteria) { sq, jc ->
             leftJoin(sq, sq.correlationName, jc.onJoinCriterion, jc.andJoinCriteria)
         }
 
-    fun rightJoin(table: SqlTable, joinCriteria: JoinReceiver): B =
+    fun rightJoin(table: SqlTable, joinCriteria: JoinReceiver): Unit =
         applyToDsl(joinCriteria) { jc ->
             rightJoin(table, jc.onJoinCriterion, jc.andJoinCriteria)
         }
 
-    fun rightJoin(table: SqlTable, alias: String, joinCriteria: JoinReceiver): B =
+    fun rightJoin(table: SqlTable, alias: String, joinCriteria: JoinReceiver): Unit =
         applyToDsl(joinCriteria) { jc ->
             rightJoin(table, alias, jc.onJoinCriterion, jc.andJoinCriteria)
         }
 
     fun rightJoin(
         subQuery: KotlinQualifiedSubQueryBuilder.() -> Unit,
         joinCriteria: JoinReceiver
-    ): B =
+    ): Unit =
         applyToDsl(subQuery, joinCriteria) { sq, jc ->
             rightJoin(sq, sq.correlationName, jc.onJoinCriterion, jc.andJoinCriteria)
         }
 
-    private fun applyToDsl(joinCriteria: JoinReceiver, applyJoin: D.(JoinCollector) -> Unit): B {
+    private fun applyToDsl(joinCriteria: JoinReceiver, applyJoin: D.(JoinCollector) -> Unit) {
         getDsl().applyJoin(JoinCollector().apply(joinCriteria))
-        return self()
     }
 
     private fun applyToDsl(
         subQuery: KotlinQualifiedSubQueryBuilder.() -> Unit,
         joinCriteria: JoinReceiver,
         applyJoin: D.(KotlinQualifiedSubQueryBuilder, JoinCollector) -> Unit
-    ): B {
+    ) {
         getDsl().applyJoin(KotlinQualifiedSubQueryBuilder().apply(subQuery), JoinCollector().apply(joinCriteria))
-        return self()
     }
 }

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

@@ -23,7 +23,7 @@ import org.mybatis.dynamic.sql.util.Buildable
 typealias CountCompleter = KotlinCountBuilder.() -> Unit
 
 class KotlinCountBuilder(private val fromGatherer: CountDSL.FromGatherer<SelectModel>) :
-    KotlinBaseJoiningBuilder<CountDSL<SelectModel>, KotlinCountBuilder>(),
+    KotlinBaseJoiningBuilder<CountDSL<SelectModel>>(),
     Buildable<SelectModel> {
 
     private lateinit var dsl: CountDSL<SelectModel>
@@ -35,8 +35,6 @@ class KotlinCountBuilder(private val fromGatherer: CountDSL.FromGatherer<SelectM
 
     override fun build(): SelectModel = getDsl().build()
 
-    override fun self(): KotlinCountBuilder = this
-
     override fun getDsl(): CountDSL<SelectModel> {
         try {
             return dsl

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

@@ -22,11 +22,9 @@ import org.mybatis.dynamic.sql.util.Buildable
 typealias DeleteCompleter = KotlinDeleteBuilder.() -> Unit
 
 class KotlinDeleteBuilder(private val dsl: DeleteDSL<DeleteModel>) :
-    KotlinBaseBuilder<DeleteDSL<DeleteModel>, KotlinDeleteBuilder>(), Buildable<DeleteModel> {
+    KotlinBaseBuilder<DeleteDSL<DeleteModel>>(), Buildable<DeleteModel> {
 
     override fun build(): DeleteModel = dsl.build()
 
     override fun getDsl(): DeleteDSL<DeleteModel> = dsl
-
-    override fun self(): KotlinDeleteBuilder = this
 }

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

@@ -26,7 +26,7 @@ typealias SelectCompleter = KotlinSelectBuilder.() -> Unit
 
 @Suppress("TooManyFunctions")
 class KotlinSelectBuilder(private val fromGatherer: QueryExpressionDSL.FromGatherer<SelectModel>) :
-    KotlinBaseJoiningBuilder<QueryExpressionDSL<SelectModel>, KotlinSelectBuilder>(), Buildable<SelectModel> {
+    KotlinBaseJoiningBuilder<QueryExpressionDSL<SelectModel>>(), Buildable<SelectModel> {
 
     private lateinit var dsl: QueryExpressionDSL<SelectModel>
 
@@ -83,8 +83,6 @@ class KotlinSelectBuilder(private val fromGatherer: QueryExpressionDSL.FromGathe
 
     override fun build(): SelectModel = getDsl().build()
 
-    override fun self(): KotlinSelectBuilder = this
-
     override fun getDsl(): QueryExpressionDSL<SelectModel> {
         try {
             return dsl

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

@@ -24,16 +24,14 @@ import org.mybatis.dynamic.sql.util.Buildable
 typealias UpdateCompleter = KotlinUpdateBuilder.() -> Unit
 
 class KotlinUpdateBuilder(private val dsl: UpdateDSL<UpdateModel>) :
-    KotlinBaseBuilder<UpdateDSL<UpdateModel>, KotlinUpdateBuilder>(), Buildable<UpdateModel> {
+    KotlinBaseBuilder<UpdateDSL<UpdateModel>>(), Buildable<UpdateModel> {
 
     fun <T> set(column: SqlColumn<T>): KotlinSetClauseFinisher<T> = KotlinSetClauseFinisher(column)
 
     override fun build(): UpdateModel = dsl.build()
 
     override fun getDsl(): UpdateDSL<UpdateModel> = dsl
 
-    override fun self(): KotlinUpdateBuilder = this
-
     @MyBatisDslMarker
     @Suppress("TooManyFunctions")
     inner class KotlinSetClauseFinisher<T>(private val column: SqlColumn<T>) {