Fixes a bunch of N+1, content/media trees should be much more snappy

src/Umbraco.Core/Models/UserExtensions.cs

@@ -193,19 +193,6 @@ namespace Umbraco.Core.Models
 
             // check for a start node in the path
             return startNodeIds.Any(x => formattedPath.Contains(string.Concat(",", x, ",")));
-        }
-
-        internal static bool IsInBranchOfStartNode(this IUser user, IUmbracoEntity entity, IEntityService entityService, int recycleBinId, out bool hasPathAccess)
-        {
-            switch (recycleBinId)
-            {
-                case Constants.System.RecycleBinMedia:
-                    return IsInBranchOfStartNode(entity.Path, user.CalculateMediaStartNodeIds(entityService), user.GetMediaStartNodePaths(entityService), out hasPathAccess);
-                case Constants.System.RecycleBinContent:
-                    return IsInBranchOfStartNode(entity.Path, user.CalculateContentStartNodeIds(entityService), user.GetContentStartNodePaths(entityService), out hasPathAccess);
-                default:
-                    throw new NotSupportedException("Path access is only determined on content or media");
-            }
         }
 
         internal static bool IsInBranchOfStartNode(string path, int[] startNodeIds, string[] startNodePaths, out bool hasPathAccess)

src/Umbraco.Core/Persistence/Factories/UmbracoEntityFactory.cs

@@ -12,14 +12,18 @@ namespace Umbraco.Core.Persistence.Factories
 {
     internal class UmbracoEntityFactory 
     {
+        private static readonly Lazy<string[]> EntityProperties = new Lazy<string[]>(() => typeof(IUmbracoEntity).GetPublicProperties().Select(x => x.Name).ToArray());
+
+        /// <summary>
+        /// Figure out what extra properties we have that are not on the IUmbracoEntity and add them to additional data
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <param name="originalEntityProperties"></param>
         internal void AddAdditionalData(UmbracoEntity entity, IDictionary<string, object> originalEntityProperties)
-        {
-            var entityProps = typeof(IUmbracoEntity).GetPublicProperties().Select(x => x.Name).ToArray();
-            
-            //figure out what extra properties we have that are not on the IUmbracoEntity and add them to additional data
+        {   
             foreach (var k in originalEntityProperties.Keys
                 .Select(x => new { orig = x, title = x.ToCleanString(CleanStringType.PascalCase | CleanStringType.Ascii | CleanStringType.ConvertCase) })
-                .Where(x => entityProps.InvariantContains(x.title) == false))
+                .Where(x => EntityProperties.Value.InvariantContains(x.title) == false))
             {
                 entity.AdditionalData[k.title] = originalEntityProperties[k.orig];
             }
@@ -78,4 +82,4 @@ namespace Umbraco.Core.Persistence.Factories
         }
         
     }
-}
+}

src/Umbraco.Core/Umbraco.Core.csproj

@@ -377,7 +377,7 @@
     <Compile Include="Models\Consent.cs" />
     <Compile Include="Models\ConsentExtensions.cs" />
     <Compile Include="Models\ConsentState.cs" />
-    <Compile Include="Models\DataTypeDefinitionExtensions.cs" />
+    <Compile Include="Models\DataTypeExtensions.cs" />
     <Compile Include="Models\EntityBase\EntityPath.cs" />
     <Compile Include="Models\EntityBase\IDeletableEntity.cs" />
     <Compile Include="Models\IAuditEntry.cs" />