U4-8447 - prepare for NuCache (work-in-progress)

src/Umbraco.Web/Cache/MemberGroupCacheRefresher.cs

@@ -1,10 +1,9 @@
 using System;
 using System.Linq;
-using System.Web.Script.Serialization;
+using Newtonsoft.Json;
 using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Models;
-
 using Umbraco.Core.Persistence.Repositories;
 using Umbraco.Core.Services;
 
@@ -14,97 +13,46 @@ namespace Umbraco.Web.Cache
     {
         private readonly IMemberGroupService _memberGroupService;
 
-        public MemberGroupCacheRefresher(CacheHelper cacheHelper, IMemberGroupService memberGroupService) : base(cacheHelper)
+        public MemberGroupCacheRefresher(CacheHelper cacheHelper, IMemberGroupService memberGroupService)
+            : base(cacheHelper)
         {
             _memberGroupService = memberGroupService;
         }
 
-        #region Static helpers
+        #region Define
 
-        /// <summary>
-        /// Converts the json to a JsonPayload object
-        /// </summary>
-        /// <param name="json"></param>
-        /// <returns></returns>
-        private static JsonPayload[] DeserializeFromJsonPayload(string json)
-        {
-            var serializer = new JavaScriptSerializer();
-            var jsonObject = serializer.Deserialize<JsonPayload[]>(json);
-            return jsonObject;
-        }
+        protected override MemberGroupCacheRefresher Instance => this;
 
-        /// <summary>
-        /// Creates the custom Json payload used to refresh cache amongst the servers
-        /// </summary>
-        /// <param name="groups"></param>
-        /// <returns></returns>
-        internal static string SerializeToJsonPayload(params IMemberGroup[] groups)
-        {
-            var serializer = new JavaScriptSerializer();
-            var items = groups.Select(FromMemberGroup).ToArray();
-            var json = serializer.Serialize(items);
-            return json;
-        }
+        public static readonly Guid UniqueId = Guid.Parse("187F236B-BD21-4C85-8A7C-29FBA3D6C00C");
 
-        /// <summary>
-        /// Converts a macro to a jsonPayload object
-        /// </summary>
-        /// <param name="group"></param>
-        /// <returns></returns>
-        private static JsonPayload FromMemberGroup(IMemberGroup group)
-        {
-            if (group == null) return null;
+        public override Guid RefresherUniqueId => UniqueId;
 
-            var payload = new JsonPayload
-            {
-                Id = group.Id,
-                Name = group.Name
-            };
-            return payload;
-        }
+        public override string Name => "Member Group Cache Refresher";
 
         #endregion
 
-        #region Sub classes
+        #region Refresher
 
-        private class JsonPayload
+        public override void Refresh(string json)
         {
-            public string Name { get; set; }
-            public int Id { get; set; }
-        }
-
-        #endregion
-
-        protected override MemberGroupCacheRefresher Instance
-        {
-            get { return this; }
-        }
-
-        public override Guid UniqueIdentifier
-        {
-            get { return new Guid(DistributedCache.MemberGroupCacheRefresherId); }
-        }
-
-        public override string Name
-        {
-            get { return "Clears Member Group Cache"; }
-        }
-
-        public override void Refresh(string jsonPayload)
-        {
-            ClearCache(DeserializeFromJsonPayload(jsonPayload));
-            base.Refresh(jsonPayload);
+            var payload = Deserialize(json);
+            ClearCache(payload);
+            base.Refresh(json);
         }
 
         public override void Refresh(int id)
         {
-            ClearCache(FromMemberGroup(_memberGroupService.GetById(id)));
+            var group = _memberGroupService.GetById(id);
+            if (group != null)
+                ClearCache(new JsonPayload(group.Id, group.Name));
             base.Refresh(id);
         }
 
         public override void Remove(int id)
         {
-            ClearCache(FromMemberGroup(_memberGroupService.GetById(id)));
+            var group = _memberGroupService.GetById(id);
+            if (group != null)
+                ClearCache(new JsonPayload(group.Id, group.Name));
             base.Remove(id);
         }
 
@@ -113,15 +61,41 @@ namespace Umbraco.Web.Cache
             if (payloads == null) return;
 
             var memberGroupCache = CacheHelper.IsolatedRuntimeCache.GetCache<IMemberGroup>();
-            payloads.ForEach(payload =>
+            if (memberGroupCache == false) return;
+
+            foreach (var payload in payloads.WhereNotNull())
             {
-                if (payload != null && memberGroupCache)
-                {
-                    memberGroupCache.Result.ClearCacheByKeySearch(string.Format("{0}.{1}", typeof(IMemberGroup).FullName, payload.Name));
-                    memberGroupCache.Result.ClearCacheItem(RepositoryBase.GetCacheIdKey<IMemberGroup>(payload.Id));
-                }                
-            });
-            
+                memberGroupCache.Result.ClearCacheByKeySearch($"{typeof(IMemberGroup).FullName}.{payload.Name}");
+                memberGroupCache.Result.ClearCacheItem(RepositoryBase.GetCacheIdKey<IMemberGroup>(payload.Id));
+            }
         }
+
+        #endregion
+
+        #region Json
+
+        public class JsonPayload
+        {
+            public JsonPayload(int id, string name)
+            {
+                Id = id;
+                Name = name;
+            }
+
+            public string Name { get; }
+            public int Id { get; }
+        }
+
+        private JsonPayload[] Deserialize(string json)
+        {
+            return JsonConvert.DeserializeObject<JsonPayload[]>(json);
+        }
+
+        internal static string Serialize(params IMemberGroup[] groups)
+        {
+            return JsonConvert.SerializeObject(groups.Select(x => new JsonPayload(x.Id, x.Name)).ToArray());
+        }
+
+        #endregion
     }
 }