Refactor where support

Where and Having are very similar so the
code should be similar also.

Author: jeffgbutler

src/main/java/org/mybatis/dynamic/sql/SqlBuilder.java

@@ -240,21 +240,21 @@ static UpdateDSL<UpdateModel> update(SqlTable table, String tableAlias) {
         return UpdateDSL.update(table, tableAlias);
     }
 
-    static WhereDSL where() {
-        return WhereDSL.where();
+    static WhereDSL.WhereFinisher where() {
+        return new WhereDSL().where();
     }
 
-    static <T> WhereDSL where(BindableColumn<T> column, VisitableCondition<T> condition,
+    static <T> WhereDSL.WhereFinisher where(BindableColumn<T> column, VisitableCondition<T> condition,
                               AndOrCriteriaGroup... subCriteria) {
-        return WhereDSL.where().where(column, condition, subCriteria);
+        return new WhereDSL().where(column, condition, subCriteria);
     }
 
-    static WhereDSL where(SqlCriterion initialCriterion, AndOrCriteriaGroup... subCriteria) {
-        return WhereDSL.where().where(initialCriterion, subCriteria);
+    static WhereDSL.WhereFinisher where(SqlCriterion initialCriterion, AndOrCriteriaGroup... subCriteria) {
+        return new WhereDSL().where(initialCriterion, subCriteria);
     }
 
-    static WhereDSL where(ExistsPredicate existsPredicate, AndOrCriteriaGroup... subCriteria) {
-        return WhereDSL.where().where(existsPredicate, subCriteria);
+    static WhereDSL.WhereFinisher where(ExistsPredicate existsPredicate, AndOrCriteriaGroup... subCriteria) {
+        return new WhereDSL().where(existsPredicate, subCriteria);
     }
 
     // where condition connectors

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

@@ -27,11 +27,11 @@
 import org.mybatis.dynamic.sql.common.OrderByModel;
 import org.mybatis.dynamic.sql.configuration.StatementConfiguration;
 import org.mybatis.dynamic.sql.util.Buildable;
-import org.mybatis.dynamic.sql.where.AbstractWhereDSL;
-import org.mybatis.dynamic.sql.where.AbstractWhereSupport;
+import org.mybatis.dynamic.sql.where.AbstractWhereFinisher;
+import org.mybatis.dynamic.sql.where.AbstractWhereStarter;
 import org.mybatis.dynamic.sql.where.WhereModel;
 
-public class DeleteDSL<R> extends AbstractWhereSupport<DeleteDSL<R>.DeleteWhereBuilder, DeleteDSL<R>>
+public class DeleteDSL<R> extends AbstractWhereStarter<DeleteDSL<R>.DeleteWhereBuilder, DeleteDSL<R>>
         implements Buildable<R> {
 
     private final Function<DeleteModel, R> adapterFunction;
@@ -109,7 +109,7 @@ public static DeleteDSL<DeleteModel> deleteFrom(SqlTable table, String tableAlia
         return deleteFrom(Function.identity(), table, tableAlias);
     }
 
-    public class DeleteWhereBuilder extends AbstractWhereDSL<DeleteWhereBuilder> implements Buildable<R> {
+    public class DeleteWhereBuilder extends AbstractWhereFinisher<DeleteWhereBuilder> implements Buildable<R> {
 
         private DeleteWhereBuilder() {
             super(statementConfiguration);
@@ -140,7 +140,7 @@ protected DeleteWhereBuilder getThis() {
         }
 
         protected WhereModel buildWhereModel() {
-            return internalBuild();
+            return buildModel();
         }
     }
 }

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

@@ -22,4 +22,8 @@ public abstract class AbstractHavingFinisher<T extends AbstractHavingFinisher<T>
     void initialize(SqlCriterion sqlCriterion) {
         setInitialCriterion(sqlCriterion, "ERROR.31"); //$NON-NLS-1$
     }
+
+    protected HavingModel buildModel() {
+        return new HavingModel(getInitialCriterion(), subCriteria);
+    }
 }

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

@@ -39,7 +39,7 @@ public <T> F having(BindableColumn<T> column, VisitableCondition<T> condition,
                 .withSubCriteria(subCriteria)
                 .build();
 
-        F finisher = getFinisher();
+        F finisher = having();
         finisher.initialize(ic);
         return finisher;
     }
@@ -54,16 +54,16 @@ public F having(SqlCriterion initialCriterion, List<AndOrCriteriaGroup> subCrite
                 .withSubCriteria(subCriteria)
                 .build();
 
-        F finisher = getFinisher();
+        F finisher = having();
         finisher.initialize(ic);
         return finisher;
     }
 
     public F applyHaving(HavingApplier havingApplier) {
-        F finisher = getFinisher();
+        F finisher = having();
         havingApplier.accept(finisher);
         return finisher;
     }
 
-    protected abstract F getFinisher();
+    protected abstract F having();
 }

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

@@ -33,12 +33,12 @@
 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.AbstractWhereSupport;
+import org.mybatis.dynamic.sql.where.AbstractWhereFinisher;
+import org.mybatis.dynamic.sql.where.AbstractWhereStarter;
 
-public abstract class AbstractQueryExpressionDSL<W extends AbstractWhereDSL<?>,
+public abstract class AbstractQueryExpressionDSL<W extends AbstractWhereFinisher<?>,
             T extends AbstractQueryExpressionDSL<W, T>>
-        extends AbstractWhereSupport<W, T> {
+        extends AbstractWhereStarter<W, T> {
 
     private final List<JoinSpecification.Builder> joinSpecificationBuilders = new ArrayList<>();
     private final Map<SqlTable, String> tableAliases = new HashMap<>();

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

@@ -25,7 +25,7 @@
 import org.mybatis.dynamic.sql.SqlTable;
 import org.mybatis.dynamic.sql.configuration.StatementConfiguration;
 import org.mybatis.dynamic.sql.util.Buildable;
-import org.mybatis.dynamic.sql.where.AbstractWhereDSL;
+import org.mybatis.dynamic.sql.where.AbstractWhereFinisher;
 import org.mybatis.dynamic.sql.where.WhereModel;
 
 /**
@@ -131,7 +131,7 @@ public CountDSL<R> from(SqlTable table) {
         }
     }
 
-    public class CountWhereBuilder extends AbstractWhereDSL<CountWhereBuilder>
+    public class CountWhereBuilder extends AbstractWhereFinisher<CountWhereBuilder>
             implements Buildable<R> {
         private CountWhereBuilder() {
             super(statementConfiguration);
@@ -149,7 +149,7 @@ protected CountWhereBuilder getThis() {
         }
 
         protected WhereModel buildWhereModel() {
-            return internalBuild();
+            return buildModel();
         }
     }
 }

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

@@ -30,7 +30,7 @@
 @FunctionalInterface
 public interface HavingApplier {
 
-    void accept(AbstractBooleanExpressionDSL<?> havingStarter);
+    void accept(AbstractHavingFinisher<?> havingFinisher);
 
     /**
      * Return a composed having applier that performs this operation followed by the after operation.
@@ -53,12 +53,12 @@ static <T> HavingApplier having(BindableColumn<T> column, VisitableCondition<T>
 
     static <T> HavingApplier having(BindableColumn<T> column, VisitableCondition<T> condition,
                         List<AndOrCriteriaGroup> subCriteria) {
-        ColumnAndConditionCriterion<T> initialCriterion = ColumnAndConditionCriterion.withColumn(column)
+        ColumnAndConditionCriterion<T> ic = ColumnAndConditionCriterion.withColumn(column)
                 .withCondition(condition)
                 .withSubCriteria(subCriteria)
                 .build();
 
-        return d -> d.and(initialCriterion);
+        return d -> d.initialize(ic);
     }
 
     static HavingApplier having(SqlCriterion initialCriterion, AndOrCriteriaGroup... subCriteria) {
@@ -71,6 +71,6 @@ static HavingApplier having(SqlCriterion initialCriterion, List<AndOrCriteriaGro
                 .withSubCriteria(subCriteria)
                 .build();
 
-        return d -> d.and(ic);
+        return d -> d.initialize(ic);
     }
 }

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

@@ -34,8 +34,8 @@
 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.AbstractWhereSupport;
+import org.mybatis.dynamic.sql.where.AbstractWhereFinisher;
+import org.mybatis.dynamic.sql.where.AbstractWhereStarter;
 import org.mybatis.dynamic.sql.where.WhereModel;
 
 public class QueryExpressionDSL<R>
@@ -79,6 +79,11 @@ public QueryExpressionDSL<R> configureStatement(Consumer<StatementConfiguration>
         return this;
     }
 
+    /**
+     * This method is protected here because it doesn't make sense at this point in the DSL.
+     *
+     * @return The having builder
+     */
     protected QueryExpressionHavingBuilder having() {
         if (havingBuilder == null) {
             havingBuilder = new QueryExpressionHavingBuilder();
@@ -277,7 +282,7 @@ public FromGatherer<R> build() {
         }
     }
 
-    public class QueryExpressionWhereBuilder extends AbstractWhereDSL<QueryExpressionWhereBuilder>
+    public class QueryExpressionWhereBuilder extends AbstractWhereFinisher<QueryExpressionWhereBuilder>
             implements Buildable<R> {
         private QueryExpressionWhereBuilder() {
             super(statementConfiguration);
@@ -331,7 +336,7 @@ protected QueryExpressionWhereBuilder getThis() {
         }
 
         protected WhereModel buildWhereModel() {
-            return internalBuild();
+            return buildModel();
         }
     }
 
@@ -355,7 +360,7 @@ public JoinSpecificationFinisher on(BasicColumn joinColumn, JoinCondition onJoin
     }
 
     public class JoinSpecificationFinisher
-            extends AbstractWhereSupport<QueryExpressionWhereBuilder, JoinSpecificationFinisher>
+            extends AbstractWhereStarter<QueryExpressionWhereBuilder, JoinSpecificationFinisher>
             implements Buildable<R> {
         private final JoinSpecification.Builder joinSpecificationBuilder;
 
@@ -538,7 +543,7 @@ public SelectDSL<R>.FetchFirstFinisher fetchFirst(long fetchFirstRows) {
         }
 
         @Override
-        public QueryExpressionHavingBuilder getFinisher() {
+        public QueryExpressionHavingBuilder having() {
             return QueryExpressionDSL.this.having();
         }
     }
@@ -619,7 +624,7 @@ protected QueryExpressionHavingBuilder getThis() {
         }
 
         protected HavingModel buildHavingModel() {
-            return new HavingModel(getInitialCriterion(), subCriteria);
+            return buildModel();
         }
     }
 }

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

@@ -42,11 +42,11 @@
 import org.mybatis.dynamic.sql.util.ValueMapping;
 import org.mybatis.dynamic.sql.util.ValueOrNullMapping;
 import org.mybatis.dynamic.sql.util.ValueWhenPresentMapping;
-import org.mybatis.dynamic.sql.where.AbstractWhereDSL;
-import org.mybatis.dynamic.sql.where.AbstractWhereSupport;
+import org.mybatis.dynamic.sql.where.AbstractWhereFinisher;
+import org.mybatis.dynamic.sql.where.AbstractWhereStarter;
 import org.mybatis.dynamic.sql.where.WhereModel;
 
-public class UpdateDSL<R> extends AbstractWhereSupport<UpdateDSL<R>.UpdateWhereBuilder, UpdateDSL<R>>
+public class UpdateDSL<R> extends AbstractWhereStarter<UpdateDSL<R>.UpdateWhereBuilder, UpdateDSL<R>>
         implements Buildable<R> {
 
     private final Function<UpdateModel, R> adapterFunction;
@@ -192,7 +192,7 @@ public UpdateDSL<R> equalToWhenPresent(Supplier<T> valueSupplier) {
         }
     }
 
-    public class UpdateWhereBuilder extends AbstractWhereDSL<UpdateWhereBuilder> implements Buildable<R> {
+    public class UpdateWhereBuilder extends AbstractWhereFinisher<UpdateWhereBuilder> implements Buildable<R> {
 
         private UpdateWhereBuilder() {
             super(statementConfiguration);
@@ -223,7 +223,7 @@ protected UpdateWhereBuilder getThis() {
         }
 
         protected WhereModel buildWhereModel() {
-            return internalBuild();
+            return buildModel();
         }
     }
 }