Better name for the grouping collector

Author: jeffgbutler

…c/sql/util/kotlin/CriteriaCollectorV2.kt …util/kotlin/GroupingCriteriaCollector.ktsrc/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/CriteriaCollectorV2.kt renamed to src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/GroupingCriteriaCollector.kt src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/CriteriaCollectorV2.kt renamed to src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/GroupingCriteriaCollector.kt

@@ -25,15 +25,15 @@ import org.mybatis.dynamic.sql.SqlBuilder
 import org.mybatis.dynamic.sql.SqlCriterion
 import org.mybatis.dynamic.sql.VisitableCondition
 
-typealias CriteriaReceiverV2 = CriteriaCollectorV2.() -> Unit
+typealias GroupingCriteriaReceiver = GroupingCriteriaCollector.() -> Unit
 
 @MyBatisDslMarker
-class CriteriaCollectorV2 {
+class GroupingCriteriaCollector {
     internal var initialCriterion: SqlCriterion? = null
     internal val subCriteria = mutableListOf<AndOrCriteriaGroup>()
 
-    fun and(criteriaReceiver: CriteriaReceiverV2) {
-        val cc = CriteriaCollectorV2().apply(criteriaReceiver)
+    fun and(criteriaReceiver: GroupingCriteriaReceiver) {
+        val cc = GroupingCriteriaCollector().apply(criteriaReceiver)
         subCriteria.add(
             AndOrCriteriaGroup.Builder().withConnector("and")
                 .withInitialCriterion(cc.initialCriterion)
@@ -42,8 +42,8 @@ class CriteriaCollectorV2 {
         )
     }
 
-    fun or(criteriaReceiver: CriteriaReceiverV2) {
-        val cc = CriteriaCollectorV2().apply(criteriaReceiver)
+    fun or(criteriaReceiver: GroupingCriteriaReceiver) {
+        val cc = GroupingCriteriaCollector().apply(criteriaReceiver)
         subCriteria.add(
             AndOrCriteriaGroup.Builder().withConnector("or")
                 .withInitialCriterion(cc.initialCriterion)
@@ -55,8 +55,8 @@ class CriteriaCollectorV2 {
     /**
      * This should only be specified once per scope, and should be first
      */
-    fun not(criteriaReceiver: CriteriaReceiverV2) {
-        val cc = CriteriaCollectorV2().apply(criteriaReceiver)
+    fun not(criteriaReceiver: GroupingCriteriaReceiver) {
+        val cc = GroupingCriteriaCollector().apply(criteriaReceiver)
         initialCriterion = NotCriterion.Builder()
             .withInitialCriterion(cc.initialCriterion)
             .withSubCriteria(cc.subCriteria)
@@ -78,8 +78,8 @@ class CriteriaCollectorV2 {
      *
      * This should only be specified once per scope, and should be first
      */
-    fun group(criteriaReceiver: CriteriaReceiverV2) {
-        val cc = CriteriaCollectorV2().apply(criteriaReceiver)
+    fun group(criteriaReceiver: GroupingCriteriaReceiver) {
+        val cc = GroupingCriteriaCollector().apply(criteriaReceiver)
         initialCriterion = CriteriaGroup.Builder()
             .withInitialCriterion(cc.initialCriterion)
             .withSubCriteria(cc.subCriteria)

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

@@ -38,20 +38,20 @@ fun WhereApplier.andThen(after: WhereApplier): WhereApplier = {
 @MyBatisDslMarker
 @Suppress("TooManyFunctions")
 abstract class KotlinBaseBuilder<D : AbstractWhereSupport<*>, B : KotlinBaseBuilder<D, B>> {
-    fun where(criteria: CriteriaReceiverV2) {
-        val criteriaCollector = CriteriaCollectorV2().apply(criteria)
+    fun where(criteria: GroupingCriteriaReceiver) {
+        val criteriaCollector = GroupingCriteriaCollector().apply(criteria)
 
         getDsl().where(criteriaCollector.initialCriterion, criteriaCollector.subCriteria)
     }
 
-    fun and(criteria: CriteriaReceiverV2) {
-        val criteriaCollector = CriteriaCollectorV2().apply(criteria)
+    fun and(criteria: GroupingCriteriaReceiver) {
+        val criteriaCollector = GroupingCriteriaCollector().apply(criteria)
 
         getDsl().where().and(criteriaCollector.initialCriterion, criteriaCollector.subCriteria)
     }
 
-    fun or(criteria: CriteriaReceiverV2) {
-        val criteriaCollector = CriteriaCollectorV2().apply(criteria)
+    fun or(criteria: GroupingCriteriaReceiver) {
+        val criteriaCollector = GroupingCriteriaCollector().apply(criteria)
 
         getDsl().where().or(criteriaCollector.initialCriterion, criteriaCollector.subCriteria)
     }