Standardize sub-query rendering

Author: jeffgbutler

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

@@ -57,6 +57,17 @@ public Optional<PagingModel> pagingModel() {
     @NotNull
     public SelectStatementProvider render(RenderingStrategy renderingStrategy) {
         RenderingContext renderingContext = RenderingContext.withRenderingStrategy(renderingStrategy).build();
+        return render(renderingContext);
+    }
+
+    /**
+     * This version is for rendering sub-queries, union queries, etc.
+     *
+     * @param renderingContext the rendering context
+     * @return a rendered select statement and parameters
+     */
+    @NotNull
+    public SelectStatementProvider render(RenderingContext renderingContext) {
         return SelectRenderer.withSelectModel(this)
                 .withRenderingContext(renderingContext)
                 .build()

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

@@ -62,10 +62,7 @@ private SelectStatementProvider toSelectStatementProvider(FragmentCollector frag
     }
 
     private FragmentAndParameters renderSelect(SelectModel selectModel) {
-        SelectStatementProvider selectStatement = SelectRenderer.withSelectModel(selectModel)
-                .withRenderingContext(renderingContext)
-                .build()
-                .render();
+        SelectStatementProvider selectStatement = selectModel.render(renderingContext);
 
         return FragmentAndParameters
                 .withFragment("(" + selectStatement.getSelectStatement() + ")") //$NON-NLS-1$ //$NON-NLS-2$
@@ -74,10 +71,7 @@ private FragmentAndParameters renderSelect(SelectModel selectModel) {
     }
 
     private FragmentAndParameters renderSelect(UnionQuery unionQuery) {
-        SelectStatementProvider selectStatement = SelectRenderer.withSelectModel(unionQuery.selectModel())
-                .withRenderingContext(renderingContext)
-                .build()
-                .render();
+        SelectStatementProvider selectStatement = unionQuery.selectModel().render(renderingContext);
 
         return FragmentAndParameters.withFragment(
                 unionQuery.connector() + " (" + selectStatement.getSelectStatement() + ")") //$NON-NLS-1$ //$NON-NLS-2$

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

@@ -39,11 +39,7 @@ public FragmentAndParameters visit(SqlTable table) {
 
     @Override
     public FragmentAndParameters visit(SubQuery subQuery) {
-        SelectStatementProvider selectStatement = new SelectRenderer.Builder()
-                .withSelectModel(subQuery.selectModel())
-                .withRenderingContext(renderingContext)
-                .build()
-                .render();
+        SelectStatementProvider selectStatement = subQuery.selectModel().render(renderingContext);
 
         String fragment = "(" + selectStatement.getSelectStatement() + ")"; //$NON-NLS-1$ //$NON-NLS-2$
 

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

@@ -20,7 +20,6 @@
 
 import org.mybatis.dynamic.sql.render.RenderedParameterInfo;
 import org.mybatis.dynamic.sql.render.RenderingContext;
-import org.mybatis.dynamic.sql.select.render.SelectRenderer;
 import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
 import org.mybatis.dynamic.sql.util.AbstractColumnMapping;
 import org.mybatis.dynamic.sql.util.ColumnToColumnMapping;
@@ -85,11 +84,7 @@ public <T> Optional<FragmentAndParameters> visit(ValueWhenPresentMapping<T> mapp
 
     @Override
     public Optional<FragmentAndParameters> visit(SelectMapping mapping) {
-        SelectStatementProvider selectStatement = SelectRenderer.withSelectModel(mapping.selectModel())
-                .withRenderingContext(renderingContext)
-                .build()
-                .render();
-
+        SelectStatementProvider selectStatement = mapping.selectModel().render(renderingContext);
         String fragment = mapping.mapColumn(renderingContext::aliasedColumnName)
                 + " = (" //$NON-NLS-1$
                 + selectStatement.getSelectStatement()

src/main/java/org/mybatis/dynamic/sql/where/render/CriterionRenderer.java

@@ -30,7 +30,6 @@
 import org.mybatis.dynamic.sql.SqlCriterion;
 import org.mybatis.dynamic.sql.SqlCriterionVisitor;
 import org.mybatis.dynamic.sql.render.RenderingContext;
-import org.mybatis.dynamic.sql.select.render.SelectRenderer;
 import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
 import org.mybatis.dynamic.sql.util.FragmentAndParameters;
 import org.mybatis.dynamic.sql.util.FragmentCollector;
@@ -121,11 +120,7 @@ private <T> Optional<FragmentAndParameters> renderColumnAndCondition(ColumnAndCo
     private FragmentAndParameters renderExists(ExistsCriterion criterion) {
         ExistsPredicate existsPredicate = criterion.existsPredicate();
 
-        SelectStatementProvider selectStatement = SelectRenderer
-                .withSelectModel(existsPredicate.selectModelBuilder().build())
-                .withRenderingContext(renderingContext)
-                .build()
-                .render();
+        SelectStatementProvider selectStatement = existsPredicate.selectModelBuilder().build().render(renderingContext);
 
         String fragment = existsPredicate.operator()
                 + " (" //$NON-NLS-1$

src/main/java/org/mybatis/dynamic/sql/where/render/DefaultConditionVisitor.java

@@ -94,10 +94,7 @@ public FragmentAndParameters visit(AbstractTwoValueCondition<T> condition) {
 
     @Override
     public FragmentAndParameters visit(AbstractSubselectCondition<T> condition) {
-        SelectStatementProvider selectStatement = SelectRenderer.withSelectModel(condition.selectModel())
-                .withRenderingContext(renderingContext)
-                .build()
-                .render();
+        SelectStatementProvider selectStatement = condition.selectModel().render(renderingContext);
 
         String finalFragment = condition.operator()
                 + " (" //$NON-NLS-1$