From 61cac95775b8667e3587791c86234932a920f031 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Fri, 27 Aug 2021 16:52:32 +0300 Subject: [PATCH] Resolved #9897: Marked EntityCreatingEventData, EntityUpdatingEventData, EntityDeletingEventData and EntityChangingEventData as obsolete. --- .../Abp/Domain/Entities/Events/EntityChangeEventHelper.cs | 6 ++++++ .../Abp/Domain/Entities/Events/EntityChangingEventData.cs | 1 + .../Abp/Domain/Entities/Events/EntityCreatingEventData.cs | 1 + .../Abp/Domain/Entities/Events/EntityDeletingEventData.cs | 1 + .../Abp/Domain/Entities/Events/EntityUpdatingEventData.cs | 1 + .../Volo/Abp/TestApp/Testing/EntityChangeEvents_Tests.cs | 2 ++ 6 files changed, 12 insertions(+) diff --git a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/EntityChangeEventHelper.cs b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/EntityChangeEventHelper.cs index 9fc5c1e90d..1d16909d1f 100644 --- a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/EntityChangeEventHelper.cs +++ b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/EntityChangeEventHelper.cs @@ -46,7 +46,9 @@ namespace Volo.Abp.Domain.Entities.Events { TriggerEventWithEntity( LocalEventBus, +#pragma warning disable 618 typeof(EntityCreatingEventData<>), +#pragma warning restore 618 entity, entity ); @@ -91,7 +93,9 @@ namespace Volo.Abp.Domain.Entities.Events { TriggerEventWithEntity( LocalEventBus, +#pragma warning disable 618 typeof(EntityUpdatingEventData<>), +#pragma warning restore 618 entity, entity ); @@ -125,7 +129,9 @@ namespace Volo.Abp.Domain.Entities.Events { TriggerEventWithEntity( LocalEventBus, +#pragma warning disable 618 typeof(EntityDeletingEventData<>), +#pragma warning restore 618 entity, entity ); diff --git a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/EntityChangingEventData.cs b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/EntityChangingEventData.cs index fb914ed46d..a965a996b7 100644 --- a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/EntityChangingEventData.cs +++ b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/EntityChangingEventData.cs @@ -8,6 +8,7 @@ namespace Volo.Abp.Domain.Entities.Events /// /// Entity type [Serializable] + [Obsolete("This event is no longer needed and identical to EntityChangedEventData. Please use EntityChangedEventData instead.")] public class EntityChangingEventData : EntityEventData { /// diff --git a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/EntityCreatingEventData.cs b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/EntityCreatingEventData.cs index 39ad3c4480..d5c7b21a24 100644 --- a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/EntityCreatingEventData.cs +++ b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/EntityCreatingEventData.cs @@ -7,6 +7,7 @@ namespace Volo.Abp.Domain.Entities.Events /// /// Entity type [Serializable] + [Obsolete("This event is no longer needed and identical to EntityCreatedEventData. Please use EntityCreatedEventData instead.")] public class EntityCreatingEventData : EntityChangingEventData { /// diff --git a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/EntityDeletingEventData.cs b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/EntityDeletingEventData.cs index b8e336ed3e..4fd571ca7f 100644 --- a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/EntityDeletingEventData.cs +++ b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/EntityDeletingEventData.cs @@ -7,6 +7,7 @@ namespace Volo.Abp.Domain.Entities.Events /// /// Entity type [Serializable] + [Obsolete("This event is no longer needed and identical to EntityDeleteEventData. Please use EntityDeleteEventData instead.")] public class EntityDeletingEventData : EntityChangingEventData { /// diff --git a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/EntityUpdatingEventData.cs b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/EntityUpdatingEventData.cs index 72a401fb34..74ed41c157 100644 --- a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/EntityUpdatingEventData.cs +++ b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/EntityUpdatingEventData.cs @@ -7,6 +7,7 @@ namespace Volo.Abp.Domain.Entities.Events /// /// Entity type [Serializable] + [Obsolete("This event is no longer needed and identical to EntityUpdatedEventData. Please use EntityUpdatedEventData instead.")] public class EntityUpdatingEventData : EntityChangingEventData { /// diff --git a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Testing/EntityChangeEvents_Tests.cs b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Testing/EntityChangeEvents_Tests.cs index 37fdbdedec..b87f23774a 100644 --- a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Testing/EntityChangeEvents_Tests.cs +++ b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Testing/EntityChangeEvents_Tests.cs @@ -38,7 +38,9 @@ namespace Volo.Abp.TestApp.Testing using (var uow = GetRequiredService().Begin()) { +#pragma warning disable 618 LocalEventBus.Subscribe>(data => +#pragma warning restore 618 { creatingEventTriggered.ShouldBeFalse(); createdEventTriggered.ShouldBeFalse();