Replaced the DataType's cache expiry with the distributed cache refre…

…sher

This is the approach to use to support load-balancing

src/Our.Umbraco.NestedContent/Bootstrap.cs

@@ -1,24 +1,39 @@
-using Umbraco.Core;
-using Umbraco.Core.Events;
-using Umbraco.Core.Models;
-using Umbraco.Core.Services;
+using System;
+using Newtonsoft.Json;
+using Our.Umbraco.NestedContent.Helpers;
+using Umbraco.Core;
+using Umbraco.Core.Cache;
+using Umbraco.Core.Sync;
+using Umbraco.Web.Cache;
 
 namespace Our.Umbraco.NestedContent
 {
     public class Bootstrap : ApplicationEventHandler
     {
         protected override void ApplicationStarted(UmbracoApplicationBase umbracoApplication, ApplicationContext applicationContext)
         {
-            DataTypeService.Saved += ExpireCache;
+            CacheRefresherBase<DataTypeCacheRefresher>.CacheUpdated += DataTypeCacheRefresher_Updated;
         }
 
-        private void ExpireCache(IDataTypeService sender, SaveEventArgs<IDataTypeDefinition> e)
+        private void DataTypeCacheRefresher_Updated(DataTypeCacheRefresher sender, CacheRefresherEventArgs e)
         {
-            foreach (var dataType in e.SavedEntities)
+            if (e.MessageType == MessageType.RefreshByJson)
             {
-                ApplicationContext.Current.ApplicationCache.RuntimeCache.ClearCacheItem(
-                    string.Concat("Our.Umbraco.NestedContent.GetPreValuesCollectionByDataTypeId_", dataType.Id));
+                var payload = JsonConvert.DeserializeObject<JsonPayload[]>((string)e.MessageObject);
+                if (payload != null)
+                {
+                    foreach (var item in payload)
+                    {
+                        NestedContentHelper.ClearCache(item.Id);
+                    }
+                }
             }
         }
+
+        private class JsonPayload
+        {
+            public Guid UniqueId { get; set; }
+            public int Id { get; set; }
+        }
     }
 }

src/Our.Umbraco.NestedContent/Helpers/NestedContentHelper.cs

@@ -13,15 +13,23 @@ namespace Our.Umbraco.NestedContent.Helpers
 {
     internal static class NestedContentHelper
     {
+        private const string CacheKeyPrefix = "Our.Umbraco.NestedContent.GetPreValuesCollectionByDataTypeId_";
+
         public static PreValueCollection GetPreValuesCollectionByDataTypeId(int dtdId)
         {
             var preValueCollection = (PreValueCollection)ApplicationContext.Current.ApplicationCache.RuntimeCache.GetCacheItem(
-                string.Concat("Our.Umbraco.NestedContent.GetPreValuesCollectionByDataTypeId_", dtdId),
+                string.Concat(CacheKeyPrefix, dtdId),
                 () => ApplicationContext.Current.Services.DataTypeService.GetPreValuesCollectionByDataTypeId(dtdId));
 
             return preValueCollection;
         }
 
+        public static void ClearCache(int dtdId)
+        {
+            ApplicationContext.Current.ApplicationCache.RuntimeCache.ClearCacheItem(
+                string.Concat(CacheKeyPrefix, dtdId));
+        }
+
         public static string GetContentTypeAliasFromItem(JObject item)
         {
             var contentTypeAliasProperty = item[NestedContentPropertyEditor.ContentTypeAliasPropertyKey];

src/Our.Umbraco.NestedContent/Our.Umbraco.NestedContent.csproj

@@ -86,7 +86,6 @@
     <Compile Include="Extensions\PublishedPropertyTypeExtensions.cs" />
     <Compile Include="Converters\SingleNestedContentValueConverter.cs" />
     <Compile Include="Converters\NestedContentValueConverter.cs" />
-    <Compile Include="Extensions\ContentTypeServiceExtensions.cs" />
     <Compile Include="Extensions\PreValueCollectionExtensions.cs" />
     <Compile Include="Helpers\NestedContentHelper.cs" />
     <Compile Include="Models\DetachedPublishedContent.cs" />