针对 mybatis-provider 中 @Entity.Prop 注解的兼容性改动

Author: abel533

mapper/src/main/java/io/mybatis/mapper/example/ExampleProvider.java

@@ -135,7 +135,7 @@ public static String deleteByExample(ProviderContext providerContext) {
             + "DELETE FROM " + entity.tableName()
             + util.parameterNotNull("Example cannot be null")
             //是否允许空条件，默认允许，允许时不检查查询条件
-            + (entity.getProp("deleteByExample.allowEmpty", true) ?
+            + (entity.getPropBoolean("deleteByExample.allowEmpty", true) ?
             "" : util.variableIsFalse("_parameter.isEmpty()", "Example Criteria cannot be empty"))
             + EXAMPLE_WHERE_CLAUSE
             + util.ifTest("endSql != null and endSql != ''", () -> "${endSql}"));
@@ -158,7 +158,7 @@ public String getSql(EntityTable entity) {
             //TODO 测试
             + variableNotNull("example", "Example cannot be null")
             //是否允许空条件，默认允许，允许时不检查查询条件
-            + (entity.getProp("updateByExample.allowEmpty", true) ?
+            + (entity.getPropBoolean("updateByExample.allowEmpty", true) ?
             "" : variableIsFalse("example.isEmpty()", "Example Criteria cannot be empty"))
             + UPDATE_BY_EXAMPLE_WHERE_CLAUSE
             + ifTest("example.endSql != null and example.endSql != ''", () -> "${example.endSql}");
@@ -182,7 +182,7 @@ public String getSql(EntityTable entity) {
             + EXAMPLE_SET_CLAUSE_INNER_WHEN
             + variableNotNull("example", "Example cannot be null")
             //是否允许空条件，默认允许，允许时不检查查询条件
-            + (entity.getProp("updateByExample.allowEmpty", true) ?
+            + (entity.getPropBoolean("updateByExample.allowEmpty", true) ?
             "" : variableIsFalse("example.isEmpty()", "Example Criteria cannot be empty"))
             + UPDATE_BY_EXAMPLE_WHERE_CLAUSE
             + ifTest("example.endSql != null and example.endSql != ''", () -> "${example.endSql}");
@@ -208,7 +208,7 @@ public String getSql(EntityTable entity) {
             //TODO 测试
             + variableNotNull("example", "Example cannot be null")
             //是否允许空条件，默认允许，允许时不检查查询条件
-            + (entity.getProp("updateByExampleSelective.allowEmpty", true) ?
+            + (entity.getPropBoolean("updateByExampleSelective.allowEmpty", true) ?
             "" : variableIsFalse("example.isEmpty()", "Example Criteria cannot be empty"))
             + UPDATE_BY_EXAMPLE_WHERE_CLAUSE
             + ifTest("example.endSql != null and example.endSql != ''", () -> "${example.endSql}");

mapper/src/test/java/io/mybatis/mapper/model/User.java

@@ -19,11 +19,11 @@
 import io.mybatis.provider.Entity;
 
 @Entity.Table(value = "user",
-  props = {
-    @Entity.Prop(name = "deleteByExample.allowEmpty", value = "false", type = Boolean.class),
-    @Entity.Prop(name = "updateByExample.allowEmpty", value = "false", type = Boolean.class),
-    @Entity.Prop(name = "updateByExampleSelective.allowEmpty", value = "false", type = Boolean.class)
-  }
+    props = {
+        @Entity.Prop(name = "deleteByExample.allowEmpty", value = "false"),
+        @Entity.Prop(name = "updateByExample.allowEmpty", value = "false"),
+        @Entity.Prop(name = "updateByExampleSelective.allowEmpty", value = "false")
+    }
 )
 public class User {
   @Entity.Column(id = true)
@@ -60,9 +60,9 @@ public void setSex(String sex) {
   @Override
   public String toString() {
     return "User{" +
-      "id=" + id +
-      ", name='" + userName + '\'' +
-      ", sex='" + sex + '\'' +
-      '}';
+        "id=" + id +
+        ", name='" + userName + '\'' +
+        ", sex='" + sex + '\'' +
+        '}';
   }
 }