Implement standalone having

Author: jeffgbutler

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

@@ -30,6 +30,7 @@
 import org.mybatis.dynamic.sql.insert.MultiRowInsertDSL;
 import org.mybatis.dynamic.sql.select.ColumnSortSpecification;
 import org.mybatis.dynamic.sql.select.CountDSL;
+import org.mybatis.dynamic.sql.select.HavingDSL;
 import org.mybatis.dynamic.sql.select.MultiSelectDSL;
 import org.mybatis.dynamic.sql.select.QueryExpressionDSL.FromGatherer;
 import org.mybatis.dynamic.sql.select.SelectDSL;
@@ -257,6 +258,15 @@ static WhereDSL.StandaloneWhereFinisher where(ExistsPredicate existsPredicate, A
         return new WhereDSL().where(existsPredicate, subCriteria);
     }
 
+    static <T> HavingDSL.StandaloneHavingFinisher having(BindableColumn<T> column, VisitableCondition<T> condition,
+                                              AndOrCriteriaGroup... subCriteria) {
+        return new HavingDSL().having(column, condition, subCriteria);
+    }
+
+    static HavingDSL.StandaloneHavingFinisher having(SqlCriterion initialCriterion, AndOrCriteriaGroup... subCriteria) {
+        return new HavingDSL().having(initialCriterion, subCriteria);
+    }
+
     // where condition connectors
     static <T> CriteriaGroup group(BindableColumn<T> column, VisitableCondition<T> condition,
                                    AndOrCriteriaGroup... subCriteria) {

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

@@ -15,16 +15,8 @@
  */
 package org.mybatis.dynamic.sql.select;
 
-import java.util.Arrays;
-import java.util.List;
 import java.util.function.Consumer;
 
-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.SqlCriterion;
-import org.mybatis.dynamic.sql.VisitableCondition;
 import org.mybatis.dynamic.sql.common.AbstractBooleanExpressionDSL;
 
 @FunctionalInterface
@@ -45,32 +37,4 @@ default HavingApplier andThen(Consumer<AbstractBooleanExpressionDSL<?>> after) {
             after.accept(t);
         };
     }
-
-    static <T> HavingApplier having(BindableColumn<T> column, VisitableCondition<T> condition,
-                        AndOrCriteriaGroup... subCriteria) {
-        return having(column, condition, Arrays.asList(subCriteria));
-    }
-
-    static <T> HavingApplier having(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);
-    }
-
-    static HavingApplier having(SqlCriterion initialCriterion, AndOrCriteriaGroup... subCriteria) {
-        return having(initialCriterion, Arrays.asList(subCriteria));
-    }
-
-    static HavingApplier having(SqlCriterion initialCriterion, List<AndOrCriteriaGroup> subCriteria) {
-        CriteriaGroup ic = new CriteriaGroup.Builder()
-                .withInitialCriterion(initialCriterion)
-                .withSubCriteria(subCriteria)
-                .build();
-
-        return d -> d.initialize(ic);
-    }
 }

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

@@ -0,0 +1,64 @@
+/*
+ *    Copyright 2016-2023 the original author or authors.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *       https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+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>
+        implements Buildable<HavingModel> {
+    private StandaloneHavingFinisher havingFinisher;
+
+    @Override
+    protected StandaloneHavingFinisher having() {
+        if (havingFinisher == null) {
+            havingFinisher = new StandaloneHavingFinisher();
+        }
+
+        return havingFinisher;
+    }
+
+    @NotNull
+    @Override
+    public HavingModel build() {
+        return havingFinisher.buildModel();
+    }
+
+    public class StandaloneHavingFinisher extends AbstractHavingFinisher<StandaloneHavingFinisher>
+            implements Buildable<HavingModel> {
+
+        @Override
+        protected StandaloneHavingFinisher getThis() {
+            return this;
+        }
+
+        @NotNull
+        @Override
+        public HavingModel build() {
+            return HavingDSL.this.build();
+        }
+
+        public HavingApplier toHavingApplier() {
+            CriteriaGroup ic = new CriteriaGroup.Builder()
+                    .withInitialCriterion(getInitialCriterion())
+                    .withSubCriteria(subCriteria)
+                    .build();
+
+            return d -> d.initialize(ic);
+        }
+    }
+}

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

@@ -22,7 +22,8 @@
 import org.mybatis.dynamic.sql.configuration.StatementConfiguration;
 import org.mybatis.dynamic.sql.util.Buildable;
 
-public class WhereDSL extends AbstractWhereStarter<WhereDSL.StandaloneWhereFinisher, WhereDSL> implements Buildable<WhereModel> {
+public class WhereDSL extends AbstractWhereStarter<WhereDSL.StandaloneWhereFinisher, WhereDSL>
+        implements Buildable<WhereModel> {
     private StandaloneWhereFinisher whereBuilder;
     private final StatementConfiguration statementConfiguration = new StatementConfiguration();
 
@@ -48,7 +49,8 @@ public WhereDSL configureStatement(Consumer<StatementConfiguration> consumer) {
         return this;
     }
 
-    public class StandaloneWhereFinisher extends AbstractWhereFinisher<StandaloneWhereFinisher> implements Buildable<WhereModel> {
+    public class StandaloneWhereFinisher extends AbstractWhereFinisher<StandaloneWhereFinisher>
+            implements Buildable<WhereModel> {
         private StandaloneWhereFinisher() {
             super(statementConfiguration);
         }

src/test/java/examples/groupby/GroupByTest.java

@@ -712,5 +712,5 @@ void testComposedHaving() {
         }
     }
 
-    private final HavingApplier commonHaving = HavingApplier.having(count(), isEqualTo(3L));
+    private final HavingApplier commonHaving = having(count(), isEqualTo(3L)).toHavingApplier();
 }