Added ability to post events to multiple Handler Objects;

Author: LamGC

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

@@ -2,6 +2,7 @@
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.ThreadFactory;
@@ -42,11 +43,13 @@ public EventExecutor(ThreadPoolExecutor threadPoolExecutor,
         final ThreadFactory threadFactory = this.threadPoolExecutor.getThreadFactory();
         this.threadPoolExecutor.setThreadFactory(r -> {
             Thread newThread = threadFactory.newThread(r);
-            newThread.setUncaughtExceptionHandler((t, e) -> {
-                if(this.exceptionHandler != null){
-                    this.exceptionHandler.uncaughtException(t, e);
-                }
-            });
+            if(newThread.getUncaughtExceptionHandler() == newThread.getThreadGroup()){
+                newThread.setUncaughtExceptionHandler((t, e) -> {
+                    if(this.exceptionHandler != null){
+                        this.exceptionHandler.uncaughtException(t, e);
+                    }
+                });
+            }
             return newThread;
         });
         this.eventHandlerList = eventHandlerList != null ? eventHandlerList : new BasicEventHandlerList();
@@ -84,7 +87,41 @@ public void executor(final EventObject eventObject){
             return;
         }
         eventHandlerMethod.forEach(method -> {
-            EventHandler handler = eventHandlerObjectMap.getHandlerObject(method.getDeclaringClass());
+            final Set<EventHandler> handlerSet = eventHandlerObjectMap.getHandlerObject(method.getDeclaringClass());
+            threadPoolExecutor.execute(() -> handlerSet.forEach(handler -> {
+                try {
+                    method.invoke(handler, eventObject);
+                } catch (IllegalAccessException e) {
+                    throw new RuntimeException(e);
+                } catch (InvocationTargetException e){
+                    throw new RuntimeException(e.getCause() == null ? e : e.getCause());
+                }
+            }));
+        });
+    }
+
+    /**
+     * 对指定{@link EventHandler}投递事件
+     * @param handler 要进行事件投递的EventHandler
+     * @param eventObject 事件对象
+     * @return 返回已处理事件方法数量
+     */
+    public int executor(EventHandler handler, EventObject eventObject){
+        Method[] methods = handler.getClass().getDeclaredMethods();
+        int invokeCount = 0;
+        for (Method method : methods) {
+            int modifiers = method.getModifiers();
+            if(!Modifier.isPublic(modifiers) || Modifier.isAbstract(modifiers) || Modifier.isInterface(modifiers)){
+                continue;
+            }
+            Class<?>[] types = method.getParameterTypes();
+            if(types.length != 1){
+                continue;
+            }
+            if(!eventObject.getClass().isAssignableFrom(types[0])){
+                continue;
+            }
+
             threadPoolExecutor.execute(() -> {
                 try {
                     method.invoke(handler, eventObject);
@@ -94,7 +131,9 @@ public void executor(final EventObject eventObject){
                     throw new RuntimeException(e.getCause() == null ? e : e.getCause());
                 }
             });
-        });
+            invokeCount++;
+        }
+        return invokeCount;
     }
 
     /**

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

@@ -1,5 +1,7 @@
 package net.lamgc.utils.event;
 
+import java.util.Set;
+
 /**
  * EventHandler对象存储Map.
  * 用于对EventHandler对象进行存储而无需重新实例化.
@@ -17,7 +19,7 @@ public interface EventHandlerObjectMap {
      * @param eventHandlerClass EventHandler的Class对象
      * @return 如果找到则返回EventHandler对象, 无则返回null
      */
-    EventHandler getHandlerObject(Class<?> eventHandlerClass);
+    Set<EventHandler> getHandlerObject(Class<?> eventHandlerClass);
 
     /**
      * 删除指定的{@link EventHandler}

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

@@ -1,18 +1,23 @@
 package net.lamgc.utils.event;
 
 import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Set;
 
 public class HashHandlerObjectMap implements EventHandlerObjectMap {
 
-    private final HashMap<Class<? extends EventHandler>, EventHandler> handlerMap = new HashMap<>();
+    private final HashMap<Class<? extends EventHandler>, HashSet<EventHandler>> handlerMap = new HashMap<>();
 
     @Override
     public void addHandlerObject(EventHandler eventHandler) {
-        handlerMap.put(eventHandler.getClass(), eventHandler);
+        if(!handlerMap.containsKey(eventHandler.getClass())){
+            handlerMap.put(eventHandler.getClass(), new HashSet<>());
+        }
+        handlerMap.get(eventHandler.getClass()).add(eventHandler);
     }
 
     @Override
-    public EventHandler getHandlerObject(Class<?> eventHandlerClass) {
+    public Set<EventHandler> getHandlerObject(Class<?> eventHandlerClass) {
         return handlerMap.get(eventHandlerClass);
     }
 

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

@@ -24,10 +24,15 @@ public void executorTest() throws IllegalAccessException, InterruptedException {
             }
         });
         EventExecutor executor = new EventExecutor(threadPoolExecutor);
-        SimpleEventHandler handler = new SimpleEventHandler();
+        SimpleEventHandler handler = new SimpleEventHandler("handler1");
+        SimpleEventHandler handler2 = new SimpleEventHandler("handler2");
         executor.addHandler(handler);
+        executor.addHandler(handler2);
         executor.executor(new SimpleEventObject(1, "HelloWorld"));
         Thread.sleep(500L);
+        System.out.println("OnlyHandlerTest-----");
+        executor.executor(handler2, new SimpleEventObject(1, "HelloWorld"));
+        Thread.sleep(500L);
         executor.removeHandler(handler);
         System.out.println("deleted Handler");
         executor.executor(new SimpleEventObject(2, "HelloWorld123"));

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

@@ -2,8 +2,14 @@
 
 public class SimpleEventHandler implements EventHandler {
 
-    public void simpleEventHandler1(SimpleEventObject event){
-        System.out.println(this.getClass().getSimpleName() + " - [" + event.errorCode + "] " + event.msg);
+    private String flag;
+
+    public SimpleEventHandler(String flag){
+        this.flag = flag;
+    }
+
+    public void simpleEventHandler(SimpleEventObject event){
+        System.out.println(this.toString() + "." + flag + " - [" + event.errorCode + "] " + event.msg);
     }
 
 }