Remove unnecessary functions

Author: jeffgbutler

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

@@ -29,21 +29,10 @@ typealias CriteriaReceiver = CriteriaCollector.() -> Unit
 class CriteriaCollector {
     val criteria = mutableListOf<CriteriaGroupWithConnector>()
 
-    fun <T> and(column: BindableColumn<T>, condition: VisitableCondition<T>): CriteriaCollector =
-        apply {
-            criteria.add(CriteriaGroupWithConnector.Builder()
-                    .withInitialCriterion(ColumnAndConditionCriterion.withColumn(column)
-                            .withCondition(condition)
-                            .build())
-                    .withConnector("and")
-                    .build()
-            )
-        }
-
     fun <T> and(
         column: BindableColumn<T>,
         condition: VisitableCondition<T>,
-        criteriaReceiver: CriteriaReceiver
+        criteriaReceiver: CriteriaReceiver = {}
     ): CriteriaCollector =
         apply {
             criteria.add(CriteriaGroupWithConnector.Builder()
@@ -56,18 +45,7 @@ class CriteriaCollector {
             )
         }
 
-    fun and(existsPredicate: ExistsPredicate): CriteriaCollector =
-        apply {
-            criteria.add(CriteriaGroupWithConnector.Builder()
-                    .withInitialCriterion(ExistsCriterion.Builder()
-                        .withExistsPredicate(existsPredicate)
-                        .build())
-                    .withConnector("and")
-                    .build()
-            )
-        }
-
-    fun and(existsPredicate: ExistsPredicate, criteriaReceiver: CriteriaReceiver): CriteriaCollector =
+    fun and(existsPredicate: ExistsPredicate, criteriaReceiver: CriteriaReceiver = {}): CriteriaCollector =
         apply {
             criteria.add(CriteriaGroupWithConnector.Builder()
                 .withInitialCriterion(ExistsCriterion.Builder()
@@ -79,18 +57,7 @@ class CriteriaCollector {
             )
         }
 
-    fun and(criteriaGroup: CriteriaGroup): CriteriaCollector =
-        apply {
-            criteria.add(CriteriaGroupWithConnector.Builder()
-                .withInitialCriterion(CriteriaGroup.Builder()
-                    .withInitialCriterion(criteriaGroup)
-                    .build())
-                .withConnector("and")
-                .build()
-            )
-        }
-
-    fun and(criteriaGroup: CriteriaGroup, criteriaReceiver: CriteriaReceiver): CriteriaCollector =
+    fun and(criteriaGroup: CriteriaGroup, criteriaReceiver: CriteriaReceiver = {}): CriteriaCollector =
         apply {
             criteria.add(CriteriaGroupWithConnector.Builder()
                 .withInitialCriterion(CriteriaGroup.Builder()
@@ -102,21 +69,10 @@ class CriteriaCollector {
             )
         }
 
-    fun <T> or(column: BindableColumn<T>, condition: VisitableCondition<T>): CriteriaCollector =
-        apply {
-            criteria.add(CriteriaGroupWithConnector.Builder()
-                .withInitialCriterion(ColumnAndConditionCriterion.withColumn(column)
-                    .withCondition(condition)
-                    .build())
-                .withConnector("or")
-                .build()
-            )
-        }
-
     fun <T> or(
         column: BindableColumn<T>,
         condition: VisitableCondition<T>,
-        criteriaReceiver: CriteriaReceiver
+        criteriaReceiver: CriteriaReceiver = {}
     ): CriteriaCollector =
         apply {
             criteria.add(CriteriaGroupWithConnector.Builder()
@@ -129,18 +85,7 @@ class CriteriaCollector {
             )
         }
 
-    fun or(existsPredicate: ExistsPredicate): CriteriaCollector =
-        apply {
-            criteria.add(CriteriaGroupWithConnector.Builder()
-                .withInitialCriterion(ExistsCriterion.Builder()
-                    .withExistsPredicate(existsPredicate)
-                    .build())
-                .withConnector("or")
-                .build()
-            )
-        }
-
-    fun or(existsPredicate: ExistsPredicate, criteriaReceiver: CriteriaReceiver): CriteriaCollector =
+    fun or(existsPredicate: ExistsPredicate, criteriaReceiver: CriteriaReceiver = {}): CriteriaCollector =
         apply {
             criteria.add(CriteriaGroupWithConnector.Builder()
                 .withInitialCriterion(ExistsCriterion.Builder()
@@ -152,18 +97,7 @@ class CriteriaCollector {
             )
         }
 
-    fun or(criteriaGroup: CriteriaGroup): CriteriaCollector =
-        apply {
-            criteria.add(CriteriaGroupWithConnector.Builder()
-                .withInitialCriterion(CriteriaGroup.Builder()
-                    .withInitialCriterion(criteriaGroup)
-                    .build())
-                .withConnector("or")
-                .build()
-            )
-        }
-
-    fun or(criteriaGroup: CriteriaGroup, criteriaReceiver: CriteriaReceiver): CriteriaCollector =
+    fun or(criteriaGroup: CriteriaGroup, criteriaReceiver: CriteriaReceiver = {}): CriteriaCollector =
         apply {
             criteria.add(CriteriaGroupWithConnector.Builder()
                 .withInitialCriterion(CriteriaGroup.Builder()

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

@@ -39,32 +39,17 @@ fun WhereApplier.andThen(after: WhereApplier): WhereApplier = {
 @MyBatisDslMarker
 @Suppress("TooManyFunctions")
 abstract class KotlinBaseBuilder<D : AbstractWhereSupport<*>, B : KotlinBaseBuilder<D, B>> {
-    fun <T> where(column: BindableColumn<T>, condition: VisitableCondition<T>): B =
-        applyToWhere {
-            where(column, condition)
-        }
-
-    fun <T> where(column: BindableColumn<T>, condition: VisitableCondition<T>, subCriteria: CriteriaReceiver): B =
+    fun <T> where(column: BindableColumn<T>, condition: VisitableCondition<T>, subCriteria: CriteriaReceiver = {}): B =
         applyToWhere(subCriteria) { sc ->
             where(column, condition, sc)
         }
 
-    fun where(existsPredicate: ExistsPredicate): B =
-        applyToWhere {
-            where(existsPredicate)
-        }
-
-    fun where(existsPredicate: ExistsPredicate, subCriteria: CriteriaReceiver): B =
+    fun where(existsPredicate: ExistsPredicate, subCriteria: CriteriaReceiver = {}): B =
         applyToWhere(subCriteria) { sc ->
             where(existsPredicate, sc)
         }
 
-    fun where(criteriaGroup: CriteriaGroup): B =
-        applyToWhere {
-            where(criteriaGroup)
-        }
-
-    fun where(criteriaGroup: CriteriaGroup, subCriteria: CriteriaReceiver): B =
+    fun where(criteriaGroup: CriteriaGroup, subCriteria: CriteriaReceiver = {}): B =
         applyToWhere(subCriteria) { sc ->
             where(criteriaGroup, sc)
         }
@@ -74,62 +59,32 @@ abstract class KotlinBaseBuilder<D : AbstractWhereSupport<*>, B : KotlinBaseBuil
             applyWhere(whereApplier)
         }
 
-    fun <T> and(column: BindableColumn<T>, condition: VisitableCondition<T>): B =
-        applyToWhere {
-            and(column, condition)
-        }
-
-    fun <T> and(column: BindableColumn<T>, condition: VisitableCondition<T>, subCriteria: CriteriaReceiver): B =
+    fun <T> and(column: BindableColumn<T>, condition: VisitableCondition<T>, subCriteria: CriteriaReceiver = {}): B =
         applyToWhere(subCriteria) { sc ->
             and(column, condition, sc)
         }
 
-    fun and(existsPredicate: ExistsPredicate): B =
-        applyToWhere {
-            and(existsPredicate)
-        }
-
-    fun and(existsPredicate: ExistsPredicate, subCriteria: CriteriaReceiver): B =
+    fun and(existsPredicate: ExistsPredicate, subCriteria: CriteriaReceiver = {}): B =
         applyToWhere(subCriteria) { sc ->
             and(existsPredicate, sc)
         }
 
-    fun and(criteriaGroup: CriteriaGroup): B =
-        applyToWhere {
-            and(criteriaGroup)
-        }
-
-    fun and(criteriaGroup: CriteriaGroup, subCriteria: CriteriaReceiver): B =
+    fun and(criteriaGroup: CriteriaGroup, subCriteria: CriteriaReceiver = {}): B =
         applyToWhere(subCriteria) { sc ->
             and(criteriaGroup, sc)
         }
 
-    fun <T> or(column: BindableColumn<T>, condition: VisitableCondition<T>): B =
-        applyToWhere {
-            or(column, condition)
-        }
-
-    fun <T> or(column: BindableColumn<T>, condition: VisitableCondition<T>, subCriteria: CriteriaReceiver): B =
+    fun <T> or(column: BindableColumn<T>, condition: VisitableCondition<T>, subCriteria: CriteriaReceiver = {}): B =
         applyToWhere(subCriteria) { sc ->
             or(column, condition, sc)
         }
 
-    fun or(existsPredicate: ExistsPredicate): B =
-        applyToWhere {
-            or(existsPredicate)
-        }
-
-    fun or(existsPredicate: ExistsPredicate, subCriteria: CriteriaReceiver): B =
+    fun or(existsPredicate: ExistsPredicate, subCriteria: CriteriaReceiver = {}): B =
         applyToWhere(subCriteria) { sc ->
             or(existsPredicate, sc)
         }
 
-    fun or(criteriaGroup: CriteriaGroup): B =
-        applyToWhere {
-            or(criteriaGroup)
-        }
-
-    fun or(criteriaGroup: CriteriaGroup, subCriteria: CriteriaReceiver): B =
+    fun or(criteriaGroup: CriteriaGroup, subCriteria: CriteriaReceiver = {}): B =
         applyToWhere(subCriteria) { sc ->
             or(criteriaGroup, sc)
         }