Update Kotlin DSL for new Join syntax

Author: jeffgbutler

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

@@ -26,19 +26,28 @@ typealias JoinReceiver = JoinCollector.() -> Unit
 
 @MyBatisDslMarker
 class JoinCollector {
-    private var onJoinCriterion: SqlCriterion? = null
-    internal val andJoinCriteria = mutableListOf<AndOrCriteriaGroup>()
+    private var initialCriterion: SqlCriterion? = null
+    internal val subCriteria = mutableListOf<AndOrCriteriaGroup>()
 
-    internal fun onJoinCriterion() : SqlCriterion = invalidIfNull(onJoinCriterion, "ERROR.22") //$NON-NLS-1$
+    internal fun initialCriterion() : SqlCriterion = invalidIfNull(initialCriterion, "ERROR.22") //$NON-NLS-1$
 
+    fun on (receiver: GroupingCriteriaReceiver) {
+        GroupingCriteriaCollector().apply(receiver).also {
+            initialCriterion = it.initialCriterion
+            subCriteria.addAll(it.subCriteria)
+        }
+    }
+
+    // TODO - Deprecate?
     fun <T> on(leftColumn: BindableColumn<T>): RightColumnCollector<T> = RightColumnCollector {
-        onJoinCriterion = ColumnAndConditionCriterion.withColumn(leftColumn)
+        initialCriterion = ColumnAndConditionCriterion.withColumn(leftColumn)
             .withCondition(it)
             .build()
     }
 
+    // TODO - Deprecate?
     fun <T> and(leftColumn: BindableColumn<T>): RightColumnCollector<T> = RightColumnCollector {
-        andJoinCriteria.add(
+        subCriteria.add(
             AndOrCriteriaGroup.Builder()
                 .withConnector("and") //$NON-NLS-1$
                 .withInitialCriterion(ColumnAndConditionCriterion.withColumn(leftColumn).withCondition(it).build())

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

@@ -66,74 +66,74 @@ abstract class KotlinBaseJoiningBuilder<D : AbstractQueryExpressionDSL<*, *>> :
 
     fun join(table: SqlTable, joinCriteria: JoinReceiver): Unit =
         applyToDsl(joinCriteria) { jc ->
-            join(table, jc.onJoinCriterion(), jc.andJoinCriteria)
+            join(table, jc.initialCriterion(), jc.subCriteria)
         }
 
     fun join(table: SqlTable, alias: String, joinCriteria: JoinReceiver): Unit =
         applyToDsl(joinCriteria) { jc ->
-            join(table, alias, jc.onJoinCriterion(), jc.andJoinCriteria)
+            join(table, alias, jc.initialCriterion(), jc.subCriteria)
         }
 
     fun join(
         subQuery: KotlinQualifiedSubQueryBuilder.() -> Unit,
         joinCriteria: JoinReceiver
     ): Unit =
         applyToDsl(subQuery, joinCriteria) { sq, jc ->
-            join(sq, sq.correlationName, jc.onJoinCriterion(), jc.andJoinCriteria)
+            join(sq, sq.correlationName, jc.initialCriterion(), jc.subCriteria)
         }
 
     fun fullJoin(table: SqlTable, joinCriteria: JoinReceiver): Unit =
         applyToDsl(joinCriteria) { jc ->
-            fullJoin(table, jc.onJoinCriterion(), jc.andJoinCriteria)
+            fullJoin(table, jc.initialCriterion(), jc.subCriteria)
         }
 
     fun fullJoin(table: SqlTable, alias: String, joinCriteria: JoinReceiver): Unit =
         applyToDsl(joinCriteria) { jc ->
-            fullJoin(table, alias, jc.onJoinCriterion(), jc.andJoinCriteria)
+            fullJoin(table, alias, jc.initialCriterion(), jc.subCriteria)
         }
 
     fun fullJoin(
         subQuery: KotlinQualifiedSubQueryBuilder.() -> Unit,
         joinCriteria: JoinReceiver
     ): Unit =
         applyToDsl(subQuery, joinCriteria) { sq, jc ->
-            fullJoin(sq, sq.correlationName, jc.onJoinCriterion(), jc.andJoinCriteria)
+            fullJoin(sq, sq.correlationName, jc.initialCriterion(), jc.subCriteria)
         }
 
     fun leftJoin(table: SqlTable, joinCriteria: JoinReceiver): Unit =
         applyToDsl(joinCriteria) { jc ->
-            leftJoin(table, jc.onJoinCriterion(), jc.andJoinCriteria)
+            leftJoin(table, jc.initialCriterion(), jc.subCriteria)
         }
 
     fun leftJoin(table: SqlTable, alias: String, joinCriteria: JoinReceiver): Unit =
         applyToDsl(joinCriteria) { jc ->
-            leftJoin(table, alias, jc.onJoinCriterion(), jc.andJoinCriteria)
+            leftJoin(table, alias, jc.initialCriterion(), jc.subCriteria)
         }
 
     fun leftJoin(
         subQuery: KotlinQualifiedSubQueryBuilder.() -> Unit,
         joinCriteria: JoinReceiver
     ): Unit =
         applyToDsl(subQuery, joinCriteria) { sq, jc ->
-            leftJoin(sq, sq.correlationName, jc.onJoinCriterion(), jc.andJoinCriteria)
+            leftJoin(sq, sq.correlationName, jc.initialCriterion(), jc.subCriteria)
         }
 
     fun rightJoin(table: SqlTable, joinCriteria: JoinReceiver): Unit =
         applyToDsl(joinCriteria) { jc ->
-            rightJoin(table, jc.onJoinCriterion(), jc.andJoinCriteria)
+            rightJoin(table, jc.initialCriterion(), jc.subCriteria)
         }
 
     fun rightJoin(table: SqlTable, alias: String, joinCriteria: JoinReceiver): Unit =
         applyToDsl(joinCriteria) { jc ->
-            rightJoin(table, alias, jc.onJoinCriterion(), jc.andJoinCriteria)
+            rightJoin(table, alias, jc.initialCriterion(), jc.subCriteria)
         }
 
     fun rightJoin(
         subQuery: KotlinQualifiedSubQueryBuilder.() -> Unit,
         joinCriteria: JoinReceiver
     ): Unit =
         applyToDsl(subQuery, joinCriteria) { sq, jc ->
-            rightJoin(sq, sq.correlationName, jc.onJoinCriterion(), jc.andJoinCriteria)
+            rightJoin(sq, sq.correlationName, jc.initialCriterion(), jc.subCriteria)
         }
 
     private fun applyToDsl(joinCriteria: JoinReceiver, applyJoin: D.(JoinCollector) -> Unit) {