Skip to content

Commit f7a8670

Browse files
committed
Remove superfluous collector
1 parent 6c9c9fd commit f7a8670

File tree

3 files changed

+6
-122
lines changed

3 files changed

+6
-122
lines changed

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

Lines changed: 0 additions & 59 deletions
This file was deleted.

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import java.util.Objects;
2222
import java.util.Optional;
2323
import java.util.concurrent.atomic.AtomicInteger;
24+
import java.util.stream.Collectors;
2425

2526
import org.mybatis.dynamic.sql.SortSpecification;
2627
import org.mybatis.dynamic.sql.render.RenderingStrategy;
@@ -29,6 +30,7 @@
2930
import org.mybatis.dynamic.sql.select.SelectModel;
3031
import org.mybatis.dynamic.sql.util.CustomCollectors;
3132
import org.mybatis.dynamic.sql.util.FragmentAndParameters;
33+
import org.mybatis.dynamic.sql.util.FragmentCollector;
3234

3335
public 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));

src/test/java/org/mybatis/dynamic/sql/select/render/QueryExpressionCollectorTest.java

Lines changed: 0 additions & 59 deletions
This file was deleted.

0 commit comments

Comments
 (0)