More trivial tidying up

Author: Warren Buckley

Our.Umbraco.TagHelpers/Notifications/CacheRefresherNotifications.cs

@@ -1,16 +1,15 @@
 using Our.Umbraco.TagHelpers.CacheKeys;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Notifications;
 
 namespace Our.Umbraco.TagHelpers.Notifications
 {
-	// For Use with the Our Cache TagHelper - to store a last cache updated datetime to use in the varyby key for the Cache TagHelper, to naively break the cache on publish
+	// For Use with the Our Cache TagHelper - to store a last cache updated datetime to use
+	// in the varyby key for the Cache TagHelper, to naively break the cache on publish.
+	// Used for ContentCacheRefresher (Load balanced scernarios not just Published event)
+	// Same for Dictionary Items and Media item
 	public class HandleContentCacheRefresherNotification : INotificationHandler<ContentCacheRefresherNotification>
 	{
 		private readonly IAppPolicyCache _runtimeCache;
@@ -20,52 +19,55 @@ public HandleContentCacheRefresherNotification(AppCaches appCaches)
 			_runtimeCache = appCaches.RuntimeCache;
 
 		}
+
 		public void Handle(ContentCacheRefresherNotification notification)
 		{
 			// fired when content published
 			// store DateTime, as the cachekey
-
 			var lastCacheRefreshDate = DateTime.UtcNow.ToString("s");
-			//insert and override existing value in appcache
+
+			// insert and override existing value in appcache
 			_runtimeCache.Insert(CacheKeyConstants.LastCacheRefreshDateKey, () => lastCacheRefreshDate, null, false, null);
 
 		}
 	}
+
 	public class HandleDictionaryCacheRefresherNotification : INotificationHandler<DictionaryCacheRefresherNotification>
 	{
 		private readonly IAppPolicyCache _runtimeCache;
 		public HandleDictionaryCacheRefresherNotification(AppCaches appCaches)
 		{
 			_runtimeCache = appCaches.RuntimeCache;
 		}
+
 		public void Handle(DictionaryCacheRefresherNotification notification)
 		{
 			// fired when Dictionary item updated
 			// store DateTime, as the cachekey
-
 			var lastCacheRefreshDate = DateTime.UtcNow.ToString("s");
-			//insert and override existing value in appcache
+
+			// insert and override existing value in appcache
 			_runtimeCache.Insert(CacheKeyConstants.LastCacheRefreshDateKey, () => lastCacheRefreshDate, null, false, null);
 
 		}
 	}
+
 	public class HandleMediaCacheRefresherNotification : INotificationHandler<MediaCacheRefresherNotification>
 	{
 		private readonly IAppPolicyCache _runtimeCache;
 		public HandleMediaCacheRefresherNotification(AppCaches appCaches)
 		{
 			_runtimeCache = appCaches.RuntimeCache;
 		}
+
 		public void Handle(MediaCacheRefresherNotification notification)
 		{
 			// fired when media updated
 			// store DateTime, as the cachekey
-
 			var lastCacheRefreshDate = DateTime.UtcNow.ToString("s");
-			//insert and override existing value in appcache
-			_runtimeCache.Insert(CacheKeyConstants.LastCacheRefreshDateKey, () => lastCacheRefreshDate, null, false, null);
 
+			// insert and override existing value in appcache
+			_runtimeCache.Insert(CacheKeyConstants.LastCacheRefreshDateKey, () => lastCacheRefreshDate, null, false, null);
 		}
 	}
-
 }

Our.Umbraco.TagHelpers/UmbracoCacheTagHelper.cs

@@ -37,11 +37,13 @@ public UmbracoCacheTagHelper(CacheTagHelperMemoryCacheFactory factory, HtmlEncod
 			_umbracoContextFactory = umbracoContextFactory;
 			_runtimeCache = appCaches.RuntimeCache;
 		}
+
 		public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
 		{
 			using (UmbracoContextReference umbracoContextReference = _umbracoContextFactory.EnsureUmbracoContext())
 			{
 				var umbracoContext = umbracoContextReference.UmbracoContext;
+
 				// we don't want to enable the cache tag helper if Umbraco is in Preview, or in Debug mode
 				if (umbracoContext.InPreviewMode || umbracoContext.IsDebug)
 				{
@@ -66,8 +68,10 @@ public override async Task ProcessAsync(TagHelperContext context, TagHelperOutpu
 					{
 						// ironically read the last cache refresh date from runtime cache, and set it to now if it's not there...
 						var umbLastCacheRefreshCacheKey = _runtimeCache.GetCacheItem(CacheKeyConstants.LastCacheRefreshDateKey, () => GetFallbackCacheRefreshDate()).ToString();
+						
 						// append to VaryBy key incase VaryBy key is set to some other parameter too
 						this.VaryBy = umbLastCacheRefreshCacheKey + "|" + this.VaryBy;
+						
 						// if an expiry date isn't set when using the CacheTagHelper, let's add one to be 24hrs, so when mulitple publishes occur, the versions of this taghelper don't hang around forever
 						if (this.ExpiresAfter == null)
                         {
@@ -80,16 +84,15 @@ public override async Task ProcessAsync(TagHelperContext context, TagHelperOutpu
 			}
 
 		}
+
 		private string GetFallbackCacheRefreshDate()
 		{
-			//this fires if the 'appcache' doesn't have a LastCacheRefreshDate set by a publish
+			// this fires if the 'appcache' doesn't have a LastCacheRefreshDate set by a publish
 			// eg after an app pool recycle
 			// it doesn't really matter that this isn't the last datetime that something was actually published
 			// because time tends to always move forwards
 			// the next publish will set a new future LastCacheRefreshDate...
 			return DateTime.UtcNow.ToString("s");
-
 		}
-
 	}
 }