Consistent naming

Author: jeffgbutler

src/main/java/org/mybatis/dynamic/sql/SqlBuilder.java

@@ -111,20 +111,20 @@ static <T> InsertDSL.IntoGatherer<T> insert(T record) {
     }
 
     @SafeVarargs
-    static <T> BatchInsertDSL.BatchIntoGatherer<T> insert(T...records) {
+    static <T> BatchInsertDSL.IntoGatherer<T> insert(T...records) {
         return BatchInsertDSL.insert(records);
     }
 
-    static <T> BatchInsertDSL.BatchIntoGatherer<T> insert(Collection<T> records) {
+    static <T> BatchInsertDSL.IntoGatherer<T> insert(Collection<T> records) {
         return BatchInsertDSL.insert(records);
     }
 
     @SafeVarargs
-    static <T> MultiRowInsertDSL.MultiRowIntoGatherer<T> insertMultiple(T...records) {
+    static <T> MultiRowInsertDSL.IntoGatherer<T> insertMultiple(T...records) {
         return MultiRowInsertDSL.insert(records);
     }
 
-    static <T> MultiRowInsertDSL.MultiRowIntoGatherer<T> insertMultiple(Collection<T> records) {
+    static <T> MultiRowInsertDSL.IntoGatherer<T> insertMultiple(Collection<T> records) {
         return MultiRowInsertDSL.insert(records);
     }
 

src/main/java/org/mybatis/dynamic/sql/insert/BatchInsertDSL.java

@@ -39,8 +39,8 @@ private BatchInsertDSL(Collection<T> records, SqlTable table) {
         this.table = table;
     }
 
-    public <F> BatchColumnMappingFinisher<F> map(SqlColumn<F> column) {
-        return new BatchColumnMappingFinisher<>(column);
+    public <F> ColumnMappingFinisher<F> map(SqlColumn<F> column) {
+        return new ColumnMappingFinisher<>(column);
     }
 
     public BatchInsertModel<T> build() {
@@ -51,18 +51,18 @@ public BatchInsertModel<T> build() {
     }
 
     @SafeVarargs
-    public static <T> BatchIntoGatherer<T> insert(T...records) {
-        return new BatchIntoGatherer<>(Arrays.asList(records));
+    public static <T> IntoGatherer<T> insert(T...records) {
+        return BatchInsertDSL.insert(Arrays.asList(records));
     }
 
-    public static <T> BatchIntoGatherer<T> insert(Collection<T> records) {
-        return new BatchIntoGatherer<>(records);
+    public static <T> IntoGatherer<T> insert(Collection<T> records) {
+        return new IntoGatherer<>(records);
     }
 
-    public static class BatchIntoGatherer<T> {
+    public static class IntoGatherer<T> {
         private Collection<T> records;
 
-        private BatchIntoGatherer(Collection<T> records) {
+        private IntoGatherer(Collection<T> records) {
             this.records = records;
         }
 
@@ -71,10 +71,10 @@ public BatchInsertDSL<T> into(SqlTable table) {
         }
     }
 
-    public class BatchColumnMappingFinisher<F> {
+    public class ColumnMappingFinisher<F> {
         private SqlColumn<F> column;
 
-        public BatchColumnMappingFinisher(SqlColumn<F> column) {
+        public ColumnMappingFinisher(SqlColumn<F> column) {
             this.column = column;
         }
 

src/main/java/org/mybatis/dynamic/sql/insert/MultiRowInsertDSL.java

@@ -51,18 +51,18 @@ public MultiRowInsertModel<T> build() {
     }
 
     @SafeVarargs
-    public static <T> MultiRowIntoGatherer<T> insert(T...records) {
-        return new MultiRowIntoGatherer<>(Arrays.asList(records));
+    public static <T> IntoGatherer<T> insert(T...records) {
+        return MultiRowInsertDSL.insert(Arrays.asList(records));
     }
 
-    public static <T> MultiRowIntoGatherer<T> insert(Collection<T> records) {
-        return new MultiRowIntoGatherer<>(records);
+    public static <T> IntoGatherer<T> insert(Collection<T> records) {
+        return new IntoGatherer<>(records);
     }
 
-    public static class MultiRowIntoGatherer<T> {
+    public static class IntoGatherer<T> {
         private Collection<T> records;
 
-        private MultiRowIntoGatherer(Collection<T> records) {
+        private IntoGatherer(Collection<T> records) {
             this.records = records;
         }