#76

Author: xlorne

example/example-application/src/main/java/com/codingapi/example/handler/CHandler.java

@@ -2,22 +2,19 @@
 
 import com.codingapi.example.event.AEvent;
 import com.codingapi.example.event.CEvent;
-import com.codingapi.springboot.framework.event.*;
+import com.codingapi.springboot.framework.event.EventPusher;
+import com.codingapi.springboot.framework.event.EventTraceContext;
+import com.codingapi.springboot.framework.event.IHandler;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-
 @Slf4j
 @Service
 public class CHandler implements IHandler<CEvent> {
 
     @Override
     public void handler(CEvent event) {
-        String eventKey = EventTraceContext.getInstance().getEventKey();
-        log.info("c event:{},eventKey:{}",event, EventTraceContext.getInstance().getEventKey());
-        List<IEvent> eventList =  EventLogContext.getInstance().getEvents(eventKey);
-        log.info("events:{}",eventList);
+        log.info("c event:{},eventKey:{}", event, EventTraceContext.getInstance().getEventKey());
 
         EventPusher.push(new AEvent());
     }

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

@@ -0,0 +1,80 @@
+package com.codingapi.springboot.framework.event;
+
+import lombok.Getter;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 事件栈上下文
+ */
+public class EventStackContext {
+
+    private final Map<String, List<Class<?>>> eventClassStack = new HashMap<>();
+    private final Map<String, List<IEvent>> eventStack = new HashMap<>();
+
+    @Getter
+    private final static EventStackContext instance = new EventStackContext();
+
+    private EventStackContext() {
+
+    }
+
+    private void addEventClass(String traceId, IEvent event) {
+        List<Class<?>> events = eventClassStack.get(traceId);
+        if (events == null) {
+            events = new ArrayList<>();
+        }
+        events.add(event.getClass());
+        eventClassStack.put(traceId, events);
+    }
+
+    private void addEventStack(String traceId, IEvent event) {
+        List<IEvent> events = eventStack.get(traceId);
+        if (events == null) {
+            events = new ArrayList<>();
+        }
+        events.add(event);
+        eventStack.put(traceId, events);
+    }
+
+
+    void addEvent(String traceId, IEvent event) {
+        addEventClass(traceId, event);
+        addEventStack(traceId, event);
+    }
+
+    boolean checkEventLoop(String traceId, IEvent event) {
+        List<Class<?>> events = eventClassStack.get(traceId);
+        if (events != null) {
+            return events.contains(event.getClass());
+        }
+        return false;
+    }
+
+    public List<IEvent> getEvents(String eventKey) {
+        if(eventKey!=null) {
+            String traceId = eventKey.split("#")[0];
+            return eventStack.get(traceId);
+        }
+        return null;
+    }
+
+    public List<Class<?>> getEventClasses(String eventKey) {
+        if(eventKey!=null) {
+            String traceId = eventKey.split("#")[0];
+            return eventClassStack.get(traceId);
+        }
+        return null;
+    }
+
+
+    void remove(String traceId) {
+        eventStack.remove(traceId);
+        eventClassStack.remove(traceId);
+    }
+
+
+}

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

@@ -6,6 +6,9 @@
 
 import java.util.*;
 
+/**
+ * 事件跟踪上下文
+ */
 public class EventTraceContext {
 
     @Getter
@@ -17,11 +20,9 @@ public class EventTraceContext {
     // thread local
     private final ThreadLocal<String> threadLocal = new ThreadLocal<>();
 
-    // event listener state
+    // event listenerKey state
     private final Map<String, Boolean> eventKeyState = new HashMap<>();
 
-    // event stack
-    private final Map<String, List<Class<?>>> eventStack = new HashMap<>();
 
     private EventTraceContext() {
     }
@@ -36,7 +37,11 @@ String getOrCreateTrace() {
         return traceId;
     }
 
-    public String getEventKey(){
+    /**
+     * get event key
+     * traceId = eventKey.split("#")[0]
+     */
+    public String getEventKey() {
         return threadLocal.get();
     }
 
@@ -54,31 +59,23 @@ void checkEventState() {
                 // event execute finish
                 String traceId = eventKey.split("#")[0];
                 traceKeys.remove(traceId);
-                eventStack.remove(traceId);
-                EventLogContext.getInstance().removeEvents(traceId);
+                EventStackContext.getInstance().remove(traceId);
             }
         }
         eventKeyState.remove(eventKey);
         threadLocal.remove();
     }
 
     void addEvent(String traceId, IEvent event) {
-        List<Class<?>> stack = eventStack.get(traceId);
-        if (stack == null) {
-            stack = new ArrayList<>();
-        } else {
-            if (stack.contains(event.getClass())) {
-                //清空trace记录
-                traceKeys.remove(traceId);
-                eventStack.remove(traceId);
-                eventKeyState.remove(traceId);
-                threadLocal.remove();
-                EventLogContext.getInstance().removeEvents(traceId);
-                throw new EventLoopException(stack, event);
-            }
+        boolean hasEventLoop = EventStackContext.getInstance().checkEventLoop(traceId, event);
+        if (hasEventLoop) {
+            List<Class<?>> stack = EventStackContext.getInstance().getEventClasses(traceId);
+            traceKeys.remove(traceId);
+            EventStackContext.getInstance().remove(traceId);
+            eventKeyState.remove(traceId);
+            threadLocal.remove();
+            throw new EventLoopException(stack, event);
         }
-        EventLogContext.getInstance().addEvent(traceId,event);
-        stack.add(event.getClass());
-        eventStack.put(traceId, stack);
+        EventStackContext.getInstance().addEvent(traceId, event);
     }
 }