Just return a plain stream

jeffgbutler · jeffgbutler · commit 77bc58cbbbf2 · 2024-03-30T10:50:24.000-04:00
diff --git a/src/main/java/org/mybatis/dynamic/sql/AbstractListValueCondition.java b/src/main/java/org/mybatis/dynamic/sql/AbstractListValueCondition.java
@@ -32,8 +32,8 @@ protected AbstractListValueCondition(Collection<T> values) {
         this.values = Objects.requireNonNull(values);
     }
 
-    public final <R> Stream<R> mapValues(Function<T, R> mapper) {
-        return values.stream().map(mapper);
+    public final Stream<T> values() {
+        return values.stream();
     }
 
     @Override
diff --git a/src/main/java/org/mybatis/dynamic/sql/common/OrderByModel.java b/src/main/java/org/mybatis/dynamic/sql/common/OrderByModel.java
@@ -19,7 +19,6 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.Objects;
-import java.util.function.Function;
 import java.util.stream.Stream;
 
 import org.mybatis.dynamic.sql.SortSpecification;
@@ -34,8 +33,8 @@ private OrderByModel(Collection<? extends SortSpecification> columns) {
         this.columns.addAll(columns);
     }
 
-    public <R> Stream<R> mapColumns(Function<SortSpecification, R> mapper) {
-        return columns.stream().map(mapper);
+    public Stream<SortSpecification> columns() {
+        return columns.stream();
     }
 
     public static OrderByModel of(Collection<? extends SortSpecification> columns) {
diff --git a/src/main/java/org/mybatis/dynamic/sql/common/OrderByRenderer.java b/src/main/java/org/mybatis/dynamic/sql/common/OrderByRenderer.java
@@ -22,7 +22,7 @@
 
 public class OrderByRenderer {
     public FragmentAndParameters render(OrderByModel orderByModel) {
-        String phrase = orderByModel.mapColumns(this::calculateOrderByPhrase)
+        String phrase = orderByModel.columns().map(this::calculateOrderByPhrase)
                 .collect(Collectors.joining(", ", "order by ", "")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
         return FragmentAndParameters.fromFragment(phrase);
     }
diff --git a/src/main/java/org/mybatis/dynamic/sql/insert/AbstractMultiRowInsertModel.java b/src/main/java/org/mybatis/dynamic/sql/insert/AbstractMultiRowInsertModel.java
@@ -20,7 +20,6 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
-import java.util.function.Function;
 import java.util.stream.Stream;
 
 import org.mybatis.dynamic.sql.SqlTable;
@@ -37,8 +36,8 @@ protected AbstractMultiRowInsertModel(AbstractBuilder<T, ?> builder) {
         columnMappings = Objects.requireNonNull(builder.columnMappings);
     }
 
-    public <R> Stream<R> mapColumnMappings(Function<AbstractColumnMapping, R> mapper) {
-        return columnMappings.stream().map(mapper);
+    public Stream<AbstractColumnMapping> columnMappings() {
+        return columnMappings.stream();
     }
 
     public List<T> records() {
diff --git a/src/main/java/org/mybatis/dynamic/sql/insert/GeneralInsertModel.java b/src/main/java/org/mybatis/dynamic/sql/insert/GeneralInsertModel.java
@@ -18,7 +18,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
-import java.util.function.Function;
 import java.util.stream.Stream;
 
 import org.jetbrains.annotations.NotNull;
@@ -43,8 +42,8 @@ private GeneralInsertModel(Builder builder) {
         statementConfiguration = Objects.requireNonNull(builder.statementConfiguration);
     }
 
-    public <R> Stream<R> mapColumnMappings(Function<AbstractColumnMapping, R> mapper) {
-        return insertMappings.stream().map(mapper);
+    public Stream<AbstractColumnMapping> columnMappings() {
+        return insertMappings.stream();
     }
 
     public SqlTable table() {
diff --git a/src/main/java/org/mybatis/dynamic/sql/insert/InsertColumnListModel.java b/src/main/java/org/mybatis/dynamic/sql/insert/InsertColumnListModel.java
@@ -18,7 +18,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
-import java.util.function.Function;
 import java.util.stream.Stream;
 
 import org.mybatis.dynamic.sql.SqlColumn;
@@ -33,8 +32,8 @@ private InsertColumnListModel(List<SqlColumn<?>> columns) {
         this.columns.addAll(columns);
     }
 
-    public <R> Stream<R> mapColumns(Function<SqlColumn<?>, R> mapper) {
-        return columns.stream().map(mapper);
+    public Stream<SqlColumn<?>> columns() {
+        return columns.stream();
     }
 
     public static InsertColumnListModel of(List<SqlColumn<?>> columns) {
diff --git a/src/main/java/org/mybatis/dynamic/sql/insert/InsertModel.java b/src/main/java/org/mybatis/dynamic/sql/insert/InsertModel.java
@@ -18,7 +18,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
-import java.util.function.Function;
 import java.util.stream.Stream;
 
 import org.jetbrains.annotations.NotNull;
@@ -41,8 +40,8 @@ private InsertModel(Builder<T> builder) {
         Validator.assertNotEmpty(columnMappings, "ERROR.7"); //$NON-NLS-1$
     }
 
-    public <R> Stream<R> mapColumnMappings(Function<AbstractColumnMapping, R> mapper) {
-        return columnMappings.stream().map(mapper);
+    public Stream<AbstractColumnMapping> columnMappings() {
+        return columnMappings.stream();
     }
 
     public T row() {
diff --git a/src/main/java/org/mybatis/dynamic/sql/insert/render/BatchInsertRenderer.java b/src/main/java/org/mybatis/dynamic/sql/insert/render/BatchInsertRenderer.java
@@ -32,7 +32,7 @@ private BatchInsertRenderer(Builder<T> builder) {
 
     public BatchInsert<T> render() {
         MultiRowValuePhraseVisitor visitor = new MultiRowValuePhraseVisitor(renderingStrategy, "row"); //$NON-NLS-1$)
-        FieldAndValueCollector collector = model.mapColumnMappings(m -> m.accept(visitor))
+        FieldAndValueCollector collector = model.columnMappings().map(m -> m.accept(visitor))
                 .collect(FieldAndValueCollector.collect());
 
         String insertStatement = InsertRenderingUtilities.calculateInsertStatement(model.table(), collector);
diff --git a/src/main/java/org/mybatis/dynamic/sql/insert/render/GeneralInsertRenderer.java b/src/main/java/org/mybatis/dynamic/sql/insert/render/GeneralInsertRenderer.java
@@ -38,7 +38,7 @@ private GeneralInsertRenderer(Builder builder) {
 
     public GeneralInsertStatementProvider render() {
         GeneralInsertValuePhraseVisitor visitor = new GeneralInsertValuePhraseVisitor(renderingContext);
-        FieldAndValueCollector collector = model.mapColumnMappings(m -> m.accept(visitor))
+        FieldAndValueCollector collector = model.columnMappings().map(m -> m.accept(visitor))
                 .filter(Optional::isPresent)
                 .map(Optional::get)
                 .collect(FieldAndValueCollector.collect());
diff --git a/src/main/java/org/mybatis/dynamic/sql/insert/render/InsertRenderer.java b/src/main/java/org/mybatis/dynamic/sql/insert/render/InsertRenderer.java
@@ -35,7 +35,7 @@ private InsertRenderer(Builder<T> builder) {
     public InsertStatementProvider<T> render() {
         ValuePhraseVisitor visitor = new ValuePhraseVisitor(renderingStrategy);
 
-        FieldAndValueCollector collector = model.mapColumnMappings(m -> m.accept(visitor))
+        FieldAndValueCollector collector = model.columnMappings().map(m -> m.accept(visitor))
                 .filter(Optional::isPresent)
                 .map(Optional::get)
                 .collect(FieldAndValueCollector.collect());
diff --git a/src/main/java/org/mybatis/dynamic/sql/insert/render/InsertSelectRenderer.java b/src/main/java/org/mybatis/dynamic/sql/insert/render/InsertSelectRenderer.java
@@ -63,7 +63,7 @@ private Optional<String> calculateColumnsPhrase() {
     }
 
     private String calculateColumnsPhrase(InsertColumnListModel columnList) {
-        return columnList.mapColumns(SqlColumn::name)
+        return columnList.columns().map(SqlColumn::name)
                 .collect(Collectors.joining(", ", "(", ")")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
diff --git a/src/main/java/org/mybatis/dynamic/sql/insert/render/MultiRowInsertRenderer.java b/src/main/java/org/mybatis/dynamic/sql/insert/render/MultiRowInsertRenderer.java
@@ -36,7 +36,7 @@ public MultiRowInsertStatementProvider<T> render() {
         // the prefix is a generic format that will be resolved below with String.format(...)
         MultiRowValuePhraseVisitor visitor =
                 new MultiRowValuePhraseVisitor(renderingStrategy, "records[%s]"); //$NON-NLS-1$
-        FieldAndValueCollector collector = model.mapColumnMappings(m -> m.accept(visitor))
+        FieldAndValueCollector collector = model.columnMappings().map(m -> m.accept(visitor))
                 .collect(FieldAndValueCollector.collect());
 
         String insertStatement = calculateInsertStatement(collector);
diff --git a/src/main/java/org/mybatis/dynamic/sql/select/GroupByModel.java b/src/main/java/org/mybatis/dynamic/sql/select/GroupByModel.java
@@ -19,7 +19,6 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.Objects;
-import java.util.function.Function;
 import java.util.stream.Stream;
 
 import org.mybatis.dynamic.sql.BasicColumn;
@@ -34,8 +33,8 @@ private GroupByModel(Collection<? extends BasicColumn> columns) {
         this.columns.addAll(columns);
     }
 
-    public <R> Stream<R> mapColumns(Function<BasicColumn, R> mapper) {
-        return columns.stream().map(mapper);
+    public Stream<BasicColumn> columns() {
+        return columns.stream();
     }
 
     public static GroupByModel of(Collection<? extends BasicColumn> columns) {
diff --git a/src/main/java/org/mybatis/dynamic/sql/select/MultiSelectModel.java b/src/main/java/org/mybatis/dynamic/sql/select/MultiSelectModel.java
@@ -19,7 +19,6 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
-import java.util.function.Function;
 import java.util.stream.Stream;
 
 import org.jetbrains.annotations.NotNull;
@@ -50,8 +49,8 @@ public SelectModel initialSelect() {
         return initialSelect;
     }
 
-    public <R> Stream<R> mapUnionQueries(Function<UnionQuery, R> mapper) {
-        return unionQueries.stream().map(mapper);
+    public Stream<UnionQuery> unionQueries() {
+        return unionQueries.stream();
     }
 
     public Optional<OrderByModel> orderByModel() {
diff --git a/src/main/java/org/mybatis/dynamic/sql/select/QueryExpressionModel.java b/src/main/java/org/mybatis/dynamic/sql/select/QueryExpressionModel.java
@@ -21,7 +21,6 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
-import java.util.function.Function;
 import java.util.stream.Stream;
 
 import org.mybatis.dynamic.sql.BasicColumn;
@@ -63,8 +62,8 @@ public boolean isDistinct() {
         return isDistinct;
     }
 
-    public <R> Stream<R> mapColumns(Function<BasicColumn, R> mapper) {
-        return selectList.stream().map(mapper);
+    public Stream<BasicColumn> columns() {
+        return selectList.stream();
     }
 
     public TableExpression table() {
diff --git a/src/main/java/org/mybatis/dynamic/sql/select/SelectModel.java b/src/main/java/org/mybatis/dynamic/sql/select/SelectModel.java
@@ -19,7 +19,6 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
-import java.util.function.Function;
 import java.util.stream.Stream;
 
 import org.jetbrains.annotations.NotNull;
@@ -45,8 +44,8 @@ private SelectModel(Builder builder) {
         statementConfiguration = Objects.requireNonNull(builder.statementConfiguration);
     }
 
-    public <R> Stream<R> mapQueryExpressions(Function<QueryExpressionModel, R> mapper) {
-        return queryExpressions.stream().map(mapper);
+    public Stream<QueryExpressionModel> queryExpressions() {
+        return queryExpressions.stream();
     }
 
     public Optional<OrderByModel> orderByModel() {
diff --git a/src/main/java/org/mybatis/dynamic/sql/select/join/JoinModel.java b/src/main/java/org/mybatis/dynamic/sql/select/join/JoinModel.java
@@ -18,7 +18,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
-import java.util.function.Function;
 import java.util.stream.Stream;
 
 import org.mybatis.dynamic.sql.TableExpression;
@@ -33,8 +32,8 @@ private JoinModel(List<JoinSpecification> joinSpecifications) {
         this.joinSpecifications.addAll(joinSpecifications);
     }
 
-    public <R> Stream<R> mapJoinSpecifications(Function<JoinSpecification, R> mapper) {
-        return joinSpecifications.stream().map(mapper);
+    public Stream<JoinSpecification> joinSpecifications() {
+        return joinSpecifications.stream();
     }
 
     public static JoinModel of(List<JoinSpecification> joinSpecifications) {
diff --git a/src/main/java/org/mybatis/dynamic/sql/select/join/JoinSpecification.java b/src/main/java/org/mybatis/dynamic/sql/select/join/JoinSpecification.java
@@ -18,7 +18,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
-import java.util.function.Function;
 import java.util.stream.Stream;
 
 import org.mybatis.dynamic.sql.TableExpression;
@@ -41,8 +40,8 @@ public TableExpression table() {
         return table;
     }
 
-    public <R> Stream<R> mapJoinCriteria(Function<JoinCriterion<?>, R> mapper) {
-        return joinCriteria.stream().map(mapper);
+    public Stream<JoinCriterion<?>> joinCriteria() {
+        return joinCriteria.stream();
     }
 
     public JoinType joinType() {
diff --git a/src/main/java/org/mybatis/dynamic/sql/select/render/JoinRenderer.java b/src/main/java/org/mybatis/dynamic/sql/select/render/JoinRenderer.java
@@ -39,7 +39,7 @@ private JoinRenderer(Builder builder) {
     }
 
     public FragmentAndParameters render() {
-        return joinModel.mapJoinSpecifications(this::renderJoinSpecification)
+        return joinModel.joinSpecifications().map(this::renderJoinSpecification)
                 .collect(FragmentCollector.collect())
                 .toFragmentAndParameters(Collectors.joining(" ")); //$NON-NLS-1$
     }
@@ -59,7 +59,8 @@ private FragmentAndParameters renderJoinSpecification(JoinSpecification joinSpec
     }
 
     private FragmentAndParameters renderConditions(JoinSpecification joinSpecification) {
-        return joinSpecification.mapJoinCriteria(this::renderCriterion)
+        return joinSpecification.joinCriteria()
+                .map(this::renderCriterion)
                 .collect(FragmentCollector.collect())
                 .toFragmentAndParameters(Collectors.joining(" ")); //$NON-NLS-1$
     }
diff --git a/src/main/java/org/mybatis/dynamic/sql/select/render/MultiSelectRenderer.java b/src/main/java/org/mybatis/dynamic/sql/select/render/MultiSelectRenderer.java
@@ -47,7 +47,8 @@ public SelectStatementProvider render() {
         FragmentAndParameters initialSelect = renderSelect(multiSelectModel.initialSelect());
 
         FragmentCollector fragmentCollector = multiSelectModel
-                .mapUnionQueries(this::renderSelect)
+                .unionQueries()
+                .map(this::renderSelect)
                 .collect(FragmentCollector.collect(initialSelect));
 
         renderOrderBy().ifPresent(fragmentCollector::add);
diff --git a/src/main/java/org/mybatis/dynamic/sql/select/render/QueryExpressionRenderer.java b/src/main/java/org/mybatis/dynamic/sql/select/render/QueryExpressionRenderer.java
@@ -130,7 +130,7 @@ private FragmentAndParameters calculateQueryExpressionStart() {
     }
 
     private FragmentAndParameters calculateColumnList() {
-        return queryExpression.mapColumns(this::renderColumnAndAlias)
+        return queryExpression.columns().map(this::renderColumnAndAlias)
                 .collect(FragmentCollector.collect())
                 .toFragmentAndParameters(Collectors.joining(", ")); //$NON-NLS-1$
     }
@@ -175,7 +175,7 @@ private Optional<FragmentAndParameters> calculateGroupByClause() {
     }
 
     private FragmentAndParameters renderGroupBy(GroupByModel groupByModel) {
-        return groupByModel.mapColumns(this::renderColumn)
+        return groupByModel.columns().map(this::renderColumn)
                 .collect(FragmentCollector.collect())
                 .toFragmentAndParameters(
                         Collectors.joining(", ", "group by ", "")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$)
diff --git a/src/main/java/org/mybatis/dynamic/sql/select/render/SelectRenderer.java b/src/main/java/org/mybatis/dynamic/sql/select/render/SelectRenderer.java
@@ -39,7 +39,8 @@ private SelectRenderer(Builder builder) {
 
     public SelectStatementProvider render() {
         FragmentCollector fragmentCollector = selectModel
-                .mapQueryExpressions(this::renderQueryExpression)
+                .queryExpressions()
+                .map(this::renderQueryExpression)
                 .collect(FragmentCollector.collect());
 
         renderOrderBy().ifPresent(fragmentCollector::add);
diff --git a/src/main/java/org/mybatis/dynamic/sql/update/UpdateModel.java b/src/main/java/org/mybatis/dynamic/sql/update/UpdateModel.java
@@ -19,7 +19,6 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
-import java.util.function.Function;
 import java.util.stream.Stream;
 
 import org.jetbrains.annotations.NotNull;
@@ -66,8 +65,8 @@ public Optional<EmbeddedWhereModel> whereModel() {
         return Optional.ofNullable(whereModel);
     }
 
-    public <R> Stream<R> mapColumnMappings(Function<AbstractColumnMapping, R> mapper) {
-        return columnMappings.stream().map(mapper);
+    public Stream<AbstractColumnMapping> columnMappings() {
+        return columnMappings.stream();
     }
 
     public Optional<Long> limit() {
diff --git a/src/main/java/org/mybatis/dynamic/sql/update/render/UpdateRenderer.java b/src/main/java/org/mybatis/dynamic/sql/update/render/UpdateRenderer.java
@@ -78,7 +78,7 @@ private FragmentAndParameters calculateSetPhrase() {
         SetPhraseVisitor visitor = new SetPhraseVisitor(renderingContext);
 
         List<Optional<FragmentAndParameters>> fragmentsAndParameters =
-                updateModel.mapColumnMappings(m -> m.accept(visitor))
+                updateModel.columnMappings().map(m -> m.accept(visitor))
                         .collect(Collectors.toList());
 
         Validator.assertFalse(fragmentsAndParameters.stream().noneMatch(Optional::isPresent),
diff --git a/src/main/java/org/mybatis/dynamic/sql/where/render/DefaultConditionVisitor.java b/src/main/java/org/mybatis/dynamic/sql/where/render/DefaultConditionVisitor.java
@@ -46,7 +46,8 @@ private DefaultConditionVisitor(Builder<T> builder) {
 
     @Override
     public FragmentAndParameters visit(AbstractListValueCondition<T> condition) {
-        FragmentCollector fc = condition.mapValues(this::toFragmentAndParameters).collect(FragmentCollector.collect());
+        FragmentCollector fc = condition.values()
+                .map(this::toFragmentAndParameters).collect(FragmentCollector.collect());
 
         String joinedFragments =
                 fc.collectFragments(Collectors.joining(",", "(", ")")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
diff --git a/src/test/java/org/mybatis/dynamic/sql/where/condition/FilterAndMapTest.java b/src/test/java/org/mybatis/dynamic/sql/where/condition/FilterAndMapTest.java

Original file line number	Diff line number	Diff line change
`@@ -32,8 +32,8 @@ protected AbstractListValueCondition(Collection<T> values) {`
`32`	`32`	`this.values = Objects.requireNonNull(values);`
`33`	`33`	`}`
`34`	`34`
`35`		`- public final <R> Stream<R> mapValues(Function<T, R> mapper) {`
`36`		`- return values.stream().map(mapper);`
	`35`	`+ public final Stream<T> values() {`
	`36`	`+ return values.stream();`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`
`23`	`23`	`public class OrderByRenderer {`
`24`	`24`	`public FragmentAndParameters render(OrderByModel orderByModel) {`
`25`		`- String phrase = orderByModel.mapColumns(this::calculateOrderByPhrase)`
	`25`	`+ String phrase = orderByModel.columns().map(this::calculateOrderByPhrase)`
`26`	`26`	`.collect(Collectors.joining(", ", "order by ", "")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$`
`27`	`27`	`return FragmentAndParameters.fromFragment(phrase);`
`28`	`28`	`}`