[v0.2.8] [R] 使用Supplier获取是否为Debug模式。

.github/workflows/deploy.yml

@@ -11,8 +11,7 @@ on:
     types: [ published ]
 
 jobs:
-  build:
+  deploy:
-
     runs-on: ubuntu-latest
 
     steps:
@@ -26,8 +25,55 @@ jobs:
           server-id: github
           server-username: MAVEN_USERNAME
           server-password: MAVEN_TOKEN
-      - name: "Deploy"
+
+      - name: "Maven Deploy With Javadoc"
         run: mvn -B deploy --file pom.xml -DskipTests
         env:
           MAVEN_USERNAME: ${{ github.repository_owner }}
           MAVEN_TOKEN: ${{secrets.GITHUB_TOKEN}}
+
+      - name: "Copy Javadoc to Location"
+        run: |
+          rm -rf docs
+          mkdir -vp docs
+          cp -vrf easysql-api/target/apidocs/* docs/
+          cp -vrf .documentation/JAVADOC-README.md docs/README.md
+
+      - name: "Generate the Javadoc sitemap"
+        id: sitemap
+        uses: cicirello/generate-sitemap@v1
+        with:
+          base-url-path: https://carmjos.github.io/EasySQL
+          path-to-root: docs
+
+      - name: "Output stats"
+        run: |
+          echo "sitemap-path = ${{ steps.sitemap.outputs.sitemap-path }}"
+          echo "url-count = ${{ steps.sitemap.outputs.url-count }}"
+          echo "excluded-count = ${{ steps.sitemap.outputs.excluded-count }}"
+
+      - name: "Configure Git"
+        env:
+          DEPLOY_PRI: ${{secrets.DEPLOY_PRI}}
+        run: |
+          sudo timedatectl set-timezone "Asia/Shanghai"
+          mkdir -p ~/.ssh/
+          echo "$DEPLOY_PRI" > ~/.ssh/id_rsa
+          chmod 600 ~/.ssh/id_rsa
+          ssh-keyscan github.com >> ~/.ssh/known_hosts
+          git config --global user.name 'CarmJos'
+          git config --global user.email 'carm@carm.cc'
+
+      - name: "Commit documentations"
+        run: |
+          cd docs
+          git init
+          git remote add origin git@github.com:CarmJos/EasySQL.git
+          git checkout -b gh-pages
+          git add -A
+          git commit -m "API Document generated."
+
+      - name: "Push javadocs"
+        run: |
+          cd docs
+          git push origin HEAD:gh-pages --force

.github/workflows/javadoc.yml

@@ -1,73 +0,0 @@
-# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
-# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
-
-name: "Javadoc Deployment"
-
-on:
-  # 支持手动触发构建
-  workflow_dispatch:
-  release:
-    # 创建release的时候触发
-    types: [ published ]
-
-jobs:
-  api-website:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout the repo
-        uses: actions/checkout@v2
-
-      - name: Set up the Java JDK
-        uses: actions/setup-java@v2
-        with:
-          java-version: '11'
-          distribution: 'adopt'
-
-      - name: Generate docs
-        run: mvn clean package -DskipTests
-
-      - name: Copy to Location
-        run: |
-          rm -rf docs
-          mkdir -vp docs
-          cp -vrf easysql-api/target/apidocs/* docs/
-          cp -vrf .documentation/JAVADOC-README.md docs/README.md
-
-      - name: Generate the sitemap
-        id: sitemap
-        uses: cicirello/generate-sitemap@v1
-        with:
-          base-url-path: https://carmjos.github.io/EasySQL
-          path-to-root: docs
-
-      - name: Output stats
-        run: |
-          echo "sitemap-path = ${{ steps.sitemap.outputs.sitemap-path }}"
-          echo "url-count = ${{ steps.sitemap.outputs.url-count }}"
-          echo "excluded-count = ${{ steps.sitemap.outputs.excluded-count }}"
-
-      - name: Configure Git
-        env:
-          DEPLOY_PRI: ${{secrets.DEPLOY_PRI}}
-        run: |
-          sudo timedatectl set-timezone "Asia/Shanghai"
-          mkdir -p ~/.ssh/
-          echo "$DEPLOY_PRI" > ~/.ssh/id_rsa
-          chmod 600 ~/.ssh/id_rsa
-          ssh-keyscan github.com >> ~/.ssh/known_hosts
-          git config --global user.name 'CarmJos'
-          git config --global user.email 'carm@carm.cc'
-
-      - name: Commit documentation changes
-        run: |
-          cd docs
-          git init
-          git remote add origin git@github.com:CarmJos/EasySQL.git
-          git checkout -b gh-pages
-          git add -A
-          git commit -m "API Document generated."
-      - name: Push javadocs
-        run: |
-          cd docs
-          git push origin HEAD:gh-pages --force
-

.github/workflows/maven.yml

@@ -1,7 +1,7 @@
 # This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
 # For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
 
-name: Build
+name: Project Build & Tests
 
 on:
   # 支持手动触发构建

easysql-api/pom.xml

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

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

@@ -14,6 +14,7 @@ import java.sql.SQLException;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
+import java.util.function.Supplier;
 import java.util.logging.Logger;
 
 public interface SQLManager {
@@ -22,7 +23,11 @@ public interface SQLManager {
 
 	boolean isDebugMode();
 
-    void setDebugMode(boolean enable);
+	void setDebugMode(@NotNull Supplier<@NotNull Boolean> debugMode);
+
+	default void setDebugMode(boolean enable) {
+		setDebugMode(() -> enable);
+	}
 	
 	/**
 	 * 得到连接池源

easysql-beecp/pom.xml

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

easysql-demo/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easysql-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>0.2.7</version>
+        <version>0.2.8</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.7</version>
+        <version>0.2.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

easysql-impl/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easysql-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>0.2.7</version>
+        <version>0.2.8</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.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.SQLQuery;
 import cc.carm.lib.easysql.api.builder.*;
 import cc.carm.lib.easysql.builder.impl.*;
 import org.jetbrains.annotations.NotNull;
@@ -21,6 +21,7 @@ import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.function.Supplier;
 import java.util.logging.Logger;
 
 public class SQLManagerImpl implements SQLManager {
@@ -29,7 +30,8 @@ public class SQLManagerImpl implements SQLManager {
 	private final DataSource dataSource;
 	protected ExecutorService executorPool;
 	ConcurrentHashMap<UUID, SQLQuery> activeQuery = new ConcurrentHashMap<>();
-    boolean debug = false;
+
+	@NotNull Supplier<Boolean> debugMode = () -> false;
 
 	public SQLManagerImpl(@NotNull DataSource dataSource) {
 		this(dataSource, null);
@@ -48,12 +50,12 @@ public class SQLManagerImpl implements SQLManager {
 
 	@Override
 	public boolean isDebugMode() {
-        return this.debug;
+		return this.debugMode.get();
 	}
 
 	@Override
-    public void setDebugMode(boolean enable) {
+	public void setDebugMode(@NotNull Supplier<@NotNull Boolean> debugMode) {
-        this.debug = enable;
+		this.debugMode = debugMode;
 	}
 
 	public void debug(String msg) {

pom.xml

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