Add Thread parameter for EventUncaughtExceptionHandler;

Author: LamGC

src/main/java/net/lamgc/utils/event/EventExecutor.java

@@ -50,6 +50,7 @@ public EventExecutor(ThreadPoolExecutor threadPoolExecutor,
                     if(e instanceof EventInvokeException && eventExceptionHandler != null){
                         EventInvokeException exception = (EventInvokeException) e;
                         eventExceptionHandler.exceptionHandler(
+                                /* Thread: */ t,
                                 exception.getHandler(),
                                 exception.getHandlerMethod(),
                                 exception.getEventObject(),
@@ -215,12 +216,13 @@ public interface EventUncaughtExceptionHandler{
 
         /**
          * 当事件对象抛出异常时触发.
+         * @param executeThread 执行事件方法的线程对象
          * @param handler 事件处理方法所在{@link EventHandler}
          * @param handlerMethod 抛出异常的方法对象
          * @param event 事件对象
          * @param cause 异常对象
          */
-        void exceptionHandler(EventHandler handler, Method handlerMethod, EventObject event, Throwable cause);
+        void exceptionHandler(Thread executeThread, EventHandler handler, Method handlerMethod, EventObject event, Throwable cause);
     }
 
 

src/test/java/net/lamgc/utils/event/EventExecutorTest.java

@@ -1,10 +1,12 @@
 package net.lamgc.utils.event;
 
+import org.junit.Assert;
 import org.junit.Test;
 
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 public class EventExecutorTest {
 
@@ -55,16 +57,23 @@ public void caughtExceptionTest() throws IllegalAccessException, InterruptedExce
         });
         EventExecutor executor = new EventExecutor(threadPoolExecutor);
 
-        executor.setEventUncaughtExceptionHandler((handler, handlerMethod, event, cause) -> {
-            System.out.println("Handler: " + handler.toString() + ", MethodName: " + handlerMethod.getName() +
-                    ", Event: " + event.getClass().getSimpleName() + " throw Exception: " + cause.getMessage());
+        AtomicBoolean handlerException = new AtomicBoolean(false);
+        executor.setEventUncaughtExceptionHandler((t, handler, handlerMethod, event, cause) -> {
+            System.out.println(
+                      "Thread: [" + t.getId() + "] " + t.getName() +
+                    ", Handler: " + handler.toString() +
+                    ", MethodName: " + handlerMethod.getName() +
+                    ", Event: " + event.getClass().getSimpleName() +
+                     " throw Exception: " + cause.getMessage());
             cause.printStackTrace();
+            handlerException.set(true);
         });
 
         SimpleEventHandler handler = new SimpleEventHandler("handler1");
         executor.addHandler(handler);
         executor.executor(new ExceptionThrowEvent(new NullPointerException()));
         Thread.sleep(1000L);
+        Assert.assertTrue(handlerException.get());
     }
 
 }