[v0.2.3] 添加默认的终止manager方法，并支持强制关闭活动链接。

easysql-api/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>cc.carm.lib</groupId>
         <artifactId>easysql-parent</artifactId>
-        <version>0.2.2</version>
+        <version>0.2.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

easysql-beecp/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easysql-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>0.2.2</version>
+        <version>0.2.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

easysql-beecp/src/main/java/cc/carm/lib/easysql/EasySQL.java

@@ -1,5 +1,8 @@
 package cc.carm.lib.easysql;
 
+import cc.carm.lib.easysql.api.SQLManager;
+import cc.carm.lib.easysql.api.action.query.SQLQuery;
+import cc.carm.lib.easysql.api.util.TimeDateUtils;
 import cc.carm.lib.easysql.manager.SQLManagerImpl;
 import cn.beecp.BeeDataSource;
 import cn.beecp.BeeDataSourceConfig;
@@ -18,4 +21,26 @@ public class EasySQL {
 		return new SQLManagerImpl(new BeeDataSource(config));
 	}
 
+
+	public static void shutdownManager(SQLManager manager, boolean forceClose, boolean outputActiveQuery) {
+		if (!manager.getActiveQuery().isEmpty()) {
+			manager.getLogger().severe("There are " + manager.getActiveQuery().size() + " connections still running");
+			for (SQLQuery value : manager.getActiveQuery().values()) {
+				if (outputActiveQuery) {
+					manager.getLogger().severe("#" + value.getAction().getShortID() + " -> " + value.getSQLContent());
+					manager.getLogger().severe("- execute at " + TimeDateUtils.getTimeString(value.getExecuteTime()));
+				}
+				if (forceClose) value.close();
+			}
+		}
+		if (manager.getDataSource() instanceof BeeDataSource) {
+			//Close bee connection pool
+			((BeeDataSource) manager.getDataSource()).close();
+		}
+	}
+
+	public static void shutdownManager(SQLManager manager) {
+		shutdownManager(manager, true, manager.isDebugMode());
+	}
+
 }

easysql-demo/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easysql-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>0.2.2</version>
+        <version>0.2.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

easysql-hikaricp/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easysql-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>0.2.2</version>
+        <version>0.2.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

easysql-hikaricp/src/main/java/easysql/EasySQL.java

@@ -1,5 +1,8 @@
 package easysql;
 
+import cc.carm.lib.easysql.api.SQLManager;
+import cc.carm.lib.easysql.api.action.query.SQLQuery;
+import cc.carm.lib.easysql.api.util.TimeDateUtils;
 import cc.carm.lib.easysql.manager.SQLManagerImpl;
 import com.zaxxer.hikari.HikariConfig;
 import com.zaxxer.hikari.HikariDataSource;
@@ -29,4 +32,25 @@ public class EasySQL {
 		return new SQLManagerImpl(new HikariDataSource(config));
 	}
 
+	public static void shutdownManager(SQLManager manager, boolean forceClose, boolean outputActiveQuery) {
+		if (!manager.getActiveQuery().isEmpty()) {
+			manager.getLogger().severe("There are " + manager.getActiveQuery().size() + " connections still running");
+			for (SQLQuery value : manager.getActiveQuery().values()) {
+				if (outputActiveQuery) {
+					manager.getLogger().severe("#" + value.getAction().getShortID() + " -> " + value.getSQLContent());
+					manager.getLogger().severe("- execute at " + TimeDateUtils.getTimeString(value.getExecuteTime()));
+				}
+				if (forceClose) value.close();
+			}
+		}
+		if (manager.getDataSource() instanceof HikariDataSource) {
+			//Close hikari pool
+			((HikariDataSource) manager.getDataSource()).close();
+		}
+	}
+
+	public static void shutdownManager(SQLManager manager) {
+		shutdownManager(manager, true, manager.isDebugMode());
+	}
+
 }

easysql-impl/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easysql-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>0.2.2</version>
+        <version>0.2.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

easysql-impl/src/main/java/cc/carm/lib/easysql/manager/SQLManagerImpl.java

@@ -5,10 +5,10 @@ import cc.carm.lib.easysql.action.PreparedSQLUpdateActionImpl;
 import cc.carm.lib.easysql.action.SQLUpdateActionImpl;
 import cc.carm.lib.easysql.action.SQLUpdateBatchActionImpl;
 import cc.carm.lib.easysql.api.SQLManager;
-import cc.carm.lib.easysql.api.action.query.SQLQuery;
 import cc.carm.lib.easysql.api.action.PreparedSQLUpdateAction;
 import cc.carm.lib.easysql.api.action.PreparedSQLUpdateBatchAction;
 import cc.carm.lib.easysql.api.action.SQLUpdateBatchAction;
+import cc.carm.lib.easysql.api.action.query.SQLQuery;
 import cc.carm.lib.easysql.api.builder.*;
 import cc.carm.lib.easysql.builder.impl.*;
 import org.jetbrains.annotations.NotNull;

pom.xml

@@ -16,7 +16,7 @@
     <groupId>cc.carm.lib</groupId>
     <artifactId>easysql-parent</artifactId>
     <packaging>pom</packaging>
-    <version>0.2.2</version>
+    <version>0.2.3</version>
 
     <modules>
         <module>easysql-api</module>