Merge branch 'master' into render-listeners

# Conflicts:
#	src/main/java/org/mybatis/dynamic/sql/delete/DeleteModel.java
#	src/main/java/org/mybatis/dynamic/sql/delete/render/DeleteRenderer.java
#	src/main/java/org/mybatis/dynamic/sql/render/RendererFactory.java
#	src/main/java/org/mybatis/dynamic/sql/update/UpdateModel.java
#	src/main/java/org/mybatis/dynamic/sql/update/render/UpdateRenderer.java

Author: jeffgbutler

.github/workflows/ci.yaml

@@ -9,7 +9,7 @@ jobs:
       matrix:
         cache: [maven]
         distribution: [temurin]
-        java: [17, 21, 22, 23-ea]
+        java: [17, 21, 23, 24-ea]
         os: [ubuntu-latest]
       fail-fast: false
       max-parallel: 4

pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.mybatis</groupId>
     <artifactId>mybatis-parent</artifactId>
-    <version>45</version>
+    <version>48</version>
   </parent>
 
   <groupId>org.mybatis.dynamic-sql</groupId>
@@ -60,16 +60,16 @@
     <java.release.version>17</java.release.version>
     <java.test.version>17</java.test.version>
     <java.test.release.version>17</java.test.release.version>
-    <junit.jupiter.version>5.11.3</junit.jupiter.version>
-    <spring.batch.version>5.1.2</spring.batch.version>
+    <junit.jupiter.version>5.11.4</junit.jupiter.version>
+    <spring.batch.version>5.2.1</spring.batch.version>
 
     <checkstyle.config>checkstyle-override.xml</checkstyle.config>
 
     <clirr.comparisonVersion>1.5.0</clirr.comparisonVersion>
 
     <module.name>org.mybatis.dynamic.sql</module.name>
 
-    <kotlin.version>2.0.21</kotlin.version>
+    <kotlin.version>2.1.0</kotlin.version>
     <kotlin.compiler.jvmTarget>17</kotlin.compiler.jvmTarget>
     <kotlin.compiler.languageVersion>2.0</kotlin.compiler.languageVersion>
     <kotlin.compiler.apiVersion>2.0</kotlin.compiler.apiVersion>
@@ -78,7 +78,7 @@
     <sonar.tests>src/test/java,src/test/kotlin</sonar.tests>
 
     <kotlin.code.style>official</kotlin.code.style>
-    <test.containers.version>1.20.3</test.containers.version>
+    <test.containers.version>1.20.4</test.containers.version>
     <osgi.export>org.mybatis.dynamic.sql.*;version=${project.version};-noimport:=true</osgi.export>
 
     <!-- Reproducible Builds -->
@@ -96,14 +96,14 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-jdbc</artifactId>
-      <version>6.1.14</version>
+      <version>6.2.1</version>
       <scope>provided</scope>
       <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.mybatis</groupId>
       <artifactId>mybatis</artifactId>
-      <version>3.5.16</version>
+      <version>3.5.17</version>
       <scope>provided</scope>
       <optional>true</optional>
     </dependency>
@@ -129,7 +129,7 @@
     <dependency>
       <groupId>org.assertj</groupId>
       <artifactId>assertj-core</artifactId>
-      <version>3.26.3</version>
+      <version>3.27.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -141,7 +141,7 @@
     <dependency>
       <groupId>org.hsqldb</groupId>
       <artifactId>hsqldb</artifactId>
-      <version>2.7.3</version>
+      <version>2.7.4</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -165,7 +165,7 @@
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
-      <version>1.5.12</version>
+      <version>1.5.15</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -195,7 +195,7 @@
     <dependency>
       <groupId>org.mariadb.jdbc</groupId>
       <artifactId>mariadb-java-client</artifactId>
-      <version>3.5.0</version>
+      <version>3.5.1</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

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

@@ -23,9 +23,9 @@
 import org.mybatis.dynamic.sql.common.CommonBuilder;
 import org.mybatis.dynamic.sql.common.OrderByModel;
 import org.mybatis.dynamic.sql.configuration.StatementConfiguration;
+import org.mybatis.dynamic.sql.delete.render.DeleteRenderer;
 import org.mybatis.dynamic.sql.delete.render.DeleteRendererVisitor;
 import org.mybatis.dynamic.sql.delete.render.DeleteStatementProvider;
-import org.mybatis.dynamic.sql.render.RendererFactory;
 import org.mybatis.dynamic.sql.render.RenderingStrategy;
 import org.mybatis.dynamic.sql.where.EmbeddedWhereModel;
 
@@ -66,15 +66,22 @@ public Optional<OrderByModel> orderByModel() {
         return Optional.ofNullable(orderByModel);
     }
 
+    public StatementConfiguration statementConfiguration() {
+        return statementConfiguration;
+    }
+
     @NotNull
     public DeleteStatementProvider render(RenderingStrategy renderingStrategy) {
         return render(renderingStrategy, DeleteRendererVisitor.NOOP);
     }
 
     @NotNull
     public DeleteStatementProvider render(RenderingStrategy renderingStrategy, DeleteRendererVisitor visitor) {
-        return RendererFactory.createDeleteRenderer(this, statementConfiguration, visitor)
-                .render(renderingStrategy);
+        return DeleteRenderer.withDeleteModel(this)
+                .withRenderingStrategy(renderingStrategy)
+                .withVisitor(visitor)
+                .build()
+                .render();
     }
 
     public static Builder withTable(SqlTable table) {

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

@@ -25,7 +25,7 @@ public class DefaultDeleteStatementProvider implements DeleteStatementProvider {
 
     private DefaultDeleteStatementProvider(Builder builder) {
         deleteStatement = Objects.requireNonNull(builder.deleteStatement);
-        parameters = Objects.requireNonNull(builder.parameters);
+        parameters = builder.parameters;
     }
 
     @Override

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

@@ -21,7 +21,6 @@
 
 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.delete.DeleteModel;
 import org.mybatis.dynamic.sql.render.ExplicitTableAliasCalculator;
 import org.mybatis.dynamic.sql.render.RenderedParameterInfo;
@@ -45,7 +44,7 @@ private DeleteRenderer(Builder builder) {
         renderingContext = RenderingContext
                 .withRenderingStrategy(Objects.requireNonNull(builder.renderingStrategy))
                 .withTableAliasCalculator(tableAliasCalculator)
-                .withStatementConfiguration(builder.statementConfiguration)
+                .withStatementConfiguration(deleteModel.statementConfiguration())
                 .build();
         visitor = Objects.requireNonNull(builder.visitor);
     }
@@ -121,7 +120,6 @@ public static Builder withDeleteModel(DeleteModel deleteModel) {
     public static class Builder {
         private DeleteModel deleteModel;
         private RenderingStrategy renderingStrategy;
-        private StatementConfiguration statementConfiguration;
         private DeleteRendererVisitor visitor;
 
         public Builder withDeleteModel(DeleteModel deleteModel) {
@@ -134,11 +132,6 @@ public Builder withRenderingStrategy(RenderingStrategy renderingStrategy) {
             return this;
         }
 
-        public Builder withStatementConfiguration(StatementConfiguration statementConfiguration) {
-            this.statementConfiguration = statementConfiguration;
-            return this;
-        }
-
         public Builder withVisitor(DeleteRendererVisitor visitor) {
             this.visitor = visitor;
             return this;

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

@@ -19,7 +19,7 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.mybatis.dynamic.sql.insert.render.BatchInsert;
-import org.mybatis.dynamic.sql.render.RendererFactory;
+import org.mybatis.dynamic.sql.insert.render.BatchInsertRenderer;
 import org.mybatis.dynamic.sql.render.RenderingStrategy;
 import org.mybatis.dynamic.sql.util.Validator;
 
@@ -33,8 +33,10 @@ private BatchInsertModel(Builder<T> builder) {
 
     @NotNull
     public BatchInsert<T> render(RenderingStrategy renderingStrategy) {
-        return RendererFactory.createBatchInsertRenderer(this)
-                .render(renderingStrategy);
+        return BatchInsertRenderer.withBatchInsertModel(this)
+                .withRenderingStrategy(renderingStrategy)
+                .build()
+                .render();
     }
 
     public static <T> Builder<T> withRecords(Collection<T> records) {

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

@@ -23,8 +23,8 @@
 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.RendererFactory;
 import org.mybatis.dynamic.sql.render.RenderingStrategy;
 import org.mybatis.dynamic.sql.util.AbstractColumnMapping;
 import org.mybatis.dynamic.sql.util.Validator;
@@ -50,10 +50,16 @@ public SqlTable table() {
         return table;
     }
 
+    public StatementConfiguration statementConfiguration() {
+        return statementConfiguration;
+    }
+
     @NotNull
     public GeneralInsertStatementProvider render(RenderingStrategy renderingStrategy) {
-        return RendererFactory.createGeneralInsertRenderer(this, statementConfiguration)
-                .render(renderingStrategy);
+        return GeneralInsertRenderer.withInsertModel(this)
+                .withRenderingStrategy(renderingStrategy)
+                .build()
+                .render();
     }
 
     public static class Builder {

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

@@ -22,8 +22,8 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.mybatis.dynamic.sql.SqlTable;
+import org.mybatis.dynamic.sql.insert.render.InsertRenderer;
 import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
-import org.mybatis.dynamic.sql.render.RendererFactory;
 import org.mybatis.dynamic.sql.render.RenderingStrategy;
 import org.mybatis.dynamic.sql.util.AbstractColumnMapping;
 import org.mybatis.dynamic.sql.util.Validator;
@@ -54,8 +54,10 @@ public SqlTable table() {
 
     @NotNull
     public InsertStatementProvider<T> render(RenderingStrategy renderingStrategy) {
-        return RendererFactory.createInsertRenderer(this)
-                .render(renderingStrategy);
+        return InsertRenderer.withInsertModel(this)
+                .withRenderingStrategy(renderingStrategy)
+                .build()
+                .render();
     }
 
     public static <T> Builder<T> withRow(T row) {

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

@@ -21,8 +21,8 @@
 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.InsertSelectRenderer;
 import org.mybatis.dynamic.sql.insert.render.InsertSelectStatementProvider;
-import org.mybatis.dynamic.sql.render.RendererFactory;
 import org.mybatis.dynamic.sql.render.RenderingStrategy;
 import org.mybatis.dynamic.sql.select.SelectModel;
 
@@ -51,10 +51,16 @@ public Optional<InsertColumnListModel> columnList() {
         return Optional.ofNullable(columnList);
     }
 
+    public StatementConfiguration statementConfiguration() {
+        return statementConfiguration;
+    }
+
     @NotNull
     public InsertSelectStatementProvider render(RenderingStrategy renderingStrategy) {
-        return RendererFactory.createInsertSelectRenderer(this, statementConfiguration)
-                .render(renderingStrategy);
+        return InsertSelectRenderer.withInsertSelectModel(this)
+                .withRenderingStrategy(renderingStrategy)
+                .build()
+                .render();
     }
 
     public static Builder withTable(SqlTable table) {

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

@@ -18,8 +18,8 @@
 import java.util.Collection;
 
 import org.jetbrains.annotations.NotNull;
+import org.mybatis.dynamic.sql.insert.render.MultiRowInsertRenderer;
 import org.mybatis.dynamic.sql.insert.render.MultiRowInsertStatementProvider;
-import org.mybatis.dynamic.sql.render.RendererFactory;
 import org.mybatis.dynamic.sql.render.RenderingStrategy;
 import org.mybatis.dynamic.sql.util.Validator;
 
@@ -33,8 +33,10 @@ private MultiRowInsertModel(Builder<T> builder) {
 
     @NotNull
     public MultiRowInsertStatementProvider<T> render(RenderingStrategy renderingStrategy) {
-        return RendererFactory.createMultiRowInsertRenderer(this)
-                .render(renderingStrategy);
+        return MultiRowInsertRenderer.withMultiRowInsertModel(this)
+                .withRenderingStrategy(renderingStrategy)
+                .build()
+                .render();
     }
 
     public static <T> Builder<T> withRecords(Collection<T> records) {