Merge pull request #38 from patricklaux/dev

1.2.1

Author: patricklaux

README.md

@@ -20,14 +20,14 @@ xtool 是一个小小的 Java 工具集，遵循简单、可靠的原则，不
 <dependency>
     <groupId>com.igeeksky.xtool</groupId>
     <artifactId>xtool</artifactId>
-    <version>1.2.0</version>
+    <version>1.2.1</version>
 </dependency>
 ```
 
 ### 2.2.Gradle
 
 ```groovy
-implementation group: 'com.igeeksky.xtool', name: 'xtool', version: '1.2.0'
+implementation group: 'com.igeeksky.xtool', name: 'xtool', version: '1.2.1'
 ```
 
 ### 2.3.编译安装
@@ -82,7 +82,11 @@ mvn clean install
 
 ### 1.2.0
 
-* 调整 Futures 接口参数
+* `Futures` InterruptedException: interrupt currentThread
+
+### 1.2.0
+
+* change `Futures` API params
 
 ### 1.1.3
 

docs/Reference.md

@@ -1,6 +1,6 @@
 ## xtool 参考文档
 
-Author: [Patrick.Lau](mailto:[email protected])        Version: 1.2.0
+Author: [Patrick.Lau](mailto:[email protected])        Version: 1.2.1
 
 [![License](https://img.shields.io/badge/license-Apache%202-4EB1BA.svg)](https://www.apache.org/licenses/LICENSE-2.0.html)  [![Release](https://img.shields.io/github/v/release/patricklaux/xtool)](https://github.com/patricklaux/xtool/releases)  [![Maven Central](https://img.shields.io/maven-central/v/com.igeeksky.xtool/xtool.svg?label=Maven%20Central)](https://search.maven.org/search?q=g:%22com.igeeksky.xtool%22%20AND%20a:%22xtool%22)  [![codecov](https://codecov.io/gh/patricklaux/xtool/branch/main/graph/badge.svg?token=VJ87A1IAVH)](https://codecov.io/gh/patricklaux/xtool)  [![Last commit](https://img.shields.io/github/last-commit/patricklaux/xtool)](https://github.com/patricklaux/xtool/commits)  [![Join the chat at https://gitter.im/igeeksky/xtool](https://badges.gitter.im/igeeksky/xtool.svg)](https://gitter.im/igeeksky/xtool?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
@@ -26,14 +26,14 @@ xtool 是一个小小的 Java 工具集，遵循简单、可靠的原则，不
 <dependency>
     <groupId>com.igeeksky.xtool</groupId>
     <artifactId>xtool</artifactId>
-    <version>1.2.0</version>
+    <version>1.2.1</version>
 </dependency>
 ```
 
 #### 1.2.2.Gradle
 
 ```groovy
-implementation group: 'com.igeeksky.xtool', name: 'xtool', version: '1.2.0'
+implementation group: 'com.igeeksky.xtool', name: 'xtool', version: '1.2.1'
 ```
 
 #### 1.2.3.编译安装

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.igeeksky.xtool</groupId>
     <artifactId>xtool</artifactId>
-    <version>1.2.0</version>
+    <version>1.2.1</version>
     <name>xtool</name>
     <description>xtool is a very small set of Java tools.</description>
     <url>https://github.com/patricklaux/xtool</url>

src/main/java/com/igeeksky/xtool/core/concurrent/Futures.java

@@ -20,6 +20,42 @@ public final class Futures {
     private Futures() {
     }
 
+    /**
+     * 等待任务完成并返回任务执行结果（无时间限制）
+     *
+     * @param future 任务
+     * @return 任务执行结果
+     */
+    public static <T> T await(Future<T> future) {
+        try {
+            return future.get();
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            throw new ConcurrentException("Interrupted", e);
+        } catch (ExecutionException e) {
+            throw new ConcurrentException(e.getMessage(), e.getCause());
+        }
+    }
+
+    /**
+     * 等待任务完成并返回任务执行结果（无时间限制）
+     *
+     * @param future 任务
+     * @return 任务执行结果
+     */
+    public static <T> T await(Future<T> future, long timeout, TimeUnit unit) {
+        try {
+            return future.get(timeout, unit);
+        } catch (TimeoutException e) {
+            throw new ConcurrentException("Timeout:wait " + timeout + unit.name(), e);
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            throw new ConcurrentException("Interrupted", e);
+        } catch (ExecutionException e) {
+            throw new ConcurrentException(e.getMessage(), e.getCause());
+        }
+    }
+
     /**
      * 等待所有任务完成（无时间限制）
      * <p>
@@ -49,8 +85,11 @@ public static void awaitAll(Future<?>[] futures, int start) {
                     future.get();
                 }
             }
-        } catch (InterruptedException | ExecutionException e) {
-            throw new ConcurrentException(e);
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            throw new ConcurrentException("Interrupted", e);
+        } catch (ExecutionException e) {
+            throw new ConcurrentException(e.getMessage(), e.getCause());
         }
     }
 
@@ -83,8 +122,11 @@ public static void awaitAll(ArrayList<Future<?>> futures, int start) {
                     future.get();
                 }
             }
-        } catch (InterruptedException | ExecutionException e) {
-            throw new ConcurrentException(e);
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            throw new ConcurrentException("Interrupted", e);
+        } catch (ExecutionException e) {
+            throw new ConcurrentException(e.getMessage(), e.getCause());
         }
     }
 
@@ -135,8 +177,11 @@ public static int awaitAll(Future<?>[] futures, long timeout, TimeUnit unit, int
             return i;
         } catch (TimeoutException e) {
             return i;
-        } catch (Exception e) {
-            throw new ConcurrentException(e);
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            throw new ConcurrentException("Interrupted", e);
+        } catch (ExecutionException e) {
+            throw new ConcurrentException(e.getMessage(), e.getCause());
         }
     }
 
@@ -186,8 +231,11 @@ public static int awaitAll(ArrayList<Future<?>> futures, long timeout, TimeUnit
             return i;
         } catch (TimeoutException e) {
             return i;
-        } catch (Exception e) {
-            throw new ConcurrentException(e);
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            throw new ConcurrentException("Interrupted", e);
+        } catch (ExecutionException e) {
+            throw new ConcurrentException(e.getMessage(), e.getCause());
         }
     }