Consistent naming

jeffgbutler · jeffgbutler · commit d7e6562198b2 · 2019-07-15T14:22:15.000-04:00
diff --git a/src/main/java/org/mybatis/dynamic/sql/SqlBuilder.java b/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);
     }
     
diff --git a/src/main/java/org/mybatis/dynamic/sql/insert/BatchInsertDSL.java b/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;
         }
             
diff --git a/src/main/java/org/mybatis/dynamic/sql/insert/MultiRowInsertDSL.java b/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;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -111,20 +111,20 @@ static <T> InsertDSL.IntoGatherer<T> insert(T record) {`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`@SafeVarargs`
`114`		`- static <T> BatchInsertDSL.BatchIntoGatherer<T> insert(T...records) {`
	`114`	`+ static <T> BatchInsertDSL.IntoGatherer<T> insert(T...records) {`
`115`	`115`	`return BatchInsertDSL.insert(records);`
`116`	`116`	`}`
`117`	`117`
`118`		`- static <T> BatchInsertDSL.BatchIntoGatherer<T> insert(Collection<T> records) {`
	`118`	`+ static <T> BatchInsertDSL.IntoGatherer<T> insert(Collection<T> records) {`
`119`	`119`	`return BatchInsertDSL.insert(records);`
`120`	`120`	`}`
`121`	`121`
`122`	`122`	`@SafeVarargs`
`123`		`- static <T> MultiRowInsertDSL.MultiRowIntoGatherer<T> insertMultiple(T...records) {`
	`123`	`+ static <T> MultiRowInsertDSL.IntoGatherer<T> insertMultiple(T...records) {`
`124`	`124`	`return MultiRowInsertDSL.insert(records);`
`125`	`125`	`}`
`126`	`126`
`127`		`- static <T> MultiRowInsertDSL.MultiRowIntoGatherer<T> insertMultiple(Collection<T> records) {`
	`127`	`+ static <T> MultiRowInsertDSL.IntoGatherer<T> insertMultiple(Collection<T> records) {`
`128`	`128`	`return MultiRowInsertDSL.insert(records);`
`129`	`129`	`}`
`130`	`130`
Original file line number	Diff line number	Diff line change
`@@ -39,8 +39,8 @@ private BatchInsertDSL(Collection<T> records, SqlTable table) {`
`39`	`39`	`this.table = table;`
`40`	`40`	`}`
`41`	`41`
`42`		`- public <F> BatchColumnMappingFinisher<F> map(SqlColumn<F> column) {`
`43`		`- return new BatchColumnMappingFinisher<>(column);`
	`42`	`+ public <F> ColumnMappingFinisher<F> map(SqlColumn<F> column) {`
	`43`	`+ return new ColumnMappingFinisher<>(column);`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`public BatchInsertModel<T> build() {`
`@@ -51,18 +51,18 @@ public BatchInsertModel<T> build() {`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`@SafeVarargs`
`54`		`- public static <T> BatchIntoGatherer<T> insert(T...records) {`
`55`		`- return new BatchIntoGatherer<>(Arrays.asList(records));`
	`54`	`+ public static <T> IntoGatherer<T> insert(T...records) {`
	`55`	`+ return BatchInsertDSL.insert(Arrays.asList(records));`
`56`	`56`	`}`
`57`	`57`
`58`		`- public static <T> BatchIntoGatherer<T> insert(Collection<T> records) {`
`59`		`- return new BatchIntoGatherer<>(records);`
	`58`	`+ public static <T> IntoGatherer<T> insert(Collection<T> records) {`
	`59`	`+ return new IntoGatherer<>(records);`
`60`	`60`	`}`
`61`	`61`
`62`		`- public static class BatchIntoGatherer<T> {`
	`62`	`+ public static class IntoGatherer<T> {`
`63`	`63`	`private Collection<T> records;`
`64`	`64`
`65`		`- private BatchIntoGatherer(Collection<T> records) {`
	`65`	`+ private IntoGatherer(Collection<T> records) {`
`66`	`66`	`this.records = records;`
`67`	`67`	`}`
`68`	`68`
`@@ -71,10 +71,10 @@ public BatchInsertDSL<T> into(SqlTable table) {`
`71`	`71`	`}`
`72`	`72`	`}`
`73`	`73`
`74`		`- public class BatchColumnMappingFinisher<F> {`
	`74`	`+ public class ColumnMappingFinisher<F> {`
`75`	`75`	`private SqlColumn<F> column;`
`76`	`76`
`77`		`- public BatchColumnMappingFinisher(SqlColumn<F> column) {`
	`77`	`+ public ColumnMappingFinisher(SqlColumn<F> column) {`
`78`	`78`	`this.column = column;`
`79`	`79`	`}`
`80`	`80`
Original file line number	Diff line number	Diff line change
`@@ -51,18 +51,18 @@ public MultiRowInsertModel<T> build() {`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`@SafeVarargs`
`54`		`- public static <T> MultiRowIntoGatherer<T> insert(T...records) {`
`55`		`- return new MultiRowIntoGatherer<>(Arrays.asList(records));`
	`54`	`+ public static <T> IntoGatherer<T> insert(T...records) {`
	`55`	`+ return MultiRowInsertDSL.insert(Arrays.asList(records));`
`56`	`56`	`}`
`57`	`57`
`58`		`- public static <T> MultiRowIntoGatherer<T> insert(Collection<T> records) {`
`59`		`- return new MultiRowIntoGatherer<>(records);`
	`58`	`+ public static <T> IntoGatherer<T> insert(Collection<T> records) {`
	`59`	`+ return new IntoGatherer<>(records);`
`60`	`60`	`}`
`61`	`61`
`62`		`- public static class MultiRowIntoGatherer<T> {`
	`62`	`+ public static class IntoGatherer<T> {`
`63`	`63`	`private Collection<T> records;`
`64`	`64`
`65`		`- private MultiRowIntoGatherer(Collection<T> records) {`
	`65`	`+ private IntoGatherer(Collection<T> records) {`
`66`	`66`	`this.records = records;`
`67`	`67`	`}`
`68`	`68`