update

lvyahui8 · lvyahui8 · commit 6ac28922d6c6 · 2019-06-02T22:51:32.000+08:00
diff --git a/spring-boot-data-aggregate-autoconfigure/src/main/java/org/feego/spring/annotation/DataBeanConsumer.java b/spring-boot-data-aggregate-autoconfigure/src/main/java/org/feego/spring/annotation/DataBeanConsumer.java
@@ -13,5 +13,4 @@
 @Documented
 public @interface DataBeanConsumer {
     String id();
-    String namespace();
 }
diff --git a/spring-boot-data-aggregate-autoconfigure/src/main/java/org/feego/spring/annotation/DataBeanProvider.java b/spring-boot-data-aggregate-autoconfigure/src/main/java/org/feego/spring/annotation/DataBeanProvider.java
@@ -13,6 +13,5 @@
 @Documented
 public @interface DataBeanProvider {
     String id();
-    String namespace();
     long timeout() default 1000;
 }
diff --git a/spring-boot-data-aggregate-autoconfigure/src/main/java/org/feego/spring/autoconfigure/BeanAggregateAutoConfiguration.java b/spring-boot-data-aggregate-autoconfigure/src/main/java/org/feego/spring/autoconfigure/BeanAggregateAutoConfiguration.java
@@ -1,25 +1,45 @@
 package org.feego.spring.autoconfigure;
 
+import lombok.extern.slf4j.Slf4j;
 import org.feego.spring.aggregate.facade.DataBeanAggregateQueryFacade;
 import org.feego.spring.aggregate.facade.impl.DataBeanAggregateQueryFacadeImpl;
+import org.feego.spring.aggregate.model.DataProvider;
+import org.feego.spring.aggregate.repository.DataProviderRepository;
+import org.feego.spring.aggregate.repository.impl.DataProviderRepositoryImpl;
+import org.feego.spring.aggregate.service.DataBeanAgregateQueryServiceImpl;
+import org.feego.spring.annotation.DataBeanProvider;
+import org.reflections.Reflections;
+import org.reflections.scanners.MethodAnnotationsScanner;
 import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.concurrent.CustomizableThreadFactory;
+
+import java.lang.reflect.Method;
+import java.util.Set;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.LinkedBlockingDeque;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
 
 /**
  * @author lvyahui (lvyahui8@gmail.com,lvyahui8@126.com)
  * @since 2019/5/31 23:28
  */
 @Configuration
 @EnableConfigurationProperties(BeanAggregateProperties.class)
+@Slf4j
 public class BeanAggregateAutoConfiguration implements ApplicationContextAware {
-
     private ApplicationContext applicationContext;
 
+    @Autowired
+    private BeanAggregateProperties properties;
+
     @Override
     public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
         this.applicationContext = applicationContext;
@@ -28,6 +48,40 @@ public void setApplicationContext(ApplicationContext applicationContext) throws
     @Bean
     @ConditionalOnMissingBean
     public DataBeanAggregateQueryFacade dataBeanAggregateQueryFacade() {
-        return new DataBeanAggregateQueryFacadeImpl();
+        DataProviderRepository repository = new DataProviderRepositoryImpl();
+        scanProviders(repository);
+        DataBeanAgregateQueryServiceImpl service = new DataBeanAgregateQueryServiceImpl(repository);
+        service.setExecutorService(aggregateExecutorService());
+        service.setApplicationContext(applicationContext);
+        return new DataBeanAggregateQueryFacadeImpl(service);
+    }
+
+    @Bean(name = "aggregateExecutorService")
+    @ConditionalOnMissingBean(name = "aggregateExecutorService")
+    public ExecutorService aggregateExecutorService() {
+        log.info("create a ThreadPoolExecutor");
+        return new ThreadPoolExecutor(
+                4,
+                properties.getThreadNumber()  < 4 ? 4 : properties.getThreadNumber() ,
+                2L, TimeUnit.HOURS,
+                new LinkedBlockingDeque<>(properties.getQueueSize()),
+                new CustomizableThreadFactory("aggregateThread-"));
+    }
+
+    private void scanProviders(DataProviderRepository repository) {
+        if(properties.getBasePackpages() != null) {
+            for (String basePackage : properties.getBasePackpages()) {
+                Reflections reflections = new Reflections(basePackage, new MethodAnnotationsScanner());
+                Set<Method> providerMethods = reflections.getMethodsAnnotatedWith(DataBeanProvider.class);
+                for (Method method : providerMethods) {
+                    DataProvider provider = new DataProvider();
+                    DataBeanProvider beanProvider = method.getAnnotation(DataBeanProvider.class);
+                    provider.setId(beanProvider.id());
+                    provider.setMethod(method);
+                    provider.setTimeout(beanProvider.timeout());
+                    repository.put(beanProvider.id(),provider);
+                }
+            }
+        }
     }
 }
diff --git a/spring-boot-data-aggregate-autoconfigure/src/main/java/org/feego/spring/autoconfigure/BeanAggregateProperties.java b/spring-boot-data-aggregate-autoconfigure/src/main/java/org/feego/spring/autoconfigure/BeanAggregateProperties.java
@@ -10,5 +10,7 @@
 @ConfigurationProperties(prefix = "org.feego.spring")
 @Data
 public class BeanAggregateProperties {
-    String basePackpages;
+    private String [] basePackpages;
+    private int threadNumber = Runtime.getRuntime().availableProcessors() * 3 ;
+    private int queueSize = 1000;
 }
diff --git a/spring-boot-data-aggregate-core/pom.xml b/spring-boot-data-aggregate-core/pom.xml
@@ -18,7 +18,14 @@
     </properties>
 
     <dependencies>
-
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/spring-boot-data-aggregate-core/src/main/java/org/feego/spring/.gitignore b/spring-boot-data-aggregate-core/src/main/java/org/feego/spring/.gitignore
diff --git a/spring-boot-data-aggregate-core/src/main/java/org/feego/spring/aggregate/facade/DataBeanAggregateQueryFacade.java b/spring-boot-data-aggregate-core/src/main/java/org/feego/spring/aggregate/facade/DataBeanAggregateQueryFacade.java
@@ -1,9 +1,11 @@
 package org.feego.spring.aggregate.facade;
 
+import java.util.Map;
+
 /**
  * @author lvyahui (lvyahui8@gmail.com,lvyahui8@126.com)
  * @since 2019/6/1 0:22
  */
 public interface DataBeanAggregateQueryFacade {
-    <T> T get(String id, Class<T> clazz);
+    <T> T get(String id, Map<String,Object> invokeParams, Class<T> clazz);
 }
diff --git a/spring-boot-data-aggregate-core/src/main/java/org/feego/spring/aggregate/facade/impl/DataBeanAggregateQueryFacadeImpl.java b/spring-boot-data-aggregate-core/src/main/java/org/feego/spring/aggregate/facade/impl/DataBeanAggregateQueryFacadeImpl.java
@@ -1,15 +1,31 @@
 package org.feego.spring.aggregate.facade.impl;
 
 import org.feego.spring.aggregate.facade.DataBeanAggregateQueryFacade;
+import org.feego.spring.aggregate.service.DataBeanAgregateQueryService;
+import org.springframework.util.Assert;
+
+import java.util.Collections;
+import java.util.Map;
 
 /**
  * @author lvyahui (lvyahui8@gmail.com,lvyahui8@126.com)
  * @since 2019/6/1 0:22
  */
 public class DataBeanAggregateQueryFacadeImpl implements DataBeanAggregateQueryFacade {
 
+    private DataBeanAgregateQueryService dataBeanAgregateQueryService;
+
+    public DataBeanAggregateQueryFacadeImpl(DataBeanAgregateQueryService dataBeanAgregateQueryService) {
+        this.dataBeanAgregateQueryService = dataBeanAgregateQueryService;
+    }
+
     @Override
-    public <T> T get(String id, Class<T> clazz) {
-        return null;
+    public <T> T get(String id, Map<String,Object> invokeParams, Class<T> clazz) {
+        Assert.notNull(id,"id must be not null!");
+        Assert.notNull(clazz,"clazz must be not null !");
+        if(invokeParams == null) {
+            invokeParams = Collections.emptyMap();
+        }
+        return dataBeanAgregateQueryService.get(id,invokeParams,clazz);
     }
 }
diff --git a/spring-boot-data-aggregate-core/src/main/java/org/feego/spring/aggregate/model/DataDepend.java b/spring-boot-data-aggregate-core/src/main/java/org/feego/spring/aggregate/model/DataDepend.java
@@ -0,0 +1,13 @@
+package org.feego.spring.aggregate.model;
+
+import lombok.Data;
+
+/**
+ * @author lvyahui (lvyahui8@gmail.com,lvyahui8@126.com)
+ * @since 2019/6/2 22:13
+ */
+@Data
+public class DataDepend {
+    private String id;
+    private Class<?> clazz;
+}
diff --git a/spring-boot-data-aggregate-core/src/main/java/org/feego/spring/aggregate/model/DataProvider.java b/spring-boot-data-aggregate-core/src/main/java/org/feego/spring/aggregate/model/DataProvider.java
@@ -0,0 +1,19 @@
+package org.feego.spring.aggregate.model;
+
+import lombok.Data;
+
+import java.lang.reflect.Method;
+import java.util.List;
+
+/**
+ * @author lvyahui (lvyahui8@gmail.com,lvyahui8@126.com)
+ * @since 2019/6/2 21:30
+ */
+@Data
+public class DataProvider {
+    private String id;
+    private Method method;
+    private Long timeout;
+    private List<DataDepend> depends;
+    private List<InvokeParam> params;
+}
diff --git a/spring-boot-data-aggregate-core/src/main/java/org/feego/spring/aggregate/model/InvokeParam.java b/spring-boot-data-aggregate-core/src/main/java/org/feego/spring/aggregate/model/InvokeParam.java
@@ -0,0 +1,8 @@
+package org.feego.spring.aggregate.model;
+
+/**
+ * @author lvyahui (lvyahui8@gmail.com,lvyahui8@126.com)
+ * @since 2019/6/2 22:14
+ */
+public class InvokeParam {
+}
diff --git a/spring-boot-data-aggregate-core/src/main/java/org/feego/spring/aggregate/repository/DataProviderRepository.java b/spring-boot-data-aggregate-core/src/main/java/org/feego/spring/aggregate/repository/DataProviderRepository.java
@@ -0,0 +1,15 @@
+package org.feego.spring.aggregate.repository;
+
+import org.feego.spring.aggregate.model.DataProvider;
+
+/**
+ * @author lvyahui (lvyahui8@gmail.com,lvyahui8@126.com)
+ * @since 2019/6/2 21:26
+ */
+public interface DataProviderRepository {
+    void put(String id, DataProvider dataProvider);
+
+    DataProvider get(String id);
+
+    boolean contains(String id);
+}
diff --git a/spring-boot-data-aggregate-core/src/main/java/org/feego/spring/aggregate/repository/impl/DataProviderRepositoryImpl.java b/spring-boot-data-aggregate-core/src/main/java/org/feego/spring/aggregate/repository/impl/DataProviderRepositoryImpl.java
@@ -0,0 +1,32 @@
+package org.feego.spring.aggregate.repository.impl;
+
+import org.feego.spring.aggregate.model.DataProvider;
+import org.feego.spring.aggregate.repository.DataProviderRepository;
+import org.springframework.util.Assert;
+
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * @author lvyahui (lvyahui8@gmail.com,lvyahui8@126.com)
+ * @since 2019/6/2 21:27
+ */
+public class DataProviderRepositoryImpl implements DataProviderRepository {
+
+    private ConcurrentHashMap<String,DataProvider> providerMap = new ConcurrentHashMap<>();
+
+    @Override
+    public void put(String id, DataProvider dataProvider) {
+        Assert.isTrue(! providerMap.containsKey(id),"data provider exisit! id: " + id);
+        providerMap.put(id,dataProvider);
+    }
+
+    @Override
+    public DataProvider get(String id) {
+        return providerMap.get(id);
+    }
+
+    @Override
+    public boolean contains(String id) {
+        return providerMap.containsKey(id);
+    }
+}
diff --git a/spring-boot-data-aggregate-core/src/main/java/org/feego/spring/aggregate/service/DataBeanAgregateQueryService.java b/spring-boot-data-aggregate-core/src/main/java/org/feego/spring/aggregate/service/DataBeanAgregateQueryService.java
@@ -0,0 +1,11 @@
+package org.feego.spring.aggregate.service;
+
+import java.util.Map;
+
+/**
+ * @author lvyahui (lvyahui8@gmail.com,lvyahui8@126.com)
+ * @since 2019/6/2 21:49
+ */
+public interface DataBeanAgregateQueryService {
+    <T> T get(String id, Map<String,Object> invokeParams, Class<T> clazz);
+}
diff --git a/spring-boot-data-aggregate-core/src/main/java/org/feego/spring/aggregate/service/DataBeanAgregateQueryServiceImpl.java b/spring-boot-data-aggregate-core/src/main/java/org/feego/spring/aggregate/service/DataBeanAgregateQueryServiceImpl.java
@@ -0,0 +1,54 @@
+package org.feego.spring.aggregate.service;
+
+import lombok.Setter;
+import org.feego.spring.aggregate.model.DataDepend;
+import org.feego.spring.aggregate.model.DataProvider;
+import org.feego.spring.aggregate.repository.DataProviderRepository;
+import org.springframework.context.ApplicationContext;
+import org.springframework.util.Assert;
+
+import java.util.Map;
+import java.util.concurrent.ExecutorService;
+
+/**
+ * @author lvyahui (lvyahui8@gmail.com,lvyahui8@126.com)
+ * @since 2019/6/2 21:50
+ */
+public class DataBeanAgregateQueryServiceImpl implements DataBeanAgregateQueryService {
+
+    private DataProviderRepository repository;
+
+    @Setter
+    private ApplicationContext applicationContext;
+
+    @Setter
+    private ExecutorService executorService;
+
+    public DataBeanAgregateQueryServiceImpl(DataProviderRepository repository) {
+        this.repository = repository;
+    }
+
+    /**
+     * 并发+递归获取并拼装数据
+     *
+     * @param id
+     * @param invokeParams
+     * @param clazz
+     * @param <T>
+     * @return
+     */
+    @Override
+    public <T> T get(String id, Map<String, Object> invokeParams, Class<T> clazz) {
+        Assert.isTrue(repository.contains(id),"id not exisit");
+        DataProvider provider = repository.get(id);
+
+        if(provider.getDepends() != null) {
+            for (DataDepend depend : provider.getDepends()) {
+                get(depend.getId(),invokeParams,depend.getClazz());
+            }
+        }
+
+        return null;
+    }
+
+}
diff --git a/spring-boot-data-aggregate-example/src/main/java/org/feego/spring/example/ExampleApplication.java b/spring-boot-data-aggregate-example/src/main/java/org/feego/spring/example/ExampleApplication.java
@@ -7,6 +7,8 @@
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.util.Assert;
 
+import java.util.Collections;
+
 /**
  * @author lvyahui (lvyahui8@gmail.com,lvyahui8@126.com)
  * @since 2019/6/1 0:13
@@ -17,7 +19,7 @@ public class ExampleApplication {
     public static void main(String[] args) {
         ConfigurableApplicationContext context = SpringApplication.run(ExampleApplication.class);
         DataBeanAggregateQueryFacade queryFacade = context.getBean(DataBeanAggregateQueryFacade.class);
-        User user = queryFacade.get("login.user", User.class);
+        User user = queryFacade.get("userWithPosts", Collections.singletonMap("userId",1), User.class);
         Assert.notNull(user,"user not null");
         Assert.notNull(user.getPosts(),"user posts not null");
     }
diff --git a/spring-boot-data-aggregate-example/src/main/java/org/feego/spring/example/aggregate/UserAggregate.java b/spring-boot-data-aggregate-example/src/main/java/org/feego/spring/example/aggregate/UserAggregate.java
@@ -17,10 +17,10 @@
 public class UserAggregate {
     private UserService userService;
 
-    @DataBeanProvider(id="userWithPosts",namespace = "feego.example")
+    @DataBeanProvider(id="userWithPosts")
     public User userWithPosts(
-            @DataBeanConsumer(id = "user",namespace = "feego.example") User user,
-            @DataBeanConsumer(id = "posts",namespace = "feego.example") List<Post> posts) {
+            @DataBeanConsumer(id = "user") User user,
+            @DataBeanConsumer(id = "posts") List<Post> posts) {
         user.setPosts(posts);
         return user;
     }
diff --git a/spring-boot-data-aggregate-example/src/main/java/org/feego/spring/example/service/impl/PostServiceImpl.java b/spring-boot-data-aggregate-example/src/main/java/org/feego/spring/example/service/impl/PostServiceImpl.java
@@ -15,7 +15,7 @@
  */
 @Service
 public class PostServiceImpl implements PostService {
-    @DataBeanProvider(id = "posts",namespace = "feego.example")
+    @DataBeanProvider(id = "posts")
     @Override
     public List<Post> getPosts(@InvokeParameter("userId") Long userId) {
         Post post = new Post();
diff --git a/spring-boot-data-aggregate-example/src/main/java/org/feego/spring/example/service/impl/UserServiceImpl.java b/spring-boot-data-aggregate-example/src/main/java/org/feego/spring/example/service/impl/UserServiceImpl.java
@@ -13,7 +13,7 @@
 @Service
 public class UserServiceImpl implements UserService {
 
-    @DataBeanProvider(id = "user",namespace = "feego.example")
+    @DataBeanProvider(id = "user")
     @Override
     public User get(@InvokeParameter("userId") Long id) {
         /* */

Original file line number	Diff line number	Diff line change
`@@ -13,5 +13,4 @@`
`13`	`13`	`@Documented`
`14`	`14`	`public @interface DataBeanConsumer {`
`15`	`15`	`String id();`
`16`		`- String namespace();`
`17`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,5 @@`
`13`	`13`	`@Documented`
`14`	`14`	`public @interface DataBeanProvider {`
`15`	`15`	`String id();`
`16`		`- String namespace();`
`17`	`16`	`long timeout() default 1000;`
`18`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,5 +10,7 @@`
`10`	`10`	`@ConfigurationProperties(prefix = "org.feego.spring")`
`11`	`11`	`@Data`
`12`	`12`	`public class BeanAggregateProperties {`
`13`		`- String basePackpages;`
	`13`	`+ private String [] basePackpages;`
	`14`	`+ private int threadNumber = Runtime.getRuntime().availableProcessors() * 3 ;`
	`15`	`+ private int queueSize = 1000;`
`14`	`16`	`}`