diff --git a/src/Umbraco.Abstractions/Cache/DistributedCache.cs b/src/Umbraco.Abstractions/Cache/DistributedCache.cs index 7f628d819f..698e97c610 100644 --- a/src/Umbraco.Abstractions/Cache/DistributedCache.cs +++ b/src/Umbraco.Abstractions/Cache/DistributedCache.cs @@ -101,19 +101,6 @@ namespace Umbraco.Web.Cache GetRefresherById(refresherGuid), payloads.ToArray()); } - /// - /// Notifies the distributed cache, for a specified . - /// - /// The unique identifier of the ICacheRefresher. - /// The notification content. - public void RefreshByJson(Guid refresherGuid, string jsonPayload) - { - if (refresherGuid == Guid.Empty || jsonPayload.IsNullOrWhiteSpace()) return; - - _serverMessenger.PerformRefresh( - GetRefresherById(refresherGuid), - jsonPayload); - } ///// ///// Notifies the distributed cache, for a specified . diff --git a/src/Umbraco.Abstractions/Cache/LanguageCacheRefresher.cs b/src/Umbraco.Abstractions/Cache/LanguageCacheRefresher.cs index 9d0c8c8450..b66e35f843 100644 --- a/src/Umbraco.Abstractions/Cache/LanguageCacheRefresher.cs +++ b/src/Umbraco.Abstractions/Cache/LanguageCacheRefresher.cs @@ -11,8 +11,6 @@ using static Umbraco.Web.Cache.LanguageCacheRefresher.JsonPayload; namespace Umbraco.Web.Cache { public sealed class LanguageCacheRefresher : PayloadCacheRefresherBase - - //CacheRefresherBase { public LanguageCacheRefresher(AppCaches appCaches, IJsonSerializer serializer, IPublishedSnapshotService publishedSnapshotService) : base(appCaches, serializer) diff --git a/src/Umbraco.Abstractions/Cache/MemberGroupCacheRefresher.cs b/src/Umbraco.Abstractions/Cache/MemberGroupCacheRefresher.cs index 75bb73f5df..1149d499f5 100644 --- a/src/Umbraco.Abstractions/Cache/MemberGroupCacheRefresher.cs +++ b/src/Umbraco.Abstractions/Cache/MemberGroupCacheRefresher.cs @@ -70,15 +70,6 @@ namespace Umbraco.Web.Cache public int Id { get; } } - // private JsonPayload[] Deserialize(string json) - // { - // return _jsonSerializer.Deserialize(json); - // } - // - // private string Serialize(params IMemberGroup[] groups) - // { - // return _jsonSerializer.Serialize(groups.Select(x => new JsonPayload(x.Id, x.Name)).ToArray()); - // } #endregion } diff --git a/src/Umbraco.Abstractions/Sync/IServerMessenger.cs b/src/Umbraco.Abstractions/Sync/IServerMessenger.cs index 37d08723f4..b8300b2d6d 100644 --- a/src/Umbraco.Abstractions/Sync/IServerMessenger.cs +++ b/src/Umbraco.Abstractions/Sync/IServerMessenger.cs @@ -17,13 +17,6 @@ namespace Umbraco.Core.Sync /// The notification content. void PerformRefresh(ICacheRefresher refresher, TPayload[] payload); - /// - /// Notifies the distributed cache, for a specified . - /// - /// The ICacheRefresher. - /// The notification content. - void PerformRefresh(ICacheRefresher refresher, string jsonPayload); - /// /// Notifies the distributed cache of specified item invalidation, for a specified . /// diff --git a/src/Umbraco.Web/Cache/DistributedCacheBinder_Handlers.cs b/src/Umbraco.Web/Cache/DistributedCacheBinder_Handlers.cs index f9f8550693..0fbd3a2e6b 100644 --- a/src/Umbraco.Web/Cache/DistributedCacheBinder_Handlers.cs +++ b/src/Umbraco.Web/Cache/DistributedCacheBinder_Handlers.cs @@ -104,10 +104,10 @@ namespace Umbraco.Web.Cache () => FileService.DeletedTemplate -= FileService_DeletedTemplate); // bind to macro events - Bind(() => MacroService.Saved += (sender, e) => MacroService_Saved(sender, e), - () => MacroService.Saved -= (sender, e) => MacroService_Saved(sender, e)); - Bind(() => MacroService.Deleted += (sender, e) => MacroService_Deleted(sender, e), - () => MacroService.Deleted -= (sender, e) => MacroService_Deleted(sender, e)); + Bind(() => MacroService.Saved += MacroService_Saved, + () => MacroService.Saved -= MacroService_Saved); + Bind(() => MacroService.Deleted += MacroService_Deleted, + () => MacroService.Deleted -= MacroService_Deleted); // bind to member events Bind(() => MemberService.Saved += MemberService_Saved, @@ -389,18 +389,16 @@ namespace Umbraco.Web.Cache #region MacroService - private MacroCacheRefresher MacroCacheRefresher => _cacheRefresherCollection[MacroCacheRefresher.UniqueId] as MacroCacheRefresher; - private void MacroService_Deleted(IMacroService sender, DeleteEventArgs e) { foreach (var entity in e.DeletedEntities) - _distributedCache.RemoveMacroCache(MacroCacheRefresher, entity); + _distributedCache.RemoveMacroCache(entity); } private void MacroService_Saved(IMacroService sender, SaveEventArgs e) { foreach (var entity in e.SavedEntities) - _distributedCache.RefreshMacroCache(MacroCacheRefresher, entity); + _distributedCache.RefreshMacroCache(entity); } #endregion diff --git a/src/Umbraco.Web/Cache/DistributedCacheExtensions.cs b/src/Umbraco.Web/Cache/DistributedCacheExtensions.cs index fe0b53a27b..1c3b6a1dcc 100644 --- a/src/Umbraco.Web/Cache/DistributedCacheExtensions.cs +++ b/src/Umbraco.Web/Cache/DistributedCacheExtensions.cs @@ -192,16 +192,18 @@ namespace Umbraco.Web.Cache #region MacroCache - public static void RefreshMacroCache(this DistributedCache dc, MacroCacheRefresher macroCacheRefresher, IMacro macro) + public static void RefreshMacroCache(this DistributedCache dc, IMacro macro) { if (macro == null) return; - dc.RefreshByJson(macroCacheRefresher.RefresherUniqueId, macroCacheRefresher.Serialize(new MacroCacheRefresher.JsonPayload(macro.Id, macro.Alias))); + var payloads = new[] { new MacroCacheRefresher.JsonPayload(macro.Id, macro.Alias) }; + dc.RefreshByPayload(MacroCacheRefresher.UniqueId, payloads); } - public static void RemoveMacroCache(this DistributedCache dc, MacroCacheRefresher macroCacheRefresher, IMacro macro) + public static void RemoveMacroCache(this DistributedCache dc, IMacro macro) { if (macro == null) return; - dc.RefreshByJson(macroCacheRefresher.RefresherUniqueId, macroCacheRefresher.Serialize(new MacroCacheRefresher.JsonPayload(macro.Id, macro.Alias))); + var payloads = new[] { new MacroCacheRefresher.JsonPayload(macro.Id, macro.Alias) }; + dc.RefreshByPayload(MacroCacheRefresher.UniqueId, payloads); } #endregion