optimize Example

Author: lvyahui8

spring-boot-data-aggregator-example/src/main/java/io/github/lvyahui8/spring/example/aggregate/UserAggregate.java

@@ -22,10 +22,10 @@ public User userWithPosts(
         return user;
     }
 
-    @DataProvider(id="userFullData")
-    public User userFullData(@DataConsumer(id = "user") User user,
-                             @DataConsumer(id = "posts") List<Post> posts,
-                             @DataConsumer(id = "followers") List<User> followers) {
+    @DataProvider("userFullData")
+    public User userFullData(@DataConsumer("user") User user,
+                             @DataConsumer("posts") List<Post> posts,
+                             @DataConsumer("followers") List<User> followers) {
         user.setFollowers(followers);
         user.setPosts(posts);
         return user;

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

@@ -15,7 +15,7 @@
  */
 @Service
 public class FollowServiceImpl implements FollowService {
-    @DataProvider(id = "followers")
+    @DataProvider("followers")
     @Override
     public List<User> getFollowers(@InvokeParameter("userId") Long userId) {
         try { Thread.sleep(1000L); } catch (InterruptedException e) {}

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

@@ -16,7 +16,7 @@
  */
 @Service
 public class PostServiceImpl implements PostService {
-    @DataProvider(id = "posts")
+    @DataProvider("posts")
     @Override
     public List<Post> getPosts(@InvokeParameter("userId") Long userId) {
         Assert.isTrue(userId != null && userId != 0, "userId must be not null and gt 0!");

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

@@ -1,7 +1,5 @@
 package io.github.lvyahui8.spring.example.service.impl;
 
-import io.github.lvyahui8.spring.annotation.DataProvider;
-import io.github.lvyahui8.spring.annotation.InvokeParameter;
 import io.github.lvyahui8.spring.annotation.DataProvider;
 import io.github.lvyahui8.spring.annotation.InvokeParameter;
 import io.github.lvyahui8.spring.example.model.User;
@@ -15,7 +13,7 @@
 @Service
 public class UserServiceImpl implements UserService {
 
-    @DataProvider(id = "user")
+    @DataProvider("user")
     @Override
     public User get(@InvokeParameter("userId") Long id) {
         /* */

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

@@ -1,12 +1,15 @@
 package io.github.lvyahui8.spring.example;
 
 import io.github.lvyahui8.spring.aggregate.facade.DataBeanAggregateQueryFacade;
+import io.github.lvyahui8.spring.autoconfigure.BeanAggregateProperties;
 import io.github.lvyahui8.spring.example.model.User;
+import lombok.extern.slf4j.Slf4j;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.util.Assert;
 
 import java.util.Collections;
 
@@ -16,15 +19,32 @@
  */
 @RunWith(SpringRunner.class)
 @SpringBootTest
+@Slf4j
 public class DataBeanAggregateQueryFacadeTest {
 
     @Autowired
     private DataBeanAggregateQueryFacade dataBeanAggregateQueryFacade;
 
+    @Autowired
+    private BeanAggregateProperties beanAggregateProperties;
+
     @Test
     public void testExceptionProcessing() throws Exception {
-        User user = dataBeanAggregateQueryFacade.get("userWithPosts",
-                Collections.singletonMap("userId", 0L), User.class);
-        System.out.println(user);
+        boolean success = false;
+        if(! beanAggregateProperties.isIgnoreException()) {
+            try {
+                dataBeanAggregateQueryFacade.get("userWithPosts",
+                        Collections.singletonMap("userId", 0L), User.class);
+            } catch (Exception e) {
+                log.info("default settings is SUSPEND, catch an exception: {}",e.getMessage(),e);
+                success = true;
+            }
+        } else {
+            User user = dataBeanAggregateQueryFacade.get("userWithPosts",
+                    Collections.singletonMap("userId", 0L), User.class);
+            System.out.println(user);
+            success = true;
+        }
+        Assert.isTrue(success,"exception handle success");
     }
 }