v3.0.7 (#32)

scx567888 · Sep 3, 2024 · 6fa1d59 · 6fa1d59
1 parent d17de74
commit 6fa1d59
Show file tree

Hide file tree

Showing 19 changed files with 74 additions and 126 deletions.
diff --git a/pom.xml b/pom.xml
@@ -12,7 +12,7 @@
 
     <artifactId>scx</artifactId>
     <packaging>pom</packaging>
-    <version>3.0.6</version>
+    <version>3.0.7</version>
 
     <name>SCX</name>
     <url>https://github.com/scx567888/scx</url>

diff --git a/scx-common/pom.xml b/scx-common/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>cool.scx</groupId>
         <artifactId>scx</artifactId>
-        <version>3.0.6</version>
+        <version>3.0.7</version>
     </parent>
 
     <artifactId>scx-common</artifactId>

diff --git a/scx-config/pom.xml b/scx-config/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>cool.scx</groupId>
         <artifactId>scx</artifactId>
-        <version>3.0.6</version>
+        <version>3.0.7</version>
     </parent>
 
     <artifactId>scx-config</artifactId>

diff --git a/scx-core/pom.xml b/scx-core/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>cool.scx</groupId>
         <artifactId>scx</artifactId>
-        <version>3.0.6</version>
+        <version>3.0.7</version>
     </parent>
 
     <artifactId>scx-core</artifactId>

diff --git a/scx-core/src/main/java/cool/scx/core/ScxVersion.java b/scx-core/src/main/java/cool/scx/core/ScxVersion.java
@@ -13,7 +13,7 @@ public class ScxVersion {
     /**
      * SCX 版本号
      */
-    public static final String SCX_VERSION = "3.0.6";
+    public static final String SCX_VERSION = "3.0.7";
 
     /**
      * 在控制台上打印 banner

diff --git a/scx-data-jdbc/pom.xml b/scx-data-jdbc/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>cool.scx</groupId>
         <artifactId>scx</artifactId>
-        <version>3.0.6</version>
+        <version>3.0.7</version>
     </parent>
 
     <artifactId>scx-data-jdbc</artifactId>

diff --git a/scx-data-mysql-x/pom.xml b/scx-data-mysql-x/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>cool.scx</groupId>
         <artifactId>scx</artifactId>
-        <version>3.0.6</version>
+        <version>3.0.7</version>
     </parent>
 
     <artifactId>scx-data-mysql-x</artifactId>

diff --git a/scx-data/pom.xml b/scx-data/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>cool.scx</groupId>
         <artifactId>scx</artifactId>
-        <version>3.0.6</version>
+        <version>3.0.7</version>
     </parent>
 
     <artifactId>scx-data</artifactId>

diff --git a/scx-data/src/main/java/cool/scx/data/query/Logic.java b/scx-data/src/main/java/cool/scx/data/query/Logic.java
@@ -2,7 +2,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.function.Predicate;
 
 import static cool.scx.data.query.WhereType.*;
 
@@ -26,19 +25,21 @@ public Object[] clauses() {
 
     public Logic add(Object... logicCauses) {
         for (var logicCause : logicCauses) {
+            if (logicCause == null) {
+                continue;
+            }
+            if (logicCause instanceof Object[] objs) {
+                add(objs);
+                continue;
+            }
             if (logicCause instanceof Where w && w.info().replace()) {
-                removeIf(c -> c instanceof Where w1 && w1.name().equals(w.name()));
+                clauses.removeIf(c -> c instanceof Where w1 && w1.name().equals(w.name()));
             }
             clauses.add(logicCause);
         }
         return this;
     }
 
-    public Logic removeIf(Predicate<Object> filter) {
-        clauses.removeIf(filter);
-        return this;
-    }
-
     public Logic clear() {
         clauses.clear();
         return this;

diff --git a/scx-data/src/main/java/cool/scx/data/query/Query.java b/scx-data/src/main/java/cool/scx/data/query/Query.java
@@ -1,7 +1,5 @@
 package cool.scx.data.query;
 
-import java.util.function.Predicate;
-
 public interface Query {
 
     Query where(Object... whereClauses);
@@ -14,18 +12,6 @@ public interface Query {
 
     Query limit(long numberOfRows);
 
-    Query addWhere(Object... whereClauses);
-
-    Query addGroupBy(Object... groupByClauses);
-
-    Query addOrderBy(Object... orderByClauses);
-
-    Query removeWhereIf(Predicate<Object> filter);
-
-    Query removeGroupByIf(Predicate<Object> filter);
-
-    Query removeOrderByIf(Predicate<Object> filter);
-
     Object[] getWhere();
 
     Object[] getGroupBy();

diff --git a/scx-data/src/main/java/cool/scx/data/query/QueryImpl.java b/scx-data/src/main/java/cool/scx/data/query/QueryImpl.java
@@ -2,7 +2,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.function.Predicate;
 
 /**
  * 默认实现
@@ -78,57 +77,6 @@ public QueryImpl limit(long limit) {
         return this;
     }
 
-    @Override
-    public QueryImpl addWhere(Object... whereClauses) {
-        for (var whereClause : whereClauses) {
-            if (whereClause instanceof Where w && w.info().replace()) {
-                removeWhereIf(c -> c instanceof Where w1 && w1.name().equals(w.name()));
-            }
-            where.add(whereClause);
-        }
-        return this;
-    }
-
-    @Override
-    public QueryImpl addGroupBy(Object... groupByClauses) {
-        for (var groupByClause : groupByClauses) {
-            if (groupByClause instanceof GroupBy w && w.info().replace()) {
-                removeGroupByIf(c -> c instanceof GroupBy w1 && w1.name().equals(w.name()));
-            }
-            groupBy.add(groupByClause);
-        }
-        return this;
-    }
-
-    @Override
-    public QueryImpl addOrderBy(Object... orderByClauses) {
-        for (var orderByClause : orderByClauses) {
-            if (orderByClause instanceof OrderBy w && w.info().replace()) {
-                removeOrderByIf(c -> c instanceof OrderBy w1 && w1.name().equals(w.name()));
-            }
-            orderBy.add(orderByClause);
-        }
-        return this;
-    }
-
-    @Override
-    public Query removeWhereIf(Predicate<Object> filter) {
-        where.removeIf(filter);
-        return this;
-    }
-
-    @Override
-    public Query removeGroupByIf(Predicate<Object> filter) {
-        groupBy.removeIf(filter);
-        return this;
-    }
-
-    @Override
-    public Query removeOrderByIf(Predicate<Object> filter) {
-        orderBy.removeIf(filter);
-        return this;
-    }
-
     @Override
     public Object[] getWhere() {
         return where.toArray();
@@ -184,4 +132,55 @@ public QueryImpl clearLimit() {
         return this;
     }
 
+    private QueryImpl addWhere(Object... whereClauses) {
+        for (var whereClause : whereClauses) {
+            if (whereClause == null) {
+                continue;
+            }
+            if (whereClause instanceof Object[] objs) {
+                addWhere(objs);
+                continue;
+            }
+            if (whereClause instanceof Where w && w.info().replace()) {
+                where.removeIf(c -> c instanceof Where w1 && w1.name().equals(w.name()));
+            }
+            where.add(whereClause);
+        }
+        return this;
+    }
+
+    private QueryImpl addGroupBy(Object... groupByClauses) {
+        for (var groupByClause : groupByClauses) {
+            if (groupByClause == null) {
+                continue;
+            }
+            if (groupByClause instanceof Object[] objs) {
+                addGroupBy(objs);
+                continue;
+            }
+            if (groupByClause instanceof GroupBy w && w.info().replace()) {
+                groupBy.removeIf(c -> c instanceof GroupBy w1 && w1.name().equals(w.name()));
+            }
+            groupBy.add(groupByClause);
+        }
+        return this;
+    }
+
+    private QueryImpl addOrderBy(Object... orderByClauses) {
+        for (var orderByClause : orderByClauses) {
+            if (orderByClause == null) {
+                continue;
+            }
+            if (orderByClause instanceof Object[] objs) {
+                addOrderBy(objs);
+                continue;
+            }
+            if (orderByClause instanceof OrderBy w && w.info().replace()) {
+                orderBy.removeIf(c -> c instanceof OrderBy w1 && w1.name().equals(w.name()));
+            }
+            orderBy.add(orderByClause);
+        }
+        return this;
+    }
+
 }
diff --git a/scx-data/src/main/java/cool/scx/data/query/QueryLike.java b/scx-data/src/main/java/cool/scx/data/query/QueryLike.java
@@ -1,7 +1,5 @@
 package cool.scx.data.query;
 
-import java.util.function.Predicate;
-
 @SuppressWarnings("unchecked")
 public abstract class QueryLike<QL extends QueryLike<QL>> implements Query {
 
@@ -44,42 +42,6 @@ public QL limit(long numberOfRows) {
         return (QL) this;
     }
 
-    @Override
-    public QL addWhere(Object... whereClauses) {
-        query().addWhere(whereClauses);
-        return (QL) this;
-    }
-
-    @Override
-    public QL addGroupBy(Object... groupByClauses) {
-        query().addGroupBy(groupByClauses);
-        return (QL) this;
-    }
-
-    @Override
-    public QL addOrderBy(Object... orderByClauses) {
-        query().addOrderBy(orderByClauses);
-        return (QL) this;
-    }
-
-    @Override
-    public QL removeWhereIf(Predicate<Object> filter) {
-        query().removeWhereIf(filter);
-        return (QL) this;
-    }
-
-    @Override
-    public QL removeGroupByIf(Predicate<Object> filter) {
-        query().removeGroupByIf(filter);
-        return (QL) this;
-    }
-
-    @Override
-    public QL removeOrderByIf(Predicate<Object> filter) {
-        query().removeOrderByIf(filter);
-        return (QL) this;
-    }
-
     @Override
     public Object[] getWhere() {
         return query().getWhere();

diff --git a/scx-ext/pom.xml b/scx-ext/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>cool.scx</groupId>
         <artifactId>scx</artifactId>
-        <version>3.0.6</version>
+        <version>3.0.7</version>
     </parent>
 
     <artifactId>scx-ext</artifactId>

diff --git a/scx-jdbc-mysql/pom.xml b/scx-jdbc-mysql/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>cool.scx</groupId>
         <artifactId>scx</artifactId>
-        <version>3.0.6</version>
+        <version>3.0.7</version>
     </parent>
 
     <artifactId>scx-jdbc-mysql</artifactId>

diff --git a/scx-jdbc-sqlite/pom.xml b/scx-jdbc-sqlite/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>cool.scx</groupId>
         <artifactId>scx</artifactId>
-        <version>3.0.6</version>
+        <version>3.0.7</version>
     </parent>
 
     <artifactId>scx-jdbc-sqlite</artifactId>

diff --git a/scx-jdbc/pom.xml b/scx-jdbc/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>cool.scx</groupId>
         <artifactId>scx</artifactId>
-        <version>3.0.6</version>
+        <version>3.0.7</version>
     </parent>
 
     <artifactId>scx-jdbc</artifactId>

diff --git a/scx-logging/pom.xml b/scx-logging/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>cool.scx</groupId>
         <artifactId>scx</artifactId>
-        <version>3.0.6</version>
+        <version>3.0.7</version>
     </parent>
 
     <artifactId>scx-logging</artifactId>

diff --git a/scx-socket/pom.xml b/scx-socket/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>cool.scx</groupId>
         <artifactId>scx</artifactId>
-        <version>3.0.6</version>
+        <version>3.0.7</version>
     </parent>
 
     <artifactId>scx-socket</artifactId>

diff --git a/scx-web/pom.xml b/scx-web/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>cool.scx</groupId>
         <artifactId>scx</artifactId>
-        <version>3.0.6</version>
+        <version>3.0.7</version>
     </parent>
 
     <artifactId>scx-web</artifactId>