diff --git a/src/Umbraco.Core/Cache/MemberCacheRefresher.cs b/src/Umbraco.Core/Cache/MemberCacheRefresher.cs index 2d0ce7da16..9fd2ed8fda 100644 --- a/src/Umbraco.Core/Cache/MemberCacheRefresher.cs +++ b/src/Umbraco.Core/Cache/MemberCacheRefresher.cs @@ -12,13 +12,11 @@ namespace Umbraco.Cms.Core.Cache public sealed class MemberCacheRefresher : PayloadCacheRefresherBase { private readonly IIdKeyMap _idKeyMap; - private readonly LegacyMemberCacheRefresher _legacyMemberRefresher; public MemberCacheRefresher(AppCaches appCaches, IJsonSerializer serializer, IIdKeyMap idKeyMap) : base(appCaches, serializer) { _idKeyMap = idKeyMap; - _legacyMemberRefresher = new LegacyMemberCacheRefresher(this, appCaches); } public class JsonPayload @@ -66,12 +64,6 @@ namespace Umbraco.Cms.Core.Cache base.Remove(id); } - [Obsolete("This is no longer used and will be removed from the codebase in the future")] - public void Refresh(IMember instance) => _legacyMemberRefresher.Refresh(instance); - - [Obsolete("This is no longer used and will be removed from the codebase in the future")] - public void Remove(IMember instance) => _legacyMemberRefresher.Remove(instance); - private void ClearCache(params JsonPayload[] payloads) { AppCaches.ClearPartialViewCache(); @@ -99,38 +91,5 @@ namespace Umbraco.Cms.Core.Cache } #endregion - - #region Backwards Compat - - // TODO: this is here purely for backwards compat but should be removed in netcore - private class LegacyMemberCacheRefresher : TypedCacheRefresherBase - { - private readonly MemberCacheRefresher _parent; - - public LegacyMemberCacheRefresher(MemberCacheRefresher parent, AppCaches appCaches) : base(appCaches) - { - _parent = parent; - } - - public override Guid RefresherUniqueId => _parent.RefresherUniqueId; - - public override string Name => _parent.Name; - - protected override MemberCacheRefresher This => _parent; - - public override void Refresh(IMember instance) - { - _parent.ClearCache(new JsonPayload(instance.Id, instance.Username)); - base.Refresh(instance.Id); - } - - public override void Remove(IMember instance) - { - _parent.ClearCache(new JsonPayload(instance.Id, instance.Username)); - base.Remove(instance); - } - } - - #endregion } } diff --git a/src/Umbraco.Core/Cache/TypedCacheRefresherBase.cs b/src/Umbraco.Core/Cache/TypedCacheRefresherBase.cs deleted file mode 100644 index 9c9314aeae..0000000000 --- a/src/Umbraco.Core/Cache/TypedCacheRefresherBase.cs +++ /dev/null @@ -1,36 +0,0 @@ -using Umbraco.Cms.Core.Sync; - -namespace Umbraco.Cms.Core.Cache -{ - /// - /// A base class for "typed" cache refreshers. - /// - /// The actual cache refresher type. - /// The entity type. - /// The actual cache refresher type is used for strongly typed events. - public abstract class TypedCacheRefresherBase : CacheRefresherBase, ICacheRefresher - where TInstanceType : class, ICacheRefresher - { - /// - /// Initializes a new instance of the . - /// - /// A cache helper. - protected TypedCacheRefresherBase(AppCaches appCaches) - : base(appCaches) - { } - - #region Refresher - - public virtual void Refresh(TEntityType instance) - { - OnCacheUpdated(This, new CacheRefresherEventArgs(instance, MessageType.RefreshByInstance)); - } - - public virtual void Remove(TEntityType instance) - { - OnCacheUpdated(This, new CacheRefresherEventArgs(instance, MessageType.RemoveByInstance)); - } - - #endregion - } -}