Skip to content

Commit 8a60188

Browse files
committed
Just return a plain stream
1 parent 72b10d3 commit 8a60188

File tree

10 files changed

+22
-12
lines changed

10 files changed

+22
-12
lines changed

src/main/java/org/mybatis/dynamic/sql/common/OrderByRenderer.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222

2323
public class OrderByRenderer {
2424
public FragmentAndParameters render(OrderByModel orderByModel) {
25-
String phrase = orderByModel.columns().map(this::calculateOrderByPhrase)
25+
String phrase = orderByModel.columns()
26+
.map(this::calculateOrderByPhrase)
2627
.collect(Collectors.joining(", ", "order by ", "")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
2728
return FragmentAndParameters.fromFragment(phrase);
2829
}

src/main/java/org/mybatis/dynamic/sql/insert/render/BatchInsertRenderer.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ private BatchInsertRenderer(Builder<T> builder) {
3232

3333
public BatchInsert<T> render() {
3434
MultiRowValuePhraseVisitor visitor = new MultiRowValuePhraseVisitor(renderingStrategy, "row"); //$NON-NLS-1$)
35-
FieldAndValueCollector collector = model.columnMappings().map(m -> m.accept(visitor))
35+
FieldAndValueCollector collector = model.columnMappings()
36+
.map(m -> m.accept(visitor))
3637
.collect(FieldAndValueCollector.collect());
3738

3839
String insertStatement = InsertRenderingUtilities.calculateInsertStatement(model.table(), collector);

src/main/java/org/mybatis/dynamic/sql/insert/render/GeneralInsertRenderer.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ private GeneralInsertRenderer(Builder builder) {
3838

3939
public GeneralInsertStatementProvider render() {
4040
GeneralInsertValuePhraseVisitor visitor = new GeneralInsertValuePhraseVisitor(renderingContext);
41-
FieldAndValueCollector collector = model.columnMappings().map(m -> m.accept(visitor))
41+
FieldAndValueCollector collector = model.columnMappings()
42+
.map(m -> m.accept(visitor))
4243
.filter(Optional::isPresent)
4344
.map(Optional::get)
4445
.collect(FieldAndValueCollector.collect());

src/main/java/org/mybatis/dynamic/sql/insert/render/InsertRenderer.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ private InsertRenderer(Builder<T> builder) {
3535
public InsertStatementProvider<T> render() {
3636
ValuePhraseVisitor visitor = new ValuePhraseVisitor(renderingStrategy);
3737

38-
FieldAndValueCollector collector = model.columnMappings().map(m -> m.accept(visitor))
38+
FieldAndValueCollector collector = model.columnMappings()
39+
.map(m -> m.accept(visitor))
3940
.filter(Optional::isPresent)
4041
.map(Optional::get)
4142
.collect(FieldAndValueCollector.collect());

src/main/java/org/mybatis/dynamic/sql/insert/render/InsertSelectRenderer.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,8 @@ private Optional<String> calculateColumnsPhrase() {
6363
}
6464

6565
private String calculateColumnsPhrase(InsertColumnListModel columnList) {
66-
return columnList.columns().map(SqlColumn::name)
66+
return columnList.columns()
67+
.map(SqlColumn::name)
6768
.collect(Collectors.joining(", ", "(", ")")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
6869
}
6970

src/main/java/org/mybatis/dynamic/sql/insert/render/MultiRowInsertRenderer.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ public MultiRowInsertStatementProvider<T> render() {
3636
// the prefix is a generic format that will be resolved below with String.format(...)
3737
MultiRowValuePhraseVisitor visitor =
3838
new MultiRowValuePhraseVisitor(renderingStrategy, "records[%s]"); //$NON-NLS-1$
39-
FieldAndValueCollector collector = model.columnMappings().map(m -> m.accept(visitor))
39+
FieldAndValueCollector collector = model.columnMappings()
40+
.map(m -> m.accept(visitor))
4041
.collect(FieldAndValueCollector.collect());
4142

4243
String insertStatement = calculateInsertStatement(collector);

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ private JoinRenderer(Builder builder) {
3939
}
4040

4141
public FragmentAndParameters render() {
42-
return joinModel.joinSpecifications().map(this::renderJoinSpecification)
42+
return joinModel.joinSpecifications()
43+
.map(this::renderJoinSpecification)
4344
.collect(FragmentCollector.collect())
4445
.toFragmentAndParameters(Collectors.joining(" ")); //$NON-NLS-1$
4546
}

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,8 @@ private FragmentAndParameters calculateQueryExpressionStart() {
130130
}
131131

132132
private FragmentAndParameters calculateColumnList() {
133-
return queryExpression.columns().map(this::renderColumnAndAlias)
133+
return queryExpression.columns()
134+
.map(this::renderColumnAndAlias)
134135
.collect(FragmentCollector.collect())
135136
.toFragmentAndParameters(Collectors.joining(", ")); //$NON-NLS-1$
136137
}
@@ -175,7 +176,8 @@ private Optional<FragmentAndParameters> calculateGroupByClause() {
175176
}
176177

177178
private FragmentAndParameters renderGroupBy(GroupByModel groupByModel) {
178-
return groupByModel.columns().map(this::renderColumn)
179+
return groupByModel.columns()
180+
.map(this::renderColumn)
179181
.collect(FragmentCollector.collect())
180182
.toFragmentAndParameters(
181183
Collectors.joining(", ", "group by ", "")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ private FragmentAndParameters calculateUpdateStatementStart() {
7777
private FragmentAndParameters calculateSetPhrase() {
7878
SetPhraseVisitor visitor = new SetPhraseVisitor(renderingContext);
7979

80-
List<Optional<FragmentAndParameters>> fragmentsAndParameters =
81-
updateModel.columnMappings().map(m -> m.accept(visitor))
80+
List<Optional<FragmentAndParameters>> fragmentsAndParameters = updateModel.columnMappings()
81+
.map(m -> m.accept(visitor))
8282
.collect(Collectors.toList());
8383

8484
Validator.assertFalse(fragmentsAndParameters.stream().noneMatch(Optional::isPresent),

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@ private DefaultConditionVisitor(Builder<T> builder) {
4747
@Override
4848
public FragmentAndParameters visit(AbstractListValueCondition<T> condition) {
4949
FragmentCollector fc = condition.values()
50-
.map(this::toFragmentAndParameters).collect(FragmentCollector.collect());
50+
.map(this::toFragmentAndParameters)
51+
.collect(FragmentCollector.collect());
5152

5253
String joinedFragments =
5354
fc.collectFragments(Collectors.joining(",", "(", ")")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

0 commit comments

Comments
 (0)