Simplify column and condition renderer

Author: jeffgbutler

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

@@ -15,45 +15,43 @@
  */
 package org.mybatis.dynamic.sql.where.render;
 
-import static org.mybatis.dynamic.sql.util.StringUtilities.spaceBefore;
-
 import java.util.Objects;
+import java.util.stream.Collectors;
 
 import org.jspecify.annotations.Nullable;
 import org.mybatis.dynamic.sql.BindableColumn;
 import org.mybatis.dynamic.sql.VisitableCondition;
 import org.mybatis.dynamic.sql.render.RenderingContext;
 import org.mybatis.dynamic.sql.util.FragmentAndParameters;
+import org.mybatis.dynamic.sql.util.FragmentCollector;
 
 public class ColumnAndConditionRenderer<T> {
     private final BindableColumn<T> column;
     private final VisitableCondition<T> condition;
     private final RenderingContext renderingContext;
+    private final DefaultConditionVisitor<T> visitor;
 
     private ColumnAndConditionRenderer(Builder<T> builder) {
         column = Objects.requireNonNull(builder.column);
         condition = Objects.requireNonNull(builder.condition);
         renderingContext = Objects.requireNonNull(builder.renderingContext);
-    }
-
-    public FragmentAndParameters render() {
-        FragmentAndParameters renderedLeftColumn = column.alias()
-                .map(FragmentAndParameters::fromFragment)
-                .orElseGet(() -> column.render(renderingContext));
-
-        DefaultConditionVisitor<T> visitor = DefaultConditionVisitor.withColumn(column)
+        visitor = DefaultConditionVisitor.withColumn(column)
                 .withRenderingContext(renderingContext)
                 .build();
+    }
 
-        FragmentAndParameters renderedCondition = condition.accept(visitor);
-
-        String finalFragment = condition.overrideRenderedLeftColumn(renderedLeftColumn.fragment())
-                + spaceBefore(renderedCondition.fragment());
+    public FragmentAndParameters render() {
+        FragmentCollector fc = new FragmentCollector();
+        fc.add(renderLeftColumn());
+        fc.add(condition.accept(visitor));
+        return fc.toFragmentAndParameters(Collectors.joining(" ")); //$NON-NLS-1$
+    }
 
-        return FragmentAndParameters.withFragment(finalFragment)
-                .withParameters(renderedLeftColumn.parameters())
-                .withParameters(renderedCondition.parameters())
-                .build();
+    private FragmentAndParameters renderLeftColumn() {
+        return column.alias()
+                .map(FragmentAndParameters::fromFragment)
+                .orElseGet(() -> column.render(renderingContext))
+                .mapFragment(condition::overrideRenderedLeftColumn);
     }
 
     public static class Builder<T> {