optimize

Author: lvyahui8

spring-boot-data-aggregator-core/src/main/java/io/github/lvyahui8/spring/aggregate/consts/AggregatorConstant.java renamed to spring-boot-data-aggregator-core/src/main/java/io/github/lvyahui8/spring/aggregate/consts/AggregationConstant.java

@@ -4,7 +4,7 @@
  * @author lvyahui (lvyahui8@gmail.com,lvyahui8@126.com)
  * @since 2019/6/28 23:53
  */
-public interface AggregatorConstant
+public interface AggregationConstant
 {
     Object EMPTY_MODEL  = new Object();
     int DEFAULT_INITIAL_CAPACITY = 8;

spring-boot-data-aggregator-core/src/main/java/io/github/lvyahui8/spring/aggregate/context/AggregateContext.java

@@ -0,0 +1,26 @@
+package io.github.lvyahui8.spring.aggregate.context;
+
+import io.github.lvyahui8.spring.aggregate.model.DataProvideDefinition;
+import lombok.Data;
+
+import java.util.Map;
+
+/**
+ * @author lvyahui (lvyahui8@gmail.com,lvyahui8@126.com)
+ * @since 2019/7/21 22:37
+ */
+@Data
+public class AggregationContext {
+    /**
+     * 发起一次递归查询的主调线程
+     */
+    Thread rootThread;
+    /**
+     * 根provider
+     */
+    DataProvideDefinition rootProvideDefinition;
+    /**
+     * 此次查询生命周期中的缓存
+     */
+    Map<String,Object> cacheMap;
+}

spring-boot-data-aggregator-core/src/main/java/io/github/lvyahui8/spring/aggregate/context/AggregationContext.java

@@ -1,6 +1,6 @@
 package io.github.lvyahui8.spring.aggregate.facade.impl;
 
-import io.github.lvyahui8.spring.aggregate.consts.AggregatorConstant;
+import io.github.lvyahui8.spring.aggregate.consts.AggregationConstant;
 import io.github.lvyahui8.spring.aggregate.facade.DataBeanAggregateQueryFacade;
 import io.github.lvyahui8.spring.aggregate.func.MultipleArgumentsFunction;
 import io.github.lvyahui8.spring.aggregate.model.DataProvideDefinition;
@@ -36,7 +36,7 @@ public <T> T get(String id, Map<String,Object> invokeParams, Class<T> clazz) thr
             invokeParams = Collections.emptyMap();
         }
         return dataBeanAggregateQueryService.get(id,invokeParams,clazz,
-                new ConcurrentHashMap<>(AggregatorConstant.DEFAULT_INITIAL_CAPACITY));
+                new ConcurrentHashMap<>(AggregationConstant.DEFAULT_INITIAL_CAPACITY));
     }
 
     @Override
@@ -75,7 +75,7 @@ public <T> T get(Map<String, Object> invokeParams, MultipleArgumentsFunction<T>
         try {
             @SuppressWarnings("unchecked")
             T ret = (T) dataBeanAggregateQueryService.get(provider, invokeParams, applyMethod.getReturnType(),
-                    new ConcurrentHashMap<>(AggregatorConstant.DEFAULT_INITIAL_CAPACITY));
+                    new ConcurrentHashMap<>(AggregationConstant.DEFAULT_INITIAL_CAPACITY));
 
             return ret;
         } finally {

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

@@ -1,6 +1,6 @@
 package io.github.lvyahui8.spring.aggregate.interceptor;
 
-import io.github.lvyahui8.spring.aggregate.context.AggregateContext;
+import io.github.lvyahui8.spring.aggregate.context.AggregationContext;
 import io.github.lvyahui8.spring.aggregate.model.DataProvideDefinition;
 
 /**
@@ -13,43 +13,43 @@ public interface AbstractAggregateQueryInterceptor {
     /**
      * 查询正常提交, Context已经创建
      *
-     * @param aggregateContext 查询上下文
+     * @param aggregationContext 查询上下文
      * @return 返回为true才继续执行
      */
-    boolean querySubmitted(AggregateContext aggregateContext) ;
+    boolean querySubmitted(AggregationContext aggregationContext) ;
 
     /**
-     * 每个Provider方法执行前, 将调用此方法
+     * 每个Provider方法执行前, 将调用此方法. 存在并发调用
      *
-     * @param aggregateContext 查询上下文
+     * @param aggregationContext 查询上下文
      * @param provideDefinition 将被执行的Provider
      * @return  返回为true才继续执行
      */
-    boolean queryBefore(AggregateContext aggregateContext, DataProvideDefinition provideDefinition);
+    boolean queryBefore(AggregationContext aggregationContext, DataProvideDefinition provideDefinition);
 
     /**
-     * 每个Provider方法执行成功之后, 调用此方法
+     * 每个Provider方法执行成功之后, 调用此方法. 存在并发调用
      *
-     * @param aggregateContext 查询上下文
+     * @param aggregationContext 查询上下文
      * @param provideDefinition 被执行的Provider
      * @param result 查询结果
      * @return 返回结果, 如不修改不, 请直接返回参数中的result
      */
-    Object queryAfter(AggregateContext aggregateContext,DataProvideDefinition provideDefinition,Object result);
+    Object queryAfter(AggregationContext aggregationContext, DataProvideDefinition provideDefinition, Object result);
 
     /**
-     * 每个Provider执行时, 如果抛出异常, 将调用此方法
+     * 每个Provider执行时, 如果抛出异常, 将调用此方法. 存在并发调用
      *
-     * @param aggregateContext  查询上下文
+     * @param aggregationContext  查询上下文
      * @param provideDefinition 被执行的Provider
      * @param e Provider抛出的异常
      */
-    void exceptionHandle(AggregateContext aggregateContext,DataProvideDefinition provideDefinition,Exception e);
+    void exceptionHandle(AggregationContext aggregationContext, DataProvideDefinition provideDefinition, Exception e);
 
     /**
      * 一次查询全部完成.
      *
-     * @param aggregateContext 查询上下文
+     * @param aggregationContext 查询上下文
      */
-    void queryFinished(AggregateContext aggregateContext);
+    void queryFinished(AggregationContext aggregationContext);
 }

spring-boot-data-aggregator-core/src/main/java/io/github/lvyahui8/spring/aggregate/interceptor/AbstractAggregateQueryInterceptor.java

@@ -1,7 +1,7 @@
 package io.github.lvyahui8.spring.aggregate.service.impl;
 
 import io.github.lvyahui8.spring.aggregate.config.RuntimeSettings;
-import io.github.lvyahui8.spring.aggregate.consts.AggregatorConstant;
+import io.github.lvyahui8.spring.aggregate.consts.AggregationConstant;
 import io.github.lvyahui8.spring.aggregate.model.*;
 import io.github.lvyahui8.spring.aggregate.repository.DataProviderRepository;
 import io.github.lvyahui8.spring.aggregate.service.DataBeanAggregateQueryService;
@@ -87,11 +87,11 @@ public <T> T get(DataProvideDefinition provider, Map<String, Object> invokeParam
                             : provider.getTarget(), args);
             if(provider.isIdempotent()) {
                 /* Map 中可能不能放空value */
-                queryCache.put(invokeSignature,resultModel != null ? resultModel : AggregatorConstant.EMPTY_MODEL);
+                queryCache.put(invokeSignature,resultModel != null ? resultModel : AggregationConstant.EMPTY_MODEL);
             }
         }
 
-        return resultType.cast(resultModel != AggregatorConstant.EMPTY_MODEL ? resultModel : null);
+        return resultType.cast(resultModel != AggregationConstant.EMPTY_MODEL ? resultModel : null);
     }
 
     @Override