release 1.1.2

Author: lvyahui8

pom.xml

@@ -20,7 +20,7 @@ limitations under the License.
 
     <groupId>io.github.lvyahui8</groupId>
     <artifactId>spring-boot-data-aggregator</artifactId>
-    <version>1.1.2</version>
+    <version>1.1.3-SNAPSHOT</version>
     <modules>
         <module>spring-boot-data-aggregator-core</module>
         <module>spring-boot-data-aggregator-autoconfigure</module>

spring-boot-data-aggregator-autoconfigure/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>spring-boot-data-aggregator</artifactId>
         <groupId>io.github.lvyahui8</groupId>
-        <version>1.1.2</version>
+        <version>1.1.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

spring-boot-data-aggregator-autoconfigure/src/main/java/io/github/lvyahui8/spring/autoconfigure/BeanAggregateAutoConfiguration.java

@@ -103,7 +103,7 @@ private void dfs(Map<String,Set<String>> graphAdjMap,Map<String,Integer> visitSt
     public DataBeanAggregateQueryService dataBeanAggregateQueryService (
             @Qualifier("dataProviderRepository") DataProviderRepository dataProviderRepository) {
         if(properties.getBasePackages() != null) {
-            Map<String,Set<String>> provideDependMap = new HashMap<>();
+            Map<String,Set<String>> provideDependMap = new HashMap<>(64);
             for (String basePackage : properties.getBasePackages()) {
                 Reflections reflections = new Reflections(basePackage, new MethodAnnotationsScanner());
                 Set<Method> providerMethods = reflections.getMethodsAnnotatedWith(DataProvider.class);

spring-boot-data-aggregator-core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>spring-boot-data-aggregator</artifactId>
         <groupId>io.github.lvyahui8</groupId>
-        <version>1.1.2</version>
+        <version>1.1.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

spring-boot-data-aggregator-core/src/main/java/io/github/lvyahui8/spring/aggregate/service/AsyncQueryTask.java renamed to spring-boot-data-aggregator-core/src/main/java/io/github/lvyahui8/spring/aggregate/service/AbstractAsyncQueryTask.java

@@ -6,11 +6,17 @@
  * @author lvyahui (lvyahui8@gmail.com,lvyahui8@126.com)
  * @since 2019/12/25 22:40
  */
-public abstract class AsyncQueryTask<T> implements Callable<T> {
-    Thread      taskFromThread;
-    AsyncQueryTaskWrapper asyncQueryTaskWrapper;
+public abstract class AbstractAsyncQueryTask<T> implements Callable<T> {
+    /**
+     * 任务来源线程
+     */
+    private Thread      taskFromThread;
+    /**
+     * 异步任务包装器
+     */
+    private AsyncQueryTaskWrapper asyncQueryTaskWrapper;
 
-    public AsyncQueryTask(Thread taskFromThread, AsyncQueryTaskWrapper asyncQueryTaskWrapper) {
+    public AbstractAsyncQueryTask(Thread taskFromThread, AsyncQueryTaskWrapper asyncQueryTaskWrapper) {
         this.taskFromThread = taskFromThread;
         this.asyncQueryTaskWrapper = asyncQueryTaskWrapper;
     }
@@ -30,9 +36,10 @@ public T call() throws Exception {
     }
 
     /**
+     * 异步任务的实际内容
      *
-     * @return
-     * @throws Exception
+     * @return 异步任务返回值
+     * @throws Exception 异步任务允许抛出异常
      */
-    public abstract T  execute() throws Exception;
+    public abstract T execute() throws Exception;
 }

spring-boot-data-aggregator-core/src/main/java/io/github/lvyahui8/spring/aggregate/service/impl/DataBeanAggregateQueryServiceImpl.java

@@ -6,7 +6,7 @@
 import io.github.lvyahui8.spring.aggregate.interceptor.AggregateQueryInterceptorChain;
 import io.github.lvyahui8.spring.aggregate.model.*;
 import io.github.lvyahui8.spring.aggregate.repository.DataProviderRepository;
-import io.github.lvyahui8.spring.aggregate.service.AsyncQueryTask;
+import io.github.lvyahui8.spring.aggregate.service.AbstractAsyncQueryTask;
 import io.github.lvyahui8.spring.aggregate.service.AsyncQueryTaskWrapper;
 import io.github.lvyahui8.spring.aggregate.service.DataBeanAggregateQueryService;
 import lombok.Setter;
@@ -151,7 +151,7 @@ private Map<String, Object> getDependObjectMap(Map<String, Object> invokeParams,
                 throw new RuntimeException("task wrapper instance create failed.",e);
             }
             taskWrapper.beforeSubmit();
-            Future<?> future = executorService.submit(new AsyncQueryTask<Object>(Thread.currentThread(),taskWrapper) {
+            Future<?> future = executorService.submit(new AbstractAsyncQueryTask<Object>(Thread.currentThread(),taskWrapper) {
                 @Override
                 public Object execute() throws Exception {
                     try {
@@ -186,14 +186,15 @@ public Object execute() throws Exception {
 
     private void throwException(ExecutionException e)  throws InterruptedException,
             InvocationTargetException, IllegalAccessException  {
-        if (e.getCause() instanceof InterruptedException) {
-            throw (InterruptedException) e.getCause();
-        } else if (e.getCause() instanceof  InvocationTargetException){
-            throw (InvocationTargetException) e.getCause();
-        } else if (e.getCause() instanceof IllegalAccessException) {
-            throw (IllegalAccessException) e.getCause();
+        Throwable cause = e.getCause();
+        if (cause instanceof InterruptedException) {
+            throw (InterruptedException) cause;
+        } else if (cause instanceof  InvocationTargetException){
+            throw (InvocationTargetException) cause;
+        } else if (cause instanceof IllegalAccessException) {
+            throw (IllegalAccessException) cause;
         } else {
-            throw (RuntimeException) e.getCause();
+            throw (RuntimeException) cause;
         }
     }
 

spring-boot-data-aggregator-example/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>spring-boot-data-aggregator</artifactId>
         <groupId>io.github.lvyahui8</groupId>
-        <version>1.1.2</version>
+        <version>1.1.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

spring-boot-data-aggregator-starter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>spring-boot-data-aggregator</artifactId>
         <groupId>io.github.lvyahui8</groupId>
-        <version>1.1.2</version>
+        <version>1.1.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>