Reuse standalone where DSL when possible

jeffgbutler · jeffgbutler · commit 392cf0238a8c · 2023-03-06T09:27:30.000-05:00
diff --git a/src/main/java/org/mybatis/dynamic/sql/SqlBuilder.java b/src/main/java/org/mybatis/dynamic/sql/SqlBuilder.java
@@ -240,20 +240,20 @@ static UpdateDSL<UpdateModel> update(SqlTable table, String tableAlias) {
         return UpdateDSL.update(table, tableAlias);
     }
 
-    static WhereDSL.WhereFinisher where() {
+    static WhereDSL.StandaloneWhereFinisher where() {
         return new WhereDSL().where();
     }
 
-    static <T> WhereDSL.WhereFinisher where(BindableColumn<T> column, VisitableCondition<T> condition,
-                              AndOrCriteriaGroup... subCriteria) {
+    static <T> WhereDSL.StandaloneWhereFinisher where(BindableColumn<T> column, VisitableCondition<T> condition,
+                                                      AndOrCriteriaGroup... subCriteria) {
         return new WhereDSL().where(column, condition, subCriteria);
     }
 
-    static WhereDSL.WhereFinisher where(SqlCriterion initialCriterion, AndOrCriteriaGroup... subCriteria) {
+    static WhereDSL.StandaloneWhereFinisher where(SqlCriterion initialCriterion, AndOrCriteriaGroup... subCriteria) {
         return new WhereDSL().where(initialCriterion, subCriteria);
     }
 
-    static WhereDSL.WhereFinisher where(ExistsPredicate existsPredicate, AndOrCriteriaGroup... subCriteria) {
+    static WhereDSL.StandaloneWhereFinisher where(ExistsPredicate existsPredicate, AndOrCriteriaGroup... subCriteria) {
         return new WhereDSL().where(existsPredicate, subCriteria);
     }
 
diff --git a/src/main/java/org/mybatis/dynamic/sql/where/WhereApplier.java b/src/main/java/org/mybatis/dynamic/sql/where/WhereApplier.java
@@ -15,19 +15,8 @@
  */
 package org.mybatis.dynamic.sql.where;
 
-import java.util.Arrays;
-import java.util.List;
 import java.util.function.Consumer;
 
-import org.jetbrains.annotations.NotNull;
-import org.mybatis.dynamic.sql.AndOrCriteriaGroup;
-import org.mybatis.dynamic.sql.BindableColumn;
-import org.mybatis.dynamic.sql.ColumnAndConditionCriterion;
-import org.mybatis.dynamic.sql.CriteriaGroup;
-import org.mybatis.dynamic.sql.ExistsCriterion;
-import org.mybatis.dynamic.sql.ExistsPredicate;
-import org.mybatis.dynamic.sql.SqlCriterion;
-import org.mybatis.dynamic.sql.VisitableCondition;
 import org.mybatis.dynamic.sql.common.AbstractBooleanExpressionDSL;
 
 @FunctionalInterface
@@ -47,60 +36,4 @@ default WhereApplier andThen(Consumer<AbstractBooleanExpressionDSL<?>> after) {
             after.accept(t);
         };
     }
-
-    @NotNull
-    static <T> WhereApplier where(BindableColumn<T> column, VisitableCondition<T> condition,
-                                  AndOrCriteriaGroup... subCriteria) {
-        return where(column, condition, Arrays.asList(subCriteria));
-    }
-
-    @NotNull
-    static <T> WhereApplier where(BindableColumn<T> column, VisitableCondition<T> condition,
-                                  List<AndOrCriteriaGroup> subCriteria) {
-        ColumnAndConditionCriterion<T> ic = ColumnAndConditionCriterion.withColumn(column)
-                .withCondition(condition)
-                .withSubCriteria(subCriteria)
-                .build();
-
-        return d -> d.initialize(ic);
-    }
-
-    @NotNull
-    static WhereApplier where(ExistsPredicate existsPredicate, AndOrCriteriaGroup... subCriteria) {
-        return where(existsPredicate, Arrays.asList(subCriteria));
-    }
-
-    @NotNull
-    static WhereApplier where(ExistsPredicate existsPredicate, List<AndOrCriteriaGroup> subCriteria) {
-        ExistsCriterion ic = new ExistsCriterion.Builder()
-                .withExistsPredicate(existsPredicate)
-                .withSubCriteria(subCriteria)
-                .build();
-
-        return d -> d.initialize(ic);
-    }
-
-    @NotNull
-    static WhereApplier where(SqlCriterion initialCriterion, AndOrCriteriaGroup... subCriteria) {
-        return where(initialCriterion, Arrays.asList(subCriteria));
-    }
-
-    @NotNull
-    static WhereApplier where(SqlCriterion initialCriterion, List<AndOrCriteriaGroup> subCriteria) {
-        CriteriaGroup ic = new CriteriaGroup.Builder()
-                .withInitialCriterion(initialCriterion)
-                .withSubCriteria(subCriteria)
-                .build();
-
-        return d -> d.initialize(ic);
-    }
-
-    @NotNull
-    static WhereApplier where(List<AndOrCriteriaGroup> criteria) {
-        CriteriaGroup ic = new CriteriaGroup.Builder()
-                .withSubCriteria(criteria)
-                .build();
-
-        return d -> d.initialize(ic);
-    }
 }
diff --git a/src/main/java/org/mybatis/dynamic/sql/where/WhereDSL.java b/src/main/java/org/mybatis/dynamic/sql/where/WhereDSL.java
@@ -18,19 +18,20 @@
 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;
 
-public class WhereDSL extends AbstractWhereStarter<WhereDSL.WhereFinisher, WhereDSL> implements Buildable<WhereModel> {
-    private WhereFinisher whereBuilder;
+public class WhereDSL extends AbstractWhereStarter<WhereDSL.StandaloneWhereFinisher, WhereDSL> implements Buildable<WhereModel> {
+    private StandaloneWhereFinisher whereBuilder;
     private final StatementConfiguration statementConfiguration = new StatementConfiguration();
 
     public WhereDSL() { }
 
     @Override
-    public WhereFinisher where() {
+    public StandaloneWhereFinisher where() {
         if (whereBuilder == null) {
-            whereBuilder = new WhereFinisher();
+            whereBuilder = new StandaloneWhereFinisher();
         }
         return whereBuilder;
     }
@@ -47,13 +48,13 @@ public WhereDSL configureStatement(Consumer<StatementConfiguration> consumer) {
         return this;
     }
 
-    public class WhereFinisher extends AbstractWhereFinisher<WhereFinisher> implements Buildable<WhereModel> {
-        private WhereFinisher() {
+    public class StandaloneWhereFinisher extends AbstractWhereFinisher<StandaloneWhereFinisher> implements Buildable<WhereModel> {
+        private StandaloneWhereFinisher() {
             super(statementConfiguration);
         }
 
         @Override
-        protected WhereFinisher getThis() {
+        protected StandaloneWhereFinisher getThis() {
             return this;
         }
 
@@ -62,5 +63,14 @@ protected WhereFinisher getThis() {
         public WhereModel build() {
             return WhereDSL.this.build();
         }
+
+        public WhereApplier toWhereApplier() {
+            CriteriaGroup ic = new CriteriaGroup.Builder()
+                    .withInitialCriterion(getInitialCriterion())
+                    .withSubCriteria(subCriteria)
+                    .build();
+
+            return d -> d.initialize(ic);
+        }
     }
 }
diff --git a/src/test/java/examples/emptywhere/EmptyWhereTest.java b/src/test/java/examples/emptywhere/EmptyWhereTest.java
@@ -262,7 +262,7 @@ void testWhereThreeConditions() {
         String fName = "Fred";
         String lName = "Flintstone";
 
-        WhereDSL.WhereFinisher builder = where(id, isEqualTo(3));
+        WhereDSL.StandaloneWhereFinisher builder = where(id, isEqualTo(3));
 
         builder.and(firstName, isEqualTo(fName).filter(Objects::nonNull));
         builder.and(PersonDynamicSqlSupport.lastName, isEqualTo(lName).filter(Objects::nonNull));
@@ -281,7 +281,7 @@ void testWhereThreeConditions() {
     @ParameterizedTest
     @MethodSource("whereVariations")
     void testWhereVariations(Variation variation) {
-        WhereDSL.WhereFinisher builder = where();
+        WhereDSL.StandaloneWhereFinisher builder = where();
 
         builder.and(firstName, isEqualTo(variation.firstName).filter(Objects::nonNull));
         builder.or(PersonDynamicSqlSupport.lastName, isEqualTo(variation.lastName).filter(Objects::nonNull));
diff --git a/src/test/java/examples/joins/JoinMapperTest.java b/src/test/java/examples/joins/JoinMapperTest.java
@@ -49,7 +49,6 @@
 import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
 import org.mybatis.dynamic.sql.util.Messages;
 import org.mybatis.dynamic.sql.util.mybatis3.CommonSelectMapper;
-import org.mybatis.dynamic.sql.where.WhereApplier;
 
 class JoinMapperTest {
 
@@ -271,7 +270,7 @@ void testMultipleTableJoinWithApplyWhere() {
                     .from(orderMaster, "om")
                     .join(orderLine, "ol").on(orderMaster.orderId, equalTo(orderLine.orderId))
                     .join(itemMaster, "im").on(orderLine.itemId, equalTo(itemMaster.itemId))
-                    .applyWhere(WhereApplier.where(orderMaster.orderId, isEqualTo(2)))
+                    .applyWhere(where(orderMaster.orderId, isEqualTo(2)).toWhereApplier())
                     .build()
                     .render(RenderingStrategies.MYBATIS3);
 
diff --git a/src/test/java/examples/simple/ReusableWhereTest.java b/src/test/java/examples/simple/ReusableWhereTest.java
@@ -20,6 +20,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mybatis.dynamic.sql.SqlBuilder.isEqualTo;
 import static org.mybatis.dynamic.sql.SqlBuilder.isNull;
+import static org.mybatis.dynamic.sql.SqlBuilder.where;
 
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -113,6 +114,5 @@ void testUpdate() {
         }
     }
 
-    private final WhereApplier commonWhere = WhereApplier.where(id, isEqualTo(1))
-            .andThen(wa -> wa.or(occupation, isNull()));
+    private final WhereApplier commonWhere = where(id, isEqualTo(1)).or(occupation, isNull()).toWhereApplier();
 }
diff --git a/src/test/java/examples/spring/ReusableWhereTest.java b/src/test/java/examples/spring/ReusableWhereTest.java
@@ -99,5 +99,6 @@ void testComposition() {
 
     }
 
-    private final WhereApplier commonWhere = WhereApplier.where(id, isEqualTo(1)).andThen(wa -> wa.or(occupation, isNull()));
+    private final WhereApplier commonWhere = where(id, isEqualTo(1)).toWhereApplier()
+            .andThen(wa -> wa.or(occupation, isNull()));
 }

Original file line number	Diff line number	Diff line change
`@@ -240,20 +240,20 @@ static UpdateDSL<UpdateModel> update(SqlTable table, String tableAlias) {`
`240`	`240`	`return UpdateDSL.update(table, tableAlias);`
`241`	`241`	`}`
`242`	`242`
`243`		`- static WhereDSL.WhereFinisher where() {`
	`243`	`+ static WhereDSL.StandaloneWhereFinisher where() {`
`244`	`244`	`return new WhereDSL().where();`
`245`	`245`	`}`
`246`	`246`
`247`		`- static <T> WhereDSL.WhereFinisher where(BindableColumn<T> column, VisitableCondition<T> condition,`
`248`		`- AndOrCriteriaGroup... subCriteria) {`
	`247`	`+ static <T> WhereDSL.StandaloneWhereFinisher where(BindableColumn<T> column, VisitableCondition<T> condition,`
	`248`	`+ AndOrCriteriaGroup... subCriteria) {`
`249`	`249`	`return new WhereDSL().where(column, condition, subCriteria);`
`250`	`250`	`}`
`251`	`251`
`252`		`- static WhereDSL.WhereFinisher where(SqlCriterion initialCriterion, AndOrCriteriaGroup... subCriteria) {`
	`252`	`+ static WhereDSL.StandaloneWhereFinisher where(SqlCriterion initialCriterion, AndOrCriteriaGroup... subCriteria) {`
`253`	`253`	`return new WhereDSL().where(initialCriterion, subCriteria);`
`254`	`254`	`}`
`255`	`255`
`256`		`- static WhereDSL.WhereFinisher where(ExistsPredicate existsPredicate, AndOrCriteriaGroup... subCriteria) {`
	`256`	`+ static WhereDSL.StandaloneWhereFinisher where(ExistsPredicate existsPredicate, AndOrCriteriaGroup... subCriteria) {`
`257`	`257`	`return new WhereDSL().where(existsPredicate, subCriteria);`
`258`	`258`	`}`
`259`	`259`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@`
`20`	`20`	`import static org.assertj.core.api.Assertions.assertThat;`
`21`	`21`	`import static org.mybatis.dynamic.sql.SqlBuilder.isEqualTo;`
`22`	`22`	`import static org.mybatis.dynamic.sql.SqlBuilder.isNull;`
	`23`	`+import static org.mybatis.dynamic.sql.SqlBuilder.where;`
`23`	`24`
`24`	`25`	`import java.io.InputStream;`
`25`	`26`	`import java.io.InputStreamReader;`
`@@ -113,6 +114,5 @@ void testUpdate() {`
`113`	`114`	`}`
`114`	`115`	`}`
`115`	`116`
`116`		`- private final WhereApplier commonWhere = WhereApplier.where(id, isEqualTo(1))`
`117`		`- .andThen(wa -> wa.or(occupation, isNull()));`
	`117`	`+ private final WhereApplier commonWhere = where(id, isEqualTo(1)).or(occupation, isNull()).toWhereApplier();`
`118`	`118`	`}`
Original file line number	Diff line number	Diff line change
`@@ -99,5 +99,6 @@ void testComposition() {`
`99`	`99`
`100`	`100`	`}`
`101`	`101`
`102`		`- private final WhereApplier commonWhere = WhereApplier.where(id, isEqualTo(1)).andThen(wa -> wa.or(occupation, isNull()));`
	`102`	`+ private final WhereApplier commonWhere = where(id, isEqualTo(1)).toWhereApplier()`
	`103`	`+ .andThen(wa -> wa.or(occupation, isNull()));`
`103`	`104`	`}`