Merge branch 'remove-extensions' into subquery-in-join

# Conflicts:
#	src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/AbstractQueryExpressionDSLExtensions.kt
#	src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/KotlinBaseBuilders.kt

Author: jeffgbutler

README.md

@@ -20,7 +20,8 @@ For example, a typical search can be coded with a query like this (the following
 
 ```kotlin
    fun search(id: String?, firstName: String?, lastName: String?) =
-        select(Customer.id, Customer.firstName, Customer.lastName).from(Customer) {
+        select(Customer.id, Customer.firstName, Customer.lastName) {
+            from(Customer)
             where(Customer.active, isEqualTo(true))
             and(Customer.id, isEqualToWhenPresent(id).then{ it?.padStart(5, '0') })
             and(Customer.firstName, isLikeCaseInsensitiveWhenPresent(firstName)

src/main/java/org/mybatis/dynamic/sql/insert/InsertSelectDSL.java

@@ -19,12 +19,13 @@
 import java.util.List;
 import java.util.Objects;
 
+import org.jetbrains.annotations.NotNull;
 import org.mybatis.dynamic.sql.SqlColumn;
 import org.mybatis.dynamic.sql.SqlTable;
 import org.mybatis.dynamic.sql.select.SelectModel;
 import org.mybatis.dynamic.sql.util.Buildable;
 
-public class InsertSelectDSL {
+public class InsertSelectDSL implements Buildable<InsertSelectModel> {
 
     private final SqlTable table;
     private final InsertColumnListModel columnList;
@@ -42,6 +43,8 @@ private InsertSelectDSL(SqlTable table, SelectModel selectModel) {
         this.columnList = null;
     }
 
+    @NotNull
+    @Override
     public InsertSelectModel build() {
         return InsertSelectModel.withTable(table)
                 .withColumnList(columnList)

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

@@ -26,6 +26,8 @@ import org.mybatis.dynamic.sql.where.AbstractWhereDSL
 @DslMarker
 annotation class MyBatisDslMarker
 
+typealias WhereApplier = AbstractWhereDSL<*>.() -> Unit
+
 @MyBatisDslMarker
 @Suppress("TooManyFunctions")
 abstract class KotlinBaseBuilder<W : AbstractWhereDSL<W>, B : KotlinBaseBuilder<W, B>> {
@@ -34,9 +36,9 @@ abstract class KotlinBaseBuilder<W : AbstractWhereDSL<W>, B : KotlinBaseBuilder<
             getWhere().where(column, condition)
         }
 
-    fun <T> where(column: BindableColumn<T>, condition: VisitableCondition<T>, collect: CriteriaReceiver): B =
+    fun <T> where(column: BindableColumn<T>, condition: VisitableCondition<T>, subCriteria: CriteriaReceiver): B =
         applySelf {
-            getWhere().where(column, condition, collect)
+            getWhere().where(column, condition, subCriteria(CriteriaCollector()).criteria)
         }
 
     fun applyWhere(whereApplier: WhereApplier): B =
@@ -49,19 +51,19 @@ abstract class KotlinBaseBuilder<W : AbstractWhereDSL<W>, B : KotlinBaseBuilder<
             getWhere().and(column, condition)
         }
 
-    fun <T> and(column: BindableColumn<T>, condition: VisitableCondition<T>, collect: CriteriaReceiver): B =
+    fun <T> and(column: BindableColumn<T>, condition: VisitableCondition<T>, subCriteria: CriteriaReceiver): B =
         applySelf {
-            getWhere().and(column, condition, collect)
+            getWhere().and(column, condition, subCriteria(CriteriaCollector()).criteria)
         }
 
     fun <T> or(column: BindableColumn<T>, condition: VisitableCondition<T>): B =
         applySelf {
             getWhere().or(column, condition)
         }
 
-    fun <T> or(column: BindableColumn<T>, condition: VisitableCondition<T>, collect: CriteriaReceiver): B =
+    fun <T> or(column: BindableColumn<T>, condition: VisitableCondition<T>, subCriteria: CriteriaReceiver): B =
         applySelf {
-            getWhere().or(column, condition, collect)
+            getWhere().or(column, condition, subCriteria(CriteriaCollector()).criteria)
         }
 
     fun allRows() = self()
@@ -77,56 +79,49 @@ abstract class KotlinBaseBuilder<W : AbstractWhereDSL<W>, B : KotlinBaseBuilder<
 abstract class KotlinBaseJoiningBuilder<T : AbstractQueryExpressionDSL<T, SelectModel>, W : AbstractWhereDSL<W>,
         B : KotlinBaseJoiningBuilder<T, W, B>> : KotlinBaseBuilder<W, B>() {
 
-    fun join(table: SqlTable, receiver: JoinReceiver): B =
-        applySelf {
-            getDsl().join(table, receiver)
-        }
-
-    fun join(table: SqlTable, alias: String, receiver: JoinReceiver): B =
-        applySelf {
-            getDsl().join(table, alias, receiver)
+    fun join(table: SqlTable, joinCriteria: JoinReceiver) =
+        applyJoin(joinCriteria) {
+            getDsl().join(table, it.onJoinCriterion, it.andJoinCriteria)
         }
 
-    fun join(subQuery: KotlinQualifiedSubQueryBuilder.() -> KotlinQualifiedSubQueryBuilder, joinCriteria: JoinReceiver): B =
-        applySelf {
-            val builder = subQuery(KotlinQualifiedSubQueryBuilder())
-            getDsl().join(builder, joinCriteria)
+    fun join(table: SqlTable, alias: String, joinCriteria: JoinReceiver) =
+        applyJoin(joinCriteria) {
+            getDsl().join(table, alias, it.onJoinCriterion, it.andJoinCriteria)
         }
 
-    fun fullJoin(table: SqlTable, receiver: JoinReceiver): B =
-        applySelf {
-            getDsl().fullJoin(table, receiver)
+    fun fullJoin(table: SqlTable, joinCriteria: JoinReceiver) =
+        applyJoin(joinCriteria) {
+            getDsl().fullJoin(table, it.onJoinCriterion, it.andJoinCriteria)
         }
 
-    fun fullJoin(table: SqlTable, alias: String, receiver: JoinReceiver): B =
-        applySelf {
-            getDsl().fullJoin(table, alias, receiver)
+    fun fullJoin(table: SqlTable, alias: String, joinCriteria: JoinReceiver) =
+        applyJoin(joinCriteria) {
+            getDsl().fullJoin(table, alias, it.onJoinCriterion, it.andJoinCriteria)
         }
 
-    fun fullJoin(subQuery: KotlinQualifiedSubQueryBuilder.() -> KotlinQualifiedSubQueryBuilder, receiver: JoinReceiver): B =
-        applySelf {
-            val builder = subQuery(KotlinQualifiedSubQueryBuilder())
-            getDsl().fullJoin(builder, receiver)
+    fun leftJoin(table: SqlTable, joinCriteria: JoinReceiver) =
+        applyJoin(joinCriteria) {
+            getDsl().leftJoin(table, it.onJoinCriterion, it.andJoinCriteria)
         }
 
-    fun leftJoin(table: SqlTable, receiver: JoinReceiver): B =
-        applySelf {
-            getDsl().leftJoin(table, receiver)
+    fun leftJoin(table: SqlTable, alias: String, joinCriteria: JoinReceiver) =
+        applyJoin(joinCriteria) {
+            getDsl().leftJoin(table, alias, it.onJoinCriterion, it.andJoinCriteria)
         }
 
-    fun leftJoin(table: SqlTable, alias: String, receiver: JoinReceiver): B =
-        applySelf {
-            getDsl().leftJoin(table, alias, receiver)
+    fun rightJoin(table: SqlTable, joinCriteria: JoinReceiver) =
+        applyJoin(joinCriteria) {
+            getDsl().rightJoin(table, it.onJoinCriterion, it.andJoinCriteria)
         }
 
-    fun rightJoin(table: SqlTable, receiver: JoinReceiver): B =
-        applySelf {
-            getDsl().rightJoin(table, receiver)
+    fun rightJoin(table: SqlTable, alias: String, joinCriteria: JoinReceiver) =
+        applyJoin(joinCriteria) {
+            getDsl().rightJoin(table, alias, it.onJoinCriterion, it.andJoinCriteria)
         }
 
-    fun rightJoin(table: SqlTable, alias: String, receiver: JoinReceiver): B =
+    private fun applyJoin(joinCriteria: JoinReceiver, block: (JoinCollector) -> Unit) =
         applySelf {
-            getDsl().rightJoin(table, alias, receiver)
+            joinCriteria(JoinCollector()).also(block)
         }
 
     protected abstract fun getDsl(): AbstractQueryExpressionDSL<T, SelectModel>

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

@@ -20,26 +20,11 @@ import org.mybatis.dynamic.sql.select.CountDSL
 import org.mybatis.dynamic.sql.select.SelectModel
 import org.mybatis.dynamic.sql.util.Buildable
 
-typealias CountCompleter = KotlinCountBuilder.() -> Buildable<SelectModel>
+typealias CountCompleter = KotlinCountBuilder.() -> KotlinCountBuilder
 
-typealias CountColumnCompleter = KotlinCountColumnBuilder.() -> Buildable<SelectModel>
-
-class KotlinCountBuilder(private val dsl: CountDSL<SelectModel>) :
-    KotlinBaseJoiningBuilder<CountDSL<SelectModel>, CountDSL<SelectModel>.CountWhereBuilder, KotlinCountBuilder>(),
-    Buildable<SelectModel> {
-
-    override fun build(): SelectModel = getDsl().build()
-
-    override fun getWhere(): CountDSL<SelectModel>.CountWhereBuilder = getDsl().where()
-
-    override fun self() = this
-
-    override fun getDsl() = dsl
-}
-
-class KotlinCountColumnBuilder(private val fromGatherer: CountDSL.FromGatherer<SelectModel>) :
+class KotlinCountBuilder(private val fromGatherer: CountDSL.FromGatherer<SelectModel>) :
     KotlinBaseJoiningBuilder<CountDSL<SelectModel>,
-            CountDSL<SelectModel>.CountWhereBuilder, KotlinCountColumnBuilder>(),
+            CountDSL<SelectModel>.CountWhereBuilder, KotlinCountBuilder>(),
     Buildable<SelectModel> {
 
     private lateinit var dsl: CountDSL<SelectModel>

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

@@ -19,7 +19,7 @@ import org.mybatis.dynamic.sql.delete.DeleteDSL
 import org.mybatis.dynamic.sql.delete.DeleteModel
 import org.mybatis.dynamic.sql.util.Buildable
 
-typealias DeleteCompleter = KotlinDeleteBuilder.() -> Buildable<DeleteModel>
+typealias DeleteCompleter = KotlinDeleteBuilder.() -> KotlinDeleteBuilder
 
 class KotlinDeleteBuilder(private val dsl: DeleteDSL<DeleteModel>) :
         KotlinBaseBuilder<DeleteDSL<DeleteModel>.DeleteWhereBuilder, KotlinDeleteBuilder>(), Buildable<DeleteModel> {