yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove obsolete static events

Browse Source
This commit is contained in:
Mole
2021-03-29 10:42:42 +02:00
parent c113ca8eda
commit b4cbf0cf5d
7 changed files with 55 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
src/Umbraco.Infrastructure/Cache/DistributedCacheBinder_Handlers.cs
View File

@@ -23,7 +23,15 @@ namespace Umbraco.Cms.Core.Cache
INotificationHandler<DictionaryItemDeletedNotification>,
INotificationHandler<DictionaryItemSavedNotification>,
INotificationHandler<LanguageSavedNotification>,
INotificationHandler<LanguageDeletedNotification>
INotificationHandler<LanguageDeletedNotification>,
INotificationHandler<MemberSavedNotification>,
INotificationHandler<MemberDeletedNotification>,
INotificationHandler<PublicAccessEntrySavedNotification>,
INotificationHandler<PublicAccessEntryDeletedNotification>,
INotificationHandler<UserSavedNotification>,
INotificationHandler<UserDeletedNotification>,
INotificationHandler<UserGroupWithUsersSavedNotification>,
INotificationHandler<UserGroupDeletedNotification>
{
private List<Action> _unbinders;
@@ -54,16 +62,6 @@ namespace Umbraco.Cms.Core.Cache
_logger.LogInformation("Initializing Umbraco internal event handlers for cache refreshing.");
// bind to user and user group events
Bind(() => UserService.SavedUserGroup += UserService_SavedUserGroup,
() => UserService.SavedUserGroup -= UserService_SavedUserGroup);
Bind(() => UserService.DeletedUserGroup += UserService_DeletedUserGroup,
() => UserService.DeletedUserGroup -= UserService_DeletedUserGroup);
Bind(() => UserService.SavedUser += UserService_SavedUser,
() => UserService.SavedUser -= UserService_SavedUser);
Bind(() => UserService.DeletedUser += UserService_DeletedUser,
() => UserService.DeletedUser -= UserService_DeletedUser);
// bind to data type events
Bind(() => DataTypeService.Deleted += DataTypeService_Deleted,
() => DataTypeService.Deleted -= DataTypeService_Deleted);
@@ -103,10 +101,6 @@ namespace Umbraco.Cms.Core.Cache
() => MacroService.Deleted -= MacroService_Deleted);
// bind to member events
Bind(() => MemberService.Saved += MemberService_Saved,
() => MemberService.Saved -= MemberService_Saved);
Bind(() => MemberService.Deleted += MemberService_Deleted,
() => MemberService.Deleted -= MemberService_Deleted);
Bind(() => MemberGroupService.Saved += MemberGroupService_Saved,
() => MemberGroupService.Saved -= MemberGroupService_Saved);
Bind(() => MemberGroupService.Deleted += MemberGroupService_Deleted,
@@ -126,12 +120,6 @@ namespace Umbraco.Cms.Core.Cache
//Bind(() => ContentService.DeletedBlueprint += ContentService_DeletedBlueprint,
// () => ContentService.DeletedBlueprint -= ContentService_DeletedBlueprint);
// bind to public access events
Bind(() => PublicAccessService.Saved += PublicAccessService_Saved,
() => PublicAccessService.Saved -= PublicAccessService_Saved);
Bind(() => PublicAccessService.Deleted += PublicAccessService_Deleted,
() => PublicAccessService.Deleted -= PublicAccessService_Deleted);
// bind to relation type events
Bind(() => RelationService.SavedRelationType += RelationService_SavedRelationType,
() => RelationService.SavedRelationType -= RelationService_SavedRelationType);
@@ -141,14 +129,15 @@ namespace Umbraco.Cms.Core.Cache
#region PublicAccessService
private void PublicAccessService_Saved(IPublicAccessService sender, SaveEventArgs<PublicAccessEntry> e)
public void Handle(PublicAccessEntrySavedNotification notification)
{
_distributedCache.RefreshPublicAccess();
}
private void PublicAccessService_Deleted(IPublicAccessService sender, DeleteEventArgs<PublicAccessEntry> e)
public void Handle(PublicAccessEntryDeletedNotification notification)
{
_distributedCache.RefreshPublicAccess();
}
#endregion
@@ -293,29 +282,36 @@ namespace Umbraco.Cms.Core.Cache
#region UserService
private void UserService_SavedUser(IUserService sender, SaveEventArgs<IUser> e)
public void Handle(UserSavedNotification notification)
{
foreach (var entity in e.SavedEntities)
foreach (IUser entity in notification.SavedEntities)
{
_distributedCache.RefreshUserCache(entity.Id);
}
}
private void UserService_DeletedUser(IUserService sender, DeleteEventArgs<IUser> e)
public void Handle(UserDeletedNotification notification)
{
foreach (var entity in e.DeletedEntities)
foreach (IUser entity in notification.DeletedEntities)
{
_distributedCache.RemoveUserCache(entity.Id);
}
}
private void UserService_SavedUserGroup(IUserService sender, SaveEventArgs<UserGroupWithUsers> e)
public void Handle(UserGroupWithUsersSavedNotification notification)
{
foreach (var entity in e.SavedEntities)
foreach (UserGroupWithUsers entity in notification.SavedEntities)
{
_distributedCache.RefreshUserGroupCache(entity.UserGroup.Id);
}
}
private void UserService_DeletedUserGroup(IUserService sender, DeleteEventArgs<IUserGroup> e)
public void Handle(UserGroupDeletedNotification notification)
{
foreach (var entity in e.DeletedEntities)
foreach (IUserGroup entity in notification.DeletedEntities)
{
_distributedCache.RemoveUserGroupCache(entity.Id);
}
}
#endregion
@@ -377,14 +373,14 @@ namespace Umbraco.Cms.Core.Cache
#region MemberService
private void MemberService_Deleted(IMemberService sender, DeleteEventArgs<IMember> e)
public void Handle(MemberDeletedNotification notification)
{
_distributedCache.RemoveMemberCache(e.DeletedEntities.ToArray());
_distributedCache.RemoveMemberCache(notification.DeletedEntities.ToArray());
}
private void MemberService_Saved(IMemberService sender, SaveEventArgs<IMember> e)
public void Handle(MemberSavedNotification notification)
{
_distributedCache.RefreshMemberCache(e.SavedEntities.ToArray());
_distributedCache.RefreshMemberCache(notification.SavedEntities.ToArray());
}
#endregion