Remove renderer factory

It didn't reduce the Sonar cycles, and added unnecessary complexity

Author: jeffgbutler

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

@@ -23,8 +23,8 @@
 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.DeleteStatementProvider;
-import org.mybatis.dynamic.sql.render.RendererFactory;
 import org.mybatis.dynamic.sql.render.RenderingStrategy;
 import org.mybatis.dynamic.sql.where.EmbeddedWhereModel;
 
@@ -71,8 +71,10 @@ public StatementConfiguration statementConfiguration() {
 
     @NotNull
     public DeleteStatementProvider render(RenderingStrategy renderingStrategy) {
-        return RendererFactory.createDeleteRenderer(this)
-                .render(renderingStrategy);
+        return DeleteRenderer.withDeleteModel(this)
+                .withRenderingStrategy(renderingStrategy)
+                .build()
+                .render();
     }
 
     public static Builder withTable(SqlTable table) {

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;
@@ -56,8 +56,10 @@ public StatementConfiguration statementConfiguration() {
 
     @NotNull
     public GeneralInsertStatementProvider render(RenderingStrategy renderingStrategy) {
-        return RendererFactory.createGeneralInsertRenderer(this)
-                .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;
 
@@ -57,8 +57,10 @@ public StatementConfiguration statementConfiguration() {
 
     @NotNull
     public InsertSelectStatementProvider render(RenderingStrategy renderingStrategy) {
-        return RendererFactory.createInsertSelectRenderer(this)
-                .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) {

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

@@ -23,9 +23,9 @@
 import org.mybatis.dynamic.sql.SqlColumn;
 import org.mybatis.dynamic.sql.insert.InsertColumnListModel;
 import org.mybatis.dynamic.sql.insert.InsertSelectModel;
-import org.mybatis.dynamic.sql.render.RendererFactory;
 import org.mybatis.dynamic.sql.render.RenderingContext;
 import org.mybatis.dynamic.sql.render.RenderingStrategy;
+import org.mybatis.dynamic.sql.select.render.SubQueryRenderer;
 import org.mybatis.dynamic.sql.util.FragmentAndParameters;
 
 public class InsertSelectRenderer {
@@ -45,9 +45,11 @@ public InsertSelectStatementProvider render() {
         String columnsPhrase = calculateColumnsPhrase();
         String prefix = statementStart + spaceAfter(columnsPhrase);
 
-        FragmentAndParameters fragmentAndParameters = RendererFactory.createSubQueryRenderer(model.selectModel(),
-                        prefix, "") //$NON-NLS-1$
-                .render(renderingContext);
+        FragmentAndParameters fragmentAndParameters = SubQueryRenderer.withSelectModel(model.selectModel())
+                .withRenderingContext(renderingContext)
+                .withPrefix(prefix)
+                .build()
+                .render();
 
         return DefaultGeneralInsertStatementProvider.withInsertStatement(fragmentAndParameters.fragment())
                 .withParameters(fragmentAndParameters.parameters())

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

@@ -21,8 +21,8 @@
 import java.util.stream.Stream;
 
 import org.jetbrains.annotations.NotNull;
-import org.mybatis.dynamic.sql.render.RendererFactory;
 import org.mybatis.dynamic.sql.render.RenderingStrategy;
+import org.mybatis.dynamic.sql.select.render.MultiSelectRenderer;
 import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
 import org.mybatis.dynamic.sql.util.Validator;
 
@@ -47,8 +47,10 @@ public Stream<UnionQuery> unionQueries() {
 
     @NotNull
     public SelectStatementProvider render(RenderingStrategy renderingStrategy) {
-        return RendererFactory.createMultiSelectRenderer(this)
-                .render(renderingStrategy);
+        return MultiSelectRenderer.withMultiSelectModel(this)
+                .withRenderingStrategy(renderingStrategy)
+                .build()
+                .render();
     }
 
     public static class Builder extends AbstractBuilder<Builder> {

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

@@ -21,8 +21,8 @@
 import java.util.stream.Stream;
 
 import org.jetbrains.annotations.NotNull;
-import org.mybatis.dynamic.sql.render.RendererFactory;
 import org.mybatis.dynamic.sql.render.RenderingStrategy;
+import org.mybatis.dynamic.sql.select.render.SelectRenderer;
 import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
 import org.mybatis.dynamic.sql.util.Validator;
 
@@ -41,7 +41,10 @@ public Stream<QueryExpressionModel> queryExpressions() {
 
     @NotNull
     public SelectStatementProvider render(RenderingStrategy renderingStrategy) {
-        return RendererFactory.createSelectRenderer(this).render(renderingStrategy);
+        return SelectRenderer.withSelectModel(this)
+                .withRenderingStrategy(renderingStrategy)
+                .build()
+                .render();
     }
 
     public static Builder withQueryExpressions(List<QueryExpressionModel> queryExpressions) {