Extremely WIP upgrade to v8

Author: nul800sebastiaan

src/Our.Umbraco.DocTypeGridEditor/Bootstrap.cs

@@ -1,38 +1,41 @@
 using System;
 using Newtonsoft.Json;
-using Our.Umbraco.DocTypeGridEditor.Web.Mvc;
-using Umbraco.Core;
+using Umbraco.Core.Composing;
 using Umbraco.Core.Sync;
 using Umbraco.Web.Cache;
 
 namespace Our.Umbraco.DocTypeGridEditor
 {
-    internal class Bootstrap : ApplicationEventHandler
+
+    public class Bootstrap : IUserComposer
     {
-        protected override void ApplicationStarting(UmbracoApplicationBase umbracoApplication, ApplicationContext applicationContext)
+        public void Compose(Composition composition)
         {
-            if (DefaultDocTypeGridEditorSurfaceControllerResolver.HasCurrent == false)
-            {
-                DefaultDocTypeGridEditorSurfaceControllerResolver.Current = new DefaultDocTypeGridEditorSurfaceControllerResolver();
-            }
-        }
+            // TODO: What is this for?
+            //if (DefaultDocTypeGridEditorSurfaceControllerResolver.HasCurrent == false)
+            //{
+            //    DefaultDocTypeGridEditorSurfaceControllerResolver.Current = new DefaultDocTypeGridEditorSurfaceControllerResolver();
+            //}
 
-        protected override void ApplicationStarted(UmbracoApplicationBase umbracoApplication, ApplicationContext applicationContext)
-        {
             DataTypeCacheRefresher.CacheUpdated += (sender, e) =>
             {
                 if (e.MessageType == MessageType.RefreshByJson)
                 {
-                    var payload = JsonConvert.DeserializeAnonymousType((string)e.MessageObject, new[] { new { Id = default(int), UniqueId = default(Guid) } });
+                    var payload = JsonConvert.DeserializeAnonymousType((string) e.MessageObject,
+                        new[] {new {Id = default(int), UniqueId = default(Guid)}});
                     if (payload != null)
                     {
                         foreach (var item in payload)
                         {
-                            applicationContext.ApplicationCache.RuntimeCache.ClearCacheItem(
-                                string.Concat("Our.Umbraco.DocTypeGridEditor.Web.Extensions.ContentTypeServiceExtensions.GetAliasById_", item.UniqueId));
+                            Current.AppCaches.RuntimeCache.ClearByKey(
+                                string.Concat(
+                                    "Our.Umbraco.DocTypeGridEditor.Web.Extensions.ContentTypeServiceExtensions.GetAliasById_",
+                                    item.UniqueId));
 
-                            applicationContext.ApplicationCache.RuntimeCache.ClearCacheItem(
-                                string.Concat("Our.Umbraco.DocTypeGridEditor.Helpers.DocTypeGridEditorHelper.GetPreValuesCollectionByDataTypeId_", item.Id));
+                            Current.AppCaches.RuntimeCache.ClearByKey(
+                                string.Concat(
+                                    "Our.Umbraco.DocTypeGridEditor.Helpers.DocTypeGridEditorHelper.GetPreValuesCollectionByDataTypeId_",
+                                    item.Id));
                         }
                     }
                 }
@@ -42,17 +45,20 @@ protected override void ApplicationStarted(UmbracoApplicationBase umbracoApplica
             {
                 if (e.MessageType == MessageType.RefreshByJson)
                 {
-                    var payload = JsonConvert.DeserializeAnonymousType((string)e.MessageObject, new[] { new { Alias = default(string) } });
+                    var payload = JsonConvert.DeserializeAnonymousType((string) e.MessageObject,
+                        new[] {new {Alias = default(string)}});
                     if (payload != null)
                     {
                         foreach (var item in payload)
                         {
-                            applicationContext.ApplicationCache.RuntimeCache.ClearCacheItem(
-                                string.Concat("Our.Umbraco.DocTypeGridEditor.Helpers.DocTypeGridEditorHelper.GetContentTypesByAlias_", item.Alias));
+                            Current.AppCaches.RuntimeCache.ClearByKey(
+                                string.Concat(
+                                    "Our.Umbraco.DocTypeGridEditor.Helpers.DocTypeGridEditorHelper.GetContentTypesByAlias_",
+                                    item.Alias));
 
                             // NOTE: Unsure how to get the doctype GUID, without hitting the database?
                             // So we end up clearing the entire cache for this key. [LK:2018-01-30]
-                            applicationContext.ApplicationCache.RuntimeCache.ClearCacheByKeySearch(
+                            Current.AppCaches.RuntimeCache.ClearByKey(
                                 "Our.Umbraco.DocTypeGridEditor.Helpers.DocTypeGridEditorHelper.GetContentTypeAliasByGuid_");
                         }
                     }

src/Our.Umbraco.DocTypeGridEditor/Extensions/ContentTypeServiceExtensions.cs

@@ -1,6 +1,6 @@
 using System;
-using Umbraco.Core;
 using Umbraco.Core.Cache;
+using Umbraco.Web.Composing;
 using Umbraco.Core.Services;
 
 namespace Our.Umbraco.DocTypeGridEditor.Extensions
@@ -9,12 +9,15 @@ internal static class ContentTypeServiceExtensions
     {
         public static string GetAliasByGuid(this IContentTypeService contentTypeService, Guid id)
         {
-            return ApplicationContext.Current.ApplicationCache.RuntimeCache.GetCacheItem<string>(
+            var cache = Current.AppCaches.RequestCache;
+
+            return cache.GetCacheItem<string>(
                 string.Concat("Our.Umbraco.DocTypeGridEditor.Web.Extensions.ContentTypeServiceExtensions.GetAliasById_", id),
-                () => ApplicationContext.Current
-                    .DatabaseContext
-                    .Database
-                    .ExecuteScalar<string>("SELECT [cmsContentType].[alias] FROM [cmsContentType] INNER JOIN [umbracoNode] ON [cmsContentType].[nodeId] = [umbracoNode].[id] WHERE [umbracoNode].[uniqueID] = @0", id));
+                () =>
+                {
+                    using (var scope = Current.ScopeProvider.CreateScope())
+                        return scope.Database.ExecuteScalar<string>("SELECT [cmsContentType].[alias] FROM [cmsContentType] INNER JOIN [umbracoNode] ON [cmsContentType].[nodeId] = [umbracoNode].[id] WHERE [umbracoNode].[uniqueID] = @0", id);
+                });
         }
     }
-}
+}