由于typeHandlers全局配置导致没有测试出Wrapper的问题，修复Wrapper中TypeHandler的支持

Author: abel533

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

@@ -265,7 +265,7 @@ public ExampleWrapper<T, I> isNull(boolean useCondition, Fn<T, Object> fn) {
    * @param fn 字段对应的 get 方法引用
    */
   public ExampleWrapper<T, I> isNull(Fn<T, Object> fn) {
-    this.current.addCriterion(fn.toColumn() + " IS NULL");
+    this.current.andIsNull(fn);
     return this;
   }
 
@@ -285,7 +285,7 @@ public ExampleWrapper<T, I> isNotNull(boolean useCondition, Fn<T, Object> fn) {
    * @param fn 字段对应的 get 方法引用
    */
   public ExampleWrapper<T, I> isNotNull(Fn<T, Object> fn) {
-    this.current.addCriterion(fn.toColumn() + " IS NOT NULL");
+    this.current.andIsNotNull(fn);
     return this;
   }
 
@@ -318,7 +318,7 @@ public ExampleWrapper<T, I> eq(boolean useCondition, Fn<T, Object> fn, Supplier<
    * @param value 值
    */
   public ExampleWrapper<T, I> eq(Fn<T, Object> fn, Object value) {
-    this.current.addCriterion(fn.toColumn() + " =", value);
+    this.current.andEqualTo(fn, value);
     return this;
   }
 
@@ -351,7 +351,7 @@ public ExampleWrapper<T, I> ne(boolean useCondition, Fn<T, Object> fn, Object va
    * @param value 值
    */
   public ExampleWrapper<T, I> ne(Fn<T, Object> fn, Object value) {
-    this.current.addCriterion(fn.toColumn() + " <>", value);
+    this.current.andNotEqualTo(fn, value);
     return this;
   }
 
@@ -384,7 +384,7 @@ public ExampleWrapper<T, I> gt(boolean useCondition, Fn<T, Object> fn, Object va
    * @param value 值
    */
   public ExampleWrapper<T, I> gt(Fn<T, Object> fn, Object value) {
-    this.current.addCriterion(fn.toColumn() + " >", value);
+    this.current.andGreaterThan(fn, value);
     return this;
   }
 
@@ -417,7 +417,7 @@ public ExampleWrapper<T, I> ge(boolean useCondition, Fn<T, Object> fn, Object va
    * @param value 值
    */
   public ExampleWrapper<T, I> ge(Fn<T, Object> fn, Object value) {
-    this.current.addCriterion(fn.toColumn() + " >=", value);
+    this.current.andGreaterThanOrEqualTo(fn, value);
     return this;
   }
 
@@ -449,7 +449,7 @@ public ExampleWrapper<T, I> lt(boolean useCondition, Fn<T, Object> fn, Object va
    * @param value 值
    */
   public ExampleWrapper<T, I> lt(Fn<T, Object> fn, Object value) {
-    this.current.addCriterion(fn.toColumn() + " <", value);
+    this.current.andLessThan(fn, value);
     return this;
   }
 
@@ -482,7 +482,7 @@ public ExampleWrapper<T, I> le(boolean useCondition, Fn<T, Object> fn, Supplier<
    * @param value 值
    */
   public ExampleWrapper<T, I> le(Fn<T, Object> fn, Object value) {
-    this.current.addCriterion(fn.toColumn() + " <=", value);
+    this.current.andLessThanOrEqualTo(fn, value);
     return this;
   }
 
@@ -518,7 +518,7 @@ public ExampleWrapper<T, I> in(boolean useCondition, Fn<T, Object> fn, Supplier<
    */
   @SuppressWarnings("rawtypes")
   public ExampleWrapper<T, I> in(Fn<T, Object> fn, Iterable values) {
-    this.current.addCriterion(fn.toColumn() + " IN", values);
+    this.current.andIn(fn, values);
     return this;
   }
 
@@ -554,7 +554,7 @@ public ExampleWrapper<T, I> notIn(boolean useCondition, Fn<T, Object> fn, Suppli
    */
   @SuppressWarnings("rawtypes")
   public ExampleWrapper<T, I> notIn(Fn<T, Object> fn, Iterable values) {
-    this.current.addCriterion(fn.toColumn() + " NOT IN", values);
+    this.current.andNotIn(fn, values);
     return this;
   }
 
@@ -590,7 +590,7 @@ public ExampleWrapper<T, I> between(boolean useCondition, Fn<T, Object> fn, Supp
    * @param value2 值2
    */
   public ExampleWrapper<T, I> between(Fn<T, Object> fn, Object value1, Object value2) {
-    this.current.addCriterion(fn.toColumn() + " BETWEEN", value1, value2);
+    this.current.andBetween(fn, value1, value2);
     return this;
   }
 
@@ -626,7 +626,7 @@ public ExampleWrapper<T, I> notBetween(boolean useCondition, Fn<T, Object> fn, S
    * @param value2 值2
    */
   public ExampleWrapper<T, I> notBetween(Fn<T, Object> fn, Object value1, Object value2) {
-    this.current.addCriterion(fn.toColumn() + " NOT BETWEEN", value1, value2);
+    this.current.andNotBetween(fn, value1, value2);
     return this;
   }
 
@@ -736,7 +736,7 @@ public ExampleWrapper<T, I> endsWith(Fn<T, Object> fn, String value) {
    * @param fn           字段对应的 get 方法引用
    * @param value        值，需要指定 '%'(多个), '_'(单个) 模糊匹配
    */
-  public ExampleWrapper<T, I> like(boolean useCondition, Fn<T, Object> fn, String value) {
+  public ExampleWrapper<T, I> like(boolean useCondition, Fn<T, Object> fn, Object value) {
     return useCondition ? like(fn, value) : this;
   }
 
@@ -747,7 +747,7 @@ public ExampleWrapper<T, I> like(boolean useCondition, Fn<T, Object> fn, String
    * @param fn           字段对应的 get 方法引用
    * @param supplier     值构造函数，需要指定 '%'(多个), '_'(单个) 模糊匹配
    */
-  public ExampleWrapper<T, I> like(boolean useCondition, Fn<T, Object> fn, Supplier<String> supplier) {
+  public ExampleWrapper<T, I> like(boolean useCondition, Fn<T, Object> fn, Supplier<Object> supplier) {
     return useCondition ? like(fn, supplier.get()) : this;
   }
 
@@ -757,8 +757,8 @@ public ExampleWrapper<T, I> like(boolean useCondition, Fn<T, Object> fn, Supplie
    * @param fn    字段对应的 get 方法引用
    * @param value 值，需要指定 '%'(多个), '_'(单个) 模糊匹配
    */
-  public ExampleWrapper<T, I> like(Fn<T, Object> fn, String value) {
-    this.current.addCriterion(fn.toColumn() + "  LIKE", value);
+  public ExampleWrapper<T, I> like(Fn<T, Object> fn, Object value) {
+    this.current.andLike(fn, value);
     return this;
   }
 
@@ -769,7 +769,7 @@ public ExampleWrapper<T, I> like(Fn<T, Object> fn, String value) {
    * @param fn           字段对应的 get 方法引用
    * @param value        值，需要指定 % 模糊匹配
    */
-  public ExampleWrapper<T, I> notLike(boolean useCondition, Fn<T, Object> fn, String value) {
+  public ExampleWrapper<T, I> notLike(boolean useCondition, Fn<T, Object> fn, Object value) {
     return useCondition ? notLike(fn, value) : this;
   }
 
@@ -780,7 +780,7 @@ public ExampleWrapper<T, I> notLike(boolean useCondition, Fn<T, Object> fn, Stri
    * @param fn           字段对应的 get 方法引用
    * @param supplier     值构造函数，需要指定 % 模糊匹配
    */
-  public ExampleWrapper<T, I> notLike(boolean useCondition, Fn<T, Object> fn, Supplier<String> supplier) {
+  public ExampleWrapper<T, I> notLike(boolean useCondition, Fn<T, Object> fn, Supplier<Object> supplier) {
     return useCondition ? notLike(fn, supplier.get()) : this;
   }
 
@@ -790,8 +790,8 @@ public ExampleWrapper<T, I> notLike(boolean useCondition, Fn<T, Object> fn, Supp
    * @param fn    字段对应的 get 方法引用
    * @param value 值，需要指定 % 模糊匹配
    */
-  public ExampleWrapper<T, I> notLike(Fn<T, Object> fn, String value) {
-    this.current.addCriterion(fn.toColumn() + "  NOT LIKE", value);
+  public ExampleWrapper<T, I> notLike(Fn<T, Object> fn, Object value) {
+    this.current.andNotLike(fn, value);
     return this;
   }
 

mapper/src/test/java/io/mybatis/mapper/UserAutoBaseMapperTest.java

@@ -54,6 +54,9 @@ public void testUpdateByExampleWrapperSetValues() {
           .set(UserAuto::getAddress, new UserAuto.Address("河北省", "秦皇岛市"))
           .eq(UserAuto::getId, 1L).update();
       Assert.assertEquals(1, update);
+
+      int delete = userAutoMapper.wrapper().eq(UserAuto::getAddress, new UserAuto.Address("河北省", "秦皇岛市")).delete();
+      Assert.assertEquals(1, delete);
       sqlSession.rollback();
     } finally {
       //不要忘记关闭sqlSession

mapper/src/test/resources/mybatis-config.xml

@@ -30,11 +30,6 @@
     <package name="io.mybatis.simple.model"/>
   </typeAliases>
 
-  <typeHandlers>
-    <typeHandler handler="io.mybatis.mapper.model.UserAuto$AddressTypeHandler"
-                 javaType="io.mybatis.mapper.model.UserAuto$Address"/>
-  </typeHandlers>
-
   <environments default="development">
     <environment id="development">
       <transactionManager type="JDBC">