Move SQL fragments into statement configuration

Author: jeffgbutler

src/main/java/org/mybatis/dynamic/sql/common/CommonBuilder.java

@@ -16,7 +16,6 @@
 package org.mybatis.dynamic.sql.common;
 
 import org.jspecify.annotations.Nullable;
-import org.mybatis.dynamic.sql.Renderable;
 import org.mybatis.dynamic.sql.SqlTable;
 import org.mybatis.dynamic.sql.configuration.StatementConfiguration;
 import org.mybatis.dynamic.sql.where.EmbeddedWhereModel;
@@ -33,9 +32,6 @@ public abstract class CommonBuilder<T extends CommonBuilder<T>> {
     private @Nullable Long limit;
     private @Nullable OrderByModel orderByModel;
     private @Nullable StatementConfiguration statementConfiguration;
-    private @Nullable Renderable afterKeywordFragment;
-    private @Nullable Renderable afterStatementFragment;
-    private @Nullable Renderable beforeStatementFragment;
 
     public @Nullable SqlTable table() {
         return table;
@@ -61,18 +57,6 @@ public abstract class CommonBuilder<T extends CommonBuilder<T>> {
         return statementConfiguration;
     }
 
-    public @Nullable Renderable afterKeywordFragment() {
-        return afterKeywordFragment;
-    }
-
-    public @Nullable Renderable afterStatementFragment() {
-        return afterStatementFragment;
-    }
-
-    public @Nullable Renderable beforeStatementFragment() {
-        return beforeStatementFragment;
-    }
-
     public T withTable(SqlTable table) {
         this.table = table;
         return getThis();
@@ -103,20 +87,5 @@ public T withStatementConfiguration(StatementConfiguration statementConfiguratio
         return getThis();
     }
 
-    public T withAfterKeywordFragment(@Nullable Renderable afterKeywordFragment) {
-        this.afterKeywordFragment = afterKeywordFragment;
-        return getThis();
-    }
-
-    public T withAfterStatementFragment(@Nullable Renderable afterStatementFragment) {
-        this.afterStatementFragment = afterStatementFragment;
-        return getThis();
-    }
-
-    public T withBeforeStatementFragment(@Nullable Renderable beforeStatementFragment) {
-        this.beforeStatementFragment = beforeStatementFragment;
-        return getThis();
-    }
-
     protected abstract T getThis();
 }

src/main/java/org/mybatis/dynamic/sql/common/CommonModel.java

@@ -19,7 +19,6 @@
 import java.util.Optional;
 
 import org.jspecify.annotations.Nullable;
-import org.mybatis.dynamic.sql.Renderable;
 import org.mybatis.dynamic.sql.SqlTable;
 import org.mybatis.dynamic.sql.configuration.StatementConfiguration;
 import org.mybatis.dynamic.sql.where.EmbeddedWhereModel;
@@ -35,9 +34,6 @@ public abstract class CommonModel {
     private final @Nullable Long limit;
     private final @Nullable OrderByModel orderByModel;
     private final StatementConfiguration statementConfiguration;
-    private final @Nullable Renderable afterKeywordFragment;
-    private final @Nullable Renderable afterStatementFragment;
-    private final @Nullable Renderable beforeStatementFragment;
 
     protected CommonModel (CommonBuilder<?> builder) {
         table = Objects.requireNonNull(builder.table());
@@ -46,9 +42,6 @@ protected CommonModel (CommonBuilder<?> builder) {
         limit = builder.limit();
         orderByModel = builder.orderByModel();
         statementConfiguration = Objects.requireNonNull(builder.statementConfiguration());
-        afterKeywordFragment = builder.afterKeywordFragment();
-        afterStatementFragment = builder.afterStatementFragment();
-        beforeStatementFragment = builder.beforeStatementFragment();
     }
 
     public SqlTable table() {
@@ -74,16 +67,4 @@ public Optional<OrderByModel> orderByModel() {
     public StatementConfiguration statementConfiguration() {
         return statementConfiguration;
     }
-
-    public Optional<Renderable> afterKeywordFragment() {
-        return Optional.ofNullable(afterKeywordFragment);
-    }
-
-    public Optional<Renderable> afterStatementFragment() {
-        return Optional.ofNullable(afterStatementFragment);
-    }
-
-    public Optional<Renderable> beforeStatementFragment() {
-        return Optional.ofNullable(beforeStatementFragment);
-    }
 }

src/main/java/org/mybatis/dynamic/sql/common/CustomSqlDSL.java

@@ -15,7 +15,12 @@
  */
 package org.mybatis.dynamic.sql.configuration;
 
+import java.util.Optional;
+
+import org.jspecify.annotations.Nullable;
+import org.mybatis.dynamic.sql.Renderable;
 import org.mybatis.dynamic.sql.exception.NonRenderingWhereClauseException;
+import org.mybatis.dynamic.sql.util.FragmentAndParameters;
 
 /**
  * This class can be used to change some behaviors of the framework. Every configurable statement
@@ -43,13 +48,56 @@
 public class StatementConfiguration {
     private boolean isNonRenderingWhereClauseAllowed =
             GlobalContext.getConfiguration().isIsNonRenderingWhereClauseAllowed();
+    private @Nullable Renderable afterKeywordFragment;
+    private @Nullable Renderable afterStatementFragment;
+    private @Nullable Renderable beforeStatementFragment;
 
     public boolean isNonRenderingWhereClauseAllowed() {
         return isNonRenderingWhereClauseAllowed;
     }
 
+    public Optional<Renderable> afterKeywordFragment() {
+        return Optional.ofNullable(afterKeywordFragment);
+    }
+
+    public Optional<Renderable> afterStatementFragment() {
+        return Optional.ofNullable(afterStatementFragment);
+    }
+
+    public Optional<Renderable> beforeStatementFragment() {
+        return Optional.ofNullable(beforeStatementFragment);
+    }
+
     public StatementConfiguration setNonRenderingWhereClauseAllowed(boolean nonRenderingWhereClauseAllowed) {
         isNonRenderingWhereClauseAllowed = nonRenderingWhereClauseAllowed;
         return this;
     }
+
+    public StatementConfiguration withSqlAfterKeyword(String sql) {
+        return withSqlAfterKeyword(rc -> FragmentAndParameters.fromFragment(sql));
+    }
+
+    public StatementConfiguration withSqlAfterKeyword(Renderable renderable) {
+        afterKeywordFragment = renderable;
+        return this;
+    }
+
+
+    public StatementConfiguration withSqlAfterStatement(String sql) {
+        return withSqlAfterStatement(rc -> FragmentAndParameters.fromFragment(sql));
+    }
+
+    public StatementConfiguration withSqlAfterStatement(Renderable renderable) {
+        afterStatementFragment = renderable;
+        return this;
+    }
+
+    public StatementConfiguration withSqlBeforeStatement(String sql) {
+        return withSqlBeforeStatement(rc -> FragmentAndParameters.fromFragment(sql));
+    }
+
+    public StatementConfiguration withSqlBeforeStatement(Renderable renderable) {
+        beforeStatementFragment = renderable;
+        return this;
+    }
 }

src/main/java/org/mybatis/dynamic/sql/configuration/StatementConfiguration.java

@@ -22,10 +22,8 @@
 import java.util.function.Function;
 
 import org.jspecify.annotations.Nullable;
-import org.mybatis.dynamic.sql.Renderable;
 import org.mybatis.dynamic.sql.SortSpecification;
 import org.mybatis.dynamic.sql.SqlTable;
-import org.mybatis.dynamic.sql.common.CustomSqlDSL;
 import org.mybatis.dynamic.sql.common.OrderByModel;
 import org.mybatis.dynamic.sql.configuration.StatementConfiguration;
 import org.mybatis.dynamic.sql.util.Buildable;
@@ -34,7 +32,7 @@
 import org.mybatis.dynamic.sql.where.EmbeddedWhereModel;
 
 public class DeleteDSL<R> implements AbstractWhereStarter<DeleteDSL<R>.DeleteWhereBuilder, DeleteDSL<R>>,
-        Buildable<R>, CustomSqlDSL<DeleteDSL<R>> {
+        Buildable<R> {
 
     private final Function<DeleteModel, R> adapterFunction;
     private final SqlTable table;
@@ -43,9 +41,6 @@ public class DeleteDSL<R> implements AbstractWhereStarter<DeleteDSL<R>.DeleteWhe
     private final StatementConfiguration statementConfiguration = new StatementConfiguration();
     private @Nullable Long limit;
     private @Nullable OrderByModel orderByModel;
-    private @Nullable Renderable afterKeywordFragment;
-    private @Nullable Renderable afterStatementFragment;
-    private @Nullable Renderable beforeStatementFragment;
 
     private DeleteDSL(SqlTable table, @Nullable String tableAlias, Function<DeleteModel, R> adapterFunction) {
         this.table = Objects.requireNonNull(table);
@@ -91,9 +86,6 @@ public R build() {
                 .withOrderByModel(orderByModel)
                 .withWhereModel(whereBuilder == null ? null : whereBuilder.buildWhereModel())
                 .withStatementConfiguration(statementConfiguration)
-                .withAfterKeywordFragment(afterKeywordFragment)
-                .withAfterStatementFragment(afterStatementFragment)
-                .withBeforeStatementFragment(beforeStatementFragment)
                 .build();
 
         return adapterFunction.apply(deleteModel);
@@ -104,25 +96,6 @@ public DeleteDSL<R> configureStatement(Consumer<StatementConfiguration> consumer
         consumer.accept(statementConfiguration);
         return this;
     }
-
-    @Override
-    public DeleteDSL<R> withSqlAfterKeyword(Renderable renderable) {
-        this.afterKeywordFragment = renderable;
-        return this;
-    }
-
-    @Override
-    public DeleteDSL<R> withSqlAfterStatement(Renderable renderable) {
-        this.afterStatementFragment = renderable;
-        return this;
-    }
-
-    @Override
-    public DeleteDSL<R> withSqlBeforeStatement(Renderable renderable) {
-        this.beforeStatementFragment = renderable;
-        return this;
-    }
-
     public static <R> DeleteDSL<R> deleteFrom(Function<DeleteModel, R> adapterFunction, SqlTable table,
             @Nullable String tableAlias) {
         return new DeleteDSL<>(table, tableAlias, adapterFunction);
@@ -137,7 +110,7 @@ public static DeleteDSL<DeleteModel> deleteFrom(SqlTable table, String tableAlia
     }
 
     public class DeleteWhereBuilder extends AbstractWhereFinisher<DeleteWhereBuilder>
-            implements Buildable<R>, CustomSqlDSL<DeleteDSL<R>> {
+            implements Buildable<R> {
 
         private DeleteWhereBuilder() {
             super(DeleteDSL.this);
@@ -173,20 +146,5 @@ protected DeleteWhereBuilder getThis() {
         protected EmbeddedWhereModel buildWhereModel() {
             return buildModel();
         }
-
-        @Override
-        public DeleteDSL<R> withSqlAfterKeyword(Renderable renderable) {
-            return DeleteDSL.this.withSqlAfterKeyword(renderable);
-        }
-
-        @Override
-        public DeleteDSL<R> withSqlAfterStatement(Renderable renderable) {
-            return DeleteDSL.this.withSqlAfterStatement(renderable);
-        }
-
-        @Override
-        public DeleteDSL<R> withSqlBeforeStatement(Renderable renderable) {
-            return DeleteDSL.this.withSqlBeforeStatement(renderable);
-        }
     }
 }

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

@@ -73,15 +73,15 @@ private DeleteStatementProvider toDeleteStatementProvider(FragmentCollector frag
     }
 
     private Optional<FragmentAndParameters> calculateBeforeStatementFragment() {
-        return deleteModel.beforeStatementFragment().map(f -> f.render(renderingContext));
+        return deleteModel.statementConfiguration().beforeStatementFragment().map(f -> f.render(renderingContext));
     }
 
     private Optional<FragmentAndParameters> calculateAfterKeywordFragment() {
-        return deleteModel.afterKeywordFragment().map(f -> f.render(renderingContext));
+        return deleteModel.statementConfiguration().afterKeywordFragment().map(f -> f.render(renderingContext));
     }
 
     private Optional<FragmentAndParameters> calculateAfterStatementFragment() {
-        return deleteModel.afterStatementFragment().map(f -> f.render(renderingContext));
+        return deleteModel.statementConfiguration().afterStatementFragment().map(f -> f.render(renderingContext));
     }
 
     private FragmentAndParameters calculateTable() {