优化

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

@@ -62,22 +62,6 @@ public class Condition implements ISqlSegment {
         return this.addNestedCondition(condition, IN);
     }
 
-    /**
-     * NOT 关键词
-     */
-    public Condition not() {
-        expression.add(NOT);
-        return this;
-    }
-
-    /**
-     * HAVING 关键词
-     */
-    public Condition having() {
-        expression.add(HAVING);
-        return this;
-    }
-
     /**
      * LIKE '%值%'
      */
@@ -121,7 +105,7 @@ public class Condition implements ISqlSegment {
     /**
      * 不等于 <>
      */
-    public Condition NE(String condition) {
+    public Condition ne(String condition) {
         return this.addCondition(condition, NE);
     }
 
@@ -185,6 +169,22 @@ public class Condition implements ISqlSegment {
         return this.addCondition(condition, ORDER_BY);
     }
 
+    /**
+     * NOT 关键词
+     */
+    public Condition not() {
+        expression.add(NOT);
+        return this;
+    }
+
+    /**
+     * HAVING 关键词
+     */
+    public Condition having() {
+        expression.add(HAVING);
+        return this;
+    }
+
     /**
      * exists ( sql 语句 )
      */
@@ -195,7 +195,7 @@ public class Condition implements ISqlSegment {
     /**
      * BETWEEN 值1 AND 值2
      */
-    public Condition BETWEEN(String condition, Object val1, Object val2) {
+    public Condition between(String condition, Object val1, Object val2) {
         expression.add(() -> condition);
         expression.add(BETWEEN);
         expression.add(() -> "val1");
@@ -221,7 +221,7 @@ public class Condition implements ISqlSegment {
      * @param keyword   SQL 关键词
      * @return
      */
-    private Condition addCondition(String condition, Keywords keyword) {
+    protected Condition addCondition(String condition, Keywords keyword) {
         expression.add(keyword);
         expression.add(() -> condition);
         return this;
@@ -236,7 +236,7 @@ public class Condition implements ISqlSegment {
      * @param keyword   SQL 关键词
      * @return
      */
-    private Condition addNestedCondition(String condition, Keywords keyword) {
+    protected Condition addNestedCondition(String condition, Keywords keyword) {
         expression.add(keyword);
         expression.add(() -> "(");
         expression.add(() -> condition);
@@ -253,7 +253,7 @@ public class Condition implements ISqlSegment {
      * @param keyword   SQL 关键词
      * @return
      */
-    private Condition addNestedCondition(Function<Condition, Condition> condition, Keywords keyword) {
+    protected Condition addNestedCondition(Function<Condition, Condition> condition, Keywords keyword) {
         expression.add(keyword);
         expression.add(() -> "(");
         expression.add(condition.apply(new Condition()));

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

@@ -21,15 +21,6 @@ public class Query implements ISqlSegment {
       return this;
    }
 
-   /**
-    * SELECT column(s)
-    * @param columns column or columns to select
-    * @return this
-    */
-   public Query select(String... columns) {
-      return add(new Select(columns));
-   }
-
    /**
     * WHERE expression
     * @param expression to

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

@@ -14,7 +14,6 @@ public class QueryTest {
     @Test
     public void test() {
         String sql = new Query()
-            .select("b.*")
             .where("b.age > 18", condition ->
                 condition.and("b.type = 'rabid'")
                     .or(nested -> nested.apply("name='12'").and("age=1"))
@@ -23,7 +22,7 @@ public class QueryTest {
             ).sqlSegment();
 
         log(sql);
-        assertEquals("SELECT b.* WHERE b.age > 18 AND b.type = 'rabid' OR ( name='12' AND age=1 ) NOT IN ( ads,2112,212 ) LIMIT 1", sql);
+        assertEquals("WHERE b.age > 18 AND b.type = 'rabid' OR ( name='12' AND age=1 ) NOT IN ( ads,2112,212 ) LIMIT 1", sql);
     }
 
 }