From 8db50d768be59986e81b8f88eff445d0f9b5facf Mon Sep 17 00:00:00 2001 From: xyfy Date: Fri, 4 Jun 2021 11:23:08 +0800 Subject: [PATCH 1/2] Update AutoEntityDistributedEventSelectorListExtensions.cs Add an `remove` extentions adjust the `Add` --- ...ntityDistributedEventSelectorListExtensions.cs | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/Distributed/AutoEntityDistributedEventSelectorListExtensions.cs b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/Distributed/AutoEntityDistributedEventSelectorListExtensions.cs index d2a0622f54..12bc8a4ec8 100644 --- a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/Distributed/AutoEntityDistributedEventSelectorListExtensions.cs +++ b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/Distributed/AutoEntityDistributedEventSelectorListExtensions.cs @@ -50,6 +50,19 @@ namespace Volo.Abp.Domain.Entities.Events.Distributed ); } + public static bool Remove( + [NotNull] this IAutoEntityDistributedEventSelectorList selectors) where TEntity : IEntity + { + Check.NotNull(selectors, nameof(selectors)); + + var selectorName = "Entity:" + typeof(TEntity).FullName; + if (selectors.Any(s => s.Name == selectorName)) + { + return selectors.RemoveAll(s => s.Name == selectorName).Count > 0; + } + return true; + } + /// /// Adds all entity types. /// @@ -114,4 +127,4 @@ namespace Volo.Abp.Domain.Entities.Events.Distributed return selectors.Any(s => s.Predicate(entityType)); } } -} \ No newline at end of file +} From a2497d5072e4eb9cd0c271b2c4f69dabfb1ce715 Mon Sep 17 00:00:00 2001 From: maliming Date: Mon, 28 Jun 2021 10:39:04 +0800 Subject: [PATCH 2/2] Minor change. --- ...yDistributedEventSelectorListExtensions.cs | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/Distributed/AutoEntityDistributedEventSelectorListExtensions.cs b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/Distributed/AutoEntityDistributedEventSelectorListExtensions.cs index 12bc8a4ec8..a9247bc28b 100644 --- a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/Distributed/AutoEntityDistributedEventSelectorListExtensions.cs +++ b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/Distributed/AutoEntityDistributedEventSelectorListExtensions.cs @@ -26,7 +26,7 @@ namespace Volo.Abp.Domain.Entities.Events.Distributed ) ); } - + /// /// Adds a specific entity type and the types derived from that entity type. /// @@ -49,18 +49,18 @@ namespace Volo.Abp.Domain.Entities.Events.Distributed ) ); } - - public static bool Remove( - [NotNull] this IAutoEntityDistributedEventSelectorList selectors) where TEntity : IEntity + + /// + /// Remove a specific entity type and the types derived from that entity type. + /// + /// Type of the entity + public static void Remove([NotNull] this IAutoEntityDistributedEventSelectorList selectors) + where TEntity : IEntity { Check.NotNull(selectors, nameof(selectors)); var selectorName = "Entity:" + typeof(TEntity).FullName; - if (selectors.Any(s => s.Name == selectorName)) - { - return selectors.RemoveAll(s => s.Name == selectorName).Count > 0; - } - return true; + selectors.RemoveAll(s => s.Name == selectorName); } /// @@ -69,7 +69,7 @@ namespace Volo.Abp.Domain.Entities.Events.Distributed public static void AddAll([NotNull] this IAutoEntityDistributedEventSelectorList selectors) { Check.NotNull(selectors, nameof(selectors)); - + if (selectors.Any(s => s.Name == AllEntitiesSelectorName)) { return; @@ -85,11 +85,11 @@ namespace Volo.Abp.Domain.Entities.Events.Distributed public static void Add( [NotNull] this IAutoEntityDistributedEventSelectorList selectors, - string selectorName, + string selectorName, Func predicate) { Check.NotNull(selectors, nameof(selectors)); - + if (selectors.Any(s => s.Name == selectorName)) { throw new AbpException($"There is already a selector added before with the same name: {selectorName}"); @@ -102,7 +102,7 @@ namespace Volo.Abp.Domain.Entities.Events.Distributed ) ); } - + public static void Add( [NotNull] this IAutoEntityDistributedEventSelectorList selectors, Func predicate) @@ -116,11 +116,11 @@ namespace Volo.Abp.Domain.Entities.Events.Distributed { Check.NotNull(selectors, nameof(selectors)); Check.NotNull(name, nameof(name)); - + return selectors.RemoveAll(s => s.Name == name).Count > 0; } - + public static bool IsMatch([NotNull] this IAutoEntityDistributedEventSelectorList selectors, Type entityType) { Check.NotNull(selectors, nameof(selectors));