Remove CountDSL Generic

Author: jeffgbutler

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

@@ -109,7 +109,7 @@ public interface SqlBuilder {
      *
      * @return the next step in the DSL
      */
-    static CountDSL.FromGatherer<SelectModel> countDistinctColumn(BasicColumn column) {
+    static CountDSL.FromGatherer countDistinctColumn(BasicColumn column) {
         return CountDSL.countDistinct(column);
     }
 
@@ -121,7 +121,7 @@ static CountDSL.FromGatherer<SelectModel> countDistinctColumn(BasicColumn column
      *
      * @return the next step in the DSL
      */
-    static CountDSL.FromGatherer<SelectModel> countColumn(BasicColumn column) {
+    static CountDSL.FromGatherer countColumn(BasicColumn column) {
         return CountDSL.count(column);
     }
 
@@ -133,7 +133,7 @@ static CountDSL.FromGatherer<SelectModel> countColumn(BasicColumn column) {
      *
      * @return the next step in the DSL
      */
-    static CountDSL<SelectModel> countFrom(SqlTable table) {
+    static CountDSL countFrom(SqlTable table) {
         return CountDSL.countFrom(table);
     }
 

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

@@ -17,7 +17,6 @@
 
 import java.util.Objects;
 import java.util.function.Consumer;
-import java.util.function.Function;
 
 import org.jspecify.annotations.Nullable;
 import org.mybatis.dynamic.sql.BasicColumn;
@@ -34,22 +33,18 @@
  * clauses, but not the other parts of a select (group by, order by, etc.) Count queries always return
  * a long. If these restrictions are not acceptable, then use the Select DSL for an unrestricted select statement.
  *
- * @param <R> the type of model built by this Builder. Typically, SelectModel.
- *
  * @author Jeff Butler
  */
-public class CountDSL<R> extends AbstractQueryExpressionDSL<CountDSL<R>.CountWhereBuilder, CountDSL<R>>
-        implements Buildable<R> {
+public class CountDSL extends AbstractQueryExpressionDSL<CountDSL.CountWhereBuilder, CountDSL>
+        implements Buildable<SelectModel> {
 
-    private final Function<SelectModel, R> adapterFunction;
     private @Nullable CountWhereBuilder whereBuilder;
     private final BasicColumn countColumn;
     private final StatementConfiguration statementConfiguration = new StatementConfiguration();
 
-    private CountDSL(BasicColumn countColumn, SqlTable table, Function<SelectModel, R> adapterFunction) {
+    private CountDSL(BasicColumn countColumn, SqlTable table) {
         super(table);
         this.countColumn = Objects.requireNonNull(countColumn);
-        this.adapterFunction = Objects.requireNonNull(adapterFunction);
     }
 
     @Override
@@ -59,12 +54,12 @@ public CountWhereBuilder where() {
     }
 
     @Override
-    public R build() {
-        return adapterFunction.apply(buildModel());
+    public SelectModel build() {
+        return buildModel();
     }
 
     @Override
-    public CountDSL<R> configureStatement(Consumer<StatementConfiguration> consumer) {
+    public CountDSL configureStatement(Consumer<StatementConfiguration> consumer) {
         consumer.accept(statementConfiguration);
         return this;
     }
@@ -84,57 +79,43 @@ private SelectModel buildModel() {
                 .build();
     }
 
-    public static CountDSL<SelectModel> countFrom(SqlTable table) {
-        return countFrom(Function.identity(), table);
-    }
-
-    public static <R> CountDSL<R> countFrom(Function<SelectModel, R> adapterFunction, SqlTable table) {
-        return new CountDSL<>(SqlBuilder.count(), table, adapterFunction);
-    }
-
-    public static FromGatherer<SelectModel> count(BasicColumn column) {
-        return count(Function.identity(), column);
-    }
-
-    public static <R> FromGatherer<R> count(Function<SelectModel, R> adapterFunction, BasicColumn column) {
-        return new FromGatherer<>(adapterFunction, SqlBuilder.count(column));
+    public static CountDSL countFrom(SqlTable table) {
+        return new CountDSL(SqlBuilder.count(), table);
     }
 
-    public static FromGatherer<SelectModel> countDistinct(BasicColumn column) {
-        return countDistinct(Function.identity(), column);
+    public static FromGatherer count(BasicColumn column) {
+        return new FromGatherer(SqlBuilder.count(column));
     }
 
-    public static <R> FromGatherer<R> countDistinct(Function<SelectModel, R> adapterFunction, BasicColumn column) {
-        return new FromGatherer<>(adapterFunction, SqlBuilder.countDistinct(column));
+    public static FromGatherer countDistinct(BasicColumn column) {
+        return new FromGatherer(SqlBuilder.countDistinct(column));
     }
 
     @Override
-    protected CountDSL<R> getThis() {
+    protected CountDSL getThis() {
         return this;
     }
 
-    public static class FromGatherer<R> {
+    public static class FromGatherer {
         private final BasicColumn column;
-        private final Function<SelectModel, R> adapterFunction;
 
-        public FromGatherer(Function<SelectModel, R> adapterFunction, BasicColumn column) {
-            this.adapterFunction = adapterFunction;
+        public FromGatherer(BasicColumn column) {
             this.column = column;
         }
 
-        public CountDSL<R> from(SqlTable table) {
-            return new CountDSL<>(column, table, adapterFunction);
+        public CountDSL from(SqlTable table) {
+            return new CountDSL(column, table);
         }
     }
 
     public class CountWhereBuilder extends AbstractWhereFinisher<CountWhereBuilder>
-            implements Buildable<R> {
+            implements Buildable<SelectModel> {
         private CountWhereBuilder() {
             super(CountDSL.this);
         }
 
         @Override
-        public R build() {
+        public SelectModel build() {
             return CountDSL.this.build();
         }
 

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

@@ -62,8 +62,7 @@
  * @author Jeff Butler
  */
 @FunctionalInterface
-public interface CountDSLCompleter extends
-        Function<CountDSL<SelectModel>, Buildable<SelectModel>> {
+public interface CountDSLCompleter extends Function<CountDSL, Buildable<SelectModel>> {
 
     /**
      * Returns a completer that can be used to count every row in a table.

src/main/java/org/mybatis/dynamic/sql/util/mybatis3/MyBatis3Utils.java

@@ -80,14 +80,14 @@ public static long countFrom(ToLongFunction<SelectStatementProvider> mapper,
         return mapper.applyAsLong(countFrom(table, completer));
     }
 
-    public static SelectStatementProvider countFrom(CountDSL<SelectModel> start, CountDSLCompleter completer) {
+    public static SelectStatementProvider countFrom(CountDSL start, CountDSLCompleter completer) {
         return completer.apply(start)
                 .build()
                 .render(RenderingStrategies.MYBATIS3);
     }
 
     public static long countFrom(ToLongFunction<SelectStatementProvider> mapper,
-            CountDSL<SelectModel> start, CountDSLCompleter completer) {
+            CountDSL start, CountDSLCompleter completer) {
         return mapper.applyAsLong(countFrom(start, completer));
     }
 

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

@@ -22,11 +22,11 @@ import org.mybatis.dynamic.sql.util.Buildable
 
 typealias CountCompleter = KotlinCountBuilder.() -> Unit
 
-class KotlinCountBuilder(private val fromGatherer: CountDSL.FromGatherer<SelectModel>) :
-    KotlinBaseJoiningBuilder<CountDSL<SelectModel>>(),
+class KotlinCountBuilder(private val fromGatherer: CountDSL.FromGatherer) :
+    KotlinBaseJoiningBuilder<CountDSL>(),
     Buildable<SelectModel> {
 
-    private var dsl: CountDSL<SelectModel>? = null
+    private var dsl: CountDSL? = null
 
     fun from(table: SqlTable): KotlinCountBuilder =
         apply {
@@ -35,5 +35,5 @@ class KotlinCountBuilder(private val fromGatherer: CountDSL.FromGatherer<SelectM
 
     override fun build(): SelectModel = getDsl().build()
 
-    override fun getDsl(): CountDSL<SelectModel> = invalidIfNull(dsl, "ERROR.24") //$NON-NLS-1$
+    override fun getDsl(): CountDSL = invalidIfNull(dsl, "ERROR.24") //$NON-NLS-1$
 }

src/test/java/examples/simple/PersonWithAddressMapper.java

@@ -97,7 +97,7 @@ default Optional<PersonWithAddress> selectByPrimaryKey(Integer recordId) {
     }
 
     default long count(CountDSLCompleter completer) {
-        CountDSL<SelectModel> start = countFrom(person)
+        CountDSL start = countFrom(person)
                 .join(address, on(person.addressId, isEqualTo(address.id)));
         return MyBatis3Utils.countFrom(this::count, start, completer);
     }