Remove another useless custom collector

jeffgbutler · jeffgbutler · commit 29c9ecd61629 · 2020-07-22T11:00:18.000-04:00
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
@@ -17,7 +17,9 @@
 
 import static org.mybatis.dynamic.sql.util.StringUtilities.spaceBefore;
 
+import java.util.List;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
 import org.mybatis.dynamic.sql.insert.BatchInsertModel;
 import org.mybatis.dynamic.sql.render.RenderingStrategy;
@@ -34,21 +36,27 @@ private BatchInsertRenderer(Builder<T> builder) {
     
     public BatchInsert<T> render() {
         MultiRowValuePhraseVisitor visitor = new MultiRowValuePhraseVisitor(renderingStrategy, "record"); //$NON-NLS-1$)
-        FieldAndValueCollector collector = model.mapColumnMappings(MultiRowRenderingUtilities.toFieldAndValue(visitor))
-                .collect(FieldAndValueCollector.collect());
+        List<FieldAndValue> fieldsAndValues = model.mapColumnMappings(MultiRowRenderingUtilities.toFieldAndValue(visitor))
+                .collect(Collectors.toList());
         
         return BatchInsert.withRecords(model.records())
-                .withInsertStatement(calculateInsertStatement(collector))
+                .withInsertStatement(calculateInsertStatement(fieldsAndValues))
                 .build();
     }
     
-    private String calculateInsertStatement(FieldAndValueCollector collector) {
+    private String calculateInsertStatement(List<FieldAndValue> fieldsAndValues) {
         return "insert into" //$NON-NLS-1$
                 + spaceBefore(model.table().tableNameAtRuntime())
-                + spaceBefore(collector.columnsPhrase())
-                + spaceBefore(collector.valuesPhrase());
+                + spaceBefore(MultiRowRenderingUtilities.calculateColumnsPhrase(fieldsAndValues))
+                + spaceBefore(calculateVluesPhrase(fieldsAndValues));
     }
     
+    private String calculateVluesPhrase(List<FieldAndValue> fieldsAndValues) {
+        return fieldsAndValues.stream()
+                .map(FieldAndValue::valuePhrase)
+                .collect(Collectors.joining(", ", "values (", ")")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    }
+
     public static <T> Builder<T> withBatchInsertModel(BatchInsertModel<T> model) {
         return new Builder<T>().withBatchInsertModel(model);
     }
diff --git a/src/main/java/org/mybatis/dynamic/sql/insert/render/FieldAndValueCollector.java b/src/main/java/org/mybatis/dynamic/sql/insert/render/FieldAndValueCollector.java
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
@@ -17,7 +17,10 @@
 
 import static org.mybatis.dynamic.sql.util.StringUtilities.spaceBefore;
 
+import java.util.List;
 import java.util.Objects;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 
 import org.mybatis.dynamic.sql.insert.MultiRowInsertModel;
 import org.mybatis.dynamic.sql.render.RenderingStrategy;
@@ -34,21 +37,33 @@ private MultiRowInsertRenderer(Builder<T> builder) {
     
     public MultiRowInsertStatementProvider<T> render() {
         MultiRowValuePhraseVisitor visitor = new MultiRowValuePhraseVisitor(renderingStrategy, "records[%s]"); //$NON-NLS-1$
-        FieldAndValueCollector collector = model.mapColumnMappings(MultiRowRenderingUtilities.toFieldAndValue(visitor))
-                .collect(FieldAndValueCollector.collect());
+        List<FieldAndValue> fieldsAndValues = model.mapColumnMappings(MultiRowRenderingUtilities.toFieldAndValue(visitor))
+                .collect(Collectors.toList());
         
         return new DefaultMultiRowInsertStatementProvider.Builder<T>().withRecords(model.records())
-                .withInsertStatement(calculateInsertStatement(collector))
+                .withInsertStatement(calculateInsertStatement(fieldsAndValues))
                 .build();
     }
     
-    private String calculateInsertStatement(FieldAndValueCollector collector) {
+    private String calculateInsertStatement(List<FieldAndValue> fieldsAndValues) {
         return "insert into" //$NON-NLS-1$
                 + spaceBefore(model.table().tableNameAtRuntime())
-                + spaceBefore(collector.columnsPhrase())
-                + spaceBefore(collector.multiRowInsertValuesPhrase(model.recordCount()));
+                + spaceBefore(MultiRowRenderingUtilities.calculateColumnsPhrase(fieldsAndValues))
+                + spaceBefore(calculateMultiRowInsertValuesPhrase(fieldsAndValues, model.recordCount()));
     }
     
+    private String calculateMultiRowInsertValuesPhrase(List<FieldAndValue> fieldsAndValues, int rowCount) {
+        return IntStream.range(0, rowCount)
+                .mapToObj(i -> toSingleRowOfValues(fieldsAndValues, i))
+                .collect(Collectors.joining(", ", "values ", "")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    }
+    
+    private String toSingleRowOfValues(List<FieldAndValue> fieldsAndValues, int row) {
+        return fieldsAndValues.stream()
+                .map(fmv -> fmv.valuePhrase(row))
+                .collect(Collectors.joining(", ", "(", ")")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    }
+
     public static <T> Builder<T> withMultiRowInsertModel(MultiRowInsertModel<T> model) {
         return new Builder<T>().withMultiRowInsertModel(model);
     }
diff --git a/src/main/java/org/mybatis/dynamic/sql/insert/render/MultiRowRenderingUtilities.java b/src/main/java/org/mybatis/dynamic/sql/insert/render/MultiRowRenderingUtilities.java
@@ -15,7 +15,9 @@
  */
 package org.mybatis.dynamic.sql.insert.render;
 
+import java.util.List;
 import java.util.function.Function;
+import java.util.stream.Collectors;
 
 import org.mybatis.dynamic.sql.util.AbstractColumnMapping;
 
@@ -30,4 +32,11 @@ public static Function<AbstractColumnMapping, FieldAndValue> toFieldAndValue(Mul
     public static FieldAndValue toFieldAndValue(MultiRowValuePhraseVisitor visitor, AbstractColumnMapping insertMapping) {
         return insertMapping.accept(visitor);
     }
+
+    public static String calculateColumnsPhrase(List<FieldAndValue> fieldsAndValues) {
+        return fieldsAndValues.stream()
+                .map(FieldAndValue::fieldName)
+                .collect(Collectors.joining(", ", "(", ")")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    }
+
 }
diff --git a/src/test/java/org/mybatis/dynamic/sql/insert/InsertStatementTest.java b/src/test/java/org/mybatis/dynamic/sql/insert/InsertStatementTest.java
@@ -16,19 +16,13 @@
 package org.mybatis.dynamic.sql.insert;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertAll;
 import static org.mybatis.dynamic.sql.SqlBuilder.insert;
 
 import java.sql.JDBCType;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collector;
 
 import org.junit.jupiter.api.Test;
 import org.mybatis.dynamic.sql.SqlColumn;
 import org.mybatis.dynamic.sql.SqlTable;
-import org.mybatis.dynamic.sql.insert.render.FieldAndValue;
-import org.mybatis.dynamic.sql.insert.render.FieldAndValueCollector;
 import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
 import org.mybatis.dynamic.sql.render.RenderingStrategies;
 
@@ -121,70 +115,6 @@ void testSelectiveInsertStatementBuilder() {
         assertThat(insertStatement.getInsertStatement()).isEqualTo(expected);
     }
 
-    @Test
-    void testParallelStream() {
-
-        List<FieldAndValue> mappings = new ArrayList<>();
-        
-        mappings.add(newFieldAndValue(id.name(), "{record.id}"));
-        mappings.add(newFieldAndValue(firstName.name(), "{record.firstName}"));
-        mappings.add(newFieldAndValue(lastName.name(), "{record.lastName}"));
-        mappings.add(newFieldAndValue(occupation.name(), "{record.occupation}"));
-        
-        FieldAndValueCollector collector = 
-                mappings.parallelStream().collect(Collector.of(
-                        FieldAndValueCollector::new,
-                        FieldAndValueCollector::add,
-                        FieldAndValueCollector::merge));
-                
-        String expectedColumnsPhrase = "(id, first_name, last_name, occupation)";
-        String expectedValuesPhrase = "values ({record.id}, {record.firstName}, {record.lastName}, {record.occupation})";
-        
-        assertAll(
-                () -> assertThat(collector.columnsPhrase()).isEqualTo(expectedColumnsPhrase),
-                () -> assertThat(collector.valuesPhrase()).isEqualTo(expectedValuesPhrase)
-        );
-    }
-    
-    private FieldAndValue newFieldAndValue(String fieldName, String valuePhrase) {
-        return FieldAndValue.withFieldName(fieldName)
-                .withValuePhrase(valuePhrase)
-                .build();
-    }
-    
-    @Test
-    void testParallelStreamForMultiRecord() {
-
-        List<FieldAndValue> mappings = new ArrayList<>();
-        
-        mappings.add(newFieldAndValues(id.name(), "#{records[%s].id}"));
-        mappings.add(newFieldAndValues(firstName.name(), "#{records[%s].firstName}"));
-        mappings.add(newFieldAndValues(lastName.name(), "#{records[%s].lastName}"));
-        mappings.add(newFieldAndValues(occupation.name(), "#{records[%s].occupation}"));
-        
-        FieldAndValueCollector collector = 
-                mappings.parallelStream().collect(Collector.of(
-                        FieldAndValueCollector::new,
-                        FieldAndValueCollector::add,
-                        FieldAndValueCollector::merge));
-                
-        String expectedColumnsPhrase = "(id, first_name, last_name, occupation)";
-        String expectedValuesPhrase = "values"
-                + " (#{records[0].id}, #{records[0].firstName}, #{records[0].lastName}, #{records[0].occupation}),"
-                + " (#{records[1].id}, #{records[1].firstName}, #{records[1].lastName}, #{records[1].occupation})";
-        
-        assertAll(
-                () -> assertThat(collector.columnsPhrase()).isEqualTo(expectedColumnsPhrase),
-                () -> assertThat(collector.multiRowInsertValuesPhrase(2)).isEqualTo(expectedValuesPhrase)
-        );
-    }
-    
-    private FieldAndValue newFieldAndValues(String fieldName, String valuePhrase) {
-        return FieldAndValue.withFieldName(fieldName)
-                .withValuePhrase(valuePhrase)
-                .build();
-    }
-    
     static class TestRecord {
         private Integer id;
         private String firstName;
