Merge remote-tracking branch 'origin/master'

[0.3.16] 支持 IS NULL 判断(即设定queryValue为null)。
Merge pull request #46 from CarmJos/dependabot/maven/org.apache.maven.plugins-maven-javadoc-plugin-3.4.0
2026-06-05 09:01:26 +08:00 · 2022-04-27 02:09:07 +08:00 · 2022-04-27 02:08:58 +08:00 · 2022-04-21 17:04:02 +08:00 · 2022-04-21 08:31:13 +00:00 · 2022-04-17 17:23:49 +08:00
8 changed files with 22 additions and 18 deletions
@@ -5,7 +5,7 @@
    <parent>
        <groupId>cc.carm.lib</groupId>
        <artifactId>easysql-parent</artifactId>
-        <version>0.3.15</version>
+        <version>0.3.16</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

@@ -78,10 +78,6 @@
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-javadoc-plugin</artifactId>
            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-            </plugin>
        </plugins>
    </build>

@@ -47,9 +47,7 @@ public interface ConditionalBuilder<B extends ConditionalBuilder<B, T>, T extend

    B addCondition(@NotNull String columnName, @NotNull String operator, @Nullable Object queryValue);

-    default B addCondition(@NotNull String columnName, @Nullable Object queryValue) {
-        return addCondition(columnName, "=", queryValue);
-    }
+    B addCondition(@NotNull String columnName, @Nullable Object queryValue);

    B addCondition(@NotNull String[] columnNames, @Nullable Object[] queryValues);

@@ -5,7 +5,7 @@
    <parent>
        <artifactId>easysql-parent</artifactId>
        <groupId>cc.carm.lib</groupId>
-        <version>0.3.15</version>
+        <version>0.3.16</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -115,6 +115,10 @@
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-jar-plugin</artifactId>
            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+            </plugin>
        </plugins>
    </build>
 </project>
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>easysql-parent</artifactId>
        <groupId>cc.carm.lib</groupId>
-        <version>0.3.15</version>
+        <version>0.3.16</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

@@ -81,10 +81,6 @@
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-javadoc-plugin</artifactId>
            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-            </plugin>
        </plugins>
    </build>

@@ -48,6 +48,16 @@ public abstract class AbstractConditionalBuilder<B extends ConditionalBuilder<B,
        return getThis();
    }

+    @Override
+    public B addCondition(@NotNull String columnName, @Nullable Object queryValue) {
+        Objects.requireNonNull(columnName, "columnName could not be null");
+        if (queryValue == null) {
+            return addCondition(withBackQuote(columnName) + " IS NULL");
+        } else {
+            return addCondition(columnName, "=", queryValue);
+        }
+    }
+
    @Override
    public B addCondition(
            @NotNull String columnName, @NotNull String operator, @Nullable Object queryValue
@@ -17,7 +17,7 @@
    <groupId>cc.carm.lib</groupId>
    <artifactId>easysql-parent</artifactId>
    <packaging>pom</packaging>
-    <version>0.3.15</version>
+    <version>0.3.16</version>

    <modules>
        <module>api</module>
@@ -169,7 +169,7 @@
                <plugin>
                    <groupId>org.apache.maven.plugins</groupId>
                    <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>3.3.2</version>
+                    <version>3.4.0</version>
                    <configuration>
                        <classifier>javadoc</classifier>
                        <detectJavaApiLink>false</detectJavaApiLink>
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>easysql-parent</artifactId>
        <groupId>cc.carm.lib</groupId>
-        <version>0.3.15</version>
+        <version>0.3.16</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>easysql-parent</artifactId>
        <groupId>cc.carm.lib</groupId>
-        <version>0.3.15</version>
+        <version>0.3.16</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
Author	SHA1	Message	Date
carm	19490d7508	Merge remote-tracking branch 'origin/master'	2022-04-27 02:09:07 +08:00
carm	e8a01169d2	[0.3.16] 支持 IS NULL 判断(即设定queryValue为null)。	2022-04-27 02:08:58 +08:00
carm	2e1df7c7f6	Merge pull request #46 from CarmJos/dependabot/maven/org.apache.maven.plugins-maven-javadoc-plugin-3.4.0 Bump maven-javadoc-plugin from 3.3.2 to 3.4.0	2022-04-21 17:04:02 +08:00
dependabot[bot]	1812db3a16	Bump maven-javadoc-plugin from 3.3.2 to 3.4.0 Bumps [maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.3.2 to 3.4.0. - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases) - [Commits](https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-3.3.2...maven-javadoc-plugin-3.4.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-javadoc-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2022-04-21 08:31:13 +00:00
carm	deb5de35a8	移除api与impl的shaded	2022-04-17 17:23:49 +08:00