Merge pull request #6 from lvyahui8/develop

Develop merge into master

Author: lvyahui8

README.md

@@ -42,7 +42,7 @@
 
 ## 使用方法
 
-### 配置
+### 1. 配置
 
 pom.xml
 
@@ -61,13 +61,13 @@ application.properties
 io.github.lvyahui8.spring.base-packages=io.github.lvyahui8.spring.example
 ```
 
-### 添加注解
+### 2. 添加注解
 
 - `@DataProvider` 定义数据提供者
 - `@DataConsumer` 定义方法参数依赖类型为其他接口返回值, 其他接口是一个`@DataProvider`
 - `@InvokeParameter` 定义方法参数依赖类型为用户输入值
 
-### 查询
+### 3. 查询
 
 Spring Bean `DataBeanAggregateQueryFacade` 查询指定的数据的门面
 

README_EN.md

@@ -43,7 +43,7 @@ Of course, in an extremely high concurrent scenario, the parallel call interface
 
 ## Getting Started
 
-### Configuration
+### 1. Configuration
 
 pom.xml
 
@@ -62,15 +62,15 @@ application.properties
 io.github.lvyahui8.spring.base-packages=io.github.lvyahui8.spring.example
 ```
 
-### Annotation
+### 2. Annotation
 
 - `@DataProvider`:  define the data provider
 
 - `@DataConsumer`: define the method parameter dependency type as return the value of other interfaces, the other interface is a `@DataProvider`
 
 - `@InvokeParameter`: define the method parameter dependency type as the user input value
 
-### Query
+### 3. Query
 
 Spring Bean `dataBeanAggregateQueryFacade` query data facade API
 

pom.xml

@@ -20,7 +20,7 @@ limitations under the License.
 
     <groupId>io.github.lvyahui8</groupId>
     <artifactId>spring-boot-data-aggregator</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.1.0</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.0-SNAPSHOT</version>
+        <version>1.1.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

@@ -3,6 +3,7 @@
 import io.github.lvyahui8.spring.aggregate.config.RuntimeSettings;
 import io.github.lvyahui8.spring.aggregate.facade.DataBeanAggregateQueryFacade;
 import io.github.lvyahui8.spring.aggregate.facade.impl.DataBeanAggregateQueryFacadeImpl;
+import io.github.lvyahui8.spring.aggregate.interceptor.AggregateQueryInterceptor;
 import io.github.lvyahui8.spring.aggregate.interceptor.AggregateQueryInterceptorChain;
 import io.github.lvyahui8.spring.aggregate.interceptor.impl.AggregateQueryInterceptorChainImpl;
 import io.github.lvyahui8.spring.aggregate.model.DataProvideDefinition;
@@ -24,14 +25,16 @@
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.core.Ordered;
 import org.springframework.core.annotation.AnnotationUtils;
+import org.springframework.core.annotation.Order;
 import org.springframework.scheduling.concurrent.CustomizableThreadFactory;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
-import java.util.Set;
+import java.util.*;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.LinkedBlockingDeque;
 import java.util.concurrent.ThreadPoolExecutor;
@@ -104,7 +107,7 @@ public DataBeanAggregateQueryService dataBeanAggregateQueryService (
      * @return
      */
     @Bean(name = "aggregateExecutorService")
-    @ConditionalOnMissingBean(name = "aggregateExecutorService")
+    @ConditionalOnMissingBean(name = "aggregateExecutorService",value=ExecutorService.class)
     public ExecutorService aggregateExecutorService() {
         return new ThreadPoolExecutor(
                 properties.getThreadNumber(),
@@ -129,6 +132,24 @@ public DataProviderRepository dataProviderRepository() {
     @Bean(name = "aggregateQueryInterceptorChain")
     @ConditionalOnMissingBean(AggregateQueryInterceptorChain.class)
     public AggregateQueryInterceptorChain aggregateQueryInterceptorChain() {
-        return new AggregateQueryInterceptorChainImpl();
+        Map<String, AggregateQueryInterceptor> interceptorMap = applicationContext.getBeansOfType(AggregateQueryInterceptor.class);
+        AggregateQueryInterceptorChainImpl interceptorChain = new AggregateQueryInterceptorChainImpl();
+        if(interceptorMap != null  && ! interceptorMap.isEmpty()) {
+            List<AggregateQueryInterceptor> interceptors = new ArrayList<>(interceptorMap.values());
+            interceptors.sort(new Comparator<AggregateQueryInterceptor>() {
+                @Override
+                public int compare(AggregateQueryInterceptor o1, AggregateQueryInterceptor o2) {
+                    Order order1 = o1.getClass().getAnnotation(Order.class);
+                    Order order2 = o2.getClass().getAnnotation(Order.class);
+                    int oi1 = order1 == null ? Ordered.LOWEST_PRECEDENCE :  order1.value();
+                    int oi2 = order2 == null ?  Ordered.LOWEST_PRECEDENCE : order2.value();
+                    return oi1 - oi2;
+                }
+            });
+            for (AggregateQueryInterceptor interceptor : interceptors) {
+                interceptorChain.addInterceptor(interceptor);
+            }
+        }
+        return interceptorChain;
     }
 }

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.0-SNAPSHOT</version>
+        <version>1.1.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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.0-SNAPSHOT</version>
+        <version>1.1.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

spring-boot-data-aggregator-example/src/main/java/io/github/lvyahui8/spring/example/configuration/AggregatorCustomConfiguration.java

@@ -1,9 +1,5 @@
 package io.github.lvyahui8.spring.example.configuration;
 
-import io.github.lvyahui8.spring.aggregate.interceptor.AggregateQueryInterceptorChain;
-import io.github.lvyahui8.spring.aggregate.interceptor.impl.AggregateQueryInterceptorChainImpl;
-import io.github.lvyahui8.spring.example.interceptor.SampleAggregateQueryInterceptor;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.concurrent.CustomizableThreadFactory;
@@ -30,18 +26,4 @@ public ExecutorService aggregateExecutorService() {
                 new LinkedBlockingDeque<>(1024),
                 new CustomizableThreadFactory("example-async"));
     }
-
-    /**
-     * 自定义拦截器处理链
-     *
-     * @param sampleAggregateQueryInterceptor
-     * @return
-     */
-    @Bean(name = "aggregateQueryInterceptorChain")
-    public AggregateQueryInterceptorChain aggregateQueryInterceptorChain(
-            @Qualifier("sampleAggregateQueryInterceptor") SampleAggregateQueryInterceptor sampleAggregateQueryInterceptor) {
-        AggregateQueryInterceptorChainImpl aggregateQueryInterceptorChain = new AggregateQueryInterceptorChainImpl();
-        aggregateQueryInterceptorChain.addInterceptor(sampleAggregateQueryInterceptor);
-        return aggregateQueryInterceptorChain;
-    }
 }

spring-boot-data-aggregator-example/src/main/java/io/github/lvyahui8/spring/example/interceptor/PerSetupAggregateQueryInterceptor.java

@@ -0,0 +1,22 @@
+package io.github.lvyahui8.spring.example.interceptor;
+
+import io.github.lvyahui8.spring.aggregate.context.AggregationContext;
+import io.github.lvyahui8.spring.aggregate.interceptor.impl.AggregateQueryInterceptorAdapter;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author lvyahui (lvyahui8@gmail.com,lvyahui8@126.com)
+ * @since 2019/9/7 23:02
+ */
+@Component
+@Order(1)
+@Slf4j
+public class PerSetupAggregateQueryInterceptor extends AggregateQueryInterceptorAdapter {
+    @Override
+    public boolean querySubmitted(AggregationContext aggregationContext) {
+        log.info("current thread {}", Thread.currentThread().getName());
+        return super.querySubmitted(aggregationContext);
+    }
+}

spring-boot-data-aggregator-example/src/main/java/io/github/lvyahui8/spring/example/interceptor/SampleAggregateQueryInterceptor.java

@@ -4,13 +4,15 @@
 import io.github.lvyahui8.spring.aggregate.interceptor.AggregateQueryInterceptor;
 import io.github.lvyahui8.spring.aggregate.model.DataProvideDefinition;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
 
 /**
  * @author lvyahui (lvyahui8@gmail.com,lvyahui8@126.com)
  * @since 2019/8/4 17:24
  */
 @Component
+@Order(2)
 @Slf4j
 public class SampleAggregateQueryInterceptor implements AggregateQueryInterceptor {
     @Override