Better names

jeffgbutler · jeffgbutler · commit e929593fe0e8 · 2019-07-15T10:53:06.000-04:00
diff --git a/src/main/java/org/mybatis/dynamic/sql/util/SqlProviderAdapter.java b/src/main/java/org/mybatis/dynamic/sql/util/SqlProviderAdapter.java
@@ -38,7 +38,7 @@ public String insert(InsertStatementProvider<?> insertStatement) {
         return insertStatement.getInsertStatement();
     }
     
-    public String multiRowInsert(MultiRowInsertStatementProvider<?> insertStatement) {
+    public String insertMultiple(MultiRowInsertStatementProvider<?> insertStatement) {
         return insertStatement.getInsertStatement();
     }
     
diff --git a/src/test/java/examples/generated/always/mybatis/GeneratedAlwaysAnnotatedMapper.java b/src/test/java/examples/generated/always/mybatis/GeneratedAlwaysAnnotatedMapper.java
@@ -55,8 +55,8 @@ public interface GeneratedAlwaysAnnotatedMapper {
     @UpdateProvider(type=SqlProviderAdapter.class, method="update")
     int update(UpdateStatementProvider updateStatement);
     
-    @InsertProvider(type=SqlProviderAdapter.class, method="multiRowInsert")
-    int multiInsert(MultiRowInsertStatementProvider<GeneratedAlwaysRecord> multiInsert);
+    @InsertProvider(type=SqlProviderAdapter.class, method="insertMultiple")
+    int insertMultiple(MultiRowInsertStatementProvider<GeneratedAlwaysRecord> multiInsert);
 
     // TODO - this is kludgy. Currently MyBatis does not support nested lists in parameter objects
     // when returning generated keys.
@@ -66,9 +66,9 @@ public interface GeneratedAlwaysAnnotatedMapper {
         "${insertStatement}"
     })
     @Options(useGeneratedKeys=true, keyProperty="records.fullName")
-    int multiInsertWithGeneratedKeys(@Param("insertStatement") String statement, @Param("records") List<GeneratedAlwaysRecord> records);
+    int insertMultipleWithGeneratedKeys(@Param("insertStatement") String statement, @Param("records") List<GeneratedAlwaysRecord> records);
 
-    default int multiInsertWithGeneratedKeys(MultiRowInsertStatementProvider<GeneratedAlwaysRecord> multiInsert) {
-        return multiInsertWithGeneratedKeys(multiInsert.getInsertStatement(), multiInsert.getRecords());
+    default int insertMultipleWithGeneratedKeys(MultiRowInsertStatementProvider<GeneratedAlwaysRecord> multiInsert) {
+        return insertMultipleWithGeneratedKeys(multiInsert.getInsertStatement(), multiInsert.getRecords());
     }
 }
diff --git a/src/test/java/examples/generated/always/mybatis/GeneratedAlwaysAnnotatedMapperTest.java b/src/test/java/examples/generated/always/mybatis/GeneratedAlwaysAnnotatedMapperTest.java
@@ -194,7 +194,7 @@ public void testMultiInsertWithRawMyBatisAnnotations() {
                     " (#{records[2].id,jdbcType=INTEGER}, #{records[2].firstName,jdbcType=VARCHAR}, #{records[2].lastName,jdbcType=VARCHAR})," +
                     " (#{records[3].id,jdbcType=INTEGER}, #{records[3].firstName,jdbcType=VARCHAR}, #{records[3].lastName,jdbcType=VARCHAR})";
             
-            int rows = mapper.multiInsertWithGeneratedKeys(statement, records);
+            int rows = mapper.insertMultipleWithGeneratedKeys(statement, records);
             
             assertAll(
                     () -> assertThat(rows).isEqualTo(4),
@@ -207,7 +207,7 @@ public void testMultiInsertWithRawMyBatisAnnotations() {
     }
     
     @Test
-    public void testMultiInsertWithList() {
+    public void testMultiInsertWithListAndGeneratedKeys() {
         try (SqlSession session = sqlSessionFactory.openSession()) {
             GeneratedAlwaysAnnotatedMapper mapper = session.getMapper(GeneratedAlwaysAnnotatedMapper.class);
             List<GeneratedAlwaysRecord> records = getTestRecords();
@@ -229,7 +229,7 @@ public void testMultiInsertWithList() {
 
             assertThat(multiRowInsert.getInsertStatement()).isEqualTo(statement);
             
-            int rows = mapper.multiInsertWithGeneratedKeys(multiRowInsert);
+            int rows = mapper.insertMultipleWithGeneratedKeys(multiRowInsert);
             
             assertAll(
                     () -> assertThat(rows).isEqualTo(4),
@@ -271,7 +271,7 @@ public void testMultiInsertWithArray() {
 
             assertThat(multiRowInsert.getInsertStatement()).isEqualTo(statement);
             
-            int rows = mapper.multiInsert(multiRowInsert);
+            int rows = mapper.insertMultiple(multiRowInsert);
             assertThat(rows).isEqualTo(2);
         }
     }
@@ -300,7 +300,7 @@ public void testMultiInsertWithArrayAndVariousMappings() {
 
             assertThat(multiRowInsert.getInsertStatement()).isEqualTo(statement);
             
-            int rows = mapper.multiInsertWithGeneratedKeys(multiRowInsert);
+            int rows = mapper.insertMultipleWithGeneratedKeys(multiRowInsert);
             
             assertAll(
                     () -> assertThat(rows).isEqualTo(1),

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public String insert(InsertStatementProvider<?> insertStatement) {`
`38`	`38`	`return insertStatement.getInsertStatement();`
`39`	`39`	`}`
`40`	`40`
`41`		`- public String multiRowInsert(MultiRowInsertStatementProvider<?> insertStatement) {`
	`41`	`+ public String insertMultiple(MultiRowInsertStatementProvider<?> insertStatement) {`
`42`	`42`	`return insertStatement.getInsertStatement();`
`43`	`43`	`}`
`44`	`44`