WhereApplier is a Consumer, not a Function

This change allows us to get rid of a clumsy cast, and more clearly expresses the intent of what a WhereSupplier actually is. Plus it avoids some danger - we do not want users changing the underlying implementation.

Author: jeffgbutler

src/main/java/org/mybatis/dynamic/sql/where/AbstractWhereDSL.java

@@ -26,7 +26,7 @@
 public abstract class AbstractWhereDSL<T extends AbstractWhereDSL<T>> {
     private List<SqlCriterion<?>> criteria = new ArrayList<>();
 
-    protected <S> AbstractWhereDSL() {
+    protected AbstractWhereDSL() {
         super();
     }
 
@@ -45,9 +45,9 @@ public <S> T where(BindableColumn<S> column, VisitableCondition<S> condition, Li
         return getThis();
     }
 
-    @SuppressWarnings("unchecked")
     public T applyWhere(WhereApplier whereApplier) {
-        return (T) whereApplier.apply(this);
+        whereApplier.accept(this);
+        return getThis();
     }
 
     public <S> T and(BindableColumn<S> column, VisitableCondition<S> condition) {

src/main/java/org/mybatis/dynamic/sql/where/WhereApplier.java

@@ -15,7 +15,7 @@
  */
 package org.mybatis.dynamic.sql.where;
 
-import java.util.function.UnaryOperator;
+import java.util.function.Consumer;
 
 @FunctionalInterface
-public interface WhereApplier extends UnaryOperator<AbstractWhereDSL<?>> {}
+public interface WhereApplier extends Consumer<AbstractWhereDSL<?>> {}

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

@@ -19,7 +19,7 @@ import org.mybatis.dynamic.sql.BindableColumn
 import org.mybatis.dynamic.sql.VisitableCondition
 import org.mybatis.dynamic.sql.where.AbstractWhereDSL
 
-typealias WhereApplier = AbstractWhereDSL<*>.() -> AbstractWhereDSL<*>
+typealias WhereApplier = AbstractWhereDSL<*>.() -> Unit
 
 fun <T, M : AbstractWhereDSL<M>> AbstractWhereDSL<M>.where(column: BindableColumn<T>, condition: VisitableCondition<T>, collect: CriteriaReceiver): M {
     val collector = CriteriaCollector()