Initial refactor of where support

Factor common where methods out of the DSL classes. THis will allow for an
easier implementation of future where support such as "exists".

Author: jeffgbutler

src/main/java/org/mybatis/dynamic/sql/delete/DeleteDSL.java

@@ -19,16 +19,13 @@
 import java.util.function.Function;
 
 import org.jetbrains.annotations.NotNull;
-import org.mybatis.dynamic.sql.BindableColumn;
-import org.mybatis.dynamic.sql.SqlCriterion;
 import org.mybatis.dynamic.sql.SqlTable;
-import org.mybatis.dynamic.sql.VisitableCondition;
 import org.mybatis.dynamic.sql.util.Buildable;
 import org.mybatis.dynamic.sql.where.AbstractWhereDSL;
-import org.mybatis.dynamic.sql.where.WhereApplier;
+import org.mybatis.dynamic.sql.where.AbstractWhereSupportingDSL;
 import org.mybatis.dynamic.sql.where.WhereModel;
 
-public class DeleteDSL<R> implements Buildable<R> {
+public class DeleteDSL<R> extends AbstractWhereSupportingDSL<DeleteDSL<R>.DeleteWhereBuilder> implements Buildable<R> {
 
     private final Function<DeleteModel, R> adapterFunction;
     private final SqlTable table;
@@ -39,20 +36,11 @@ private DeleteDSL(SqlTable table, Function<DeleteModel, R> adapterFunction) {
         this.adapterFunction = Objects.requireNonNull(adapterFunction);
     }
 
-    public DeleteWhereBuilder where() {
-        return whereBuilder;
-    }
-
-    public <T> DeleteWhereBuilder where(BindableColumn<T> column, VisitableCondition<T> condition,
-            SqlCriterion<?>...subCriteria) {
-        whereBuilder.where(column, condition, subCriteria);
+    @Override
+    protected DeleteWhereBuilder whereDsl() {
         return whereBuilder;
     }
 
-    public DeleteWhereBuilder applyWhere(WhereApplier whereApplier) {
-        return whereBuilder.applyWhere(whereApplier);
-    }
-
     /**
      * WARNING! Calling this method could result in an delete statement that deletes
      * all rows in a table.

src/main/java/org/mybatis/dynamic/sql/select/AbstractQueryExpressionDSL.java

@@ -31,8 +31,11 @@
 import org.mybatis.dynamic.sql.select.join.JoinSpecification;
 import org.mybatis.dynamic.sql.select.join.JoinType;
 import org.mybatis.dynamic.sql.util.Buildable;
+import org.mybatis.dynamic.sql.where.AbstractWhereDSL;
+import org.mybatis.dynamic.sql.where.AbstractWhereSupportingDSL;
 
-public abstract class AbstractQueryExpressionDSL<T extends AbstractQueryExpressionDSL<T, R>, R>
+public abstract class AbstractQueryExpressionDSL<W extends AbstractWhereDSL<?>, T extends AbstractQueryExpressionDSL<W, T, R>, R>
+        extends AbstractWhereSupportingDSL<W>
         implements Buildable<R> {
 
     private final List<JoinSpecification.Builder> joinSpecificationBuilders = new ArrayList<>();

src/main/java/org/mybatis/dynamic/sql/select/CountDSL.java

@@ -20,14 +20,10 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.mybatis.dynamic.sql.BasicColumn;
-import org.mybatis.dynamic.sql.BindableColumn;
 import org.mybatis.dynamic.sql.SqlBuilder;
-import org.mybatis.dynamic.sql.SqlCriterion;
 import org.mybatis.dynamic.sql.SqlTable;
-import org.mybatis.dynamic.sql.VisitableCondition;
 import org.mybatis.dynamic.sql.util.Buildable;
 import org.mybatis.dynamic.sql.where.AbstractWhereDSL;
-import org.mybatis.dynamic.sql.where.WhereApplier;
 import org.mybatis.dynamic.sql.where.WhereModel;
 
 /**
@@ -39,7 +35,7 @@
  *
  * @author Jeff Butler
  */
-public class CountDSL<R> extends AbstractQueryExpressionDSL<CountDSL<R>, R> implements Buildable<R> {
+public class CountDSL<R> extends AbstractQueryExpressionDSL<CountDSL<R>.CountWhereBuilder, CountDSL<R>, R> implements Buildable<R> {
 
     private final Function<SelectModel, R> adapterFunction;
     private final CountWhereBuilder whereBuilder = new CountWhereBuilder();
@@ -51,20 +47,11 @@ private CountDSL(BasicColumn countColumn, SqlTable table, Function<SelectModel,
         this.adapterFunction = Objects.requireNonNull(adapterFunction);
     }
 
-    public CountWhereBuilder where() {
-        return whereBuilder;
-    }
-
-    public <T> CountWhereBuilder where(BindableColumn<T> column, VisitableCondition<T> condition,
-            SqlCriterion<?>...subCriteria) {
-        whereBuilder.where(column, condition, subCriteria);
+    @Override
+    protected CountWhereBuilder whereDsl() {
         return whereBuilder;
     }
 
-    public CountWhereBuilder applyWhere(WhereApplier whereApplier) {
-        return whereBuilder.applyWhere(whereApplier);
-    }
-
     @NotNull
     @Override
     public R build() {

src/main/java/org/mybatis/dynamic/sql/select/QueryExpressionDSL.java

@@ -38,7 +38,7 @@
 import org.mybatis.dynamic.sql.where.WhereApplier;
 import org.mybatis.dynamic.sql.where.WhereModel;
 
-public class QueryExpressionDSL<R> extends AbstractQueryExpressionDSL<QueryExpressionDSL<R>, R>
+public class QueryExpressionDSL<R> extends AbstractQueryExpressionDSL<QueryExpressionDSL<R>.QueryExpressionWhereBuilder, QueryExpressionDSL<R>, R>
         implements Buildable<R> {
 
     private final String connector;
@@ -61,20 +61,11 @@ public class QueryExpressionDSL<R> extends AbstractQueryExpressionDSL<QueryExpre
         tableAliases.put(table, tableAlias);
     }
 
-    public QueryExpressionWhereBuilder where() {
-        return whereBuilder;
-    }
-
-    public <T> QueryExpressionWhereBuilder where(BindableColumn<T> column, VisitableCondition<T> condition,
-            SqlCriterion<?>...subCriteria) {
-        whereBuilder.where(column, condition, subCriteria);
+    @Override
+    protected QueryExpressionWhereBuilder whereDsl() {
         return whereBuilder;
     }
 
-    public QueryExpressionWhereBuilder applyWhere(WhereApplier whereApplier) {
-        return whereBuilder.applyWhere(whereApplier);
-    }
-
     @NotNull
     @Override
     public R build() {

src/main/java/org/mybatis/dynamic/sql/update/UpdateDSL.java

@@ -23,11 +23,8 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.mybatis.dynamic.sql.BasicColumn;
-import org.mybatis.dynamic.sql.BindableColumn;
 import org.mybatis.dynamic.sql.SqlColumn;
-import org.mybatis.dynamic.sql.SqlCriterion;
 import org.mybatis.dynamic.sql.SqlTable;
-import org.mybatis.dynamic.sql.VisitableCondition;
 import org.mybatis.dynamic.sql.select.SelectModel;
 import org.mybatis.dynamic.sql.util.AbstractColumnMapping;
 import org.mybatis.dynamic.sql.util.Buildable;
@@ -39,10 +36,10 @@
 import org.mybatis.dynamic.sql.util.ValueMapping;
 import org.mybatis.dynamic.sql.util.ValueWhenPresentMapping;
 import org.mybatis.dynamic.sql.where.AbstractWhereDSL;
-import org.mybatis.dynamic.sql.where.WhereApplier;
+import org.mybatis.dynamic.sql.where.AbstractWhereSupportingDSL;
 import org.mybatis.dynamic.sql.where.WhereModel;
 
-public class UpdateDSL<R> implements Buildable<R> {
+public class UpdateDSL<R> extends AbstractWhereSupportingDSL<UpdateDSL<R>.UpdateWhereBuilder> implements Buildable<R> {
 
     private final Function<UpdateModel, R> adapterFunction;
     private final List<AbstractColumnMapping> columnMappings = new ArrayList<>();
@@ -58,20 +55,11 @@ public <T> SetClauseFinisher<T> set(SqlColumn<T> column) {
         return new SetClauseFinisher<>(column);
     }
 
-    public UpdateWhereBuilder where() {
-        return whereBuilder;
-    }
-
-    public <T> UpdateWhereBuilder where(BindableColumn<T> column, VisitableCondition<T> condition,
-            SqlCriterion<?>...subCriteria) {
-        whereBuilder.where(column, condition, subCriteria);
+    @Override
+    protected UpdateWhereBuilder whereDsl() {
         return whereBuilder;
     }
 
-    public UpdateWhereBuilder applyWhere(WhereApplier whereApplier) {
-        return whereBuilder.applyWhere(whereApplier);
-    }
-
     /**
      * WARNING! Calling this method could result in an update statement that updates
      * all rows in a table.

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

@@ -0,0 +1,35 @@
+package org.mybatis.dynamic.sql.where;
+
+import org.mybatis.dynamic.sql.BindableColumn;
+import org.mybatis.dynamic.sql.SqlCriterion;
+import org.mybatis.dynamic.sql.VisitableCondition;
+
+import java.util.function.Consumer;
+
+/**
+ * Base class for DSLs that support where clauses.
+ *
+ * @param <W> the implementation of the Where DSL.
+ */
+public abstract class AbstractWhereSupportingDSL<W extends AbstractWhereDSL<?>> {
+
+    public W where() {
+        return whereDsl();
+    }
+
+    public <T> W where(BindableColumn<T> column, VisitableCondition<T> condition, SqlCriterion<?>...subCriteria) {
+        return apply(w -> w.where(column, condition, subCriteria));
+    }
+
+    public W applyWhere(WhereApplier whereApplier) {
+        return apply(w -> w.applyWhere(whereApplier));
+    }
+
+    private W apply(Consumer<W> block) {
+        W dsl = whereDsl();
+        block.accept(dsl);
+        return dsl;
+    }
+
+    protected abstract W whereDsl();
+}

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

@@ -77,7 +77,7 @@ abstract class KotlinBaseBuilder<W : AbstractWhereDSL<W>, B : KotlinBaseBuilder<
 }
 
 @Suppress("TooManyFunctions")
-abstract class KotlinBaseJoiningBuilder<T : AbstractQueryExpressionDSL<T, SelectModel>, W : AbstractWhereDSL<W>,
+abstract class KotlinBaseJoiningBuilder<T : AbstractQueryExpressionDSL<W, T, SelectModel>, W : AbstractWhereDSL<W>,
         B : KotlinBaseJoiningBuilder<T, W, B>> : KotlinBaseBuilder<W, B>() {
 
     fun join(table: SqlTable, joinCriteria: JoinReceiver) =
@@ -161,5 +161,5 @@ abstract class KotlinBaseJoiningBuilder<T : AbstractQueryExpressionDSL<T, Select
             JoinCollector().apply(joinCriteria).apply(block)
         }
 
-    protected abstract fun getDsl(): AbstractQueryExpressionDSL<T, SelectModel>
+    protected abstract fun getDsl(): AbstractQueryExpressionDSL<W, T, SelectModel>
 }