Move all insert rendering into the insert renderers

jeffgbutler · jeffgbutler · commit 12972ab9c07b · 2019-04-07T14:41:19.000-04:00
diff --git a/src/main/java/org/mybatis/dynamic/sql/insert/render/BatchInsert.java b/src/main/java/org/mybatis/dynamic/sql/insert/render/BatchInsert.java
@@ -1,5 +1,5 @@
 /**
- *    Copyright 2016-2018 the original author or authors.
+ *    Copyright 2016-2019 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -15,24 +15,18 @@
  */
 package org.mybatis.dynamic.sql.insert.render;
 
-import static org.mybatis.dynamic.sql.util.StringUtilities.spaceBefore;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
 public class BatchInsert<T> {
-    private String tableName;
-    private String columnsPhrase;
-    private String valuesPhrase;
+    private String insertStatement;
     private List<T> records;
     
     private BatchInsert(Builder<T> builder) {
-        tableName = Objects.requireNonNull(builder.tableName);
-        columnsPhrase = Objects.requireNonNull(builder.columnsPhrase);
-        valuesPhrase = Objects.requireNonNull(builder.valuesPhrase);
+        insertStatement = Objects.requireNonNull(builder.insertStatement);
         records = Collections.unmodifiableList(Objects.requireNonNull(builder.records));
     }
     
@@ -49,9 +43,7 @@ public List<InsertStatementProvider<T>> insertStatements() {
     
     private InsertStatementProvider<T> toInsertStatement(T record) {
         return DefaultInsertStatementProvider.withRecord(record)
-                .withTableName(tableName)
-                .withColumnsPhrase(columnsPhrase)
-                .withValuesPhrase(valuesPhrase)
+                .withInsertStatement(insertStatement)
                 .build();
     }
 
@@ -61,37 +53,22 @@ private InsertStatementProvider<T> toInsertStatement(T record) {
      * @return the generated INSERT statement
      */
     public String getInsertStatementSQL() {
-        return "insert into" //$NON-NLS-1$
-                + spaceBefore(tableName)
-                + spaceBefore(columnsPhrase)
-                + spaceBefore(valuesPhrase);
+        return insertStatement;
     }
     
     public static <T> Builder<T> withRecords(List<T> records) {
         return new Builder<T>().withRecords(records);
     }
     
     public static class Builder<T> {
-        private String tableName;
-        private String columnsPhrase;
-        private String valuesPhrase;
+        private String insertStatement;
         private List<T> records = new ArrayList<>();
         
-        public Builder<T> withTableName(String tableName) {
-            this.tableName = tableName;
+        public Builder<T> withInsertStatement(String insertStatement) {
+            this.insertStatement = insertStatement;
             return this;
         }
 
-        public Builder<T> withColumnsPhrase(String columnsPhrase) {
-            this.columnsPhrase = columnsPhrase;
-            return this;
-        }
-        
-        public Builder<T> withValuesPhrase(String valuesPhrase) {
-            this.valuesPhrase = valuesPhrase;
-            return this;
-        }
-        
         public Builder<T> withRecords(List<T> records) {
             this.records.addAll(records);
             return this;
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
@@ -1,5 +1,5 @@
 /**
- *    Copyright 2016-2017 the original author or authors.
+ *    Copyright 2016-2019 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -15,6 +15,8 @@
  */
 package org.mybatis.dynamic.sql.insert.render;
 
+import static org.mybatis.dynamic.sql.util.StringUtilities.spaceBefore;
+
 import java.util.Objects;
 import java.util.function.Function;
 
@@ -36,10 +38,9 @@ public BatchInsert<T> render() {
         ValuePhraseVisitor visitor = new ValuePhraseVisitor(renderingStrategy);
         FieldAndValueCollector<T> collector = model.mapColumnMappings(toFieldAndValue(visitor))
                 .collect(FieldAndValueCollector.collect());
+        
         return BatchInsert.withRecords(model.records())
-                .withTableName(model.table().name())
-                .withColumnsPhrase(collector.columnsPhrase())
-                .withValuesPhrase(collector.valuesPhrase())
+                .withInsertStatement(calculateInsertStatement(collector))
                 .build();
     }
     
@@ -50,6 +51,13 @@ private Function<InsertMapping, FieldAndValue> toFieldAndValue(ValuePhraseVisito
     private FieldAndValue toFieldAndValue(ValuePhraseVisitor visitor, InsertMapping insertMapping) {
         return insertMapping.accept(visitor);
     }
+
+    private String calculateInsertStatement(FieldAndValueCollector<T> collector) {
+        return "insert into" //$NON-NLS-1$
+                + spaceBefore(model.table().name())
+                + spaceBefore(collector.columnsPhrase())
+                + spaceBefore(collector.valuesPhrase());
+    }
     
     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/DefaultInsertSelectStatementProvider.java b/src/main/java/org/mybatis/dynamic/sql/insert/render/DefaultInsertSelectStatementProvider.java
@@ -1,5 +1,5 @@
 /**
- *    Copyright 2016-2018 the original author or authors.
+ *    Copyright 2016-2019 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -15,64 +15,42 @@
  */
 package org.mybatis.dynamic.sql.insert.render;
 
-import static org.mybatis.dynamic.sql.util.StringUtilities.spaceBefore;
-
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
-import java.util.Optional;
 
 public class DefaultInsertSelectStatementProvider implements InsertSelectStatementProvider {
-    private String tableName;
-    private Optional<String> columnsPhrase;
-    private String selectStatement;
+    private String insertStatement;
     private Map<String, Object> parameters;
     
     private DefaultInsertSelectStatementProvider(Builder builder) {
-        tableName = Objects.requireNonNull(builder.tableName);
-        columnsPhrase = Objects.requireNonNull(builder.columnsPhrase);
-        selectStatement = Objects.requireNonNull(builder.selectStatement);
+        insertStatement = Objects.requireNonNull(builder.insertStatement);
         parameters = Objects.requireNonNull(builder.parameters);
     }
     
     @Override
     public String getInsertStatement() {
-        return "insert into" //$NON-NLS-1$
-                + spaceBefore(tableName)
-                + spaceBefore(columnsPhrase)
-                + spaceBefore(selectStatement);
+        return insertStatement;
     }
     
     @Override
     public Map<String, Object> getParameters() {
         return parameters;
     }
 
-    public static Builder withTableName(String tableName) {
-        return new Builder().withTableName(tableName);
+    public static Builder withInsertStatement(String insertStatement) {
+        return new Builder().withInsertStatement(insertStatement);
     }
     
     public static class Builder {
-        private String tableName;
-        private Optional<String> columnsPhrase;
-        private String selectStatement;
+        private String insertStatement;
         private Map<String, Object> parameters = new HashMap<>();
         
-        public Builder withTableName(String tableName) {
-            this.tableName = tableName;
+        public Builder withInsertStatement(String insertStatement) {
+            this.insertStatement = insertStatement;
             return this;
         }
 
-        public Builder withColumnsPhrase(Optional<String> columnsPhrase) {
-            this.columnsPhrase = columnsPhrase;
-            return this;
-        }
-        
-        public Builder withSelectStatement(String selectStatement) {
-            this.selectStatement = selectStatement;
-            return this;
-        }
-        
         public Builder withParameters(Map<String, Object> parameters) {
             this.parameters.putAll(parameters);
             return this;
diff --git a/src/main/java/org/mybatis/dynamic/sql/insert/render/DefaultInsertStatementProvider.java b/src/main/java/org/mybatis/dynamic/sql/insert/render/DefaultInsertStatementProvider.java
@@ -1,5 +1,5 @@
 /**
- *    Copyright 2016-2018 the original author or authors.
+ *    Copyright 2016-2019 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -15,20 +15,14 @@
  */
 package org.mybatis.dynamic.sql.insert.render;
 
-import static org.mybatis.dynamic.sql.util.StringUtilities.spaceBefore;
-
 import java.util.Objects;
 
 public class DefaultInsertStatementProvider<T> implements InsertStatementProvider<T> {
-    private String tableName;
-    private String columnsPhrase;
-    private String valuesPhrase;
+    private String insertStatement;
     private T record;
     
     private DefaultInsertStatementProvider(Builder<T> builder) {
-        tableName = Objects.requireNonNull(builder.tableName);
-        columnsPhrase = Objects.requireNonNull(builder.columnsPhrase);
-        valuesPhrase = Objects.requireNonNull(builder.valuesPhrase);
+        insertStatement = Objects.requireNonNull(builder.insertStatement);
         record = Objects.requireNonNull(builder.record);
     }
     
@@ -39,37 +33,22 @@ public T getRecord() {
     
     @Override
     public String getInsertStatement() {
-        return "insert into" //$NON-NLS-1$
-                + spaceBefore(tableName)
-                + spaceBefore(columnsPhrase)
-                + spaceBefore(valuesPhrase);
+        return insertStatement;
     }
 
     public static <T> Builder<T> withRecord(T record) {
         return new Builder<T>().withRecord(record);
     }
     
     public static class Builder<T> {
-        private String tableName;
-        private String columnsPhrase;
-        private String valuesPhrase;
+        private String insertStatement;
         private T record;
         
-        public Builder<T> withTableName(String tableName) {
-            this.tableName = tableName;
+        public Builder<T> withInsertStatement(String insertStatement) {
+            this.insertStatement = insertStatement;
             return this;
         }
 
-        public Builder<T> withColumnsPhrase(String columnsPhrase) {
-            this.columnsPhrase = columnsPhrase;
-            return this;
-        }
-        
-        public Builder<T> withValuesPhrase(String valuesPhrase) {
-            this.valuesPhrase = valuesPhrase;
-            return this;
-        }
-        
         public Builder<T> withRecord(T record) {
             this.record = record;
             return this;
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
@@ -1,5 +1,5 @@
 /**
- *    Copyright 2016-2018 the original author or authors.
+ *    Copyright 2016-2019 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -15,6 +15,8 @@
  */
 package org.mybatis.dynamic.sql.insert.render;
 
+import static org.mybatis.dynamic.sql.util.StringUtilities.spaceBefore;
+
 import java.util.Objects;
 import java.util.function.Function;
 
@@ -36,13 +38,19 @@ public InsertStatementProvider<T> render() {
         ValuePhraseVisitor visitor = new ValuePhraseVisitor(renderingStrategy);
         FieldAndValueCollector<T> collector = model.mapColumnMappings(toFieldAndValue(visitor))
                 .collect(FieldAndValueCollector.collect());
+        
         return DefaultInsertStatementProvider.withRecord(model.record())
-                .withTableName(model.table().name())
-                .withColumnsPhrase(collector.columnsPhrase())
-                .withValuesPhrase(collector.valuesPhrase())
+                .withInsertStatement(calculateInsertStatement(collector))
                 .build();
     }
 
+    private String calculateInsertStatement(FieldAndValueCollector<T> collector) {
+        return "insert into" //$NON-NLS-1$
+                + spaceBefore(model.table().name())
+                + spaceBefore(collector.columnsPhrase())
+                + spaceBefore(collector.valuesPhrase());
+    }
+
     private Function<InsertMapping, FieldAndValue> toFieldAndValue(ValuePhraseVisitor visitor) {
         return insertMapping -> toFieldAndValue(visitor, insertMapping);
     }
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
@@ -1,5 +1,5 @@
 /**
- *    Copyright 2016-2018 the original author or authors.
+ *    Copyright 2016-2019 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -15,6 +15,8 @@
  */
 package org.mybatis.dynamic.sql.insert.render;
 
+import static org.mybatis.dynamic.sql.util.StringUtilities.spaceBefore;
+
 import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Collectors;
@@ -38,13 +40,18 @@ private InsertSelectRenderer(Builder builder) {
     public InsertSelectStatementProvider render() {
         SelectStatementProvider selectStatement = model.selectModel().render(renderingStrategy);
         
-        return DefaultInsertSelectStatementProvider.withTableName(model.table().name())
-                .withColumnsPhrase(calculateColumnsPhrase())
-                .withSelectStatement(selectStatement.getSelectStatement())
+        return DefaultInsertSelectStatementProvider.withInsertStatement(calculateInsertStatement(selectStatement))
                 .withParameters(selectStatement.getParameters())
                 .build();
     }
     
+    private String calculateInsertStatement(SelectStatementProvider selectStatement) {
+        return "insert into" //$NON-NLS-1$
+                + spaceBefore(model.table().name())
+                + spaceBefore(calculateColumnsPhrase())
+                + spaceBefore(selectStatement.getSelectStatement());
+    }
+    
     private Optional<String> calculateColumnsPhrase() {
         return model.columnList()
                 .map(this::calculateColumnsPhrase);
