Add StatementConfiguration to RenderingContext

Author: jeffgbutler

src/main/java/org/mybatis/dynamic/sql/delete/render/DeleteRenderer.java

@@ -41,11 +41,10 @@ private DeleteRenderer(Builder builder) {
         TableAliasCalculator tableAliasCalculator = builder.deleteModel.tableAlias()
                 .map(a -> ExplicitTableAliasCalculator.of(deleteModel.table(), a))
                 .orElseGet(TableAliasCalculator::empty);
-        // TODO - Add configuration to RenderingContext
-        Objects.requireNonNull(builder.statementConfiguration);
         renderingContext = RenderingContext
                 .withRenderingStrategy(Objects.requireNonNull(builder.renderingStrategy))
                 .withTableAliasCalculator(tableAliasCalculator)
+                .withStatementConfiguration(builder.statementConfiguration)
                 .build();
     }
 

src/main/java/org/mybatis/dynamic/sql/insert/GeneralInsertDSL.java

@@ -19,23 +19,27 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.Objects;
+import java.util.function.Consumer;
 import java.util.function.Supplier;
 
 import org.jetbrains.annotations.NotNull;
 import org.mybatis.dynamic.sql.SqlColumn;
 import org.mybatis.dynamic.sql.SqlTable;
+import org.mybatis.dynamic.sql.configuration.StatementConfiguration;
 import org.mybatis.dynamic.sql.util.AbstractColumnMapping;
 import org.mybatis.dynamic.sql.util.Buildable;
+import org.mybatis.dynamic.sql.util.ConfigurableStatement;
 import org.mybatis.dynamic.sql.util.ConstantMapping;
 import org.mybatis.dynamic.sql.util.NullMapping;
 import org.mybatis.dynamic.sql.util.StringConstantMapping;
 import org.mybatis.dynamic.sql.util.ValueMapping;
 import org.mybatis.dynamic.sql.util.ValueOrNullMapping;
 import org.mybatis.dynamic.sql.util.ValueWhenPresentMapping;
 
-public class GeneralInsertDSL implements Buildable<GeneralInsertModel> {
+public class GeneralInsertDSL implements Buildable<GeneralInsertModel>, ConfigurableStatement<GeneralInsertDSL> {
     private final List<AbstractColumnMapping> columnMappings;
     private final SqlTable table;
+    private final StatementConfiguration statementConfiguration = new StatementConfiguration();
 
     private GeneralInsertDSL(Builder builder) {
         table = Objects.requireNonNull(builder.table);
@@ -52,13 +56,20 @@ public GeneralInsertModel build() {
         return new GeneralInsertModel.Builder()
                 .withTable(table)
                 .withInsertMappings(columnMappings)
+                .withStatementConfiguration(statementConfiguration)
                 .build();
     }
 
     public static GeneralInsertDSL insertInto(SqlTable table) {
         return new GeneralInsertDSL.Builder().withTable(table).build();
     }
 
+    @Override
+    public GeneralInsertDSL configureStatement(Consumer<StatementConfiguration> consumer) {
+        consumer.accept(statementConfiguration);
+        return this;
+    }
+
     public class SetClauseFinisher<T> {
 
         private final SqlColumn<T> column;

src/main/java/org/mybatis/dynamic/sql/insert/GeneralInsertModel.java

@@ -23,6 +23,7 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.mybatis.dynamic.sql.SqlTable;
+import org.mybatis.dynamic.sql.configuration.StatementConfiguration;
 import org.mybatis.dynamic.sql.insert.render.GeneralInsertRenderer;
 import org.mybatis.dynamic.sql.insert.render.GeneralInsertStatementProvider;
 import org.mybatis.dynamic.sql.render.RenderingStrategy;
@@ -33,11 +34,13 @@ public class GeneralInsertModel {
 
     private final SqlTable table;
     private final List<AbstractColumnMapping> insertMappings;
+    private final StatementConfiguration statementConfiguration;
 
     private GeneralInsertModel(Builder builder) {
         table = Objects.requireNonNull(builder.table);
         Validator.assertNotEmpty(builder.insertMappings, "ERROR.6"); //$NON-NLS-1$
         insertMappings = builder.insertMappings;
+        statementConfiguration = Objects.requireNonNull(builder.statementConfiguration);
     }
 
     public <R> Stream<R> mapColumnMappings(Function<AbstractColumnMapping, R> mapper) {
@@ -52,13 +55,15 @@ public SqlTable table() {
     public GeneralInsertStatementProvider render(RenderingStrategy renderingStrategy) {
         return GeneralInsertRenderer.withInsertModel(this)
                 .withRenderingStrategy(renderingStrategy)
+                .withStatementConfiguration(statementConfiguration)
                 .build()
                 .render();
     }
 
     public static class Builder {
         private SqlTable table;
         private final List<AbstractColumnMapping> insertMappings = new ArrayList<>();
+        private StatementConfiguration statementConfiguration;
 
         public Builder withTable(SqlTable table) {
             this.table = table;
@@ -70,6 +75,11 @@ public Builder withInsertMappings(List<? extends AbstractColumnMapping> insertMa
             return this;
         }
 
+        public Builder withStatementConfiguration(StatementConfiguration statementConfiguration) {
+            this.statementConfiguration = statementConfiguration;
+            return this;
+        }
+
         public GeneralInsertModel build() {
             return new GeneralInsertModel(this);
         }

src/main/java/org/mybatis/dynamic/sql/insert/render/GeneralInsertRenderer.java

@@ -18,6 +18,7 @@
 import java.util.Objects;
 import java.util.Optional;
 
+import org.mybatis.dynamic.sql.configuration.StatementConfiguration;
 import org.mybatis.dynamic.sql.insert.GeneralInsertModel;
 import org.mybatis.dynamic.sql.render.RenderingContext;
 import org.mybatis.dynamic.sql.render.RenderingStrategy;
@@ -26,16 +27,16 @@
 public class GeneralInsertRenderer {
 
     private final GeneralInsertModel model;
-    private final RenderingStrategy renderingStrategy;
+    private final RenderingContext renderingContext;
 
     private GeneralInsertRenderer(Builder builder) {
         model = Objects.requireNonNull(builder.model);
-        renderingStrategy = Objects.requireNonNull(builder.renderingStrategy);
+        renderingContext = RenderingContext.withRenderingStrategy(builder.renderingStrategy)
+                .withStatementConfiguration(builder.statementConfiguration)
+                .build();
     }
 
     public GeneralInsertStatementProvider render() {
-        RenderingContext renderingContext = RenderingContext.withRenderingStrategy(renderingStrategy).build();
-
         GeneralInsertValuePhraseVisitor visitor = new GeneralInsertValuePhraseVisitor(renderingContext);
         FieldAndValueCollector collector = model.mapColumnMappings(m -> m.accept(visitor))
                 .filter(Optional::isPresent)
@@ -58,6 +59,7 @@ public static Builder withInsertModel(GeneralInsertModel model) {
     public static class Builder {
         private GeneralInsertModel model;
         private RenderingStrategy renderingStrategy;
+        private StatementConfiguration statementConfiguration;
 
         public Builder withInsertModel(GeneralInsertModel model) {
             this.model = model;
@@ -69,6 +71,11 @@ public Builder withRenderingStrategy(RenderingStrategy renderingStrategy) {
             return this;
         }
 
+        public Builder withStatementConfiguration(StatementConfiguration statementConfiguration) {
+            this.statementConfiguration = statementConfiguration;
+            return this;
+        }
+
         public GeneralInsertRenderer build() {
             return new GeneralInsertRenderer(this);
         }

src/main/java/org/mybatis/dynamic/sql/render/RenderingContext.java

@@ -23,6 +23,7 @@
 import org.mybatis.dynamic.sql.BindableColumn;
 import org.mybatis.dynamic.sql.SqlColumn;
 import org.mybatis.dynamic.sql.SqlTable;
+import org.mybatis.dynamic.sql.configuration.StatementConfiguration;
 
 /**
  * This class encapsulates all the supporting items related to rendering, and contains many utility methods
@@ -38,11 +39,13 @@ public class RenderingContext {
     private final TableAliasCalculator tableAliasCalculator;
     private final String configuredParameterName;
     private final String calculatedParameterName;
+    private final StatementConfiguration statementConfiguration;
 
     private RenderingContext(Builder builder) {
         renderingStrategy = Objects.requireNonNull(builder.renderingStrategy);
         configuredParameterName = builder.parameterName;
         tableAliasCalculator = Objects.requireNonNull(builder.tableAliasCalculator);
+        statementConfiguration = Objects.requireNonNull(builder.statementConfiguration);
 
         // reasonable defaults
         sequence = builder.sequence == null ? new AtomicInteger(1) : builder.sequence;
@@ -114,6 +117,7 @@ public RenderingContext withChildTableAliasCalculator(TableAliasCalculator child
                 .withSequence(this.sequence)
                 .withParameterName(this.configuredParameterName)
                 .withTableAliasCalculator(tac)
+                .withStatementConfiguration(statementConfiguration)
                 .build();
     }
 
@@ -126,6 +130,7 @@ public static class Builder {
         private AtomicInteger sequence;
         private TableAliasCalculator tableAliasCalculator = TableAliasCalculator.empty();
         private String parameterName;
+        private StatementConfiguration statementConfiguration;
 
         public Builder withRenderingStrategy(RenderingStrategy renderingStrategy) {
             this.renderingStrategy = renderingStrategy;
@@ -147,6 +152,11 @@ public Builder withParameterName(String parameterName) {
             return this;
         }
 
+        public Builder withStatementConfiguration(StatementConfiguration statementConfiguration) {
+            this.statementConfiguration = statementConfiguration;
+            return this;
+        }
+
         public RenderingContext build() {
             return new RenderingContext(this);
         }

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

@@ -20,19 +20,23 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
+import java.util.function.Consumer;
 
 import org.jetbrains.annotations.NotNull;
 import org.mybatis.dynamic.sql.SortSpecification;
 import org.mybatis.dynamic.sql.common.OrderByModel;
+import org.mybatis.dynamic.sql.configuration.StatementConfiguration;
 import org.mybatis.dynamic.sql.util.Buildable;
+import org.mybatis.dynamic.sql.util.ConfigurableStatement;
 
-public class MultiSelectDSL implements Buildable<MultiSelectModel> {
+public class MultiSelectDSL implements Buildable<MultiSelectModel>, ConfigurableStatement<MultiSelectDSL> {
     private final List<UnionQuery> unionQueries = new ArrayList<>();
     private final SelectModel initialSelect;
     private OrderByModel orderByModel;
     private Long limit;
     private Long offset;
     private Long fetchFirstRows;
+    private StatementConfiguration statementConfiguration = new StatementConfiguration();
 
     public MultiSelectDSL(Buildable<SelectModel> builder) {
         initialSelect = builder.build();
@@ -80,6 +84,7 @@ public MultiSelectModel build() {
                 .withUnionQueries(unionQueries)
                 .withOrderByModel(orderByModel)
                 .withPagingModel(buildPagingModel().orElse(null))
+                .withStatementConfiguration(statementConfiguration)
                 .build();
     }
 
@@ -91,6 +96,12 @@ private Optional<PagingModel> buildPagingModel() {
                 .build();
     }
 
+    @Override
+    public MultiSelectDSL configureStatement(Consumer<StatementConfiguration> consumer) {
+        consumer.accept(statementConfiguration);
+        return this;
+    }
+
     public class LimitFinisher implements Buildable<MultiSelectModel> {
         public OffsetFinisher offset(long offset) {
             MultiSelectDSL.this.offset(offset);

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

@@ -24,6 +24,7 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.mybatis.dynamic.sql.common.OrderByModel;
+import org.mybatis.dynamic.sql.configuration.StatementConfiguration;
 import org.mybatis.dynamic.sql.render.RenderingStrategy;
 import org.mybatis.dynamic.sql.select.render.MultiSelectRenderer;
 import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
@@ -34,12 +35,14 @@ public class MultiSelectModel {
     private final List<UnionQuery> unionQueries;
     private final OrderByModel orderByModel;
     private final PagingModel pagingModel;
+    private final StatementConfiguration statementConfiguration;
 
     private MultiSelectModel(Builder builder) {
         initialSelect = Objects.requireNonNull(builder.initialSelect);
         unionQueries = builder.unionQueries;
         orderByModel = builder.orderByModel;
         pagingModel = builder.pagingModel;
+        statementConfiguration = Objects.requireNonNull(builder.statementConfiguration);
         Validator.assertNotEmpty(unionQueries, "ERROR.35"); //$NON-NLS-1$
     }
 
@@ -64,6 +67,7 @@ public SelectStatementProvider render(RenderingStrategy renderingStrategy) {
         return new MultiSelectRenderer.Builder()
                 .withMultiSelectModel(this)
                 .withRenderingStrategy(renderingStrategy)
+                .withStatementConfiguration(statementConfiguration)
                 .build()
                 .render();
     }
@@ -73,6 +77,7 @@ public static class Builder {
         private final List<UnionQuery> unionQueries = new ArrayList<>();
         private OrderByModel orderByModel;
         private PagingModel pagingModel;
+        private StatementConfiguration statementConfiguration;
 
         public Builder withInitialSelect(SelectModel initialSelect) {
             this.initialSelect = initialSelect;
@@ -94,6 +99,11 @@ public Builder withPagingModel(PagingModel pagingModel) {
             return this;
         }
 
+        public Builder withStatementConfiguration(StatementConfiguration statementConfiguration) {
+            this.statementConfiguration = statementConfiguration;
+            return this;
+        }
+
         public MultiSelectModel build() {
             return new MultiSelectModel(this);
         }

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

@@ -59,7 +59,9 @@ public Optional<PagingModel> pagingModel() {
 
     @NotNull
     public SelectStatementProvider render(RenderingStrategy renderingStrategy) {
-        RenderingContext renderingContext = RenderingContext.withRenderingStrategy(renderingStrategy).build();
+        RenderingContext renderingContext = RenderingContext.withRenderingStrategy(renderingStrategy)
+                .withStatementConfiguration(statementConfiguration)
+                .build();
         return render(renderingContext);
     }
 

src/main/java/org/mybatis/dynamic/sql/select/render/MultiSelectRenderer.java

@@ -21,6 +21,7 @@
 
 import org.mybatis.dynamic.sql.common.OrderByModel;
 import org.mybatis.dynamic.sql.common.OrderByRenderer;
+import org.mybatis.dynamic.sql.configuration.StatementConfiguration;
 import org.mybatis.dynamic.sql.render.RenderingContext;
 import org.mybatis.dynamic.sql.render.RenderingStrategy;
 import org.mybatis.dynamic.sql.select.MultiSelectModel;
@@ -36,7 +37,8 @@ public class MultiSelectRenderer {
 
     private MultiSelectRenderer(Builder builder) {
         renderingContext = RenderingContext
-                .withRenderingStrategy(Objects.requireNonNull(builder.renderingStrategy))
+                .withRenderingStrategy(builder.renderingStrategy)
+                .withStatementConfiguration(builder.statementConfiguration)
                 .build();
         multiSelectModel = Objects.requireNonNull(builder.multiSelectModel);
     }
@@ -102,6 +104,7 @@ private FragmentAndParameters renderPagingModel(PagingModel pagingModel) {
     public static class Builder {
         private RenderingStrategy renderingStrategy;
         private MultiSelectModel multiSelectModel;
+        private StatementConfiguration statementConfiguration;
 
         public Builder withRenderingStrategy(RenderingStrategy renderingStrategy) {
             this.renderingStrategy = renderingStrategy;
@@ -113,6 +116,11 @@ public Builder withMultiSelectModel(MultiSelectModel multiSelectModel) {
             return this;
         }
 
+        public Builder withStatementConfiguration(StatementConfiguration statementConfiguration) {
+            this.statementConfiguration = statementConfiguration;
+            return this;
+        }
+
         public MultiSelectRenderer build() {
             return new MultiSelectRenderer(this);
         }

src/main/java/org/mybatis/dynamic/sql/update/render/UpdateRenderer.java

@@ -43,11 +43,10 @@ private UpdateRenderer(Builder builder) {
         TableAliasCalculator tableAliasCalculator = builder.updateModel.tableAlias()
                 .map(a -> ExplicitTableAliasCalculator.of(updateModel.table(), a))
                 .orElseGet(TableAliasCalculator::empty);
-        // TODO - Add configuration to RenderingContext
-        Objects.requireNonNull(builder.statementConfiguration);
         renderingContext = RenderingContext
                 .withRenderingStrategy(Objects.requireNonNull(builder.renderingStrategy))
                 .withTableAliasCalculator(tableAliasCalculator)
+                .withStatementConfiguration(builder.statementConfiguration)
                 .build();
     }