修改命名

hsweb-eventbus/hsweb-eventbus-api/src/main/java/org/hswebframework/web/eventbus/annotation/Subscribe.java

@@ -10,7 +10,7 @@ import java.lang.annotation.*;
 @Retention(RetentionPolicy.RUNTIME)
 @Inherited
 @Documented
-public @interface Subscribe {
+public @interface EventListener {
     EventMode mode() default EventMode.SYNC;
 
     boolean transaction() default true;

hsweb-eventbus/hsweb-eventbus-default/src/main/java/org/hswebframework/web/eventbus/spring/SpringEventBus.java

@@ -2,7 +2,7 @@ package org.hswebframework.web.eventbus.spring;
 
 import org.hswebframework.web.eventbus.AbstractEventBus;
 import org.hswebframework.web.eventbus.EventListenerDefine;
-import org.hswebframework.web.eventbus.annotation.Subscribe;
+import org.hswebframework.web.eventbus.annotation.EventListener;
 import org.hswebframework.web.eventbus.executor.EventListenerContainer;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.config.BeanPostProcessor;
@@ -33,15 +33,15 @@ public class SpringEventBus extends AbstractEventBus implements BeanPostProcesso
     protected Object processListener(Object object) {
         Method[] methods = object.getClass().getDeclaredMethods();
         for (Method method : methods) {
-            Subscribe subscribe = method.getAnnotation(Subscribe.class);
-            if (subscribe != null) {
-                createListener(subscribe, object, method);
+            EventListener eventListener = method.getAnnotation(EventListener.class);
+            if (eventListener != null) {
+                createListener(eventListener, object, method);
             }
         }
         return object;
     }
 
-    protected void createListener(Subscribe type, Object target, Method method) {
+    protected void createListener(EventListener type, Object target, Method method) {
         EventListenerDefine define = EventListenerDefine.builder().eventMode(type.mode())
                 .transaction(type.transaction())
                 .listener(new FastListener(target, method))

hsweb-eventbus/hsweb-eventbus-default/src/test/java/org/hswebframework/web/eventbus/spring/SpringEventBusTest.java

@@ -1,19 +1,13 @@
 package org.hswebframework.web.eventbus.spring;
 
 import org.hswebframework.web.eventbus.EventBus;
-import org.hswebframework.web.eventbus.annotation.EventMode;
-import org.hswebframework.web.eventbus.annotation.Subscribe;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.stereotype.Component;
-import org.springframework.stereotype.Service;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import java.util.concurrent.atomic.AtomicInteger;
-
 /**
  * @author zhouhao
  * @since 3.0

hsweb-eventbus/hsweb-eventbus-default/src/test/java/org/hswebframework/web/eventbus/spring/Test2.java

@@ -1,7 +1,7 @@
 package org.hswebframework.web.eventbus.spring;
 
 import org.hswebframework.web.eventbus.annotation.EventMode;
-import org.hswebframework.web.eventbus.annotation.Subscribe;
+import org.hswebframework.web.eventbus.annotation.EventListener;
 import org.springframework.stereotype.Component;
 
 import java.util.concurrent.atomic.AtomicLong;
@@ -10,21 +10,21 @@ import java.util.concurrent.atomic.AtomicLong;
 public class Test2 {
     public static AtomicLong counter = new AtomicLong();
 
-    @Subscribe(mode = EventMode.SYNC)
+    @EventListener(mode = EventMode.SYNC)
     public void test1(SpringEventBus eventBus) {
 //            System.out.println(Thread.currentThread().getName());
 //            System.out.println(eventBus);
         counter.addAndGet(1);
     }
 
-    @Subscribe(mode = EventMode.ASYNC, transaction = false)
+    @EventListener(mode = EventMode.ASYNC, transaction = false)
     public void test2(SpringEventBus eventBus) {
 //            System.out.println(Thread.currentThread().getName());
 //            System.out.println(eventBus);
         counter.addAndGet(1);
     }
 
-    @Subscribe(mode = EventMode.BACKGROUND, transaction = false)
+    @EventListener(mode = EventMode.BACKGROUND, transaction = false)
     public void test3(SpringEventBus eventBus) {
 //            System.out.println(Thread.currentThread().getName());
 //            System.out.println(eventBus);