Remove DeleteDSL Generic

Author: jeffgbutler

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

@@ -23,7 +23,6 @@
 
 import org.jspecify.annotations.Nullable;
 import org.mybatis.dynamic.sql.delete.DeleteDSL;
-import org.mybatis.dynamic.sql.delete.DeleteModel;
 import org.mybatis.dynamic.sql.insert.BatchInsertDSL;
 import org.mybatis.dynamic.sql.insert.GeneralInsertDSL;
 import org.mybatis.dynamic.sql.insert.InsertDSL;
@@ -138,11 +137,11 @@ static CountDSL<SelectModel> countFrom(SqlTable table) {
         return CountDSL.countFrom(table);
     }
 
-    static DeleteDSL<DeleteModel> deleteFrom(SqlTable table) {
+    static DeleteDSL deleteFrom(SqlTable table) {
         return DeleteDSL.deleteFrom(table);
     }
 
-    static DeleteDSL<DeleteModel> deleteFrom(SqlTable table, String tableAlias) {
+    static DeleteDSL deleteFrom(SqlTable table, String tableAlias) {
         return DeleteDSL.deleteFrom(table, tableAlias);
     }
 

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

@@ -19,7 +19,6 @@
 import java.util.Collection;
 import java.util.Objects;
 import java.util.function.Consumer;
-import java.util.function.Function;
 
 import org.jspecify.annotations.Nullable;
 import org.mybatis.dynamic.sql.SortSpecification;
@@ -32,21 +31,19 @@
 import org.mybatis.dynamic.sql.where.AbstractWhereStarter;
 import org.mybatis.dynamic.sql.where.EmbeddedWhereModel;
 
-public class DeleteDSL<R> implements AbstractWhereStarter<DeleteDSL<R>.DeleteWhereBuilder, DeleteDSL<R>>,
-        Buildable<R> {
+public class DeleteDSL implements AbstractWhereStarter<DeleteDSL.DeleteWhereBuilder, DeleteDSL>,
+        Buildable<DeleteModel> {
 
-    private final Function<DeleteModel, R> adapterFunction;
     private final SqlTable table;
     private final @Nullable String tableAlias;
     private @Nullable DeleteWhereBuilder whereBuilder;
     private final StatementConfiguration statementConfiguration = new StatementConfiguration();
     private @Nullable Long limit;
     private @Nullable OrderByModel orderByModel;
 
-    private DeleteDSL(SqlTable table, @Nullable String tableAlias, Function<DeleteModel, R> adapterFunction) {
+    private DeleteDSL(SqlTable table, @Nullable String tableAlias) {
         this.table = Objects.requireNonNull(table);
         this.tableAlias = tableAlias;
-        this.adapterFunction = Objects.requireNonNull(adapterFunction);
     }
 
     @Override
@@ -55,20 +52,20 @@ public DeleteWhereBuilder where() {
         return whereBuilder;
     }
 
-    public DeleteDSL<R> limit(long limit) {
+    public DeleteDSL limit(long limit) {
         return limitWhenPresent(limit);
     }
 
-    public DeleteDSL<R> limitWhenPresent(@Nullable Long limit) {
+    public DeleteDSL limitWhenPresent(@Nullable Long limit) {
         this.limit = limit;
         return this;
     }
 
-    public DeleteDSL<R> orderBy(SortSpecification... columns) {
+    public DeleteDSL orderBy(SortSpecification... columns) {
         return orderBy(Arrays.asList(columns));
     }
 
-    public DeleteDSL<R> orderBy(Collection<? extends SortSpecification> columns) {
+    public DeleteDSL orderBy(Collection<? extends SortSpecification> columns) {
         orderByModel = OrderByModel.of(columns);
         return this;
     }
@@ -80,62 +77,55 @@ public DeleteDSL<R> orderBy(Collection<? extends SortSpecification> columns) {
      * @return the model class
      */
     @Override
-    public R build() {
-        DeleteModel deleteModel = DeleteModel.withTable(table)
+    public DeleteModel build() {
+        return DeleteModel.withTable(table)
                 .withTableAlias(tableAlias)
                 .withLimit(limit)
                 .withOrderByModel(orderByModel)
                 .withWhereModel(whereBuilder == null ? null : whereBuilder.buildWhereModel())
                 .withStatementConfiguration(statementConfiguration)
                 .build();
-
-        return adapterFunction.apply(deleteModel);
     }
 
     @Override
-    public DeleteDSL<R> configureStatement(Consumer<StatementConfiguration> consumer) {
+    public DeleteDSL configureStatement(Consumer<StatementConfiguration> consumer) {
         consumer.accept(statementConfiguration);
         return this;
     }
 
-    public static <R> DeleteDSL<R> deleteFrom(Function<DeleteModel, R> adapterFunction, SqlTable table,
-            @Nullable String tableAlias) {
-        return new DeleteDSL<>(table, tableAlias, adapterFunction);
-    }
-
-    public static DeleteDSL<DeleteModel> deleteFrom(SqlTable table) {
-        return deleteFrom(Function.identity(), table, null);
+    public static DeleteDSL deleteFrom(SqlTable table) {
+        return deleteFrom(table, null);
     }
 
-    public static DeleteDSL<DeleteModel> deleteFrom(SqlTable table, String tableAlias) {
-        return deleteFrom(Function.identity(), table, tableAlias);
+    public static DeleteDSL deleteFrom(SqlTable table, @Nullable String tableAlias) {
+        return new DeleteDSL(table, tableAlias);
     }
 
-    public class DeleteWhereBuilder extends AbstractWhereFinisher<DeleteWhereBuilder> implements Buildable<R> {
+    public class DeleteWhereBuilder extends AbstractWhereFinisher<DeleteWhereBuilder> implements Buildable<DeleteModel> {
 
         private DeleteWhereBuilder() {
             super(DeleteDSL.this);
         }
 
-        public DeleteDSL<R> limit(long limit) {
+        public DeleteDSL limit(long limit) {
             return limitWhenPresent(limit);
         }
 
-        public DeleteDSL<R> limitWhenPresent(Long limit) {
+        public DeleteDSL limitWhenPresent(Long limit) {
             return DeleteDSL.this.limitWhenPresent(limit);
         }
 
-        public DeleteDSL<R> orderBy(SortSpecification... columns) {
+        public DeleteDSL orderBy(SortSpecification... columns) {
             return orderBy(Arrays.asList(columns));
         }
 
-        public DeleteDSL<R> orderBy(Collection<? extends SortSpecification> columns) {
+        public DeleteDSL orderBy(Collection<? extends SortSpecification> columns) {
             orderByModel = OrderByModel.of(columns);
             return DeleteDSL.this;
         }
 
         @Override
-        public R build() {
+        public DeleteModel build() {
             return DeleteDSL.this.build();
         }
 

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

@@ -63,8 +63,7 @@
  * @author Jeff Butler
  */
 @FunctionalInterface
-public interface DeleteDSLCompleter extends
-        Function<DeleteDSL<DeleteModel>, Buildable<DeleteModel>> {
+public interface DeleteDSLCompleter extends Function<DeleteDSL, Buildable<DeleteModel>> {
 
     /**
      * Returns a completer that can be used to delete every row in a table.

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

@@ -22,8 +22,8 @@ import org.mybatis.dynamic.sql.util.Buildable
 
 typealias DeleteCompleter = KotlinDeleteBuilder.() -> Unit
 
-class KotlinDeleteBuilder(private val dsl: DeleteDSL<DeleteModel>) :
-    KotlinBaseBuilder<DeleteDSL<DeleteModel>>(), Buildable<DeleteModel> {
+class KotlinDeleteBuilder(private val dsl: DeleteDSL) :
+    KotlinBaseBuilder<DeleteDSL>(), Buildable<DeleteModel> {
 
     fun orderBy(vararg columns: SortSpecification) {
         dsl.orderBy(columns.toList())
@@ -39,5 +39,5 @@ class KotlinDeleteBuilder(private val dsl: DeleteDSL<DeleteModel>) :
 
     override fun build(): DeleteModel = dsl.build()
 
-    override fun getDsl(): DeleteDSL<DeleteModel> = dsl
+    override fun getDsl(): DeleteDSL = dsl
 }

src/test/java/examples/emptywhere/EmptyWhereTest.java

@@ -27,7 +27,6 @@
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.mybatis.dynamic.sql.delete.DeleteDSL;
-import org.mybatis.dynamic.sql.delete.DeleteModel;
 import org.mybatis.dynamic.sql.delete.render.DeleteStatementProvider;
 import org.mybatis.dynamic.sql.render.RenderingStrategies;
 import org.mybatis.dynamic.sql.select.QueryExpressionDSL;
@@ -90,7 +89,7 @@ void testDeleteThreeConditions() {
         String fName = "Fred";
         String lName = "Flintstone";
 
-        DeleteDSL<DeleteModel>.DeleteWhereBuilder builder = deleteFrom(person)
+        DeleteDSL.DeleteWhereBuilder builder = deleteFrom(person)
                 .where(id, isEqualTo(3));
 
         builder.and(firstName, isEqualTo(fName).filter(Objects::nonNull));
@@ -109,7 +108,7 @@ void testDeleteThreeConditions() {
     @ParameterizedTest
     @MethodSource("whereVariations")
     void testDeleteVariations(Variation variation) {
-        DeleteDSL<DeleteModel>.DeleteWhereBuilder builder = deleteFrom(person)
+        DeleteDSL.DeleteWhereBuilder builder = deleteFrom(person)
                 .where();
 
         builder.and(firstName, isEqualTo(variation.firstName).filter(Objects::nonNull));