2121import java .util .Objects ;
2222import java .util .Optional ;
2323import java .util .concurrent .atomic .AtomicInteger ;
24+ import java .util .stream .Collectors ;
2425
2526import org .mybatis .dynamic .sql .SortSpecification ;
2627import org .mybatis .dynamic .sql .render .RenderingStrategy ;
2930import org .mybatis .dynamic .sql .select .SelectModel ;
3031import org .mybatis .dynamic .sql .util .CustomCollectors ;
3132import org .mybatis .dynamic .sql .util .FragmentAndParameters ;
33+ import org .mybatis .dynamic .sql .util .FragmentCollector ;
3234
3335public class SelectRenderer {
3436 private static final String LIMIT_PARAMETER = "_limit" ; //$NON-NLS-1$
@@ -44,13 +46,13 @@ private SelectRenderer(Builder builder) {
4446 }
4547
4648 public SelectStatementProvider render () {
47- QueryExpressionCollector collector = selectModel
49+ FragmentCollector queryExpressionCollector = selectModel
4850 .mapQueryExpressions (this ::renderQueryExpression )
49- .collect (QueryExpressionCollector .collect ());
51+ .collect (FragmentCollector .collect ());
5052
51- Map <String , Object > parameters = collector .parameters ();
53+ Map <String , Object > parameters = queryExpressionCollector .parameters ();
5254
53- String selectStatement = collector . queryExpression ()
55+ String selectStatement = queryExpressionCollector . fragments (). collect ( Collectors . joining ( " " )) //$NON-NLS-1$
5456 + spaceBefore (renderOrderBy ())
5557 + spaceBefore (renderLimit (parameters ))
5658 + spaceBefore (renderOffset (parameters ));
0 commit comments