More consistent use of builders and Optionals

Author: jeffgbutler

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

@@ -42,7 +42,11 @@ public Optional<WhereModel> whereModel() {
     }
 
     public DeleteSupport render(RenderingStrategy renderingStrategy) {
-        return DeleteRenderer.of(this).render(renderingStrategy);
+        return new DeleteRenderer.Builder()
+                .withDeleteModer(this)
+                .withRenderingStrategy(renderingStrategy)
+                .build()
+                .render();
     }
 
     public static class Builder {

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

@@ -17,7 +17,6 @@
 
 import java.util.Objects;
 import java.util.concurrent.atomic.AtomicInteger;
-import java.util.function.Consumer;
 
 import org.mybatis.dynamic.sql.delete.DeleteModel;
 import org.mybatis.dynamic.sql.render.RenderingStrategy;
@@ -28,38 +27,46 @@
 
 public class DeleteRenderer {
     private DeleteModel deleteModel;
+    private RenderingStrategy renderingStrategy;
 
-    private DeleteRenderer(DeleteModel deleteModel) {
-        this.deleteModel = Objects.requireNonNull(deleteModel);
+    private DeleteRenderer(Builder builder) {
+        deleteModel = Objects.requireNonNull(builder.deleteModel);
+        renderingStrategy = Objects.requireNonNull(builder.renderingStrategy);
     }
 
-    public DeleteSupport render(RenderingStrategy renderingStrategy) {
-        DeleteSupport.Builder builder = new DeleteSupport.Builder()
-                .withTableName(deleteModel.table().name());
-        
-        deleteModel.whereModel().ifPresent(applyWhere(builder, renderingStrategy));
-        
-        return builder.build();
-    }
-    
-    private Consumer<WhereModel> applyWhere(DeleteSupport.Builder builder, RenderingStrategy renderingStrategy) {
-        return whereModel -> applyWhere(builder, renderingStrategy, whereModel);
+    public DeleteSupport render() {
+        return new DeleteSupport.Builder()
+                .withTableName(deleteModel.table().name())
+                .withWhereSupport(deleteModel.whereModel().map(this::renderWhereModel))
+                .build();
     }
 
-    private void applyWhere(DeleteSupport.Builder builder, RenderingStrategy renderingStrategy, WhereModel whereModel) {
-        WhereSupport whereSupport = new WhereRenderer.Builder()
+    private WhereSupport renderWhereModel(WhereModel whereModel) {
+        return new WhereRenderer.Builder()
                 .withWhereModel(whereModel)
                 .withRenderingStrategy(renderingStrategy)
                 .withSequence(new AtomicInteger(1))
                 .withTableAliasCalculator(TableAliasCalculator.empty())
                 .build()
                 .render();
-        
-        builder.withWhereClause(whereSupport.getWhereClause());
-        builder.withParameters(whereSupport.getParameters());
     }
 
-    public static DeleteRenderer of(DeleteModel deleteModel) {
-        return new DeleteRenderer(deleteModel);
+    public static class Builder {
+        private DeleteModel deleteModel;
+        private RenderingStrategy renderingStrategy;
+
+        public Builder withDeleteModer(DeleteModel deleteModel) {
+            this.deleteModel = deleteModel;
+            return this;
+        }
+        
+        public Builder withRenderingStrategy(RenderingStrategy renderingStrategy) {
+            this.renderingStrategy = renderingStrategy;
+            return this;
+        }
+        
+        public DeleteRenderer build() {
+            return new DeleteRenderer(this);
+        }
     }
 }

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

@@ -17,21 +17,22 @@
 
 import static org.mybatis.dynamic.sql.util.StringUtilities.spaceBefore;
 
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 
 import org.mybatis.dynamic.sql.AbstractSqlSupport;
+import org.mybatis.dynamic.sql.where.render.WhereSupport;
 
 public class DeleteSupport extends AbstractSqlSupport {
-
     private Optional<String> whereClause;
     private Map<String, Object> parameters;
 
     private DeleteSupport(Builder builder) {
         super(builder.tableName);
-        whereClause = Optional.ofNullable(builder.whereClause);
+        whereClause = Objects.requireNonNull(builder.whereClause);
         parameters = Objects.requireNonNull(builder.parameters);
     }
 
@@ -47,21 +48,17 @@ public String getFullDeleteStatement() {
 
     public static class Builder {
         private String tableName;
-        private String whereClause;
+        private Optional<String> whereClause = Optional.empty();
         private Map<String, Object> parameters = new HashMap<>();
 
         public Builder withTableName(String tableName) {
             this.tableName = tableName;
             return this;
         }
 
-        public Builder withWhereClause(String whereClause) {
-            this.whereClause = whereClause;
-            return this;
-        }
-        
-        public Builder withParameters(Map<String, Object> parameters) {
-            this.parameters.putAll(parameters);
+        public Builder withWhereSupport(Optional<WhereSupport> whereSupport) {
+            whereClause = whereSupport.map(WhereSupport::getWhereClause);
+            parameters.putAll(whereSupport.map(WhereSupport::getParameters).orElse(Collections.emptyMap()));
             return this;
         }
 

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

@@ -52,7 +52,11 @@ public SqlTable table() {
     }
 
     public InsertBatchSupport<T> render(RenderingStrategy renderingStrategy) {
-        return InsertBatchRenderer.of(this).render(renderingStrategy);
+        return new InsertBatchRenderer.Builder<T>()
+                .withInsertBatchModel(this)
+                .withRenderingStrategy(renderingStrategy)
+                .build()
+                .render();
     }
 
     public static class Builder<T> {

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

@@ -51,7 +51,11 @@ public SqlTable table() {
     }
 
     public InsertSupport<T> render(RenderingStrategy renderingStrategy) {
-        return InsertRenderer.of(this).render(renderingStrategy);
+        return new InsertRenderer.Builder<T>()
+                .withInsertModel(this)
+                .withRenderingStrategy(renderingStrategy)
+                .build()
+                .render();
     }
 
     public static class Builder<T> {

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

@@ -52,7 +52,11 @@ public <R> Optional<Stream<R>> mapColumns(Function<SqlColumn<?>, R> mapper) {
     }
 
     public InsertSelectSupport render(RenderingStrategy renderingStrategy) {
-        return InsertSelectRenderer.of(this).render(renderingStrategy);
+        return new InsertSelectRenderer.Builder()
+                .withInsertSelectModel(this)
+                .withRenderingStrategy(renderingStrategy)
+                .build()
+                .render();
     }
 
     public static class Builder {

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

@@ -25,12 +25,14 @@
 public class InsertBatchRenderer<T> {
 
     private InsertBatchModel<T> model;
+    private RenderingStrategy renderingStrategy;
 
-    private InsertBatchRenderer(InsertBatchModel<T> model) {
-        this.model = Objects.requireNonNull(model);
+    private InsertBatchRenderer(Builder<T> builder) {
+        model = Objects.requireNonNull(builder.model);
+        renderingStrategy = Objects.requireNonNull(builder.renderingStrategy);
     }
 
-    public InsertBatchSupport<T> render(RenderingStrategy renderingStrategy) {
+    public InsertBatchSupport<T> render() {
         ValuePhraseVisitor visitor = new ValuePhraseVisitor(renderingStrategy);
         FieldAndValueCollector<T> collector = model.mapColumnMappings(toFieldAndValue(visitor))
                 .collect(FieldAndValueCollector.collect());
@@ -41,7 +43,7 @@ public InsertBatchSupport<T> render(RenderingStrategy renderingStrategy) {
                 .withRecords(model.records())
                 .build();
     }
-
+    
     private Function<InsertMapping, FieldAndValue> toFieldAndValue(ValuePhraseVisitor visitor) {
         return insertMapping -> toFieldAndValue(visitor, insertMapping);
     }
@@ -50,7 +52,22 @@ private FieldAndValue toFieldAndValue(ValuePhraseVisitor visitor, InsertMapping
         return insertMapping.accept(visitor);
     }
 
-    public static <T> InsertBatchRenderer<T> of(InsertBatchModel<T> model) {
-        return new InsertBatchRenderer<>(model);
+    public static class Builder<T> {
+        private InsertBatchModel<T> model;
+        private RenderingStrategy renderingStrategy;
+        
+        public Builder<T> withInsertBatchModel(InsertBatchModel<T> model) {
+            this.model = model;
+            return this;
+        }
+        
+        public Builder<T> withRenderingStrategy(RenderingStrategy renderingStrategy) {
+            this.renderingStrategy = renderingStrategy;
+            return this;
+        }
+        
+        public InsertBatchRenderer<T> build() {
+            return new InsertBatchRenderer<>(this);
+        }
     }
 }

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

@@ -25,12 +25,14 @@
 public class InsertRenderer<T> {
 
     private InsertModel<T> model;
+    private RenderingStrategy renderingStrategy;
 
-    private InsertRenderer(InsertModel<T> model) {
-        this.model = Objects.requireNonNull(model);
+    private InsertRenderer(Builder<T> builder) {
+        model = Objects.requireNonNull(builder.model);
+        renderingStrategy = Objects.requireNonNull(builder.renderingStrategy);
     }
 
-    public InsertSupport<T> render(RenderingStrategy renderingStrategy) {
+    public InsertSupport<T> render() {
         ValuePhraseVisitor visitor = new ValuePhraseVisitor(renderingStrategy);
         FieldAndValueCollector<T> collector = model.mapColumnMappings(toFieldAndValue(visitor))
                 .collect(FieldAndValueCollector.collect());
@@ -50,7 +52,22 @@ private FieldAndValue toFieldAndValue(ValuePhraseVisitor visitor, InsertMapping
         return insertMapping.accept(visitor);
     }
 
-    public static <T> InsertRenderer<T> of(InsertModel<T> model) {
-        return new InsertRenderer<>(model);
+    public static class Builder<T> {
+        private InsertModel<T> model;
+        private RenderingStrategy renderingStrategy;
+        
+        public Builder<T> withInsertModel(InsertModel<T> model) {
+            this.model = model;
+            return this;
+        }
+        
+        public Builder<T> withRenderingStrategy(RenderingStrategy renderingStrategy) {
+            this.renderingStrategy = renderingStrategy;
+            return this;
+        }
+        
+        public InsertRenderer<T> build() {
+            return new InsertRenderer<>(this);
+        }
     }
 }

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

@@ -28,12 +28,14 @@
 public class InsertSelectRenderer {
 
     private InsertSelectModel model;
+    private RenderingStrategy renderingStrategy;
 
-    private InsertSelectRenderer(InsertSelectModel model) {
-        this.model = Objects.requireNonNull(model);
+    private InsertSelectRenderer(Builder builder) {
+        model = Objects.requireNonNull(builder.model);
+        renderingStrategy = Objects.requireNonNull(builder.renderingStrategy);
     }
 
-    public InsertSelectSupport render(RenderingStrategy renderingStrategy) {
+    public InsertSelectSupport render() {
         SelectSupport selectSupport = model.selectModel().render(renderingStrategy);
 
         return new InsertSelectSupport.Builder()
@@ -53,7 +55,22 @@ private String calculateColumnsPhrase(Stream<String> ss) {
         return ss.collect(Collectors.joining(", ", "(", ")")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
-    public static InsertSelectRenderer of(InsertSelectModel model) {
-        return new InsertSelectRenderer(model);
+    public static class Builder {
+        private InsertSelectModel model;
+        private RenderingStrategy renderingStrategy;
+        
+        public Builder withInsertSelectModel(InsertSelectModel model) {
+            this.model = model;
+            return this;
+        }
+        
+        public Builder withRenderingStrategy(RenderingStrategy renderingStrategy) {
+            this.renderingStrategy = renderingStrategy;
+            return this;
+        }
+        
+        public InsertSelectRenderer build() {
+            return new InsertSelectRenderer(this);
+        }
     }
 }

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

@@ -44,7 +44,11 @@ public Optional<OrderByModel> orderByModel() {
     }
 
     public SelectSupport render(RenderingStrategy renderingStrategy) {
-        return SelectRenderer.of(this).render(renderingStrategy);
+        return new SelectRenderer.Builder()
+                .withSelectModel(this)
+                .withRenderingStrategy(renderingStrategy)
+                .build()
+                .render();
     }
 
     public static class Builder {