Merge pull request #529 from jeffgbutler/record-to-row

jeffgbutler · web-flow · commit 772c60e4d95d · 2022-09-09T15:37:10.000-04:00
Miscellaneous Code Polishing
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
@@ -35,7 +35,7 @@ private BatchInsertRenderer(Builder<T> builder) {
     }
 
     public BatchInsert<T> render() {
-        BatchValuePhraseVisitor visitor = new BatchValuePhraseVisitor(renderingStrategy, "record"); //$NON-NLS-1$)
+        BatchValuePhraseVisitor visitor = new BatchValuePhraseVisitor(renderingStrategy, "row"); //$NON-NLS-1$)
         List<FieldAndValue> fieldsAndValues = model
                 .mapColumnMappings(m -> m.accept(visitor))
                 .collect(Collectors.toList());
diff --git a/src/main/java/org/mybatis/dynamic/sql/insert/render/ValuePhraseVisitor.java b/src/main/java/org/mybatis/dynamic/sql/insert/render/ValuePhraseVisitor.java
@@ -73,6 +73,6 @@ public Optional<FieldAndValue> visit(PropertyWhenPresentMapping mapping) {
 
     private String calculateJdbcPlaceholder(SqlColumn<?> column, String parameterName) {
         return column.renderingStrategy().orElse(renderingStrategy)
-                .getFormattedJdbcPlaceholder(column, "record", parameterName); //$NON-NLS-1$
+                .getFormattedJdbcPlaceholder(column, "row", parameterName); //$NON-NLS-1$
     }
 }
diff --git a/src/main/java/org/mybatis/dynamic/sql/util/GeneralInsertMappingVisitor.java b/src/main/java/org/mybatis/dynamic/sql/util/GeneralInsertMappingVisitor.java
@@ -18,21 +18,21 @@
 public abstract class GeneralInsertMappingVisitor<R> implements ColumnMappingVisitor<R> {
     @Override
     public final R visit(SelectMapping mapping) {
-        throw new UnsupportedOperationException();
+        throw new UnsupportedOperationException(Messages.getString("ERROR.31", "1")); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     @Override
     public final R visit(PropertyMapping mapping) {
-        throw new UnsupportedOperationException();
+        throw new UnsupportedOperationException(Messages.getString("ERROR.31", "2")); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     @Override
     public final R visit(PropertyWhenPresentMapping mapping) {
-        throw new UnsupportedOperationException();
+        throw new UnsupportedOperationException(Messages.getString("ERROR.31", "3")); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     @Override
     public final R visit(ColumnToColumnMapping columnMapping) {
-        throw new UnsupportedOperationException();
+        throw new UnsupportedOperationException(Messages.getString("ERROR.31", "4")); //$NON-NLS-1$ //$NON-NLS-2$
     }
 }
diff --git a/src/main/java/org/mybatis/dynamic/sql/util/InsertMappingVisitor.java b/src/main/java/org/mybatis/dynamic/sql/util/InsertMappingVisitor.java
@@ -18,26 +18,26 @@
 public abstract class InsertMappingVisitor<R> implements ColumnMappingVisitor<R> {
     @Override
     public final <T> R visit(ValueMapping<T> mapping) {
-        throw new UnsupportedOperationException();
+        throw new UnsupportedOperationException(Messages.getString("ERROR.31", "5")); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     @Override
     public final <T> R visit(ValueOrNullMapping<T> mapping) {
-        throw new UnsupportedOperationException();
+        throw new UnsupportedOperationException(Messages.getString("ERROR.31", "6")); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     @Override
     public final <T> R visit(ValueWhenPresentMapping<T> mapping) {
-        throw new UnsupportedOperationException();
+        throw new UnsupportedOperationException(Messages.getString("ERROR.31", "7")); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     @Override
     public final R visit(SelectMapping mapping) {
-        throw new UnsupportedOperationException();
+        throw new UnsupportedOperationException(Messages.getString("ERROR.31", "8")); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     @Override
     public final R visit(ColumnToColumnMapping columnMapping) {
-        throw new UnsupportedOperationException();
+        throw new UnsupportedOperationException(Messages.getString("ERROR.31", "9")); //$NON-NLS-1$ //$NON-NLS-2$
     }
 }
diff --git a/src/main/java/org/mybatis/dynamic/sql/util/MultiRowInsertMappingVisitor.java b/src/main/java/org/mybatis/dynamic/sql/util/MultiRowInsertMappingVisitor.java
@@ -18,6 +18,6 @@
 public abstract class MultiRowInsertMappingVisitor<R> extends InsertMappingVisitor<R> {
     @Override
     public final R visit(PropertyWhenPresentMapping mapping) {
-        throw new UnsupportedOperationException();
+        throw new UnsupportedOperationException(Messages.getString("ERROR.31", "12")); //$NON-NLS-1$ //$NON-NLS-2$
     }
 }
diff --git a/src/main/java/org/mybatis/dynamic/sql/util/SqlProviderAdapter.java b/src/main/java/org/mybatis/dynamic/sql/util/SqlProviderAdapter.java
@@ -81,8 +81,7 @@ public String insertMultipleWithGeneratedKeys(Map<String, Object> parameterMap)
         if (entries.size() == 1) {
             return entries.get(0);
         } else {
-            throw new IllegalArgumentException("The parameters for insertMultipleWithGeneratedKeys" //$NON-NLS-1$
-                    + " must contain exactly one parameter of type String"); //$NON-NLS-1$
+            throw new IllegalArgumentException(Messages.getString("ERROR.30")); //$NON-NLS-1$
         }
     }
 
diff --git a/src/main/java/org/mybatis/dynamic/sql/util/UpdateMappingVisitor.java b/src/main/java/org/mybatis/dynamic/sql/util/UpdateMappingVisitor.java
@@ -18,11 +18,11 @@
 public abstract class UpdateMappingVisitor<R> implements ColumnMappingVisitor<R> {
     @Override
     public final R visit(PropertyMapping mapping) {
-        throw new UnsupportedOperationException();
+        throw new UnsupportedOperationException(Messages.getString("ERROR.31", "10")); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     @Override
     public final R visit(PropertyWhenPresentMapping mapping) {
-        throw new UnsupportedOperationException();
+        throw new UnsupportedOperationException(Messages.getString("ERROR.31", "11")); //$NON-NLS-1$ //$NON-NLS-2$
     }
 }
diff --git a/src/main/java/org/mybatis/dynamic/sql/where/WhereModel.java b/src/main/java/org/mybatis/dynamic/sql/where/WhereModel.java
@@ -31,9 +31,6 @@
 import org.mybatis.dynamic.sql.where.render.WhereRenderer;
 
 public class WhereModel {
-    private static final WhereClauseProvider EMPTY_WHERE_CLAUSE =
-            new WhereClauseProvider.Builder().withWhereClause("").build(); //$NON-NLS-1$
-
     private final SqlCriterion initialCriterion;
     private final List<AndOrCriteriaGroup> subCriteria = new ArrayList<>();
 
@@ -54,7 +51,7 @@ public List<AndOrCriteriaGroup> subCriteria() {
         return Collections.unmodifiableList(subCriteria);
     }
 
-    public boolean isUnrenderableClauseAllowed() {
+    public boolean isNonRenderingClauseAllowed() {
         return statementConfiguration.isNonRenderingWhereClauseAllowed();
     }
 
@@ -66,48 +63,44 @@ public boolean isUnrenderableClauseAllowed() {
      *
      * @return rendered where clause
      */
-    public WhereClauseProvider render(RenderingStrategy renderingStrategy) {
+    public Optional<WhereClauseProvider> render(RenderingStrategy renderingStrategy) {
         return WhereRenderer.withWhereModel(this)
                 .withRenderingStrategy(renderingStrategy)
                 .withSequence(new AtomicInteger(1))
                 .withTableAliasCalculator(TableAliasCalculator.empty())
                 .build()
-                .render()
-                .orElse(EMPTY_WHERE_CLAUSE);
+                .render();
     }
 
-    public WhereClauseProvider render(RenderingStrategy renderingStrategy,
+    public Optional<WhereClauseProvider> render(RenderingStrategy renderingStrategy,
             TableAliasCalculator tableAliasCalculator) {
         return WhereRenderer.withWhereModel(this)
                 .withRenderingStrategy(renderingStrategy)
                 .withSequence(new AtomicInteger(1))
                 .withTableAliasCalculator(tableAliasCalculator)
                 .build()
-                .render()
-                .orElse(EMPTY_WHERE_CLAUSE);
+                .render();
     }
 
-    public WhereClauseProvider render(RenderingStrategy renderingStrategy,
+    public Optional<WhereClauseProvider> render(RenderingStrategy renderingStrategy,
             String parameterName) {
         return WhereRenderer.withWhereModel(this)
                 .withRenderingStrategy(renderingStrategy)
                 .withSequence(new AtomicInteger(1))
                 .withTableAliasCalculator(TableAliasCalculator.empty())
                 .withParameterName(parameterName)
                 .build()
-                .render()
-                .orElse(EMPTY_WHERE_CLAUSE);
+                .render();
     }
 
-    public WhereClauseProvider render(RenderingStrategy renderingStrategy,
+    public Optional<WhereClauseProvider> render(RenderingStrategy renderingStrategy,
             TableAliasCalculator tableAliasCalculator, String parameterName) {
         return WhereRenderer.withWhereModel(this)
                 .withRenderingStrategy(renderingStrategy)
                 .withSequence(new AtomicInteger(1))
                 .withTableAliasCalculator(tableAliasCalculator)
                 .withParameterName(parameterName)
                 .build()
-                .render()
-                .orElse(EMPTY_WHERE_CLAUSE);
+                .render();
     }
 }
diff --git a/src/main/java/org/mybatis/dynamic/sql/where/render/WhereRenderer.java b/src/main/java/org/mybatis/dynamic/sql/where/render/WhereRenderer.java
@@ -50,7 +50,7 @@ public Optional<WhereClauseProvider> render() {
                         .build()
                 );
 
-        if (whereClause.isPresent() || whereModel.isUnrenderableClauseAllowed()) {
+        if (whereClause.isPresent() || whereModel.isNonRenderingClauseAllowed()) {
             return whereClause;
         } else {
             throw new NonRenderingWhereClauseException();
diff --git a/src/main/resources/org/mybatis/dynamic/sql/util/messages.properties b/src/main/resources/org/mybatis/dynamic/sql/util/messages.properties
@@ -45,3 +45,5 @@ ERROR.26=Multiple Row Insert Statements Must Contain an "into" phrase
 ERROR.27=You must specify a "from" clause before any other clauses in a select statement
 ERROR.28=You must specify a select statement in a sub query
 ERROR.29=Insert Select Statements Must Contain an "into" phrase
+ERROR.30=The parameters for insertMultipleWithGeneratedKeys must contain exactly one parameter of type String
+ERROR.31=Internal Error {0}
diff --git a/src/site/markdown/docs/whereClauses.md b/src/site/markdown/docs/whereClauses.md
@@ -87,11 +87,11 @@ library. If you want to use a stand alone where clause, you can code a mapper me
 You can build a stand alone where clause and call your mapper like this:
 
 ```java
-    WhereClauseProvider whereClause = where(id, isNotBetween(10).and(60))
+    Optional<WhereClauseProvider> whereClause = where(id, isNotBetween(10).and(60))
             .build()
             .render(RenderingStrategies.MYBATIS3);
 
-    List<AnimalData> animals = mapper.selectWithWhereClause(whereClause);
+    List<AnimalData> animals = whereClause.map(wc -> mapper.selectWithWhereClause(wc)).orElse(Collections.emptyList());
 ```
 This method works well when there are no other parameters needed for the statement and when there are no table aliases
 involved.  If you have those other needs, then see the following.
@@ -112,11 +112,11 @@ If you need to use a table alias in the generated where clause you can supply it
 Then you can specify the alias for the generated WHERE clause on the render method like this:
 
 ```java
-    WhereClauseProvider whereClause = where(id, isEqualTo(1), or(bodyWeight, isGreaterThan(1.0)))
+    Optional<WhereClauseProvider> whereClause = where(id, isEqualTo(1), or(bodyWeight, isGreaterThan(1.0)))
             .build()
             .render(RenderingStrategies.MYBATIS3, TableAliasCalculator.of(animalData, "a"));
 
-    List<AnimalData> animals = mapper.selectWithWhereClauseAndAlias(whereClause);
+    List<AnimalData> animals = whereClause.map(wc -> mapper.selectWithWhereClauseAndAlias(wc)).orElse(Collections.emptyList());
 ```
 It is more likely that you will be using table aliases with hand coded joins where there is more than on table alias.
 In this case, you supply a `Map<SqlTable, String>` to the TableAliasCalculator that holds an alias for each table
@@ -143,11 +143,11 @@ In this mapper method there are three parameters.  So in this case it will be ne
 parameter name to use the for rendered where clause.  That code looks like this:
 
 ```java
-    WhereClauseProvider whereClause = where(id, isLessThan(60))
+    Optional<WhereClauseProvider> whereClause = where(id, isLessThan(60))
             .build()
             .render(RenderingStrategies.MYBATIS3, "whereClauseProvider");
             
-    List<AnimalData> animals = mapper.selectWithWhereClauseLimitAndOffset(whereClause, 5, 15);
+    List<AnimalData> animals = whereClause.map(wc -> mapper.selectWithWhereClauseLimitAndOffset(wc, 5, 15)).orElse(Collections.emptyList());
 ```
 Notice that the string `whereClauseProvider` is used both as the parameter name in the mapper `@Param` annotation,
 and the parameter name in the `render` method.
diff --git a/src/test/java/examples/animal/data/AnimalDataTest.java b/src/test/java/examples/animal/data/AnimalDataTest.java
@@ -33,6 +33,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Optional;
 
 import org.apache.ibatis.datasource.unpooled.UnpooledDataSource;
 import org.apache.ibatis.jdbc.ScriptRunner;
@@ -298,13 +299,15 @@ void testSelectRowsNotBetweenWithStandaloneWhereClause() {
         try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
             AnimalDataMapper mapper = sqlSession.getMapper(AnimalDataMapper.class);
 
-            WhereClauseProvider whereClause = where(id, isNotBetween(10).and(60))
+            Optional<WhereClauseProvider> whereClause = where(id, isNotBetween(10).and(60))
                     .or(id, isIn(25, 27))
                     .build()
                     .render(RenderingStrategies.MYBATIS3);
 
-            List<AnimalData> animals = mapper.selectWithWhereClause(whereClause);
-            assertThat(animals).hasSize(16);
+            assertThat(whereClause).hasValueSatisfying(wc -> {
+                List<AnimalData> animals = mapper.selectWithWhereClause(wc);
+                assertThat(animals).hasSize(16);
+            });
         }
     }
 
@@ -313,14 +316,15 @@ void testComplexConditionWithStandaloneWhereAndTableAlias() {
         try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
             AnimalDataMapper mapper = sqlSession.getMapper(AnimalDataMapper.class);
 
-            WhereClauseProvider whereClause = where(id, isEqualTo(1), or(bodyWeight, isGreaterThan(1.0)))
+            Optional<WhereClauseProvider> whereClause = where(id, isEqualTo(1), or(bodyWeight, isGreaterThan(1.0)))
                     .build()
                     .render(RenderingStrategies.MYBATIS3, ExplicitTableAliasCalculator.of(animalData, "a"));
 
-            assertThat(whereClause.getWhereClause()).isEqualTo("where (a.id = #{parameters.p1,jdbcType=INTEGER} or a.body_weight > #{parameters.p2,jdbcType=DOUBLE})");
-
-            List<AnimalData> animals = mapper.selectWithWhereClauseAndAlias(whereClause);
-            assertThat(animals).hasSize(59);
+            assertThat(whereClause).hasValueSatisfying(wc -> {
+                assertThat(wc.getWhereClause()).isEqualTo("where (a.id = #{parameters.p1,jdbcType=INTEGER} or a.body_weight > #{parameters.p2,jdbcType=DOUBLE})");
+                List<AnimalData> animals = mapper.selectWithWhereClauseAndAlias(wc);
+                assertThat(animals).hasSize(59);
+            });
         }
     }
 
@@ -329,15 +333,15 @@ void testSelectRowsNotBetweenWithStandaloneWhereClauseLimitAndOffset() {
         try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
             AnimalDataMapper mapper = sqlSession.getMapper(AnimalDataMapper.class);
 
-            WhereClauseProvider whereClause = where(id, isLessThan(60))
+            Optional<WhereClauseProvider> whereClause = where(id, isLessThan(60))
                     .build()
                     .render(RenderingStrategies.MYBATIS3, "whereClauseProvider");
 
-            List<AnimalData> animals = mapper.selectWithWhereClauseLimitAndOffset(whereClause, 5, 15);
-            assertAll(
-                    () -> assertThat(animals).hasSize(5),
-                    () -> assertThat(animals.get(0).getId()).isEqualTo(16)
-            );
+            assertThat(whereClause).hasValueSatisfying(wc -> {
+                List<AnimalData> animals = mapper.selectWithWhereClauseLimitAndOffset(wc, 5, 15);
+                assertThat(animals).hasSize(5);
+                assertThat(animals.get(0).getId()).isEqualTo(16);
+            });
         }
     }
 
@@ -346,16 +350,17 @@ void testSelectRowsNotBetweenWithStandaloneWhereClauseAliasLimitAndOffset() {
         try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
             AnimalDataMapper mapper = sqlSession.getMapper(AnimalDataMapper.class);
 
-            WhereClauseProvider whereClause = where(id, isLessThan(60))
+            Optional<WhereClauseProvider> whereClause = where(id, isLessThan(60))
                     .build()
                     .render(RenderingStrategies.MYBATIS3, ExplicitTableAliasCalculator.of(animalData, "b"),
                             "whereClauseProvider");
 
-            List<AnimalData> animals = mapper.selectWithWhereClauseAliasLimitAndOffset(whereClause, 3, 24);
-            assertAll(
-                    () -> assertThat(animals).hasSize(3),
-                    () -> assertThat(animals.get(0).getId()).isEqualTo(25)
-            );
+            assertThat(whereClause).hasValueSatisfying(wc -> {
+                List<AnimalData> animals = mapper.selectWithWhereClauseAliasLimitAndOffset(wc, 3, 24);
+                assertThat(animals).hasSize(3);
+                assertThat(animals.get(0).getId()).isEqualTo(25);
+            });
+
         }
     }
 
diff --git a/src/test/java/examples/custom_render/CustomRenderingTest.java b/src/test/java/examples/custom_render/CustomRenderingTest.java
@@ -102,8 +102,8 @@ void testInsertRecord() {
                     .render(RenderingStrategies.MYBATIS3);
 
             String expected = "insert into JsonTest (id, description, info) "
-                    + "values (#{record.id,jdbcType=INTEGER}, #{record.description,jdbcType=VARCHAR}, "
-                    + "#{record.info,jdbcType=VARCHAR}::json)";
+                    + "values (#{row.id,jdbcType=INTEGER}, #{row.description,jdbcType=VARCHAR}, "
+                    + "#{row.info,jdbcType=VARCHAR}::json)";
 
             assertThat(insertStatement.getInsertStatement()).isEqualTo(expected);
 
diff --git a/src/test/java/examples/emptywhere/EmptyWhereTest.java b/src/test/java/examples/emptywhere/EmptyWhereTest.java
@@ -267,13 +267,15 @@ void testWhereThreeConditions() {
         builder.and(firstName, isEqualTo(fName).filter(Objects::nonNull));
         builder.and(PersonDynamicSqlSupport.lastName, isEqualTo(lName).filter(Objects::nonNull));
 
-        WhereClauseProvider whereClause = builder.build().render(RenderingStrategies.MYBATIS3);
+        Optional<WhereClauseProvider> whereClause = builder.build().render(RenderingStrategies.MYBATIS3);
 
         String expected = "where id = #{parameters.p1}"
                 + " and first_name = #{parameters.p2}"
                 + " and last_name = #{parameters.p3}";
 
-        assertThat(whereClause.getWhereClause()).isEqualTo(expected);
+        assertThat(whereClause.map(WhereClauseProvider::getWhereClause)).hasValueSatisfying(wc ->
+            assertThat(wc).isEqualTo(expected)
+        );
     }
 
     @ParameterizedTest
@@ -285,9 +287,15 @@ void testWhereVariations(Variation variation) {
         builder.or(PersonDynamicSqlSupport.lastName, isEqualTo(variation.lastName).filter(Objects::nonNull));
         builder.configureStatement(c -> c.setNonRenderingWhereClauseAllowed(true));
 
-        WhereClauseProvider whereClause = builder.build().render(RenderingStrategies.MYBATIS3);
+        Optional<WhereClauseProvider> whereClause = builder.build().render(RenderingStrategies.MYBATIS3);
 
-        assertThat(whereClause.getWhereClause()).isEqualTo(variation.whereClause);
+        if (variation.firstName == null && variation.lastName == null) {
+            assertThat(whereClause).isEmpty();
+        } else {
+            assertThat(whereClause.map(WhereClauseProvider::getWhereClause)).hasValueSatisfying(wc ->
+                    assertThat(wc).isEqualTo(variation.whereClause)
+            );
+        }
     }
 
     private static class Variation {
diff --git a/src/test/java/examples/generated/always/mybatis/GeneratedAlwaysMapper.java b/src/test/java/examples/generated/always/mybatis/GeneratedAlwaysMapper.java
@@ -58,7 +58,7 @@ public interface GeneratedAlwaysMapper extends CommonUpdateMapper {
     Optional<GeneratedAlwaysRecord> selectOne(SelectStatementProvider selectStatement);
 
     @InsertProvider(type=SqlProviderAdapter.class, method="insert")
-    @Options(useGeneratedKeys=true, keyProperty="record.fullName")
+    @Options(useGeneratedKeys=true, keyProperty="row.fullName")
     int insert(InsertStatementProvider<GeneratedAlwaysRecord> insertStatement);
 
     @InsertProvider(type=SqlProviderAdapter.class, method="insertMultipleWithGeneratedKeys")
diff --git a/src/test/java/examples/generated/always/mybatis/PersonMapper.java b/src/test/java/examples/generated/always/mybatis/PersonMapper.java
@@ -48,7 +48,7 @@ public interface PersonMapper {
     int insertSelect(InsertSelectStatementProvider insertSelectStatement);
 
     @InsertProvider(type = SqlProviderAdapter.class, method = "insert")
-    @Options(useGeneratedKeys = true, keyProperty = "record.id")
+    @Options(useGeneratedKeys = true, keyProperty = "row.id")
     int insert(InsertStatementProvider<PersonRecord> insertStatement);
 
     @InsertProvider(type=SqlProviderAdapter.class, method="insertMultipleWithGeneratedKeys")
diff --git a/src/test/java/org/mybatis/dynamic/sql/insert/InsertStatementTest.java b/src/test/java/org/mybatis/dynamic/sql/insert/InsertStatementTest.java
diff --git a/src/test/java/org/mybatis/dynamic/sql/mybatis3/InsertStatementTest.java b/src/test/java/org/mybatis/dynamic/sql/mybatis3/InsertStatementTest.java
diff --git a/src/test/java/org/mybatis/dynamic/sql/where/WhereModelTest.java b/src/test/java/org/mybatis/dynamic/sql/where/WhereModelTest.java
diff --git a/src/test/java/org/mybatis/dynamic/sql/where/render/OptionalCriterionRenderTest.java b/src/test/java/org/mybatis/dynamic/sql/where/render/OptionalCriterionRenderTest.java
diff --git a/src/test/kotlin/examples/kotlin/mybatis3/custom/render/KCustomRenderingTest.kt b/src/test/kotlin/examples/kotlin/mybatis3/custom/render/KCustomRenderingTest.kt
diff --git a/src/test/kotlin/examples/kotlin/mybatis3/general/GeneralKotlinTest.kt b/src/test/kotlin/examples/kotlin/mybatis3/general/GeneralKotlinTest.kt

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ private BatchInsertRenderer(Builder<T> builder) {`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`public BatchInsert<T> render() {`
`38`		`- BatchValuePhraseVisitor visitor = new BatchValuePhraseVisitor(renderingStrategy, "record"); //$NON-NLS-1$)`
	`38`	`+ BatchValuePhraseVisitor visitor = new BatchValuePhraseVisitor(renderingStrategy, "row"); //$NON-NLS-1$)`
`39`	`39`	`List<FieldAndValue> fieldsAndValues = model`
`40`	`40`	`.mapColumnMappings(m -> m.accept(visitor))`
`41`	`41`	`.collect(Collectors.toList());`
Original file line number	Diff line number	Diff line change
`@@ -73,6 +73,6 @@ public Optional<FieldAndValue> visit(PropertyWhenPresentMapping mapping) {`
`73`	`73`
`74`	`74`	`private String calculateJdbcPlaceholder(SqlColumn<?> column, String parameterName) {`
`75`	`75`	`return column.renderingStrategy().orElse(renderingStrategy)`
`76`		`- .getFormattedJdbcPlaceholder(column, "record", parameterName); //$NON-NLS-1$`
	`76`	`+ .getFormattedJdbcPlaceholder(column, "row", parameterName); //$NON-NLS-1$`
`77`	`77`	`}`
`78`	`78`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,21 +18,21 @@`
`18`	`18`	`public abstract class GeneralInsertMappingVisitor<R> implements ColumnMappingVisitor<R> {`
`19`	`19`	`@Override`
`20`	`20`	`public final R visit(SelectMapping mapping) {`
`21`		`- throw new UnsupportedOperationException();`
	`21`	`+ throw new UnsupportedOperationException(Messages.getString("ERROR.31", "1")); //$NON-NLS-1$ //$NON-NLS-2$`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`@Override`
`25`	`25`	`public final R visit(PropertyMapping mapping) {`
`26`		`- throw new UnsupportedOperationException();`
	`26`	`+ throw new UnsupportedOperationException(Messages.getString("ERROR.31", "2")); //$NON-NLS-1$ //$NON-NLS-2$`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`@Override`
`30`	`30`	`public final R visit(PropertyWhenPresentMapping mapping) {`
`31`		`- throw new UnsupportedOperationException();`
	`31`	`+ throw new UnsupportedOperationException(Messages.getString("ERROR.31", "3")); //$NON-NLS-1$ //$NON-NLS-2$`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`@Override`
`35`	`35`	`public final R visit(ColumnToColumnMapping columnMapping) {`
`36`		`- throw new UnsupportedOperationException();`
	`36`	`+ throw new UnsupportedOperationException(Messages.getString("ERROR.31", "4")); //$NON-NLS-1$ //$NON-NLS-2$`
`37`	`37`	`}`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,26 +18,26 @@`
`18`	`18`	`public abstract class InsertMappingVisitor<R> implements ColumnMappingVisitor<R> {`
`19`	`19`	`@Override`
`20`	`20`	`public final <T> R visit(ValueMapping<T> mapping) {`
`21`		`- throw new UnsupportedOperationException();`
	`21`	`+ throw new UnsupportedOperationException(Messages.getString("ERROR.31", "5")); //$NON-NLS-1$ //$NON-NLS-2$`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`@Override`
`25`	`25`	`public final <T> R visit(ValueOrNullMapping<T> mapping) {`
`26`		`- throw new UnsupportedOperationException();`
	`26`	`+ throw new UnsupportedOperationException(Messages.getString("ERROR.31", "6")); //$NON-NLS-1$ //$NON-NLS-2$`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`@Override`
`30`	`30`	`public final <T> R visit(ValueWhenPresentMapping<T> mapping) {`
`31`		`- throw new UnsupportedOperationException();`
	`31`	`+ throw new UnsupportedOperationException(Messages.getString("ERROR.31", "7")); //$NON-NLS-1$ //$NON-NLS-2$`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`@Override`
`35`	`35`	`public final R visit(SelectMapping mapping) {`
`36`		`- throw new UnsupportedOperationException();`
	`36`	`+ throw new UnsupportedOperationException(Messages.getString("ERROR.31", "8")); //$NON-NLS-1$ //$NON-NLS-2$`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`@Override`
`40`	`40`	`public final R visit(ColumnToColumnMapping columnMapping) {`
`41`		`- throw new UnsupportedOperationException();`
	`41`	`+ throw new UnsupportedOperationException(Messages.getString("ERROR.31", "9")); //$NON-NLS-1$ //$NON-NLS-2$`
`42`	`42`	`}`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,6 @@`
`18`	`18`	`public abstract class MultiRowInsertMappingVisitor<R> extends InsertMappingVisitor<R> {`
`19`	`19`	`@Override`
`20`	`20`	`public final R visit(PropertyWhenPresentMapping mapping) {`
`21`		`- throw new UnsupportedOperationException();`
	`21`	`+ throw new UnsupportedOperationException(Messages.getString("ERROR.31", "12")); //$NON-NLS-1$ //$NON-NLS-2$`
`22`	`22`	`}`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -81,8 +81,7 @@ public String insertMultipleWithGeneratedKeys(Map<String, Object> parameterMap)`
`81`	`81`	`if (entries.size() == 1) {`
`82`	`82`	`return entries.get(0);`
`83`	`83`	`} else {`
`84`		`- throw new IllegalArgumentException("The parameters for insertMultipleWithGeneratedKeys" //$NON-NLS-1$`
`85`		`- + " must contain exactly one parameter of type String"); //$NON-NLS-1$`
	`84`	`+ throw new IllegalArgumentException(Messages.getString("ERROR.30")); //$NON-NLS-1$`
`86`	`85`	`}`
`87`	`86`	`}`
`88`	`87`
Original file line number	Diff line number	Diff line change
`@@ -18,11 +18,11 @@`
`18`	`18`	`public abstract class UpdateMappingVisitor<R> implements ColumnMappingVisitor<R> {`
`19`	`19`	`@Override`
`20`	`20`	`public final R visit(PropertyMapping mapping) {`
`21`		`- throw new UnsupportedOperationException();`
	`21`	`+ throw new UnsupportedOperationException(Messages.getString("ERROR.31", "10")); //$NON-NLS-1$ //$NON-NLS-2$`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`@Override`
`25`	`25`	`public final R visit(PropertyWhenPresentMapping mapping) {`
`26`		`- throw new UnsupportedOperationException();`
	`26`	`+ throw new UnsupportedOperationException(Messages.getString("ERROR.31", "11")); //$NON-NLS-1$ //$NON-NLS-2$`
`27`	`27`	`}`
`28`	`28`	`}`