Remove another useless custom collector

Author: jeffgbutler

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

@@ -17,9 +17,13 @@
 
 import static org.mybatis.dynamic.sql.util.StringUtilities.spaceBefore;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.function.Function;
+import java.util.stream.Collectors;
 
 import org.mybatis.dynamic.sql.insert.GeneralInsertModel;
 import org.mybatis.dynamic.sql.render.RenderingStrategy;
@@ -37,19 +41,19 @@ private GeneralInsertRenderer(Builder builder) {
 
     public GeneralInsertStatementProvider render() {
         GeneralInsertValuePhraseVisitor visitor = new GeneralInsertValuePhraseVisitor(renderingStrategy);
-        FieldAndValueAndParametersCollector collector = model.mapColumnMappings(toFieldAndValue(visitor))
-                .collect(FieldAndValueAndParametersCollector.collect());
+        List<Optional<FieldAndValueAndParameters>> fieldsAndValues = model.mapColumnMappings(toFieldAndValue(visitor))
+                .collect(Collectors.toList());
 
-        return DefaultGeneralInsertStatementProvider.withInsertStatement(calculateInsertStatement(collector))
-                .withParameters(collector.parameters())
+        return DefaultGeneralInsertStatementProvider.withInsertStatement(calculateInsertStatement(fieldsAndValues))
+                .withParameters(calculateParameters(fieldsAndValues))
                 .build();
     }
 
-    private String calculateInsertStatement(FieldAndValueAndParametersCollector collector) {
+    private String calculateInsertStatement(List<Optional<FieldAndValueAndParameters>> fieldsAndValues) {
         return "insert into" //$NON-NLS-1$
                 + spaceBefore(model.table().tableNameAtRuntime())
-                + spaceBefore(collector.columnsPhrase())
-                + spaceBefore(collector.valuesPhrase());
+                + spaceBefore(calculateColumnsPhrase(fieldsAndValues))
+                + spaceBefore(calculateValuesPhrase(fieldsAndValues));
     }
 
     private Function<AbstractColumnMapping, Optional<FieldAndValueAndParameters>> toFieldAndValue(
@@ -62,6 +66,30 @@ private Optional<FieldAndValueAndParameters> toFieldAndValue(GeneralInsertValueP
         return insertMapping.accept(visitor);
     }
 
+    private String calculateColumnsPhrase(List<Optional<FieldAndValueAndParameters>> fieldsAndValues) {
+        return fieldsAndValues.stream()
+                .filter(Optional::isPresent)
+                .map(Optional::get)
+                .map(FieldAndValueAndParameters::fieldName)
+                .collect(Collectors.joining(", ", "(", ")")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    }
+
+    private String calculateValuesPhrase(List<Optional<FieldAndValueAndParameters>> fieldsAndValues) {
+        return fieldsAndValues.stream()
+                .filter(Optional::isPresent)
+                .map(Optional::get)
+                .map(FieldAndValueAndParameters::valuePhrase)
+                .collect(Collectors.joining(", ", "values (", ")")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    }
+    
+    private Map<String, Object> calculateParameters(List<Optional<FieldAndValueAndParameters>> fieldsAndValues) {
+        return fieldsAndValues.stream()
+                .filter(Optional::isPresent)
+                .map(Optional::get)
+                .map(FieldAndValueAndParameters::parameters)
+                .collect(HashMap::new, HashMap::putAll, HashMap::putAll);
+    }
+
     public static Builder withInsertModel(GeneralInsertModel model) {
         return new Builder().withInsertModel(model);
     }

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

@@ -22,15 +22,12 @@
 import java.sql.JDBCType;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Optional;
 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.FieldAndValueAndParameters;
-import org.mybatis.dynamic.sql.insert.render.FieldAndValueAndParametersCollector;
 import org.mybatis.dynamic.sql.insert.render.FieldAndValueCollector;
 import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
 import org.mybatis.dynamic.sql.render.RenderingStrategies;
@@ -155,40 +152,6 @@ private FieldAndValue newFieldAndValue(String fieldName, String valuePhrase) {
                 .build();
     }
 
-    @Test
-    void testParallelStreamWithParameters() {
-
-        List<Optional<FieldAndValueAndParameters>> mappings = new ArrayList<>();
-        
-        mappings.add(newFieldAndValueAndParameter(id.name(), "{p1}", "p1", 1));
-        mappings.add(newFieldAndValueAndParameter(firstName.name(), "{p2}", "p2", "Fred"));
-        mappings.add(newFieldAndValueAndParameter(lastName.name(), "{p3}", "p3", "Flintstone"));
-        mappings.add(newFieldAndValueAndParameter(occupation.name(), "{p4}", "p4", "Driver"));
-        
-        FieldAndValueAndParametersCollector collector = 
-                mappings.parallelStream().collect(Collector.of(
-                        FieldAndValueAndParametersCollector::new,
-                        FieldAndValueAndParametersCollector::add,
-                        FieldAndValueAndParametersCollector::merge));
-                
-        String expectedColumnsPhrase = "(id, first_name, last_name, occupation)";
-        String expectedValuesPhrase = "values ({p1}, {p2}, {p3}, {p4})";
-        
-        assertAll(
-                () -> assertThat(collector.columnsPhrase()).isEqualTo(expectedColumnsPhrase),
-                () -> assertThat(collector.valuesPhrase()).isEqualTo(expectedValuesPhrase),
-                () -> assertThat(collector.parameters()).hasSize(4)
-        );
-    }
-    
-    private Optional<FieldAndValueAndParameters> newFieldAndValueAndParameter(String fieldName, String valuePhrase, String parameterName,
-            Object parameterValue) {
-        return FieldAndValueAndParameters.withFieldName(fieldName)
-                .withValuePhrase(valuePhrase)
-                .withParameter(parameterName, parameterValue)
-                .buildOptional();
-    }
-    
     @Test
     void testParallelStreamForMultiRecord() {