Merge pull request #2 from Ghost-chu/CarmJos-master

Carm jos master

api/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ghostchu.fork.cc.carm.lib</groupId>
         <artifactId>easysql-parent</artifactId>
-        <version>0.4.3</version>
+        <version>0.4.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

@@ -12,6 +12,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.UUID;
+import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -206,6 +207,8 @@ default void executeAsync(@Nullable SQLHandler<T> success) {
     void executeAsync(@Nullable SQLHandler<T> success,
                       @Nullable SQLExceptionHandler failure);
 
+    <R> @NotNull Future<R> executeFuture(@NotNull SQLFunction<T, R> handler);
+
     default void handleException(@Nullable SQLExceptionHandler handler, SQLException exception) {
         if (handler == null) handler = defaultExceptionHandler();
         handler.accept(exception, this);

demo/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easysql-parent</artifactId>
         <groupId>com.ghostchu.fork.cc.carm.lib</groupId>
-        <version>0.4.3</version>
+        <version>0.4.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

demo/src/test/java/cc/carm/lib/easysql/EasySQLTest.java

@@ -50,6 +50,7 @@ public void onTest() {
         tests.add(new SQLUpdateReturnKeysTest());
         tests.add(new QueryCloseTest());
         tests.add(new QueryFunctionTest());
+        tests.add(new QueryFutureTest());
         tests.add(new QueryAsyncTest());
 //        tests.add(new DeleteTest());
 

demo/src/test/java/cc/carm/lib/easysql/TestHandler.java

@@ -5,6 +5,7 @@
 import org.jetbrains.annotations.NotNull;
 
 import java.sql.SQLException;
+import java.util.concurrent.ExecutionException;
 
 public abstract class TestHandler {
 
@@ -13,7 +14,7 @@ protected static void print(@NotNull String format, Object... params) {
     }
 
     @ApiStatus.OverrideOnly
-    public abstract void onTest(SQLManager sqlManager) throws SQLException;
+    public abstract void onTest(SQLManager sqlManager) throws SQLException, ExecutionException, InterruptedException;
 
     public boolean executeTest(int index, SQLManager sqlManager) {
         String testName = getClass().getSimpleName();

demo/src/test/java/cc/carm/lib/easysql/tests/QueryFutureTest.java

@@ -0,0 +1,33 @@
+package cc.carm.lib.easysql.tests;
+
+import cc.carm.lib.easysql.TestHandler;
+import cc.carm.lib.easysql.api.SQLManager;
+
+import java.sql.SQLException;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+
+public class QueryFutureTest extends TestHandler {
+
+
+    @Override
+    public void onTest(SQLManager sqlManager) throws SQLException, ExecutionException, InterruptedException {
+
+
+        Future<Integer> future = sqlManager.createQuery()
+                .inTable("test_user_table")
+                .orderBy("id", false)
+                .setLimit(1)
+                .build().executeFuture((query) -> {
+                    if (!query.getResultSet().next()) {
+                        return -1;
+                    } else {
+                        return query.getResultSet().getInt("id");
+                    }
+                });
+
+        int id = future.get();
+        System.out.println("id(future): " + id);
+
+    }
+}

impl/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easysql-parent</artifactId>
         <groupId>com.ghostchu.fork.cc.carm.lib</groupId>
-        <version>0.4.3</version>
+        <version>0.4.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

impl/src/main/java/cc/carm/lib/easysql/action/AbstractSQLAction.java

@@ -2,6 +2,7 @@
 
 import cc.carm.lib.easysql.api.SQLAction;
 import cc.carm.lib.easysql.api.function.SQLExceptionHandler;
+import cc.carm.lib.easysql.api.function.SQLFunction;
 import cc.carm.lib.easysql.api.function.SQLHandler;
 import cc.carm.lib.easysql.manager.SQLManagerImpl;
 import org.jetbrains.annotations.NotNull;
@@ -10,6 +11,8 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 
 public abstract class AbstractSQLAction<T> implements SQLAction<T> {
@@ -94,4 +97,10 @@ public void executeAsync(SQLHandler<T> success, SQLExceptionHandler failure) {
         });
     }
 
+    @Override
+    public @NotNull <R> Future<R> executeFuture(@NotNull SQLFunction<T, R> handler) {
+        CompletableFuture<R> future = new CompletableFuture<>();
+        executeAsync((t -> future.complete(handler.apply(t))), (e, q) -> future.completeExceptionally(e));
+        return future;
+    }
 }

pom.xml

@@ -19,7 +19,7 @@
     <groupId>com.ghostchu.fork.cc.carm.lib</groupId>
     <artifactId>easysql-parent</artifactId>
     <packaging>pom</packaging>
-    <version>0.4.3</version>
+    <version>0.4.4</version>
 
     <modules>
         <module>api</module>

with-pool/beecp/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easysql-parent</artifactId>
         <groupId>com.ghostchu.fork.cc.carm.lib</groupId>
-        <version>0.4.3</version>
+        <version>0.4.4</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -79,7 +79,7 @@
             <!--项目地址 https://github.com/Chris2018998/BeeCP  -->
             <groupId>com.github.chris2018998</groupId>
             <artifactId>beecp</artifactId>
-            <version>3.3.7</version>
+            <version>3.3.8</version>
             <optional>true</optional>
             <scope>compile</scope>
         </dependency>

with-pool/hikaricp/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easysql-parent</artifactId>
         <groupId>com.ghostchu.fork.cc.carm.lib</groupId>
-        <version>0.4.3</version>
+        <version>0.4.4</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>