Fix Having/Where Appliers

This fix makes the methods build clauses
in a more natural way - parentheses
are where they are expected.

Author: jeffgbutler

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

@@ -15,15 +15,23 @@
  */
 package org.mybatis.dynamic.sql.select;
 
+import org.mybatis.dynamic.sql.AndOrCriteriaGroup;
 import org.mybatis.dynamic.sql.SqlCriterion;
 import org.mybatis.dynamic.sql.common.AbstractBooleanExpressionDSL;
 
+import java.util.List;
+
 public abstract class AbstractHavingFinisher<T extends AbstractHavingFinisher<T>>
         extends AbstractBooleanExpressionDSL<T> {
     void initialize(SqlCriterion sqlCriterion) {
         setInitialCriterion(sqlCriterion, StatementType.HAVING);
     }
 
+    void initialize(SqlCriterion sqlCriterion, List<AndOrCriteriaGroup> subCriteria) {
+        setInitialCriterion(sqlCriterion, StatementType.HAVING);
+        super.subCriteria.addAll(subCriteria);
+    }
+
     protected HavingModel buildModel() {
         return new HavingModel(getInitialCriterion(), subCriteria);
     }

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

@@ -16,7 +16,6 @@
 package org.mybatis.dynamic.sql.select;
 
 import org.jetbrains.annotations.NotNull;
-import org.mybatis.dynamic.sql.CriteriaGroup;
 import org.mybatis.dynamic.sql.util.Buildable;
 
 public class HavingDSL extends AbstractHavingStarter<HavingDSL.StandaloneHavingFinisher> {
@@ -44,12 +43,7 @@ public HavingModel build() {
         }
 
         public HavingApplier toHavingApplier() {
-            CriteriaGroup ic = new CriteriaGroup.Builder()
-                    .withInitialCriterion(getInitialCriterion())
-                    .withSubCriteria(subCriteria)
-                    .build();
-
-            return d -> d.initialize(ic);
+            return d -> d.initialize(getInitialCriterion(), subCriteria);
         }
     }
 }

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

@@ -15,9 +15,11 @@
  */
 package org.mybatis.dynamic.sql.where;
 
+import java.util.List;
 import java.util.Objects;
 import java.util.function.Consumer;
 
+import org.mybatis.dynamic.sql.AndOrCriteriaGroup;
 import org.mybatis.dynamic.sql.SqlCriterion;
 import org.mybatis.dynamic.sql.common.AbstractBooleanExpressionDSL;
 import org.mybatis.dynamic.sql.configuration.StatementConfiguration;
@@ -31,6 +33,11 @@ void initialize(SqlCriterion sqlCriterion) {
         setInitialCriterion(sqlCriterion, StatementType.WHERE);
     }
 
+    void initialize(SqlCriterion sqlCriterion, List<AndOrCriteriaGroup> subCriteria) {
+        setInitialCriterion(sqlCriterion, StatementType.WHERE);
+        super.subCriteria.addAll(subCriteria);
+    }
+
     protected AbstractWhereFinisher(StatementConfiguration statementConfiguration) {
         this.statementConfiguration = Objects.requireNonNull(statementConfiguration);
     }

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

@@ -18,7 +18,6 @@
 import java.util.function.Consumer;
 
 import org.jetbrains.annotations.NotNull;
-import org.mybatis.dynamic.sql.CriteriaGroup;
 import org.mybatis.dynamic.sql.configuration.StatementConfiguration;
 import org.mybatis.dynamic.sql.util.Buildable;
 
@@ -55,12 +54,7 @@ public WhereModel build() {
         }
 
         public WhereApplier toWhereApplier() {
-            CriteriaGroup ic = new CriteriaGroup.Builder()
-                    .withInitialCriterion(getInitialCriterion())
-                    .withSubCriteria(subCriteria)
-                    .build();
-
-            return d -> d.initialize(ic);
+            return d -> d.initialize(getInitialCriterion(), subCriteria);
         }
     }
 }

src/test/java/examples/spring/ReusableWhereTest.java

@@ -99,6 +99,5 @@ void testComposition() {
 
     }
 
-    private final WhereApplier commonWhere = where(id, isEqualTo(1)).toWhereApplier()
-            .andThen(wa -> wa.or(occupation, isNull()));
+    private final WhereApplier commonWhere = where(id, isEqualTo(1)).or(occupation, isNull()).toWhereApplier();
 }