Merge pull request #78 from codingapi/dev

xlorne · web-flow · commit f62f9738f695 · 2024-11-09T10:59:03.000+08:00
update version and event support global handler &amp; handler order
diff --git a/example/example-application/pom.xml b/example/example-application/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.5</version>
+        <version>3.3.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/example/example-application/src/main/java/com/codingapi/example/handler/CHandler.java b/example/example-application/src/main/java/com/codingapi/example/handler/CHandler.java
@@ -15,7 +15,7 @@ public void handler(CEvent event) {
         log.info("c event:{},eventKey:{}", event, EventTraceContext.getInstance().getEventKey());
 
 //        EventPusher.push(new AEvent());
-        throw new RuntimeException("c handler error");
+//        throw new RuntimeException("c handler error");
     }
 
     @Override
diff --git a/example/example-application/src/main/java/com/codingapi/example/handler/GlobalEventHandler.java b/example/example-application/src/main/java/com/codingapi/example/handler/GlobalEventHandler.java
@@ -0,0 +1,16 @@
+package com.codingapi.example.handler;
+
+import com.codingapi.springboot.framework.event.IEvent;
+import com.codingapi.springboot.framework.event.IHandler;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+@Slf4j
+@Service
+public class GlobalEventHandler implements IHandler<IEvent> {
+
+    @Override
+    public void handler(IEvent event) {
+        log.info("global event:{}", event);
+    }
+}
diff --git a/example/example-application/src/main/java/com/codingapi/example/handler/Test2Handler.java b/example/example-application/src/main/java/com/codingapi/example/handler/Test2Handler.java
@@ -0,0 +1,37 @@
+package com.codingapi.example.handler;
+
+import com.codingapi.example.event.AEvent;
+import com.codingapi.example.event.TestEvent;
+import com.codingapi.example.infra.entity.TestEntity;
+import com.codingapi.example.infra.jpa.TestEntityRepository;
+import com.codingapi.springboot.framework.event.EventPusher;
+import com.codingapi.springboot.framework.event.IHandler;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Repository;
+
+@Repository
+@AllArgsConstructor
+public class Test2Handler implements IHandler<TestEvent> {
+
+    private TestEntityRepository testEntityRepository;
+
+    @Override
+    public void handler(TestEvent event) {
+        TestEntity entity = new TestEntity(event.getName()+"123");
+        testEntityRepository.save(entity);
+
+        new Thread(()->{
+            EventPusher.push(new AEvent());
+        }).start();
+
+//        new Thread(()->{
+//            EventPusher.push(new AEvent());
+//        }).start();
+    }
+
+
+    @Override
+    public int order() {
+        return 100;
+    }
+}
diff --git a/example/example-application/src/main/java/com/codingapi/example/handler/TestHandler.java b/example/example-application/src/main/java/com/codingapi/example/handler/TestHandler.java
@@ -24,10 +24,13 @@ public void handler(TestEvent event) {
             EventPusher.push(new AEvent());
         }).start();
 
-        new Thread(()->{
-            EventPusher.push(new AEvent());
-        }).start();
+//        new Thread(()->{
+//            EventPusher.push(new AEvent());
+//        }).start();
     }
 
-
+    @Override
+    public int order() {
+        return 10;
+    }
 }
diff --git a/example/example-domain/pom.xml b/example/example-domain/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.5</version>
+        <version>3.3.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/example/example-infra-flow/pom.xml b/example/example-infra-flow/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.5</version>
+        <version>3.3.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/example/example-infra-jpa/pom.xml b/example/example-infra-jpa/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.5</version>
+        <version>3.3.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/example/example-server/pom.xml b/example/example-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.5</version>
+        <version>3.3.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/example/pom.xml b/example/pom.xml
@@ -17,7 +17,7 @@
     </parent>
 
     <artifactId>springboot-example</artifactId>
-    <version>3.3.5</version>
+    <version>3.3.6</version>
 
     <name>springboot-example</name>
     <description>springboot-example project for Spring Boot</description>
diff --git a/pom.xml b/pom.xml
@@ -6,13 +6,13 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.3.4</version>
+        <version>3.3.5</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
     <groupId>com.codingapi.springboot</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>3.3.5</version>
+    <version>3.3.6</version>
 
     <url>https://github.com/codingapi/springboot-framewrok</url>
     <name>springboot-parent</name>
@@ -31,18 +31,19 @@
         <nexus.staging.maven.plugin>1.6.13</nexus.staging.maven.plugin>
         <maven.gpg.plugin>3.1.0</maven.gpg.plugin>
         <codingapi.framework.version>${project.version}</codingapi.framework.version>
-        <fastjson.version>2.0.42</fastjson.version>
-        <jsonwebtoken.jjwt.version>0.12.5</jsonwebtoken.jjwt.version>
-        <commons-io.version>2.15.0</commons-io.version>
+        <fastjson.version>2.0.53</fastjson.version>
+        <jsonwebtoken.jjwt.version>0.12.6</jsonwebtoken.jjwt.version>
+        <commons-io.version>2.17.0</commons-io.version>
+        <commons-lang3.version>3.17.0</commons-lang3.version>
         <commons-dbutils.version>1.8.1</commons-dbutils.version>
-        <commons-text.version>1.11.0</commons-text.version>
+        <commons-text.version>1.12.0</commons-text.version>
         <org.reflections.version>0.10.2</org.reflections.version>
         <perf4j.version>0.9.16</perf4j.version>
-        <bcprov-jdk18on.version>1.77</bcprov-jdk18on.version>
+        <bcprov-jdk18on.version>1.79</bcprov-jdk18on.version>
         <commons-crypto.version>1.2.0</commons-crypto.version>
         <snakeyaml.version>2.2</snakeyaml.version>
-        <apache-groovy.version>4.0.15</apache-groovy.version>
-        <h2.version>2.2.224</h2.version>
+        <apache-groovy.version>4.0.24</apache-groovy.version>
+        <h2.version>2.3.232</h2.version>
         <esotericsoftware.kryo.version>5.6.2</esotericsoftware.kryo.version>
     </properties>
 
@@ -108,6 +109,19 @@
                 <version>${commons-crypto.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>commons-io</groupId>
+                <artifactId>commons-io</artifactId>
+                <version>${commons-io.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-lang3</artifactId>
+                <version>${commons-lang3.version}</version>
+            </dependency>
+
+
             <dependency>
                 <groupId>org.perf4j</groupId>
                 <artifactId>perf4j</artifactId>
@@ -168,12 +182,6 @@
                 <version>${codingapi.framework.version}</version>
             </dependency>
 
-            <dependency>
-                <groupId>commons-dbutils</groupId>
-                <artifactId>commons-dbutils</artifactId>
-                <version>${commons-dbutils.version}</version>
-            </dependency>
-
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-text</artifactId>
@@ -301,7 +309,7 @@
                     <plugin>
                         <groupId>org.openclover</groupId>
                         <artifactId>clover-maven-plugin</artifactId>
-                        <version>4.4.1</version>
+                        <version>4.5.2</version>
                         <configuration>
                             <generateHtml>true</generateHtml>
                             <generateXml>true</generateXml>
diff --git a/springboot-starter-data-fast/pom.xml b/springboot-starter-data-fast/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.5</version>
+        <version>3.3.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/springboot-starter-flow/pom.xml b/springboot-starter-flow/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.5</version>
+        <version>3.3.6</version>
     </parent>
 
     <name>springboot-starter-flow</name>
@@ -45,28 +45,6 @@
 
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.jacoco</groupId>
-                <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.12</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>prepare-agent</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>report</id>
-                        <phase>test</phase>
-                        <goals>
-                            <goal>report</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
+
 
 </project>
diff --git a/springboot-starter-security/pom.xml b/springboot-starter-security/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.5</version>
+        <version>3.3.6</version>
     </parent>
 
     <artifactId>springboot-starter-security</artifactId>
diff --git a/springboot-starter/pom.xml b/springboot-starter/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>3.3.5</version>
+        <version>3.3.6</version>
     </parent>
     <artifactId>springboot-starter</artifactId>
 
diff --git a/springboot-starter/src/main/java/com/codingapi/springboot/framework/event/ApplicationHandlerUtils.java b/springboot-starter/src/main/java/com/codingapi/springboot/framework/event/ApplicationHandlerUtils.java
@@ -2,8 +2,10 @@
 
 import com.codingapi.springboot.framework.exception.EventException;
 import com.codingapi.springboot.framework.exception.EventLoopException;
+import org.springframework.core.ResolvableType;
 
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
 
 class ApplicationHandlerUtils implements IHandler<IEvent> {
@@ -40,18 +42,37 @@ public void addHandler(IHandler handler) {
         }
     }
 
+    /**
+     * 获取订阅的事件类型
+     */
+    private Class<?> getHandlerEventClass(IHandler<?> handler) {
+        ResolvableType resolvableType = ResolvableType.forClass(handler.getClass()).as(IHandler.class);
+        return resolvableType.getGeneric(0).resolve();
+    }
+
 
     @Override
     public void handler(IEvent event) {
         Class<?> eventClass = event.getClass();
+
+        List<IHandler<IEvent>> matchHandlers = handlers
+                .stream()
+                .filter(handler -> {
+                    Class<?> targetClass = getHandlerEventClass(handler);
+                    return targetClass.isAssignableFrom(eventClass);
+                })
+                .sorted(Comparator.comparingInt(IHandler::order))
+                .toList();
+
+        if (matchHandlers.isEmpty()) {
+            return;
+        }
+
         List<Exception> errorStack = new ArrayList<>();
-        boolean throwException = false;
-        for (IHandler<IEvent> handler : handlers) {
+        boolean hasThrowException = false;
+        for (IHandler<IEvent> handler : matchHandlers) {
             try {
-                Class<?> targetClass = handler.getHandlerEventClass();
-                if (eventClass.equals(targetClass)) {
-                    handler.handler(event);
-                }
+                handler.handler(event);
             } catch (Exception e) {
                 if (e instanceof EventLoopException) {
                     throw e;
@@ -60,12 +81,12 @@ public void handler(IEvent event) {
                     handler.error(e);
                     errorStack.add(e);
                 } catch (Exception err) {
-                    throwException = true;
+                    hasThrowException = true;
                     errorStack.add(err);
                 }
             }
         }
-        if(throwException){
+        if (hasThrowException) {
             throw new EventException(errorStack);
         }
     }
diff --git a/springboot-starter/src/main/java/com/codingapi/springboot/framework/event/IEvent.java b/springboot-starter/src/main/java/com/codingapi/springboot/framework/event/IEvent.java
@@ -12,5 +12,4 @@
  */
 public interface IEvent extends Serializable {
 
-
 }
diff --git a/springboot-starter/src/main/java/com/codingapi/springboot/framework/event/IHandler.java b/springboot-starter/src/main/java/com/codingapi/springboot/framework/event/IHandler.java
@@ -1,14 +1,20 @@
 package com.codingapi.springboot.framework.event;
 
-import org.springframework.core.ResolvableType;
-
 /**
  * handler 订阅
  *
  * @param <T> Event 类型
  */
 public interface IHandler<T extends IEvent> {
 
+    /**
+     * 事件订阅排序
+     * 在同样的事件中，可以通过order来控制订阅的顺序
+     */
+    default int order() {
+        return 0;
+    }
+
     /**
      * 订阅触发
      *
@@ -27,13 +33,6 @@ default void error(Exception exception) throws Exception {
     }
 
 
-    /**
-     * 获取订阅的事件类型
-     */
-    default Class<?> getHandlerEventClass() {
-        ResolvableType resolvableType = ResolvableType.forClass(getClass()).as(IHandler.class);
-        return resolvableType.getGeneric(0).resolve();
-    }
 
 
 }

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public void handler(CEvent event) {`
`15`	`15`	`log.info("c event:{},eventKey:{}", event, EventTraceContext.getInstance().getEventKey());`
`16`	`16`
`17`	`17`	`// EventPusher.push(new AEvent());`
`18`		`- throw new RuntimeException("c handler error");`
	`18`	`+// throw new RuntimeException("c handler error");`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`@Override`