Merge pull request #4 from zhongxunking/dev

增加获取目标对象入口+细节优化

Author: zhongxunking

README.md

@@ -289,8 +289,8 @@
         @TheFlowListener(flow = "demoFlow")  // 特定流程监听器注解，属性flow指定被监听的流程名称
         public class DenoFlowListener {
         
-            @ListenNodeDecide   // 监听节点选择事件
-            public void listenNodeDecide(String node, TargetContext<Transfer> targetContext) { // 入参node表示被选择的节点，targetContext是目标上下文
+            @ListenNodeDecided   // 监听节点选择事件
+            public void listenNodeDecided(String node, TargetContext<Transfer> targetContext) { // 入参node表示被选择的节点，targetContext是目标上下文
                 // 一般监听节点选择事件的目的是用来更新目标对象的状态，因为当节点选择事件发生时，就表明已经执行完一个节点，即将进入到下一个节点，所以目标对象的状态应该修改为下一个状态
             }
         
@@ -399,7 +399,7 @@
 
         @Service(enableTx = true) // 服务定义注解（注意：此注解和spring的@Service注解名字一样，但是是两个不一样的注解），enableTx属性表示服务是否开启事务，默认不开启
         public class MyService {
-            @ServiceCheck // 服务校验注解，进行业务校验（注意：此注解对应方法执行时不会开启事务，原因是这里面只是进行业务校验，而不是执行业务，所以没必要开启事务；同时如果开启了事务，但是当校验不通过还需要回滚事务，反而浪费资源）
+            @ServiceBefore // 服务前置处理（执行中不会有事务）
             public void check(ServiceContext<XXXOrder, XXXResult> serviceContext) { 
                 // ServiceContext是服务上下文，可以通过它获取到传给服务引擎的order，也可以获取由服务引擎创建的result。
                 // 进行业务校验（比如校验账户是否合法等等）

common/pom.xml

@@ -13,11 +13,6 @@
     <name>common</name>
 
     <dependencies>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-tx</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
@@ -26,5 +21,11 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-tx</artifactId>
+            <scope>provided</scope>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 </project>

event/pom.xml

@@ -18,10 +18,16 @@
             <artifactId>common</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-autoconfigure</artifactId>
             <scope>provided</scope>
+            <optional>true</optional>
         </dependency>
     </dependencies>
 </project>

event/src/main/java/org/bekit/event/annotation/Listen.java

@@ -8,6 +8,7 @@
  */
 package org.bekit.event.annotation;
 
+import org.bekit.event.extension.support.ClassListenResolver;
 import org.springframework.core.annotation.AliasFor;
 
 import java.lang.annotation.*;
@@ -18,7 +19,7 @@
 @Documented
 @Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE})
 @Retention(RetentionPolicy.RUNTIME)
-@org.bekit.event.annotation.listener.Listen
+@org.bekit.event.annotation.listener.Listen(resolver = ClassListenResolver.class)
 public @interface Listen {
 
     /**

event/src/main/java/org/bekit/event/annotation/listener/Listen.java

@@ -9,7 +9,6 @@
 package org.bekit.event.annotation.listener;
 
 import org.bekit.event.extension.ListenResolver;
-import org.bekit.event.extension.support.DefaultListenResolver;
 
 import java.lang.annotation.*;
 
@@ -22,9 +21,9 @@
 public @interface Listen {
 
     /**
-     * 监听解决器（默认DefaultListenResolver）
+     * 监听解决器
      */
-    Class<? extends ListenResolver> resolver() default DefaultListenResolver.class;
+    Class<? extends ListenResolver> resolver();
 
     /**
      * 是否按照优先级升序

event/src/main/java/org/bekit/event/boot/EventBusConfiguration.java

@@ -9,35 +9,27 @@
 package org.bekit.event.boot;
 
 import org.bekit.event.EventPublisher;
-import org.bekit.event.bus.EventBusHolder;
+import org.bekit.event.bus.EventBusesHolder;
 import org.bekit.event.extension.support.BizListenerType;
-import org.bekit.event.listener.ListenerHolder;
+import org.bekit.event.listener.ListenersHolder;
 import org.bekit.event.publisher.DefaultEventPublisher;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.DependsOn;
+import org.springframework.context.annotation.Import;
 
 /**
  * 事件总线配置类
  * （非spring-boot项目需手动引入本配置类完成事件总线配置）
  */
 @Configuration
+@Import({EventBusesHolder.class, ListenersHolder.class})
 public class EventBusConfiguration {
 
     // 业务事件发布器
     @Bean
-    public EventPublisher eventPublisher(EventBusHolder eventBusHolder) {
-        return new DefaultEventPublisher(eventBusHolder.getEventBus(BizListenerType.class));
-    }
-
-    // 事件总线持有器
-    @Bean
-    public EventBusHolder eventBusHolder() {
-        return new EventBusHolder();
-    }
-
-    // 监听器持有器
-    @Bean
-    public ListenerHolder listenerHolder() {
-        return new ListenerHolder();
+    @DependsOn("org.bekit.event.bus.EventBusesHolder")      // 保证出现循环引用时不会出错
+    public EventPublisher eventPublisher(EventBusesHolder eventBusesHolder) {
+        return new DefaultEventPublisher(eventBusesHolder.getEventBus(BizListenerType.class));
     }
 }

…/org/bekit/event/bus/EventBusHolder.java …rg/bekit/event/bus/EventBusesHolder.javaevent/src/main/java/org/bekit/event/bus/EventBusHolder.java renamed to event/src/main/java/org/bekit/event/bus/EventBusesHolder.java event/src/main/java/org/bekit/event/bus/EventBusHolder.java renamed to event/src/main/java/org/bekit/event/bus/EventBusesHolder.java

@@ -10,30 +10,32 @@
 
 import org.bekit.event.extension.ListenerType;
 import org.bekit.event.listener.ListenerExecutor;
-import org.bekit.event.listener.ListenerHolder;
 import org.bekit.event.listener.ListenerParser;
+import org.bekit.event.listener.ListenersHolder;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 
 import javax.annotation.PostConstruct;
 import java.util.HashMap;
 import java.util.Map;
 
 /**
- * 事件总线持有器（会被注册到spring容器中）
+ * 事件总线持有器
  */
-public class EventBusHolder {
+@Component
+public class EventBusesHolder {
     @Autowired
-    private ListenerHolder listenerHolder;
+    private ListenersHolder listenersHolder;
     // 事件总线Map（key：总线类型）
     private Map<Class, EventBus> eventBusMap = new HashMap<>();
 
     // 初始化（根据监听器类型创建相应类型的事件总线，spring自动执行）
     @PostConstruct
     public void init() {
-        for (Class type : listenerHolder.getTypes()) {
+        for (Class type : listenersHolder.getTypes()) {
             // 初始化事件总线
             EventBus eventBus = getEventBus(type);
-            for (ListenerExecutor listenerExecutor : listenerHolder.getRequiredListenerExecutors(type)) {
+            for (ListenerExecutor listenerExecutor : listenersHolder.getRequiredListenerExecutors(type)) {
                 eventBus.register(listenerExecutor);
             }
         }

event/src/main/java/org/bekit/event/extension/support/BizListenerType.java

@@ -18,6 +18,6 @@ public class BizListenerType implements ListenerType {
 
     @Override
     public EventTypeResolver getResolver() {
-        return DefaultEventTypeResolver.INSTANCE;
+        return ClassEventTypeResolver.INSTANCE;
     }
 }

…on/support/DefaultEventTypeResolver.java …sion/support/ClassEventTypeResolver.javaevent/src/main/java/org/bekit/event/extension/support/DefaultEventTypeResolver.java renamed to event/src/main/java/org/bekit/event/extension/support/ClassEventTypeResolver.java event/src/main/java/org/bekit/event/extension/support/DefaultEventTypeResolver.java renamed to event/src/main/java/org/bekit/event/extension/support/ClassEventTypeResolver.java

@@ -11,13 +11,13 @@
 import org.bekit.event.extension.EventTypeResolver;
 
 /**
- * 默认的事件类型解决器实现（事件类型就是事件对应的Class类）
+ * Class事件类型解决器（事件类型就是事件对应的Class类）
  */
-public class DefaultEventTypeResolver implements EventTypeResolver {
+public class ClassEventTypeResolver implements EventTypeResolver {
     /**
      * 实例
      */
-    public static final DefaultEventTypeResolver INSTANCE = new DefaultEventTypeResolver();
+    public static final ClassEventTypeResolver INSTANCE = new ClassEventTypeResolver();
 
     @Override
     public Object resolve(Object event) {

…nsion/support/DefaultListenResolver.java …tension/support/ClassListenResolver.javaevent/src/main/java/org/bekit/event/extension/support/DefaultListenResolver.java renamed to event/src/main/java/org/bekit/event/extension/support/ClassListenResolver.java event/src/main/java/org/bekit/event/extension/support/DefaultListenResolver.java renamed to event/src/main/java/org/bekit/event/extension/support/ClassListenResolver.java

@@ -14,9 +14,9 @@
 import java.lang.reflect.Method;
 
 /**
- * 默认的监听解决器实现（监听方法只能有一个入参，事件类型就是入参的Class类）
+ * Class监听解决器（监听方法只能有一个入参，事件类型就是入参的Class类）
  */
-public class DefaultListenResolver implements ListenResolver {
+public class ClassListenResolver implements ListenResolver {
     // 监听的事件类型
     private Class eventType;