实现异常处理, 支持忽略异常或者异常中断, 支持全局配置和consumer级别配置

lvyahui8 · lvyahui8 · commit 2a98a3befe3f · 2019-06-16T00:21:22.000+08:00
diff --git a/spring-boot-data-aggregator-autoconfigure/src/main/java/io/github/lvyahui8/spring/annotation/DataConsumer.java b/spring-boot-data-aggregator-autoconfigure/src/main/java/io/github/lvyahui8/spring/annotation/DataConsumer.java
@@ -1,5 +1,6 @@
 package io.github.lvyahui8.spring.annotation;
 
+import io.github.lvyahui8.spring.enums.ExceptionProcessingMethod;
 import org.springframework.core.annotation.AliasFor;
 
 import java.lang.annotation.*;
@@ -25,4 +26,10 @@
      */
     @AliasFor("id")
     String value() default "";
+
+    /**
+     * Exception handling, default by global configuration
+     */
+    ExceptionProcessingMethod exceptionProcessingMethod()
+            default ExceptionProcessingMethod.BY_DEFAULT;
 }
diff --git a/spring-boot-data-aggregator-autoconfigure/src/main/java/io/github/lvyahui8/spring/annotation/DataProvider.java b/spring-boot-data-aggregator-autoconfigure/src/main/java/io/github/lvyahui8/spring/annotation/DataProvider.java
@@ -31,4 +31,5 @@
      * Asynchronous execution method timeout
      */
     long timeout() default -1;
+
 }
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
@@ -10,6 +10,7 @@
 import io.github.lvyahui8.spring.annotation.DataConsumer;
 import io.github.lvyahui8.spring.annotation.DataProvider;
 import io.github.lvyahui8.spring.annotation.InvokeParameter;
+import io.github.lvyahui8.spring.enums.ExceptionProcessingMethod;
 import lombok.extern.slf4j.Slf4j;
 import org.reflections.Reflections;
 import org.reflections.scanners.MethodAnnotationsScanner;
@@ -122,6 +123,11 @@ private void dealMethodParamter(DataProvideDefination provideDefination, List<Me
             DataConsumeDefination dataConsumeDefination = new DataConsumeDefination();
             dataConsumeDefination.setClazz(parameter.getType());
             dataConsumeDefination.setId(dataId);
+            if(! dataConsumer.exceptionProcessingMethod().equals(ExceptionProcessingMethod.BY_DEFAULT)) {
+                dataConsumeDefination.setIgnoreException(
+                        dataConsumer.exceptionProcessingMethod().equals(ExceptionProcessingMethod.IGNORE)
+                );
+            }
             provideDefination.getDepends().add(dataConsumeDefination);
         } else {
             methodArg.setAnnotionKey(invokeParameter.value());
@@ -138,6 +144,7 @@ private RuntimeSettings createRuntimeSettings() {
         RuntimeSettings runtimeSettings = new RuntimeSettings();
         runtimeSettings.setEnableLogging(properties.getEnableLogging() != null
                 ? properties.getEnableLogging() : false);
+        runtimeSettings.setIgnoreException(properties.isIgnoreException());
         return runtimeSettings;
     }
 
diff --git a/spring-boot-data-aggregator-autoconfigure/src/main/java/io/github/lvyahui8/spring/autoconfigure/BeanAggregateProperties.java b/spring-boot-data-aggregator-autoconfigure/src/main/java/io/github/lvyahui8/spring/autoconfigure/BeanAggregateProperties.java
@@ -17,21 +17,25 @@ public class BeanAggregateProperties {
     /**
      * Thread name prefix for asynchronous threads
      */
-    private String   threadPrefix   = "aggregateTask-";
+    private String   threadPrefix    = "aggregateTask-";
     /**
      * Thread size of the asynchronous thread pool
      */
-    private int      threadNumber   = Runtime.getRuntime().availableProcessors() * 3;
+    private int      threadNumber    = Runtime.getRuntime().availableProcessors() * 3;
     /**
      * The size of the queue that holds the task to be executed
      */
-    private int      queueSize      = 1000;
+    private int      queueSize       = 1000;
     /**
      * Set a default timeout for the method of providing data
      */
-    private Long     defaultTimeout = 3000L;
+    private Long     defaultTimeout  = 3000L;
     /**
      * Allow output log
      */
-    private Boolean  enableLogging  = true;
+    private Boolean  enableLogging   = true;
+    /**
+     * Ignore exception thrown by asynchronous execution, method returns null value
+     */
+    private boolean ignoreException = false;
 }
diff --git a/spring-boot-data-aggregator-autoconfigure/src/main/java/io/github/lvyahui8/spring/enums/ExceptionProcessingMethod.java b/spring-boot-data-aggregator-autoconfigure/src/main/java/io/github/lvyahui8/spring/enums/ExceptionProcessingMethod.java
@@ -0,0 +1,20 @@
+package io.github.lvyahui8.spring.enums;
+
+/**
+ * @author lvyahui (lvyahui8@gmail.com,lvyahui8@126.com)
+ * @since 2019/6/15 23:13
+ */
+public enum ExceptionProcessingMethod {
+    /**
+     * Ignore exception thrown by asynchronous execution, method returns null value
+     */
+    IGNORE,
+    /**
+     * Follow the default handling of the framework
+     */
+    BY_DEFAULT,
+    /**
+     * Abort execution
+     */
+    SUSPEND;
+}
diff --git a/spring-boot-data-aggregator-core/src/main/java/io/github/lvyahui8/spring/aggregate/config/RuntimeSettings.java b/spring-boot-data-aggregator-core/src/main/java/io/github/lvyahui8/spring/aggregate/config/RuntimeSettings.java
@@ -9,4 +9,5 @@
 @Data
 public class RuntimeSettings {
     private boolean enableLogging;
+    private boolean ignoreException;
 }
diff --git a/spring-boot-data-aggregator-core/src/main/java/io/github/lvyahui8/spring/aggregate/model/DataConsumeDefination.java b/spring-boot-data-aggregator-core/src/main/java/io/github/lvyahui8/spring/aggregate/model/DataConsumeDefination.java
@@ -10,4 +10,5 @@
 public class DataConsumeDefination {
     private String id;
     private Class<?> clazz;
+    private Boolean ignoreException;
 }
diff --git a/spring-boot-data-aggregator-core/src/main/java/io/github/lvyahui8/spring/aggregate/service/impl/DataBeanAgregateQueryServiceImpl.java b/spring-boot-data-aggregator-core/src/main/java/io/github/lvyahui8/spring/aggregate/service/impl/DataBeanAgregateQueryServiceImpl.java
@@ -49,14 +49,14 @@ public <T> T get(String id, Map<String, Object> invokeParams, Class<T> resultTyp
         if(provider.getDepends() != null && ! provider.getDepends().isEmpty()) {
             CountDownLatch stopDownLatch = new CountDownLatch(provider.getDepends().size());
             Map<String,Future<?>> futureMap = new HashMap<>(provider.getDepends().size());
+            Map<String,DataConsumeDefination> consumeDefinationMap = new HashMap<>(provider.getDepends().size());
             for (DataConsumeDefination depend : provider.getDepends()) {
+                consumeDefinationMap.put(depend.getId(),depend);
                 Future<?> future = executorService.submit(() -> {
                     try {
                         Object o = get(depend.getId(), invokeParams, depend.getClazz());
                         return depend.getClazz().cast(o);
-                    } catch (Exception e) {
-                        return null;
-                    }finally {
+                    } finally {
                         stopDownLatch.countDown();
                     }
                 });
@@ -65,11 +65,18 @@ public <T> T get(String id, Map<String, Object> invokeParams, Class<T> resultTyp
             stopDownLatch.await(provider.getTimeout(),TimeUnit.MILLISECONDS);
             if(! futureMap.isEmpty()){
                 for (Map.Entry<String,Future<?>> item : futureMap.entrySet()) {
+                    Future<?> future = item.getValue();
+                    Object value = null;
+                    DataConsumeDefination consumeDefination = consumeDefinationMap.get(item.getKey());
                     try {
-                        dependObjectMap.put(item.getKey(),item.getValue().get());
+                        value = future.get();
                     } catch (ExecutionException e) {
-                        //
+                        if (consumeDefination.getIgnoreException() != null ? ! consumeDefination.getIgnoreException()
+                                : ! runtimeSettings.isIgnoreException()) {
+                            throwException(e);
+                        }
                     }
+                    dependObjectMap.put(item.getKey(),value);
                 }
             }
         }
@@ -82,16 +89,30 @@ public <T> T get(String id, Map<String, Object> invokeParams, Class<T> resultTyp
             } else {
                 args[i] = invokeParams.get(methodArg.getAnnotionKey());
             }
-            if (! methodArg.getParameter().getType().isAssignableFrom(args[i].getClass())) {
+            if (args[i] != null && ! methodArg.getParameter().getType().isAssignableFrom(args[i].getClass())) {
                 throw new IllegalArgumentException("param type not match, param:"
                         + methodArg.getParameter().getName());
             }
         }
+        try {
+            return resultType.cast(provider.getMethod()
+                    .invoke(applicationContext.getBean(provider.getMethod().getDeclaringClass()), args));
+        } finally {
+            logging(id, startTime, provider);
+        }
+    }
 
-        T result = resultType.cast(provider.getMethod()
-                .invoke(applicationContext.getBean(provider.getMethod().getDeclaringClass()), args));
-        logging(id, startTime, provider);
-        return result;
+    private void throwException(ExecutionException e)  throws InterruptedException,
+            InvocationTargetException, IllegalAccessException  {
+        if (e.getCause() instanceof InterruptedException) {
+            throw (InterruptedException) e.getCause();
+        } else if (e.getCause() instanceof  InvocationTargetException){
+            throw (InvocationTargetException) e.getCause();
+        } else if (e.getCause() instanceof IllegalAccessException) {
+            throw (IllegalAccessException) e.getCause();
+        } else {
+            throw (RuntimeException) e.getCause();
+        }
     }
 
     private void logging(String id, long startTime, DataProvideDefination provider) {
diff --git a/spring-boot-data-aggregator-example/src/main/java/io/github/lvyahui8/spring/example/service/impl/PostServiceImpl.java b/spring-boot-data-aggregator-example/src/main/java/io/github/lvyahui8/spring/example/service/impl/PostServiceImpl.java
@@ -1,14 +1,11 @@
 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.example.model.Post;
-import io.github.lvyahui8.spring.example.service.PostService;
 import io.github.lvyahui8.spring.annotation.DataProvider;
 import io.github.lvyahui8.spring.annotation.InvokeParameter;
 import io.github.lvyahui8.spring.example.model.Post;
 import io.github.lvyahui8.spring.example.service.PostService;
 import org.springframework.stereotype.Service;
+import org.springframework.util.Assert;
 
 import java.util.Collections;
 import java.util.List;
@@ -22,6 +19,7 @@ public class PostServiceImpl implements PostService {
     @DataProvider(id = "posts")
     @Override
     public List<Post> getPosts(@InvokeParameter("userId") Long userId) {
+        Assert.isTrue(userId != null && userId != 0, "userId must be not null and gt 0!");
         try {
             Thread.sleep(1000L);
         } catch (InterruptedException e) {
diff --git a/spring-boot-data-aggregator-example/src/main/resources/application.properties b/spring-boot-data-aggregator-example/src/main/resources/application.properties
@@ -1,2 +1,3 @@
 spring.main.banner-mode=off
 io.github.lvyahui8.spring.base-packages=io.github.lvyahui8.spring.example
+io.github.lvyahui8.spring.ignore-exception=false
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
@@ -0,0 +1,30 @@
+package io.github.lvyahui8.spring.example;
+
+import io.github.lvyahui8.spring.aggregate.facade.DataBeanAggregateQueryFacade;
+import io.github.lvyahui8.spring.example.model.User;
+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 java.util.Collections;
+
+/**
+ * @author lvyahui (lvyahui8@gmail.com,lvyahui8@126.com)
+ * @since 2019/6/16 0:07
+ */
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class DataBeanAggregateQueryFacadeTest {
+
+    @Autowired
+    private DataBeanAggregateQueryFacade dataBeanAggregateQueryFacade;
+
+    @Test
+    public void testExceptionProcessing() throws Exception {
+        User user = dataBeanAggregateQueryFacade.get("userWithPosts",
+                Collections.singletonMap("userId", 0L), User.class);
+        System.out.println(user);
+    }
+}
diff --git a/spring-boot-data-aggregator-example/src/test/resources/.gitignore b/spring-boot-data-aggregator-example/src/test/resources/.gitignore

Original file line number	Diff line number	Diff line change
`@@ -31,4 +31,5 @@`
`31`	`31`	`* Asynchronous execution method timeout`
`32`	`32`	`*/`
`33`	`33`	`long timeout() default -1;`
	`34`	`+`
`34`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,4 +9,5 @@`
`9`	`9`	`@Data`
`10`	`10`	`public class RuntimeSettings {`
`11`	`11`	`private boolean enableLogging;`
	`12`	`+ private boolean ignoreException;`
`12`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,4 +10,5 @@`
`10`	`10`	`public class DataConsumeDefination {`
`11`	`11`	`private String id;`
`12`	`12`	`private Class<?> clazz;`
	`13`	`+ private Boolean ignoreException;`
`13`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`spring.main.banner-mode=off`
`2`	`2`	`io.github.lvyahui8.spring.base-packages=io.github.lvyahui8.spring.example`
	`3`	`+io.github.lvyahui8.spring.ignore-exception=false`