增加静态门面

lvyahui8 · lvyahui8 · commit 36d5ca74276e · 2020-02-13T21:50:42.000+08:00
diff --git a/README.md b/README.md
@@ -110,17 +110,12 @@ public class UserServiceImpl implements UserService {
 
 ### 2. 调用聚合接口
 
-```java
-@Autowired
-DataBeanAggregateQueryFacade dataBeanAggregateQueryFacade;
-```
-
 #### 方式一: 函数式调用
 
 注意这里不能将函数式调用改为Lambda表达式, 两者的实际行为是不一致的.
 
 ```java
-User user = dataBeanAggregateQueryFacade.get(
+User user = DataFacade.get(
      Collections.singletonMap("userId", 1L), 
      new Function2<User, List<Post>, User>() {
             @Override
@@ -154,7 +149,7 @@ public class UserAggregate {
 指定要查询的data id, 查询参数, 返回值类型, 并调用`facade.get`方法即可
 
 ```java
-User user = dataBeanAggregateQueryFacade.get(/*data id*/ "userWithPosts", 
+User user = DataFacade.get(/*data id*/ "userWithPosts",
                             /*Invoke Parameters*/
                             Collections.singletonMap("userId",1L), 
                             User.class);
diff --git a/README_EN.md b/README_EN.md
@@ -113,15 +113,11 @@ public class UserServiceImpl implements UserService {
 
 ### 2. Call the aggregation interface
 
-```java
-@Autowired
-DataBeanAggregateQueryFacade dataBeanAggregateQueryFacade;
-```
-
 #### Method 1: Functional call
 
+
 ```java
-User user = dataBeanAggregateQueryFacade.get(
+User user = DataFacade.get(
      Collections.singletonMap("userId", 1L), 
      new Function2<User, List<Post>, User>() {
             @Override
@@ -155,8 +151,7 @@ public class UserAggregate {
 Specify queried data id, invoke parameters, and return type to invoke `facade.get` method
 
 ```java
-DataBeanAggregateQueryFacade queryFacade = context.getBean(DataBeanAggregateQueryFacade.class);
-User user = queryFacade.get(/*data id*/ "userWithPosts",
+User user = DataFacade.get(/*data id*/ "userWithPosts",
                             /*Invoke Parameters*/
                             Collections.singletonMap("userId",1L),
                             User.class);
diff --git a/pom.xml b/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
 
     <groupId>io.github.lvyahui8</groupId>
     <artifactId>spring-boot-data-aggregator</artifactId>
-    <version>1.1.3-SNAPSHOT</version>
+    <version>1.1.3</version>
     <modules>
         <module>spring-boot-data-aggregator-core</module>
         <module>spring-boot-data-aggregator-autoconfigure</module>
diff --git a/spring-boot-data-aggregator-autoconfigure/pom.xml b/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.3-SNAPSHOT</version>
+        <version>1.1.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-boot-data-aggregator-autoconfigure/src/main/java/io/github/lvyahui8/spring/autoconfigure/BeanAggregateAutoConfiguration.java b/spring-boot-data-aggregator-autoconfigure/src/main/java/io/github/lvyahui8/spring/autoconfigure/BeanAggregateAutoConfiguration.java
@@ -14,6 +14,7 @@
 import io.github.lvyahui8.spring.aggregate.service.impl.DataBeanAggregateServiceImpl;
 import io.github.lvyahui8.spring.aggregate.util.DefinitionUtils;
 import io.github.lvyahui8.spring.annotation.DataProvider;
+import io.github.lvyahui8.spring.facade.FacadeInitializer;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.reflections.Reflections;
@@ -64,7 +65,9 @@ public void setApplicationContext(ApplicationContext applicationContext) throws
     @ConditionalOnMissingBean
     public DataBeanAggregateQueryFacade dataBeanAggregateQueryFacade(
             @Qualifier("dataProviderRepository") DataProviderRepository dataProviderRepository) {
-        return new DataBeanAggregateQueryFacadeImpl(dataBeanAggregateQueryService(dataProviderRepository));
+        DataBeanAggregateQueryFacadeImpl facade = new DataBeanAggregateQueryFacadeImpl(dataBeanAggregateQueryService(dataProviderRepository));
+        FacadeInitializer.initFacade(facade);
+        return facade;
     }
 
     private void checkCycle(Map<String,Set<String>> graphAdjMap) {
diff --git a/spring-boot-data-aggregator-autoconfigure/src/main/java/io/github/lvyahui8/spring/facade/DataFacade.java b/spring-boot-data-aggregator-autoconfigure/src/main/java/io/github/lvyahui8/spring/facade/DataFacade.java
@@ -0,0 +1,37 @@
+package io.github.lvyahui8.spring.facade;
+
+import io.github.lvyahui8.spring.aggregate.facade.DataBeanAggregateQueryFacade;
+import io.github.lvyahui8.spring.aggregate.func.MultipleArgumentsFunction;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.Map;
+
+/**
+ * @author lvyahui (lvyahui8@gmail.com,lvyahui8@126.com)
+ * @since 2020/2/13
+ */
+public class DataFacade {
+
+    @Setter(AccessLevel.PACKAGE)
+    @Getter(AccessLevel.PACKAGE)
+    private static DataBeanAggregateQueryFacade facade;
+
+    public static <T> T get(String id, Map<String,Object> invokeParams, Class<T> clazz)
+            throws InterruptedException, IllegalAccessException, InvocationTargetException {
+        return facade.get(id,invokeParams,clazz);
+    }
+
+    public static <T> T get(Map<String,Object> invokeParams, MultipleArgumentsFunction<T> multipleArgumentsFunction)
+            throws InterruptedException, IllegalAccessException, InvocationTargetException {
+        return facade.get(invokeParams,multipleArgumentsFunction);
+    }
+
+    public static  <T> T get(Map<String,Object> invokeParams, MultipleArgumentsFunction<T> multipleArgumentsFunction,Long timeout)
+            throws InterruptedException, IllegalAccessException, InvocationTargetException {
+        return facade.get(invokeParams,multipleArgumentsFunction,timeout);
+    }
+
+}
diff --git a/spring-boot-data-aggregator-autoconfigure/src/main/java/io/github/lvyahui8/spring/facade/FacadeInitializer.java b/spring-boot-data-aggregator-autoconfigure/src/main/java/io/github/lvyahui8/spring/facade/FacadeInitializer.java
@@ -0,0 +1,16 @@
+package io.github.lvyahui8.spring.facade;
+
+import io.github.lvyahui8.spring.aggregate.facade.DataBeanAggregateQueryFacade;
+
+/**
+ * @author lvyahui (lvyahui8@gmail.com,lvyahui8@126.com)
+ * @since 2020/2/13
+ */
+public class FacadeInitializer {
+    public static void initFacade(DataBeanAggregateQueryFacade facade) {
+        if (DataFacade.getFacade() != null) {
+            throw new UnsupportedOperationException("DataFacade can be initialized only once.");
+        }
+        DataFacade.setFacade(facade);
+    }
+}
diff --git a/spring-boot-data-aggregator-core/pom.xml b/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.3-SNAPSHOT</version>
+        <version>1.1.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-boot-data-aggregator-example/pom.xml b/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.3-SNAPSHOT</version>
+        <version>1.1.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-boot-data-aggregator-example/src/test/java/io/github/lvyahui8/spring/example/DataBeanAggregateQueryFacadeTest.java b/spring-boot-data-aggregator-example/src/test/java/io/github/lvyahui8/spring/example/DataBeanAggregateQueryFacadeTest.java
@@ -2,7 +2,6 @@
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
-import io.github.lvyahui8.spring.aggregate.facade.DataBeanAggregateQueryFacade;
 import io.github.lvyahui8.spring.aggregate.func.Function2;
 import io.github.lvyahui8.spring.aggregate.func.Function3;
 import io.github.lvyahui8.spring.annotation.DataConsumer;
@@ -14,6 +13,7 @@
 import io.github.lvyahui8.spring.example.model.Category;
 import io.github.lvyahui8.spring.example.model.Post;
 import io.github.lvyahui8.spring.example.model.User;
+import io.github.lvyahui8.spring.facade.DataFacade;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -37,9 +37,6 @@ public class DataBeanAggregateQueryFacadeTest {
 
     private static final int NUM = 100;
 
-    @Autowired
-    private DataBeanAggregateQueryFacade dataBeanAggregateQueryFacade;
-
     @Autowired
     private BeanAggregateProperties beanAggregateProperties;
 
@@ -49,7 +46,7 @@ public class DataBeanAggregateQueryFacadeTest {
     @Test
     public void testSample() throws Exception {
         {
-            User user = dataBeanAggregateQueryFacade.get("userWithPosts", Collections.singletonMap("userId",1L), User.class);
+            User user = DataFacade.get("userWithPosts", Collections.singletonMap("userId",1L), User.class);
             Assert.notNull(user,"user not null");
             Assert.notNull(user.getPosts(),"user posts not null");
             log.info("user.name:{},user.posts.size:{}",
@@ -67,7 +64,7 @@ public void testSample() throws Exception {
 
         {
             for (int i = 0; i < NUM; i ++) {
-                String s = dataBeanAggregateQueryFacade.get("categoryTitle", Collections.singletonMap("categoryId", 1L), String.class);
+                String s = DataFacade.get("categoryTitle", Collections.singletonMap("categoryId", 1L), String.class);
                 Assert.isTrue(org.apache.commons.lang3.StringUtils.isNotEmpty(s),"s  not null");
             }
         }
@@ -78,13 +75,13 @@ public void testExceptionProcessing() throws Exception {
         boolean success = false;
         if(! beanAggregateProperties.isIgnoreException()) {
             try {
-                dataBeanAggregateQueryFacade.get("userWithPosts",
+                DataFacade.get("userWithPosts",
                         Collections.singletonMap("userId", 1L), User.class);
             } catch (Exception e) {
                 log.info("default settings is SUSPEND, catch an exception: {}",e.getMessage(),e);
             }
         } else {
-            User user = dataBeanAggregateQueryFacade.get("userWithPosts",
+            User user = DataFacade.get("userWithPosts",
                     Collections.singletonMap("userId", 1L), User.class);
             Assert.notNull(user,"user must be not null!");
         }
@@ -93,7 +90,7 @@ public void testExceptionProcessing() throws Exception {
     @Test
     public void testGetByMultipleArgumentsFunction() throws Exception {
         Map<String, Object> singletonMap = Collections.singletonMap("userId", 1L);
-        User user = dataBeanAggregateQueryFacade.get(singletonMap, new Function2<User, List<Post>, User>() {
+        User user = DataFacade.get(singletonMap, new Function2<User, List<Post>, User>() {
             @Override
             public User apply(@DataConsumer("user") User user, @DataConsumer("posts") List<Post> posts) {
                 user.setPosts(posts);
@@ -102,7 +99,7 @@ public User apply(@DataConsumer("user") User user, @DataConsumer("posts") List<P
         },null);
         Assert.notNull(user,"user never not be null!");
         try {
-            user = dataBeanAggregateQueryFacade.get(singletonMap, (Function2<User, List<Post>, User>) (user1, posts) -> {
+            user = DataFacade.get(singletonMap, (Function2<User, List<Post>, User>) (user1, posts) -> {
                 user1.setPosts(posts);
                 return user1;
             },null);
@@ -118,7 +115,7 @@ public void testInheritableThreadLocals() throws Exception {
             user.setUsername("bob");
             user.setId(100000L);
             ExampleAppContext.setLoggedUser(user);
-            dataBeanAggregateQueryFacade.get(null, new Function2<String,List<User>,User>() {
+            DataFacade.get(null, new Function2<String,List<User>,User>() {
                 @Override
                 public User apply(@DataConsumer("loggedUsername") String loggedUsername,
                                   @DataConsumer("loggedUserFollowers") List<User> loggedUserFollowers) {
@@ -138,7 +135,7 @@ public User apply(@DataConsumer("loggedUsername") String loggedUsername,
     public void testThreadLocal() throws Exception {
         try {
             RequestContext.setTenantId(10000L);
-            Object result = dataBeanAggregateQueryFacade.get(null,
+            Object result = DataFacade.get(null,
                     new Function3<List<Category>, List<Post>, List<User>, Object>() {
                 @Override
                 public Object apply(
@@ -161,7 +158,7 @@ public void testDynamicParameter() throws Exception {
                 .put("userA_Id", 1L)
                 .put("userB_Id", 2L)
                 .put("userC_Id", 3L).build();
-        Object specialUserCollection = dataBeanAggregateQueryFacade.get(params,
+        Object specialUserCollection = DataFacade.get(params,
                 new Function3<User,User,User,Object>() {
                     @Override
                     public Object apply(
@@ -181,7 +178,7 @@ public Object apply(
     @Test
     public void testParameterTypeException() throws Exception {
         try{
-            dataBeanAggregateQueryFacade.get(Collections.singletonMap("userId", "1"),
+            DataFacade.get(Collections.singletonMap("userId", "1"),
                     new Function2<User, List<Post>, User>() {
                         @Override
                         public User apply(@DataConsumer("user") User user,
@@ -209,7 +206,7 @@ public String apply(@DataConsumer("rootCategory") Category category,
         Exception exp = null;
         for (int i = 0; i < 1000; i ++) {
             try {
-                String name =  dataBeanAggregateQueryFacade.get(map,userFunction);
+                String name =  DataFacade.get(map,userFunction);
             } catch (Exception e) {
                 exp = e;
                 log.error("exp:" + e.getMessage());
diff --git a/spring-boot-data-aggregator-starter/pom.xml b/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.3-SNAPSHOT</version>
+        <version>1.1.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
