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

Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/relationservice-events

Browse Source 
# Conflicts:
#	src/Umbraco.Infrastructure/Cache/DistributedCacheBinder_Handlers.cs
#	src/Umbraco.Infrastructure/Compose/NotificationsComposer.cs
This commit is contained in:
Bjarke Berg
2021-04-07 13:33:46 +02:00
parent a7072277ba a184271196
commit d4dd6427ba
43 changed files with 1063 additions and 646 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,7 +37,11 @@ namespace Umbraco.Cms.Core.Cache
INotificationHandler<DataTypeDeletedNotification>,
INotificationHandler<DataTypeSavedNotification>,
INotificationHandler<RelationTypeDeletedNotification>,
INotificationHandler<RelationTypeSavedNotification>
INotificationHandler<RelationTypeSavedNotification>,
INotificationHandler<DomainDeletedNotification>,
INotificationHandler<DomainSavedNotification>,
INotificationHandler<MacroSavedNotification>,
INotificationHandler<MacroDeletedNotification>
{
private List<Action> _unbinders;
@@ -74,12 +78,6 @@ namespace Umbraco.Cms.Core.Cache
Bind(() => FileService.DeletedStylesheet += FileService_DeletedStylesheet,
() => FileService.DeletedStylesheet -= FileService_DeletedStylesheet);
// bind to domain events
Bind(() => DomainService.Saved += DomainService_Saved,
() => DomainService.Saved -= DomainService_Saved);
Bind(() => DomainService.Deleted += DomainService_Deleted,
() => DomainService.Deleted -= DomainService_Deleted);
// bind to content type events
Bind(() => ContentTypeService.Changed += ContentTypeService_Changed,
() => ContentTypeService.Changed -= ContentTypeService_Changed);
@@ -94,12 +92,6 @@ namespace Umbraco.Cms.Core.Cache
Bind(() => FileService.DeletedTemplate += FileService_DeletedTemplate,
() => FileService.DeletedTemplate -= FileService_DeletedTemplate);
// bind to macro events
Bind(() => MacroService.Saved += MacroService_Saved,
() => MacroService.Saved -= MacroService_Saved);
Bind(() => MacroService.Deleted += MacroService_Deleted,
() => MacroService.Deleted -= MacroService_Deleted);
// bind to media events - handles all media changes
Bind(() => MediaService.TreeChanged += MediaService_TreeChanged,
() => MediaService.TreeChanged -= MediaService_TreeChanged);
@@ -203,16 +195,20 @@ namespace Umbraco.Cms.Core.Cache
#region DomainService
private void DomainService_Saved(IDomainService sender, SaveEventArgs<IDomain> e)
public void Handle(DomainSavedNotification notification)
{
foreach (var entity in e.SavedEntities)
foreach (IDomain entity in notification.SavedEntities)
{
_distributedCache.RefreshDomainCache(entity);
}
}
private void DomainService_Deleted(IDomainService sender, DeleteEventArgs<IDomain> e)
public void Handle(DomainDeletedNotification notification)
{
foreach (var entity in e.DeletedEntities)
foreach (IDomain entity in notification.DeletedEntities)
{
_distributedCache.RemoveDomainCache(entity);
}
}
#endregion
@@ -340,16 +336,20 @@ namespace Umbraco.Cms.Core.Cache
#region MacroService
private void MacroService_Deleted(IMacroService sender, DeleteEventArgs<IMacro> e)
public void Handle(MacroDeletedNotification notification)
{
foreach (var entity in e.DeletedEntities)
foreach (IMacro entity in notification.DeletedEntities)
{
_distributedCache.RemoveMacroCache(entity);
}
}
private void MacroService_Saved(IMacroService sender, SaveEventArgs<IMacro> e)
public void Handle(MacroSavedNotification notification)
{
foreach (var entity in e.SavedEntities)
foreach (IMacro entity in notification.SavedEntities)
{
_distributedCache.RefreshMacroCache(entity);
}
}
#endregion