Merge pull request #3 from lvyahui8/develop

Develop

Author: lvyahui8

README.md

@@ -98,7 +98,6 @@ public class PostServiceImpl implements PostService {
 ```java
 @Service
 public class UserServiceImpl implements UserService {
-
     @DataProvider("user")
     @Override
     public User get(@InvokeParameter("userId") Long id) {

README_EN.md

@@ -101,7 +101,6 @@ require input parameter `userId`.
 ```java
 @Service
 public class UserServiceImpl implements UserService {
-
     @DataProvider("user")
     @Override
     public User get(@InvokeParameter("userId") Long id) {

spring-boot-data-aggregator-core/src/main/java/io/github/lvyahui8/spring/aggregate/concurrent/AbstractRunnableWrapper.java

@@ -0,0 +1,24 @@
+package io.github.lvyahui8.spring.aggregate.concurrent;
+
+/**
+ * @author lvyahui (lvyahui8@gmail.com,lvyahui8@126.com)
+ * @since 2019/7/18 21:49
+ */
+public abstract class AbstractRunnableWrapper implements Runnable {
+    private Thread rootThread;
+
+    @Override
+    public void run() {
+        /* copy context to executor service threads */
+        try {
+            doRun();
+        } finally {
+            /* remove all cope context*/
+        }
+    }
+
+    /**
+     * actual run method
+     */
+    public abstract void doRun();
+}

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

@@ -37,7 +37,7 @@ <T> T get(String id, Map<String,Object> invokeParams, Class<T> clazz)
      * 3. Automatic injection
      *
      * @param invokeParams Fixed parameters that need to be passed in the query process
-     * @param multipleArgumentsFunction
+     * @param multipleArgumentsFunction Multiple arguments function
      * @param <T> Return value type
      * @return Return value
      * @throws InterruptedException  If the thread is interrupted, this exception will be thrown
@@ -54,7 +54,7 @@ <T> T get(Map<String,Object> invokeParams, MultipleArgumentsFunction<T> multiple
      * 3. Automatic injection
      *
      * @param invokeParams Fixed parameters that need to be passed in the query process
-     * @param multipleArgumentsFunction
+     * @param multipleArgumentsFunction Multiple arguments function
      * @param timeout Timeout
      * @param <T> Return value type
      * @return Return value

spring-boot-data-aggregator-example/src/main/java/io/github/lvyahui8/spring/example/context/ExampleAppContext.java

@@ -0,0 +1,34 @@
+package io.github.lvyahui8.spring.example.context;
+
+import io.github.lvyahui8.spring.example.model.User;
+
+/**
+ * @author lvyahui (lvyahui8@gmail.com,lvyahui8@126.com)
+ * @since 2019/7/18 22:19
+ */
+public class ExampleAppContext {
+    /**
+     * 这里必须使用, InheritableThreadLocal, 只有InheritableThreadLocal会向子线程传递.
+     */
+    private static ThreadLocal<User> LOGGED_USER = new InheritableThreadLocal<>();
+
+    public static void setLoggedUser(User user) {
+        LOGGED_USER.set(user);
+    }
+
+    public static boolean isLogged() {
+        return LOGGED_USER.get() != null;
+    }
+
+    public static Long getUserId() {
+        return LOGGED_USER.get().getId();
+    }
+
+    public static String getUsername() {
+        return LOGGED_USER.get() != null ? LOGGED_USER.get().getUsername() : null;
+    }
+
+    public static void remove() {
+        LOGGED_USER.remove();
+    }
+}

spring-boot-data-aggregator-example/src/main/java/io/github/lvyahui8/spring/example/service/FollowService.java

@@ -9,5 +9,18 @@
  * @since 2019/6/11 21:31
  */
 public interface FollowService {
+    /**
+     * xxx
+     *
+     * @param userId userId
+     * @return xx
+     */
     List<User> getFollowers(Long userId);
+
+    /**
+     * xxx
+     *
+     * @return xx
+     */
+    List<User> getLoggedUserFollowers();
 }

spring-boot-data-aggregator-example/src/main/java/io/github/lvyahui8/spring/example/service/UserService.java

@@ -13,4 +13,11 @@ public interface UserService {
      * @return
      */
     User get(Long id);
+
+    /**
+     * 获取已登录用户用户名
+     *
+     * @return xx
+     */
+    String getLoggedUsername();
 }

spring-boot-data-aggregator-example/src/main/java/io/github/lvyahui8/spring/example/service/impl/FollowServiceImpl.java

@@ -2,11 +2,13 @@
 
 import io.github.lvyahui8.spring.annotation.DataProvider;
 import io.github.lvyahui8.spring.annotation.InvokeParameter;
+import io.github.lvyahui8.spring.example.context.ExampleAppContext;
 import io.github.lvyahui8.spring.example.model.User;
 import io.github.lvyahui8.spring.example.service.FollowService;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -30,4 +32,15 @@ public List<User> getFollowers(@InvokeParameter("userId") Long userId) {
         }
         return users;
     }
+
+    @DataProvider("loggedUserFollowers")
+    @Override
+    public List<User> getLoggedUserFollowers() {
+        Long userId = ExampleAppContext.getUserId();
+        String username = ExampleAppContext.getUsername();
+        User follower = new User();
+        follower.setId(userId + 10000L);
+        follower.setUsername(username + "_follower");
+        return Collections.singletonList(follower);
+    }
 }

spring-boot-data-aggregator-example/src/main/java/io/github/lvyahui8/spring/example/service/impl/UserServiceImpl.java

@@ -2,6 +2,7 @@
 
 import io.github.lvyahui8.spring.annotation.DataProvider;
 import io.github.lvyahui8.spring.annotation.InvokeParameter;
+import io.github.lvyahui8.spring.example.context.ExampleAppContext;
 import io.github.lvyahui8.spring.example.model.User;
 import io.github.lvyahui8.spring.example.service.UserService;
 import org.springframework.stereotype.Service;
@@ -29,4 +30,10 @@ public User get(@InvokeParameter("userId") Long id) {
         user.setUsername("lvyahui8");
         return user;
     }
+
+    @DataProvider("loggedUsername")
+    @Override
+    public String getLoggedUsername() {
+        return ExampleAppContext.getUsername();
+    }
 }

spring-boot-data-aggregator-example/src/test/java/io/github/lvyahui8/spring/example/DataBeanAggregateQueryFacadeTest.java

@@ -4,6 +4,7 @@
 import io.github.lvyahui8.spring.aggregate.func.Function2;
 import io.github.lvyahui8.spring.annotation.DataConsumer;
 import io.github.lvyahui8.spring.autoconfigure.BeanAggregateProperties;
+import io.github.lvyahui8.spring.example.context.ExampleAppContext;
 import io.github.lvyahui8.spring.example.model.Post;
 import io.github.lvyahui8.spring.example.model.User;
 import lombok.extern.slf4j.Slf4j;
@@ -63,7 +64,7 @@ public User apply(@DataConsumer("user") User user, @DataConsumer("posts") List<P
                 return user;
             }
         },null);
-        log.info("query result:{} ",user);
+        Assert.notNull(user,"user never not be null!");
         try {
             user = dataBeanAggregateQueryFacade.get(singletonMap, (Function2<User, List<Post>, User>) (user1, posts) -> {
                 user1.setPosts(posts);
@@ -73,4 +74,27 @@ public User apply(@DataConsumer("user") User user, @DataConsumer("posts") List<P
             log.info("don't support lambda!!! eMsg:{}",e.getMessage());
         }
     }
+
+    @Test
+    public void testInheritableThreadLocals() throws Exception {
+        try {
+            User user = new User();
+            user.setUsername("bob");
+            user.setId(100000L);
+            ExampleAppContext.setLoggedUser(user);
+            dataBeanAggregateQueryFacade.get(null, new Function2<String,List<User>,User>() {
+                @Override
+                public User apply(@DataConsumer("loggedUsername") String loggedUsername,
+                                  @DataConsumer("loggedUserFollowers") List<User> loggedUserFollowers) {
+                    Assert.notNull(loggedUsername, "loggedUsername must be not null");
+                    Assert.notNull(loggedUserFollowers, "loggedUserFollowers must be not null");
+                    Assert.notNull(ExampleAppContext.getUsername(),"ExampleAppContext.getUsername() must be not null");
+                    log.info("everything is normal~");
+                    return null;
+                }
+            });
+        } finally {
+            ExampleAppContext.remove();
+        }
+    }
 }