[0.3.3] 版本更新

- `[F]` 修复上个版本中 QueryAction 的 executeFunction 方法未重写 SQLAction 中同方法导致的链接未被自动关闭的问题。
- `[U]` 更新软件依赖于Maven相关插件的版本。

.github/dependabot.yml

@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "maven" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "daily"

easysql-api/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>cc.carm.lib</groupId>
         <artifactId>easysql-parent</artifactId>
-        <version>0.3.2</version>
+        <version>0.3.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -19,7 +19,7 @@
     <artifactId>easysql-api</artifactId>
     <packaging>jar</packaging>
 
-    <name>00-EasySQL-API</name>
+    <name>EasySQL-API</name>
     <description>EasySQL的接口部分。用于打包到公共项目的API中，避免项目过大。</description>
     <url>https://github.com/CarmJos/EasySQL</url>
 

easysql-api/src/main/java/cc/carm/lib/easysql/api/SQLAction.java

@@ -98,7 +98,7 @@ public interface SQLAction<T> {
 	 */
 	@Nullable
 	default <R> R execute(@NotNull SQLFunction<T, R> function,
-						  @Nullable SQLExceptionHandler exceptionHandler) {
+	                      @Nullable SQLExceptionHandler exceptionHandler) {
 		return execute(function, null, exceptionHandler);
 	}
 
@@ -114,8 +114,8 @@ public interface SQLAction<T> {
 	@Nullable
 	@Contract("_,!null,_ -> !null")
 	default <R> R execute(@NotNull SQLFunction<T, R> function,
-						  @Nullable R defaultResult,
-						  @Nullable SQLExceptionHandler exceptionHandler) {
+	                      @Nullable R defaultResult,
+	                      @Nullable SQLExceptionHandler exceptionHandler) {
 		try {
 			return executeFunction(function, defaultResult);
 		} catch (SQLException exception) {
@@ -133,7 +133,7 @@ public interface SQLAction<T> {
 	 * @throws SQLException 当SQL操作出现问题时抛出
 	 */
 	@Nullable
-	default <R> R executeFunction(@NotNull SQLFunction<T, R> function) throws SQLException {
+	default <R> R executeFunction(@NotNull SQLFunction<@NotNull T, R> function) throws SQLException {
 		return executeFunction(function, null);
 	}
 
@@ -148,11 +148,10 @@ public interface SQLAction<T> {
 	 */
 	@Nullable
 	@Contract("_,!null -> !null")
-	default <R> R executeFunction(@NotNull SQLFunction<T, R> function,
-								  @Nullable R defaultResult) throws SQLException {
+	default <R> R executeFunction(@NotNull SQLFunction<@NotNull T, R> function,
+	                              @Nullable R defaultResult) throws SQLException {
 		try {
-			T value = execute();
-			R result = function.apply(value);
+			R result = function.apply(execute());
 			return result == null ? defaultResult : result;
 		} catch (SQLException exception) {
 			throw new SQLException(exception);
@@ -182,7 +181,7 @@ public interface SQLAction<T> {
 	 * @param failure 异常处理器 默认为 {@link SQLAction#defaultExceptionHandler()}
 	 */
 	void executeAsync(@Nullable SQLHandler<T> success,
-					  @Nullable SQLExceptionHandler failure);
+	                  @Nullable SQLExceptionHandler failure);
 
 	default void handleException(@Nullable SQLExceptionHandler handler, SQLException exception) {
 		if (handler == null) handler = defaultExceptionHandler();

easysql-api/src/main/java/cc/carm/lib/easysql/api/action/query/QueryAction.java

@@ -32,20 +32,10 @@ import java.sql.SQLException;
  */
 public interface QueryAction extends SQLAction<SQLQuery> {
 
-	/**
-	 * 执行语句并处理返回值
-	 *
-	 * @param defaultResult 默认结果，若处理后的结果为null，则返回该值
-	 * @param function      处理方法
-	 * @param <R>           需要返回的内容
-	 * @return 指定类型数据
-	 * @throws SQLException 当SQL操作出现问题时抛出
-	 */
-	@Nullable
-	@Contract("!null, _ -> !null")
-	default <R> R executeFunction(@Nullable R defaultResult,
-								  @NotNull SQLFunction<SQLQuery, R> function) throws SQLException {
-
+	@Override
+	@Contract("_,!null -> !null")
+	default <R> @Nullable R executeFunction(@NotNull SQLFunction<@NotNull SQLQuery, R> function,
+	                                        @Nullable R defaultResult) throws SQLException {
 		try (SQLQuery value = execute()) {
 			R result = function.apply(value);
 			return result == null ? defaultResult : result;

easysql-impl/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easysql-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>0.3.2</version>
+        <version>0.3.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -19,7 +19,7 @@
     <artifactId>easysql-impl</artifactId>
     <packaging>jar</packaging>
 
-    <name>01-EasySQL-Impl</name>
+    <name>EasySQL-Impl</name>
     <description>EasySQL的实现部分。</description>
     <url>https://github.com/CarmJos/EasySQL</url>
 

example/easysql-demo/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easysql-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>0.3.2</version>
+        <version>0.3.3</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -22,7 +22,7 @@
     <artifactId>easysql-demo</artifactId>
     <packaging>jar</packaging>
 
-    <name>99-EasySQL-Demo</name>
+    <name>EasySQL-Demo</name>
     <description>EasySQL的演示部分</description>
     <url>https://github.com/CarmJos/EasySQL</url>
 

example/easysql-test/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easysql-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>0.3.2</version>
+        <version>0.3.3</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
 
     <artifactId>easysql-test</artifactId>
 
-    <name>98-EasySQL-Demo</name>
+    <name>EasySQL-Test</name>
     <description>EasySQL的测试代码</description>
     <url>https://github.com/CarmJos/EasySQL</url>
 

example/easysql-test/src/main/java/cc/carm/lib/easysql/testrunner/Main.java

@@ -2,8 +2,8 @@ package cc.carm.lib.easysql.testrunner;
 
 import cc.carm.lib.easysql.EasySQL;
 import cc.carm.lib.easysql.api.SQLManager;
-import cc.carm.lib.easysql.testrunner.tests.SQLUpdateBatchTests;
-import cc.carm.lib.easysql.testrunner.tests.SQLUpdateReturnKeysTest;
+import cc.carm.lib.easysql.testrunner.tests.QueryCloseTest;
+import cc.carm.lib.easysql.testrunner.tests.QueryFunctionTest;
 import cc.carm.lib.easysql.testrunner.tests.TableCreateTest;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.TestOnly;
@@ -45,9 +45,10 @@ public class Main {
 //		tests.add(new TableAlterTest());
 //		tests.add(new TableRenameTest());
 //		tests.add(new QueryNotCloseTest());
-//		tests.add(new QueryCloseTest());
-		tests.add(new SQLUpdateBatchTests());
-		tests.add(new SQLUpdateReturnKeysTest());
+		tests.add(new QueryCloseTest());
+//		tests.add(new SQLUpdateBatchTests());
+//		tests.add(new SQLUpdateReturnKeysTest());
+		tests.add(new QueryFunctionTest());
 
 		print("准备进行测试...");
 

example/easysql-test/src/main/java/cc/carm/lib/easysql/testrunner/tests/QueryFunctionTest.java

@@ -0,0 +1,34 @@
+package cc.carm.lib.easysql.testrunner.tests;
+
+import cc.carm.lib.easysql.api.SQLManager;
+import cc.carm.lib.easysql.testrunner.EasySQLTest;
+
+import java.sql.SQLException;
+
+public class QueryFunctionTest extends EasySQLTest {
+
+
+	@Override
+	public void onTest(SQLManager sqlManager) throws SQLException {
+
+		Integer id_1 = sqlManager.createQuery()
+				.inTable("test_user_table")
+				.orderBy("id", false)
+				.setLimit(1)
+				.build().executeFunction(query -> {
+					if (!query.getResultSet().next()) return -1;
+					else return query.getResultSet().getInt("id");
+				});
+
+		System.out.println("id (ps): " + id_1);
+
+		Integer id_2 = sqlManager.createQuery().withSQL("SELECT id FROM test_user_table ORDER BY id DESC LIMIT 1")
+				.executeFunction(query -> {
+					if (!query.getResultSet().next()) return -1;
+					else return query.getResultSet().getInt("id");
+				});
+
+		System.out.println("id (s): " + id_2);
+
+	}
+}

pom.xml

@@ -16,7 +16,7 @@
     <groupId>cc.carm.lib</groupId>
     <artifactId>easysql-parent</artifactId>
     <packaging>pom</packaging>
-    <version>0.3.2</version>
+    <version>0.3.3</version>
 
     <modules>
         <module>easysql-api</module>
@@ -153,7 +153,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-release-plugin</artifactId>
-                <version>2.5.1</version>
+                <version>2.5.3</version>
                 <configuration>
                     <autoVersionSubmodules>true</autoVersionSubmodules>
                     <useReleaseProfile>false</useReleaseProfile>
@@ -169,7 +169,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>3.2.0</version>
+                    <version>3.3.1</version>
                     <configuration>
                         <classifier>javadoc</classifier>
                         <detectJavaApiLink>false</detectJavaApiLink>
@@ -196,7 +196,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.8.1</version>
+                    <version>3.9.0</version>
                     <configuration>
                         <source>1.8</source>
                         <target>1.8</target>
@@ -208,7 +208,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-jar-plugin</artifactId>
-                    <version>3.2.0</version>
+                    <version>3.2.2</version>
                 </plugin>
 
                 <plugin>

with-pool/easysql-beecp/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easysql-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>0.3.2</version>
+        <version>0.3.3</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -20,7 +20,7 @@
     <artifactId>easysql-beecp</artifactId>
     <packaging>jar</packaging>
 
-    <name>12-EasySQL-BeeCP</name>
+    <name>EasySQL-BeeCP</name>
     <description>EasySQL的应用部分。此为BeeCP版本。</description>
     <url>https://github.com/CarmJos/EasySQL</url>
 
@@ -73,7 +73,7 @@
             <!--项目地址 https://github.com/Chris2018998/BeeCP  -->
             <groupId>com.github.chris2018998</groupId>
             <artifactId>beecp</artifactId>
-            <version>3.3.0</version>
+            <version>3.3.1</version>
             <optional>true</optional>
             <scope>compile</scope>
         </dependency>

with-pool/easysql-hikaricp/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easysql-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>0.3.2</version>
+        <version>0.3.3</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -19,7 +19,7 @@
 
     <artifactId>easysql-hikaricp</artifactId>
 
-    <name>11-EasySQL-HikariCP</name>
+    <name>EasySQL-HikariCP</name>
     <description>EasySQL的应用部分。此为HikariCP版本。</description>
     <url>https://github.com/CarmJos/EasySQL</url>