Collectors have Unit functions

Author: jeffgbutler

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

@@ -35,20 +35,20 @@ class CriteriaCollector {
         column: BindableColumn<T>,
         condition: VisitableCondition<T>,
         criteriaReceiver: CriteriaReceiver = {}
-    ): CriteriaCollector =
+    ): Unit =
         addCriteriaGroup("and", buildCriterion(column, condition), criteriaReceiver)
 
-    fun and(existsPredicate: ExistsPredicate, criteriaReceiver: CriteriaReceiver = {}): CriteriaCollector =
+    fun and(existsPredicate: ExistsPredicate, criteriaReceiver: CriteriaReceiver = {}): Unit =
         addCriteriaGroup("and", buildCriterion(existsPredicate), criteriaReceiver)
 
     fun <T> or(
         column: BindableColumn<T>,
         condition: VisitableCondition<T>,
         criteriaReceiver: CriteriaReceiver = {}
-    ): CriteriaCollector =
+    ): Unit =
         addCriteriaGroup("or", buildCriterion(column, condition), criteriaReceiver)
 
-    fun or(existsPredicate: ExistsPredicate, criteriaReceiver: CriteriaReceiver = {}): CriteriaCollector =
+    fun or(existsPredicate: ExistsPredicate, criteriaReceiver: CriteriaReceiver = {}): Unit =
         addCriteriaGroup("or", buildCriterion(existsPredicate), criteriaReceiver)
 
     private fun <T> buildCriterion(
@@ -64,14 +64,13 @@ class CriteriaCollector {
         connector: String,
         initialCriterion: SqlCriterion,
         criteriaReceiver: CriteriaReceiver
-    ) =
-        apply {
-            criteria.add(
-                AndOrCriteriaGroup.Builder()
-                    .withInitialCriterion(initialCriterion)
-                    .withSubCriteria(CriteriaCollector().apply(criteriaReceiver).criteria)
-                    .withConnector(connector)
-                    .build()
-            )
-        }
+    ) {
+        criteria.add(
+            AndOrCriteriaGroup.Builder()
+                .withInitialCriterion(initialCriterion)
+                .withSubCriteria(CriteriaCollector().apply(criteriaReceiver).criteria)
+                .withConnector(connector)
+                .build()
+        )
+    }
 }

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

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2016-2021 the original author or authors.
+ *    Copyright 2016-2022 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -27,23 +27,21 @@ class JoinCollector {
     val andJoinCriteria = mutableListOf<JoinCriterion>()
     private lateinit var internalOnCriterion: JoinCriterion
 
-    fun on(column: BasicColumn, condition: JoinCondition): JoinCollector =
-        apply {
-            internalOnCriterion = JoinCriterion.Builder()
-                .withConnector("on")
+    fun on(column: BasicColumn, condition: JoinCondition) {
+        internalOnCriterion = JoinCriterion.Builder()
+            .withConnector("on")
+            .withJoinColumn(column)
+            .withJoinCondition(condition)
+            .build()
+    }
+
+    fun and(column: BasicColumn, condition: JoinCondition) {
+        andJoinCriteria.add(
+            JoinCriterion.Builder()
+                .withConnector("and")
                 .withJoinColumn(column)
                 .withJoinCondition(condition)
                 .build()
-        }
-
-    fun and(column: BasicColumn, condition: JoinCondition): JoinCollector =
-        apply {
-            andJoinCriteria.add(
-                JoinCriterion.Builder()
-                    .withConnector("and")
-                    .withJoinColumn(column)
-                    .withJoinCondition(condition)
-                    .build()
-            )
-        }
+        )
+    }
 }