Refactored eventbus

framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/EntityChangeEventHelper.cs

@@ -126,7 +126,7 @@ namespace Volo.Abp.Domain.Entities.Events
             }
         }
 
-        protected virtual async Task TriggerEventWithEntity(IEventPublisher eventPublisher, Type genericEventType, object entity, bool triggerInCurrentUnitOfWork)
+        protected virtual async Task TriggerEventWithEntity(IEventBus eventPublisher, Type genericEventType, object entity, bool triggerInCurrentUnitOfWork)
         {
             var entityType = ProxyHelper.UnProxy(entity).GetType();
             var eventType = genericEventType.MakeGenericType(entityType);

framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/AbpEventBusModule.cs

@@ -1,7 +1,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using Volo.Abp.EventBus.Distributed;
 using Volo.Abp.EventBus.Local;
 using Volo.Abp.Modularity;
@@ -23,15 +22,14 @@ namespace Volo.Abp.EventBus
 
             services.OnRegistred(context =>
             {
-                if (ReflectionHelper.IsAssignableToGenericType(context.ImplementationType, typeof(IEventHandler<>)))
+                if (ReflectionHelper.IsAssignableToGenericType(context.ImplementationType, typeof(ILocalEventHandler<>)))
                 {
                     localHandlers.Add(context.ImplementationType);
                 }
-                //TODO: Distrbiuted event bus is disabled since it's not properly working yet for v0.8 release
-                //else if (ReflectionHelper.IsAssignableToGenericType(context.ImplementationType, typeof(IDistributedEventHandler<>)))
-                //{
-                //    distributedHandlers.Add(context.ImplementationType);
-                //}
+                else if (ReflectionHelper.IsAssignableToGenericType(context.ImplementationType, typeof(IDistributedEventHandler<>)))
+                {
+                    distributedHandlers.Add(context.ImplementationType);
+                }
             });
 
             services.Configure<LocalEventBusOptions>(options =>

framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/ActionEventHandler.cs

@@ -5,11 +5,11 @@ using Volo.Abp.DependencyInjection;
 namespace Volo.Abp.EventBus
 {
     /// <summary>
-    /// This event handler is an adapter to be able to use an action as <see cref="IEventHandler{TEvent}"/> implementation.
+    /// This event handler is an adapter to be able to use an action as <see cref="ILocalEventHandler{TEvent}"/> implementation.
     /// </summary>
     /// <typeparam name="TEvent">Event type</typeparam>
     public class ActionEventHandler<TEvent> :
-        IEventHandler<TEvent>,
+        ILocalEventHandler<TEvent>,
         ITransientDependency
     {
         /// <summary>

framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/Distributed/LocalDistributedEventBus.cs

@@ -53,7 +53,7 @@ namespace Volo.Abp.EventBus.Distributed
             return _localEventBus.Subscribe(action);
         }
 
-        public IDisposable Subscribe<TEvent>(IEventHandler<TEvent> handler) where TEvent : class
+        public IDisposable Subscribe<TEvent>(ILocalEventHandler<TEvent> handler) where TEvent : class
         {
             return _localEventBus.Subscribe(handler);
         }
@@ -83,7 +83,7 @@ namespace Volo.Abp.EventBus.Distributed
             _localEventBus.Unsubscribe(action);
         }
 
-        public void Unsubscribe<TEvent>(IEventHandler<TEvent> handler) where TEvent : class
+        public void Unsubscribe<TEvent>(ILocalEventHandler<TEvent> handler) where TEvent : class
         {
             _localEventBus.Unsubscribe(handler);
         }

framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/Distributed/NullLocalEventBus.cs → framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/Distributed/NullDistributedEventBus.cs

@@ -17,7 +17,7 @@ namespace Volo.Abp.EventBus.Distributed
             return NullDisposable.Instance;
         }
 
-        public IDisposable Subscribe<TEvent>(IEventHandler<TEvent> handler) where TEvent : class
+        public IDisposable Subscribe<TEvent>(ILocalEventHandler<TEvent> handler) where TEvent : class
         {
             return NullDisposable.Instance;
         }
@@ -47,7 +47,7 @@ namespace Volo.Abp.EventBus.Distributed
             
         }
 
-        public void Unsubscribe<TEvent>(IEventHandler<TEvent> handler) where TEvent : class
+        public void Unsubscribe<TEvent>(ILocalEventHandler<TEvent> handler) where TEvent : class
         {
             
         }

framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/EventBusBase.cs

@@ -8,7 +8,7 @@ using System.Threading.Tasks;
 using Volo.Abp.EventBus.Distributed;
 using Volo.Abp.Reflection;
 
-namespace Volo.Abp.EventBus.Local
+namespace Volo.Abp.EventBus
 {
     public abstract class EventBusBase : IEventBus
     {
@@ -19,7 +19,7 @@ namespace Volo.Abp.EventBus.Local
         }
 
         /// <inheritdoc/>
-        public virtual IDisposable Subscribe<TEvent>(IEventHandler<TEvent> handler) where TEvent : class
+        public virtual IDisposable Subscribe<TEvent>(ILocalEventHandler<TEvent> handler) where TEvent : class
         {
             return Subscribe(typeof(TEvent), handler);
         }
@@ -49,7 +49,7 @@ namespace Volo.Abp.EventBus.Local
         public abstract void Unsubscribe<TEvent>(Func<TEvent, Task> action) where TEvent : class;
 
         /// <inheritdoc/>
-        public virtual void Unsubscribe<TEvent>(IEventHandler<TEvent> handler) where TEvent : class
+        public virtual void Unsubscribe<TEvent>(ILocalEventHandler<TEvent> handler) where TEvent : class
         {
             Unsubscribe(typeof(TEvent), handler);
         }
@@ -138,12 +138,12 @@ namespace Volo.Abp.EventBus.Local
                 {
                     var handlerType = eventHandlerWrapper.EventHandler.GetType();
 
-                    if (ReflectionHelper.IsAssignableToGenericType(handlerType, typeof(IEventHandler<>)))
+                    if (ReflectionHelper.IsAssignableToGenericType(handlerType, typeof(ILocalEventHandler<>)))
                     {
-                        var method = typeof(IEventHandler<>) //TODO: to a static field
+                        var method = typeof(ILocalEventHandler<>)
                             .MakeGenericType(eventType)
                             .GetMethod(
-                                nameof(IEventHandler<object>.HandleEventAsync),
+                                nameof(ILocalEventHandler<object>.HandleEventAsync),
                                 new[] { eventType }
                             );
 
@@ -151,7 +151,7 @@ namespace Volo.Abp.EventBus.Local
                     }
                     else if (ReflectionHelper.IsAssignableToGenericType(handlerType, typeof(IDistributedEventHandler<>)))
                     {
-                        var method = typeof(IDistributedEventHandler<>) //TODO: to a static field
+                        var method = typeof(IDistributedEventHandler<>)
                             .MakeGenericType(eventType)
                             .GetMethod(
                                 nameof(IDistributedEventHandler<object>.HandleEventAsync),

framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/IEventBus.cs

@@ -1,7 +1,128 @@
+using System;
+using System.Threading.Tasks;
+
 namespace Volo.Abp.EventBus
 {
-    public interface IEventBus : IEventSubscriber, IEventPublisher
+    public interface IEventBus
     {
+        /// <summary>
+        /// Triggers an event asynchronously.
+        /// </summary>
+        /// <typeparam name="TEvent">Event type</typeparam>
+        /// <param name="eventData">Related data for the event</param>
+        /// <returns>The task to handle async operation</returns>
+        Task PublishAsync<TEvent>(TEvent eventData)
+            where TEvent : class;
+
+        /// <summary>
+        /// Triggers an event asynchronously.
+        /// </summary>
+        /// <param name="eventType">Event type</param>
+        /// <param name="eventData">Related data for the event</param>
+        /// <returns>The task to handle async operation</returns>
+        Task PublishAsync(Type eventType, object eventData);
+
+        /// <summary>
+        /// Registers to an event.
+        /// Given action is called for all event occurrences.
+        /// </summary>
+        /// <param name="action">Action to handle events</param>
+        /// <typeparam name="TEvent">Event type</typeparam>
+        IDisposable Subscribe<TEvent>(Func<TEvent, Task> action)
+            where TEvent : class;
+
+        /// <summary>
+        /// Registers to an event. 
+        /// Same (given) instance of the handler is used for all event occurrences.
+        /// </summary>
+        /// <typeparam name="TEvent">Event type</typeparam>
+        /// <param name="handler">Object to handle the event</param>
+        IDisposable Subscribe<TEvent>(ILocalEventHandler<TEvent> handler)
+            where TEvent : class;
+
+        /// <summary>
+        /// Registers to an event.
+        /// A new instance of <see cref="THandler"/> object is created for every event occurrence.
+        /// </summary>
+        /// <typeparam name="TEvent">Event type</typeparam>
+        /// <typeparam name="THandler">Type of the event handler</typeparam>
+        IDisposable Subscribe<TEvent, THandler>()
+            where TEvent : class
+            where THandler : IEventHandler, new();
+
+        /// <summary>
+        /// Registers to an event.
+        /// Same (given) instance of the handler is used for all event occurrences.
+        /// </summary>
+        /// <param name="eventType">Event type</param>
+        /// <param name="handler">Object to handle the event</param>
+        IDisposable Subscribe(Type eventType, IEventHandler handler);
+
+        /// <summary>
+        /// Registers to an event.
+        /// Given factory is used to create/release handlers
+        /// </summary>
+        /// <typeparam name="TEvent">Event type</typeparam>
+        /// <param name="factory">A factory to create/release handlers</param>
+        IDisposable Subscribe<TEvent>(IEventHandlerFactory factory)
+            where TEvent : class;
+
+        /// <summary>
+        /// Registers to an event.
+        /// </summary>
+        /// <param name="eventType">Event type</param>
+        /// <param name="factory">A factory to create/release handlers</param>
+        IDisposable Subscribe(Type eventType, IEventHandlerFactory factory);
+
+        /// <summary>
+        /// Unregisters from an event.
+        /// </summary>
+        /// <typeparam name="TEvent">Event type</typeparam>
+        /// <param name="action"></param>
+        void Unsubscribe<TEvent>(Func<TEvent, Task> action)
+            where TEvent : class;
+
+        /// <summary>
+        /// Unregisters from an event.
+        /// </summary>
+        /// <typeparam name="TEvent">Event type</typeparam>
+        /// <param name="handler">Handler object that is registered before</param>
+        void Unsubscribe<TEvent>(ILocalEventHandler<TEvent> handler)
+            where TEvent : class;
+
+        /// <summary>
+        /// Unregisters from an event.
+        /// </summary>
+        /// <param name="eventType">Event type</param>
+        /// <param name="handler">Handler object that is registered before</param>
+        void Unsubscribe(Type eventType, IEventHandler handler);
+
+        /// <summary>
+        /// Unregisters from an event.
+        /// </summary>
+        /// <typeparam name="TEvent">Event type</typeparam>
+        /// <param name="factory">Factory object that is registered before</param>
+        void Unsubscribe<TEvent>(IEventHandlerFactory factory)
+            where TEvent : class;
+
+        /// <summary>
+        /// Unregisters from an event.
+        /// </summary>
+        /// <param name="eventType">Event type</param>
+        /// <param name="factory">Factory object that is registered before</param>
+        void Unsubscribe(Type eventType, IEventHandlerFactory factory);
+
+        /// <summary>
+        /// Unregisters all event handlers of given event type.
+        /// </summary>
+        /// <typeparam name="TEvent">Event type</typeparam>
+        void UnsubscribeAll<TEvent>()
+            where TEvent : class;
 
+        /// <summary>
+        /// Unregisters all event handlers of given event type.
+        /// </summary>
+        /// <param name="eventType">Event type</param>
+        void UnsubscribeAll(Type eventType);
     }
 }

framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/IEventHandler.cs

@@ -1,26 +1,13 @@
-using System.Threading.Tasks;
+using Volo.Abp.EventBus.Distributed;
 
 namespace Volo.Abp.EventBus
 {
     /// <summary>
     /// Undirect base interface for all event handlers.
-    /// Implement <see cref="IEventHandler{TEvent}"/> instead of this one.
+    /// Implement <see cref="ILocalEventHandler{TEvent}"/> or <see cref="IDistributedEventHandler{TEvent}"/> instead of this one.
     /// </summary>
     public interface IEventHandler
     {
         
     }
-
-    /// <summary>
-    /// Defines an interface of a class that handles events asynchrounously of type <see cref="IEventHandler{TEvent}"/>.
-    /// </summary>
-    /// <typeparam name="TEvent">Event type to handle</typeparam>
-    public interface IEventHandler<in TEvent> : IEventHandler
-    {
-        /// <summary>
-        /// Handler handles the event by implementing this method.
-        /// </summary>
-        /// <param name="eventData">Event data</param>
-        Task HandleEventAsync(TEvent eventData);
-    }
 }

framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/IEventPublisher.cs

@@ -1,25 +0,0 @@
-using System;
-using System.Threading.Tasks;
-
-namespace Volo.Abp.EventBus
-{
-    public interface IEventPublisher
-    {
-        /// <summary>
-        /// Triggers an event asynchronously.
-        /// </summary>
-        /// <typeparam name="TEvent">Event type</typeparam>
-        /// <param name="eventData">Related data for the event</param>
-        /// <returns>The task to handle async operation</returns>
-        Task PublishAsync<TEvent>(TEvent eventData)
-            where TEvent : class;
-
-        /// <summary>
-        /// Triggers an event asynchronously.
-        /// </summary>
-        /// <param name="eventType">Event type</param>
-        /// <param name="eventData">Related data for the event</param>
-        /// <returns>The task to handle async operation</returns>
-        Task PublishAsync(Type eventType, object eventData);
-    }
-}

framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/IEventSubscriber.cs

@@ -1,111 +0,0 @@
-using System;
-using System.Threading.Tasks;
-
-namespace Volo.Abp.EventBus
-{
-    public interface IEventSubscriber
-    {
-        /// <summary>
-        /// Registers to an event.
-        /// Given action is called for all event occurrences.
-        /// </summary>
-        /// <param name="action">Action to handle events</param>
-        /// <typeparam name="TEvent">Event type</typeparam>
-        IDisposable Subscribe<TEvent>(Func<TEvent, Task> action)
-            where TEvent : class;
-
-        /// <summary>
-        /// Registers to an event. 
-        /// Same (given) instance of the handler is used for all event occurrences.
-        /// </summary>
-        /// <typeparam name="TEvent">Event type</typeparam>
-        /// <param name="handler">Object to handle the event</param>
-        IDisposable Subscribe<TEvent>(IEventHandler<TEvent> handler)
-            where TEvent : class;
-
-        /// <summary>
-        /// Registers to an event.
-        /// A new instance of <see cref="THandler"/> object is created for every event occurrence.
-        /// </summary>
-        /// <typeparam name="TEvent">Event type</typeparam>
-        /// <typeparam name="THandler">Type of the event handler</typeparam>
-        IDisposable Subscribe<TEvent, THandler>()
-            where TEvent : class
-            where THandler : IEventHandler, new();
-
-        /// <summary>
-        /// Registers to an event.
-        /// Same (given) instance of the handler is used for all event occurrences.
-        /// </summary>
-        /// <param name="eventType">Event type</param>
-        /// <param name="handler">Object to handle the event</param>
-        IDisposable Subscribe(Type eventType, IEventHandler handler);
-
-        /// <summary>
-        /// Registers to an event.
-        /// Given factory is used to create/release handlers
-        /// </summary>
-        /// <typeparam name="TEvent">Event type</typeparam>
-        /// <param name="factory">A factory to create/release handlers</param>
-        IDisposable Subscribe<TEvent>(IEventHandlerFactory factory)
-            where TEvent : class;
-
-        /// <summary>
-        /// Registers to an event.
-        /// </summary>
-        /// <param name="eventType">Event type</param>
-        /// <param name="factory">A factory to create/release handlers</param>
-        IDisposable Subscribe(Type eventType, IEventHandlerFactory factory);
-
-        /// <summary>
-        /// Unregisters from an event.
-        /// </summary>
-        /// <typeparam name="TEvent">Event type</typeparam>
-        /// <param name="action"></param>
-        void Unsubscribe<TEvent>(Func<TEvent, Task> action)
-            where TEvent : class;
-
-        /// <summary>
-        /// Unregisters from an event.
-        /// </summary>
-        /// <typeparam name="TEvent">Event type</typeparam>
-        /// <param name="handler">Handler object that is registered before</param>
-        void Unsubscribe<TEvent>(IEventHandler<TEvent> handler)
-            where TEvent : class;
-
-        /// <summary>
-        /// Unregisters from an event.
-        /// </summary>
-        /// <param name="eventType">Event type</param>
-        /// <param name="handler">Handler object that is registered before</param>
-        void Unsubscribe(Type eventType, IEventHandler handler);
-
-        /// <summary>
-        /// Unregisters from an event.
-        /// </summary>
-        /// <typeparam name="TEvent">Event type</typeparam>
-        /// <param name="factory">Factory object that is registered before</param>
-        void Unsubscribe<TEvent>(IEventHandlerFactory factory)
-            where TEvent : class;
-
-        /// <summary>
-        /// Unregisters from an event.
-        /// </summary>
-        /// <param name="eventType">Event type</param>
-        /// <param name="factory">Factory object that is registered before</param>
-        void Unsubscribe(Type eventType, IEventHandlerFactory factory);
-
-        /// <summary>
-        /// Unregisters all event handlers of given event type.
-        /// </summary>
-        /// <typeparam name="TEvent">Event type</typeparam>
-        void UnsubscribeAll<TEvent>()
-            where TEvent : class;
-
-        /// <summary>
-        /// Unregisters all event handlers of given event type.
-        /// </summary>
-        /// <param name="eventType">Event type</param>
-        void UnsubscribeAll(Type eventType);
-    }
-}

framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/Local/ILocalEventHandler.cs

@@ -0,0 +1,13 @@
+using System.Threading.Tasks;
+
+namespace Volo.Abp.EventBus
+{
+    public interface ILocalEventHandler<in TEvent> : IEventHandler
+    {
+        /// <summary>
+        /// Handler handles the event by implementing this method.
+        /// </summary>
+        /// <param name="eventData">Event data</param>
+        Task HandleEventAsync(TEvent eventData);
+    }
+}

framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/Local/NullLocalEventBus.cs

@@ -17,7 +17,7 @@ namespace Volo.Abp.EventBus.Local
             return NullDisposable.Instance;
         }
 
-        public IDisposable Subscribe<TEvent>(IEventHandler<TEvent> handler) where TEvent : class
+        public IDisposable Subscribe<TEvent>(ILocalEventHandler<TEvent> handler) where TEvent : class
         {
             return NullDisposable.Instance;
         }
@@ -47,7 +47,7 @@ namespace Volo.Abp.EventBus.Local
             
         }
 
-        public void Unsubscribe<TEvent>(IEventHandler<TEvent> handler) where TEvent : class
+        public void Unsubscribe<TEvent>(ILocalEventHandler<TEvent> handler) where TEvent : class
         {
             
         }

framework/test/Volo.Abp.EventBus.Tests/Volo/Abp/EventBus/Local/EventBus_MultipleHandle_Test.cs

@@ -31,8 +31,8 @@ namespace Volo.Abp.EventBus.Local
         }
 
         public class MyEventHandler :
-            IEventHandler<EntityChangedEventData<MyEntity>>,
-            IEventHandler<EntityCreatedEventData<MyEntity>>
+            ILocalEventHandler<EntityChangedEventData<MyEntity>>,
+            ILocalEventHandler<EntityCreatedEventData<MyEntity>>
         {
             public int EntityChangedEventCount { get; set; }
             public int EntityCreatedEventCount { get; set; }

framework/test/Volo.Abp.EventBus.Tests/Volo/Abp/EventBus/Local/MySimpleEventDataHandler.cs

@@ -3,7 +3,7 @@ using Volo.Abp.DependencyInjection;
 
 namespace Volo.Abp.EventBus.Local
 {
-    public class MySimpleEventDataHandler : IEventHandler<MySimpleEventData>, ISingletonDependency
+    public class MySimpleEventDataHandler : ILocalEventHandler<MySimpleEventData>, ISingletonDependency
     {
         public int TotalData { get; private set; }
 

framework/test/Volo.Abp.EventBus.Tests/Volo/Abp/EventBus/Local/MySimpleTransientEventHandler.cs

@@ -3,7 +3,7 @@ using System.Threading.Tasks;
 
 namespace Volo.Abp.EventBus.Local
 {
-    public class MySimpleTransientEventHandler : IEventHandler<MySimpleEventData>, IDisposable
+    public class MySimpleTransientEventHandler : ILocalEventHandler<MySimpleEventData>, IDisposable
     {
         public static int HandleCount { get; set; }