Consolidate rendering of where model

Author: jeffgbutler

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

@@ -31,7 +31,6 @@
 import org.mybatis.dynamic.sql.util.FragmentAndParameters;
 import org.mybatis.dynamic.sql.util.FragmentCollector;
 import org.mybatis.dynamic.sql.where.WhereModel;
-import org.mybatis.dynamic.sql.where.render.WhereRenderer;
 
 public class DeleteRenderer {
     private final DeleteModel deleteModel;
@@ -78,10 +77,7 @@ private Optional<FragmentAndParameters> calculateWhereClause() {
     }
 
     private Optional<FragmentAndParameters> renderWhereClause(WhereModel whereModel) {
-        return WhereRenderer.withWhereModel(whereModel)
-                .withRenderingContext(renderingContext)
-                .build()
-                .render();
+        return whereModel.render(renderingContext);
     }
 
     private Optional<FragmentAndParameters> calculateLimitClause() {

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

@@ -33,7 +33,6 @@
 import org.mybatis.dynamic.sql.util.FragmentCollector;
 import org.mybatis.dynamic.sql.util.StringUtilities;
 import org.mybatis.dynamic.sql.where.WhereModel;
-import org.mybatis.dynamic.sql.where.render.WhereRenderer;
 
 public class QueryExpressionRenderer {
     private final QueryExpressionModel queryExpression;
@@ -168,10 +167,7 @@ private Optional<FragmentAndParameters> calculateWhereClause() {
     }
 
     private Optional<FragmentAndParameters> renderWhereClause(WhereModel whereModel) {
-        return WhereRenderer.withWhereModel(whereModel)
-                .withRenderingContext(renderingContext)
-                .build()
-                .render();
+        return whereModel.render(renderingContext);
     }
 
     private Optional<FragmentAndParameters> calculateGroupByClause() {

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

@@ -33,7 +33,6 @@
 import org.mybatis.dynamic.sql.util.FragmentCollector;
 import org.mybatis.dynamic.sql.util.Validator;
 import org.mybatis.dynamic.sql.where.WhereModel;
-import org.mybatis.dynamic.sql.where.render.WhereRenderer;
 
 public class UpdateRenderer {
     private final UpdateModel updateModel;
@@ -104,10 +103,7 @@ private Optional<FragmentAndParameters> calculateWhereClause() {
     }
 
     private Optional<FragmentAndParameters> renderWhereClause(WhereModel whereModel) {
-        return WhereRenderer.withWhereModel(whereModel)
-                .withRenderingContext(renderingContext)
-                .build()
-                .render();
+        return whereModel.render(renderingContext);
     }
 
     private Optional<FragmentAndParameters> calculateLimitClause() {

src/main/java/org/mybatis/dynamic/sql/where/WhereModel.java

@@ -50,7 +50,7 @@ public boolean isNonRenderingClauseAllowed() {
     public Optional<WhereClauseProvider> render(RenderingStrategy renderingStrategy) {
         RenderingContext renderingContext = RenderingContext.withRenderingStrategy(renderingStrategy).build();
 
-        return render(renderingContext);
+        return render(renderingContext).map(this::toWhereClauseProvider);
     }
 
     public Optional<WhereClauseProvider> render(RenderingStrategy renderingStrategy,
@@ -60,7 +60,7 @@ public Optional<WhereClauseProvider> render(RenderingStrategy renderingStrategy,
                 .withTableAliasCalculator(tableAliasCalculator)
                 .build();
 
-        return render(renderingContext);
+        return render(renderingContext).map(this::toWhereClauseProvider);
     }
 
     public Optional<WhereClauseProvider> render(RenderingStrategy renderingStrategy, String parameterName) {
@@ -69,7 +69,7 @@ public Optional<WhereClauseProvider> render(RenderingStrategy renderingStrategy,
                 .withParameterName(parameterName)
                 .build();
 
-        return render(renderingContext);
+        return render(renderingContext).map(this::toWhereClauseProvider);
     }
 
     public Optional<WhereClauseProvider> render(RenderingStrategy renderingStrategy,
@@ -80,15 +80,14 @@ public Optional<WhereClauseProvider> render(RenderingStrategy renderingStrategy,
                 .withParameterName(parameterName)
                 .build();
 
-        return render(renderingContext);
+        return render(renderingContext).map(this::toWhereClauseProvider);
     }
 
-    private Optional<WhereClauseProvider> render(RenderingContext renderingContext) {
+    public Optional<FragmentAndParameters> render(RenderingContext renderingContext) {
         return WhereRenderer.withWhereModel(this)
                 .withRenderingContext(renderingContext)
                 .build()
-                .render()
-                .map(this::toWhereClauseProvider);
+                .render();
     }
 
     private WhereClauseProvider toWhereClauseProvider(FragmentAndParameters fragmentAndParameters) {