From a4ab137c3f93b7e4f7e54899bd3537875dad63b7 Mon Sep 17 00:00:00 2001 From: Shannon Date: Thu, 17 Mar 2016 15:59:35 +0100 Subject: [PATCH] moves ICacheRefresher to Core --- src/Umbraco.Core/Cache/ICacheRefresher.cs | 17 +++++++++++++- src/Umbraco.Core/CacheRefreshersResolver.cs | 2 +- .../Sync/BatchedWebServiceServerMessenger.cs | 2 +- src/Umbraco.Core/Sync/IServerMessenger.cs | 1 + src/Umbraco.Core/Sync/RefreshInstruction.cs | 3 +-- .../Sync/RefreshInstructionEnvelope.cs | 2 +- src/Umbraco.Core/Sync/ServerMessengerBase.cs | 1 - .../Sync/WebServiceServerMessenger.cs | 2 +- .../DistributedCache/DistributedCacheTests.cs | 2 +- .../BatchedDatabaseServerMessenger.cs | 2 +- src/Umbraco.Web/Cache/DistributedCache.cs | 2 +- src/Umbraco.Web/Cache/ICacheRefresher.cs | 6 +++++ src/Umbraco.Web/Umbraco.Web.csproj | 1 + src/umbraco.interfaces/ICacheRefresher.cs | 22 ------------------- .../umbraco.interfaces.csproj | 3 --- 15 files changed, 32 insertions(+), 36 deletions(-) create mode 100644 src/Umbraco.Web/Cache/ICacheRefresher.cs delete mode 100644 src/umbraco.interfaces/ICacheRefresher.cs diff --git a/src/Umbraco.Core/Cache/ICacheRefresher.cs b/src/Umbraco.Core/Cache/ICacheRefresher.cs index e50c11fa35..c82cc907ee 100644 --- a/src/Umbraco.Core/Cache/ICacheRefresher.cs +++ b/src/Umbraco.Core/Cache/ICacheRefresher.cs @@ -1,7 +1,22 @@ -using umbraco.interfaces; +using System; +using umbraco.interfaces; namespace Umbraco.Core.Cache { + /// + /// The IcacheRefresher Interface is used for loadbalancing. + /// + /// + public interface ICacheRefresher + { + Guid UniqueIdentifier { get; } + string Name { get; } + void RefreshAll(); + void Refresh(int id); + void Remove(int id); + void Refresh(Guid id); + } + /// /// Strongly type cache refresher that is able to refresh cache of real instances of objects as well as IDs /// diff --git a/src/Umbraco.Core/CacheRefreshersResolver.cs b/src/Umbraco.Core/CacheRefreshersResolver.cs index 4047a06b62..fc30e05a64 100644 --- a/src/Umbraco.Core/CacheRefreshersResolver.cs +++ b/src/Umbraco.Core/CacheRefreshersResolver.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using Umbraco.Core.Logging; using Umbraco.Core.ObjectResolution; -using umbraco.interfaces; +using Umbraco.Core.Cache; namespace Umbraco.Core { diff --git a/src/Umbraco.Core/Sync/BatchedWebServiceServerMessenger.cs b/src/Umbraco.Core/Sync/BatchedWebServiceServerMessenger.cs index 9ab6d08455..a0357111d1 100644 --- a/src/Umbraco.Core/Sync/BatchedWebServiceServerMessenger.cs +++ b/src/Umbraco.Core/Sync/BatchedWebServiceServerMessenger.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; -using umbraco.interfaces; +using Umbraco.Core.Cache; namespace Umbraco.Core.Sync { diff --git a/src/Umbraco.Core/Sync/IServerMessenger.cs b/src/Umbraco.Core/Sync/IServerMessenger.cs index 1208ea3caf..81e43078ef 100644 --- a/src/Umbraco.Core/Sync/IServerMessenger.cs +++ b/src/Umbraco.Core/Sync/IServerMessenger.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using umbraco.interfaces; +using Umbraco.Core.Cache; namespace Umbraco.Core.Sync { diff --git a/src/Umbraco.Core/Sync/RefreshInstruction.cs b/src/Umbraco.Core/Sync/RefreshInstruction.cs index cd10019f00..2b5b1cafe0 100644 --- a/src/Umbraco.Core/Sync/RefreshInstruction.cs +++ b/src/Umbraco.Core/Sync/RefreshInstruction.cs @@ -1,9 +1,8 @@ using System; -using System.Collections; using System.Collections.Generic; using System.Linq; using Newtonsoft.Json; -using umbraco.interfaces; +using Umbraco.Core.Cache; namespace Umbraco.Core.Sync { diff --git a/src/Umbraco.Core/Sync/RefreshInstructionEnvelope.cs b/src/Umbraco.Core/Sync/RefreshInstructionEnvelope.cs index 2a198ef99c..bcbde3a38e 100644 --- a/src/Umbraco.Core/Sync/RefreshInstructionEnvelope.cs +++ b/src/Umbraco.Core/Sync/RefreshInstructionEnvelope.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using umbraco.interfaces; +using Umbraco.Core.Cache; namespace Umbraco.Core.Sync { diff --git a/src/Umbraco.Core/Sync/ServerMessengerBase.cs b/src/Umbraco.Core/Sync/ServerMessengerBase.cs index 573be67169..d22d292e76 100644 --- a/src/Umbraco.Core/Sync/ServerMessengerBase.cs +++ b/src/Umbraco.Core/Sync/ServerMessengerBase.cs @@ -4,7 +4,6 @@ using System.Linq; using Newtonsoft.Json; using Umbraco.Core.Cache; using Umbraco.Core.Logging; -using umbraco.interfaces; namespace Umbraco.Core.Sync { diff --git a/src/Umbraco.Core/Sync/WebServiceServerMessenger.cs b/src/Umbraco.Core/Sync/WebServiceServerMessenger.cs index e5717fbfdc..5a9af4e83d 100644 --- a/src/Umbraco.Core/Sync/WebServiceServerMessenger.cs +++ b/src/Umbraco.Core/Sync/WebServiceServerMessenger.cs @@ -7,7 +7,7 @@ using System.Threading; using Newtonsoft.Json; using Umbraco.Core.Configuration; using Umbraco.Core.Logging; -using umbraco.interfaces; +using Umbraco.Core.Cache; namespace Umbraco.Core.Sync { diff --git a/src/Umbraco.Tests/Cache/DistributedCache/DistributedCacheTests.cs b/src/Umbraco.Tests/Cache/DistributedCache/DistributedCacheTests.cs index e568af682d..b72b24e501 100644 --- a/src/Umbraco.Tests/Cache/DistributedCache/DistributedCacheTests.cs +++ b/src/Umbraco.Tests/Cache/DistributedCache/DistributedCacheTests.cs @@ -4,8 +4,8 @@ using System.Linq; using LightInject; using Moq; using NUnit.Framework; -using umbraco.interfaces; using Umbraco.Core; +using Umbraco.Core.Cache; using Umbraco.Core.Logging; using Umbraco.Core.ObjectResolution; using Umbraco.Core.Sync; diff --git a/src/Umbraco.Web/BatchedDatabaseServerMessenger.cs b/src/Umbraco.Web/BatchedDatabaseServerMessenger.cs index 730efd380b..49635b7f52 100644 --- a/src/Umbraco.Web/BatchedDatabaseServerMessenger.cs +++ b/src/Umbraco.Web/BatchedDatabaseServerMessenger.cs @@ -3,8 +3,8 @@ using System.Collections.Generic; using System.Linq; using System.Web; using Newtonsoft.Json; -using umbraco.interfaces; using Umbraco.Core; +using Umbraco.Core.Cache; using Umbraco.Core.Models.Rdbms; using Umbraco.Core.Sync; using Umbraco.Web.Routing; diff --git a/src/Umbraco.Web/Cache/DistributedCache.cs b/src/Umbraco.Web/Cache/DistributedCache.cs index 6848ce2496..5d3dcb3632 100644 --- a/src/Umbraco.Web/Cache/DistributedCache.cs +++ b/src/Umbraco.Web/Cache/DistributedCache.cs @@ -3,7 +3,7 @@ using System.ComponentModel; using System.Linq; using Umbraco.Core; using Umbraco.Core.Sync; -using umbraco.interfaces; +using Umbraco.Core.Cache; namespace Umbraco.Web.Cache { diff --git a/src/Umbraco.Web/Cache/ICacheRefresher.cs b/src/Umbraco.Web/Cache/ICacheRefresher.cs new file mode 100644 index 0000000000..73b27e182a --- /dev/null +++ b/src/Umbraco.Web/Cache/ICacheRefresher.cs @@ -0,0 +1,6 @@ +using System; + +namespace Umbraco.Web.Cache +{ + +} \ No newline at end of file diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj index c0a537b46a..9e5a64cbcd 100644 --- a/src/Umbraco.Web/Umbraco.Web.csproj +++ b/src/Umbraco.Web/Umbraco.Web.csproj @@ -322,6 +322,7 @@ + diff --git a/src/umbraco.interfaces/ICacheRefresher.cs b/src/umbraco.interfaces/ICacheRefresher.cs deleted file mode 100644 index d239e81fe6..0000000000 --- a/src/umbraco.interfaces/ICacheRefresher.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System; - -namespace umbraco.interfaces -{ - - /// - /// The IcacheRefresher Interface is used for loadbalancing. - /// - /// - public interface ICacheRefresher - { - Guid UniqueIdentifier { get; } - string Name { get; } - void RefreshAll(); - void Refresh(int Id); - void Remove(int Id); - void Refresh(Guid Id); - - //void Notify(object payload); - } - -} diff --git a/src/umbraco.interfaces/umbraco.interfaces.csproj b/src/umbraco.interfaces/umbraco.interfaces.csproj index bf4387f97d..5d2259f28d 100644 --- a/src/umbraco.interfaces/umbraco.interfaces.csproj +++ b/src/umbraco.interfaces/umbraco.interfaces.csproj @@ -127,9 +127,6 @@ Code - - Code -