not api

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/conditions/AbstractWrapper.java

@@ -36,7 +36,6 @@ import java.util.function.Consumer;
 
 import static com.baomidou.mybatisplus.core.enums.SqlKeyword.*;
 import static com.baomidou.mybatisplus.core.enums.WrapperKeyword.APPLY;
-import static com.baomidou.mybatisplus.core.enums.WrapperKeyword.BRACKET;
 import static java.util.stream.Collectors.joining;
 
 /**
@@ -371,7 +370,7 @@ public abstract class AbstractWrapper<T, R, Children extends AbstractWrapper<T,
         if (condition) {
             final Children instance = instance();
             consumer.accept(instance);
-            return doIt(true, BRACKET, instance);
+            return doIt(true, APPLY, instance);
         }
         return typedThis;
     }

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/conditions/segments/MatchSegment.java

@@ -36,8 +36,7 @@ public enum MatchSegment {
     AND_OR(i -> i == SqlKeyword.AND || i == SqlKeyword.OR),
     EXISTS(i -> i == SqlKeyword.EXISTS),
     HAVING(i -> i == SqlKeyword.HAVING),
-    APPLY(i -> i == WrapperKeyword.APPLY),
-    BRACKET(i -> i == WrapperKeyword.BRACKET);
+    APPLY(i -> i == WrapperKeyword.APPLY);
 
     private final Predicate<ISqlSegment> predicate;
 

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/conditions/segments/NormalSegmentList.java

@@ -70,9 +70,6 @@ public class NormalSegmentList extends AbstractISegmentList {
             if (MatchSegment.APPLY.match(firstSegment)) {
                 list.remove(0);
             }
-            if (MatchSegment.BRACKET.match(firstSegment)) {
-                list.remove(0);
-            }
             if (!MatchSegment.AND_OR.match(lastValue) && !isEmpty()) {
                 add(SqlKeyword.AND);
             }

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/enums/WrapperKeyword.java

@@ -27,8 +27,7 @@ public enum WrapperKeyword implements ISqlSegment {
     /**
      * 只用作于辨识,不用于其他
      */
-    APPLY(null),
-    BRACKET(null);
+    APPLY(null);
 
     private final String keyword;
 

mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/WrapperTest.java

@@ -150,26 +150,6 @@ class WrapperTest {
         logSqlSegment("只存在 group by", new QueryWrapper<User>()
                 .groupBy("id", "name", "sex").groupBy("id", "name"),
             "GROUP BY id,name,sex,id,name");
-
-        /* not 系列 */
-        logSqlSegment("not in", new QueryWrapper<User>()
-                .notIn("id", 1),
-            "(id NOT IN (?))");
-        logSqlSegment("not in sql", new QueryWrapper<User>()
-                .notInSql("id", "select"),
-            "(id NOT IN (select))");
-
-        logSqlSegment("not like", new QueryWrapper<User>()
-                .notLike("id", 1),
-            "(id NOT LIKE ?)");
-
-        logSqlSegment("not exists", new QueryWrapper<User>()
-                .notExists("select"),
-            "(NOT EXISTS (select))");
-
-        logSqlSegment("not", new QueryWrapper<User>()
-                .not(i -> i.eq("id", 1)),
-            "(NOT (id = ?))");
     }
 
     @Test
@@ -217,8 +197,9 @@ class WrapperTest {
         QueryWrapper<User> queryWrapper = new QueryWrapper<User>()
             .and(i -> i.eq("id", 1).nested(j -> j.ne("id", 2)))
             .or(i -> i.eq("id", 1).and(j -> j.ne("id", 2)))
-            .nested(i -> i.eq("id", 1).or(j -> j.ne("id", 2)));
-        logSqlSegment("测试 Nested 下的方法", queryWrapper, "((id = ? AND (id <> ?)) OR (id = ? AND (id <> ?)) AND (id = ? OR (id <> ?)))");
+            .nested(i -> i.eq("id", 1).or(j -> j.ne("id", 2)))
+            .not(i -> i.eq("id", 1).or(j -> j.ne("id", 2)));
+        logSqlSegment("测试 Nested 下的方法", queryWrapper, "((id = ? AND (id <> ?)) OR (id = ? AND (id <> ?)) AND (id = ? OR (id <> ?)) AND NOT (id = ? OR (id <> ?)))");
         logParams(queryWrapper);
     }