support loop event pusher

Author: xlorne

pom.xml

@@ -12,7 +12,7 @@
 
     <groupId>com.codingapi.springboot</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>2.9.0</version>
+    <version>2.9.1</version>
 
     <url>https://github.com/codingapi/springboot-framewrok</url>
     <name>springboot-parent</name>

springboot-starter-data-fast/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>2.9.0</version>
+        <version>2.9.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

springboot-starter-flow/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>2.9.0</version>
+        <version>2.9.1</version>
     </parent>
 
     <name>springboot-starter-flow</name>

springboot-starter-security/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>2.9.0</version>
+        <version>2.9.1</version>
     </parent>
 
     <artifactId>springboot-starter-security</artifactId>

springboot-starter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>2.9.0</version>
+        <version>2.9.1</version>
     </parent>
     <artifactId>springboot-starter</artifactId>
 

springboot-starter/src/main/java/com/codingapi/springboot/framework/event/DomainEventContext.java

@@ -23,9 +23,13 @@ public static DomainEventContext getInstance() {
         return instance;
     }
 
-    private void push(IEvent event, boolean sync) {
+    private void push(IEvent event, boolean sync,boolean hasLoopEvent) {
         if (context != null) {
             String traceId = EventTraceContext.getInstance().getOrCreateTrace();
+            if(hasLoopEvent){
+                EventTraceContext.getInstance().clearTrace();
+                traceId = EventTraceContext.getInstance().getOrCreateTrace();
+            }
             EventTraceContext.getInstance().addEvent(traceId,event);
             context.publishEvent(new DomainEvent(event, sync,traceId));
         }
@@ -36,13 +40,13 @@ private void push(IEvent event, boolean sync) {
      * @see EventPusher
      * 默认 同步事件
      */
-    public void push(IEvent event) {
+    public void push(IEvent event,boolean hasLoopEvent) {
         if (event instanceof IAsyncEvent) {
-            this.push(event, false);
+            this.push(event, false,hasLoopEvent);
         } else if (event instanceof ISyncEvent) {
-            this.push(event, true);
+            this.push(event, true,hasLoopEvent);
         } else {
-            this.push(event, true);
+            this.push(event, true,hasLoopEvent);
         }
     }
 

springboot-starter/src/main/java/com/codingapi/springboot/framework/event/EventPusher.java

@@ -5,7 +5,23 @@
  */
 public class EventPusher {
 
+    /**
+     *  推送事件
+     *  默认将自动检测事件是否有循环事件，当出现循环事件时，系统将会抛出循环调用异常。
+     * @param event 事件
+     */
     public static void push(IEvent event) {
-        DomainEventContext.getInstance().push(event);
+        push(event, false);
+    }
+
+    /**
+     * 推送事件
+     * 默认将自动检测事件是否有循环事件，当出现循环事件时，系统将会抛出循环调用异常。
+     * 设置hasLoopEvent为true，将不会检测循环事件。
+     * @param event 事件
+     * @param hasLoopEvent 是否有循环事件
+     */
+    public static void push(IEvent event, boolean hasLoopEvent) {
+        DomainEventContext.getInstance().push(event, hasLoopEvent);
     }
 }

springboot-starter/src/main/java/com/codingapi/springboot/framework/event/EventTraceContext.java

@@ -45,12 +45,19 @@ public String getEventKey() {
         return threadLocal.get();
     }
 
+    /**
+     * create event key
+     * @param traceId traceId
+     */
     void createEventKey(String traceId) {
         String eventKey = traceId + "#" + RandomGenerator.randomString(8);
         eventKeyState.put(eventKey, false);
         threadLocal.set(eventKey);
     }
 
+    /**
+     * check event state
+     */
     void checkEventState() {
         String eventKey = threadLocal.get();
         if (eventKey != null) {
@@ -66,6 +73,11 @@ void checkEventState() {
         threadLocal.remove();
     }
 
+    /**
+     * add event
+     * @param traceId traceId
+     * @param event event
+     */
     void addEvent(String traceId, IEvent event) {
         boolean hasEventLoop = EventStackContext.getInstance().checkEventLoop(traceId, event);
         if (hasEventLoop) {
@@ -78,4 +90,18 @@ void addEvent(String traceId, IEvent event) {
         }
         EventStackContext.getInstance().addEvent(traceId, event);
     }
+
+    /**
+     * clear trace
+     */
+    public void clearTrace() {
+        String eventKey = threadLocal.get();
+        if (eventKey != null) {
+            String traceId = eventKey.split("#")[0];
+            traceKeys.remove(traceId);
+            EventStackContext.getInstance().remove(traceId);
+            eventKeyState.remove(eventKey);
+            threadLocal.remove();
+        }
+    }
 }