Removed obsoleted code from Umbraco.Cms.Core.Cache & .Routing

src/Umbraco.Cms.Api.Delivery/Services/ApiMediaQueryService.cs

@@ -66,12 +66,7 @@ private IPublishedMediaCache GetRequiredPublishedMediaCache()
     private IPublishedContent? TryGetByPath(string path, IPublishedMediaCache mediaCache)
     {
         var segments = path.Split(Constants.CharArrays.ForwardSlash, StringSplitOptions.RemoveEmptyEntries);
-        if (_mediaNavigationQueryService.TryGetRootKeys(out IEnumerable<Guid> rootKeys) is false)
-        {
-            return null;
-        }
-
-        IEnumerable<IPublishedContent> currentChildren = rootKeys.Select(x => mediaCache.GetById(false, x)).WhereNotNull();
+        IEnumerable<IPublishedContent> currentChildren = GetRootContent(mediaCache);
         IPublishedContent? resolvedMedia = null;
 
         foreach (var segment in segments)
@@ -106,9 +101,9 @@ private IPublishedMediaCache GetRequiredPublishedMediaCache()
         }
 
         IPublishedMediaCache mediaCache = GetRequiredPublishedMediaCache();
-        if (childrenOf.Trim(Constants.CharArrays.ForwardSlash).Length == 0 && _mediaNavigationQueryService.TryGetRootKeys(out IEnumerable<Guid> rootKeys))
+        if (childrenOf.Trim(Constants.CharArrays.ForwardSlash).Length == 0)
         {
-            return rootKeys.Select(x => mediaCache.GetById(false, x)).WhereNotNull();
+            return GetRootContent(mediaCache);
         }
 
         IPublishedContent? parent = Guid.TryParse(childrenOf, out Guid parentKey)
@@ -201,4 +196,8 @@ private static Attempt<PagedModel<Guid>, ApiMediaQueryOperationStatus> PagedResu
 
         return Attempt.SucceedWithStatus(ApiMediaQueryOperationStatus.Success, result);
     }
+
+    private IEnumerable<IPublishedContent> GetRootContent(IPublishedMediaCache mediaCache)
+        => _mediaNavigationQueryService.TryGetRootKeys(out IEnumerable<Guid> rootKeys) is false ? []
+            : rootKeys.Select(x => mediaCache.GetById(false, x)).WhereNotNull();
 }

src/Umbraco.PublishedCache.HybridCache/DocumentCache.cs

@@ -1,4 +1,3 @@
-using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Models.PublishedContent;
 using Umbraco.Cms.Core.PublishedCache;
 using Umbraco.Cms.Core.Routing;
@@ -45,7 +44,10 @@ public DocumentCache(
 
     public IEnumerable<IPublishedContent> GetAtRoot(bool preview, string? culture = null)
     {
-        _documentNavigationQueryService.TryGetRootKeys(out IEnumerable<Guid> rootKeys);
+        if (_documentNavigationQueryService.TryGetRootKeys(out IEnumerable<Guid> rootKeys) is false)
+        {
+            return [];
+        }
 
         IEnumerable<IPublishedContent> rootContent = rootKeys.Select(key => GetById(preview, key)).WhereNotNull();
         return culture is null ? rootContent : rootContent.Where(x => x.IsInvariantOrHasCulture(culture));

src/Umbraco.PublishedCache.HybridCache/MediaCache.cs

@@ -1,4 +1,3 @@
-using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Models.PublishedContent;
 using Umbraco.Cms.Core.PublishedCache;
 using Umbraco.Cms.Core.Services.Navigation;
@@ -35,7 +34,10 @@ public MediaCache(IMediaCacheService mediaCacheService, IPublishedContentTypeCac
 
     public IEnumerable<IPublishedContent> GetAtRoot(bool preview, string? culture = null)
     {
-        _mediaNavigationQueryService.TryGetRootKeys(out IEnumerable<Guid> rootKeys);
+        if (_mediaNavigationQueryService.TryGetRootKeys(out IEnumerable<Guid> rootKeys) is false)
+        {
+            return [];
+        }
 
         IEnumerable<IPublishedContent> rootContent = rootKeys.Select(key => GetById(preview, key)).WhereNotNull();
         return culture is null ? rootContent : rootContent.Where(x => x.IsInvariantOrHasCulture(culture));

tests/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Routing/UmbracoRouteValueTransformerTests.cs

@@ -1,6 +1,4 @@
 using System.Reflection;
-using System.Threading.Tasks;
-using Lucene.Net.Search.Similarities;
 using Microsoft.AspNetCore.DataProtection;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc.Controllers;
@@ -13,15 +11,11 @@
 using NUnit.Framework;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Configuration.Models;
-using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models.PublishedContent;
-using Umbraco.Cms.Core.PublishedCache;
 using Umbraco.Cms.Core.Routing;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Core.Web;
-using Umbraco.Cms.Tests.UnitTests.TestHelpers;
 using Umbraco.Cms.Web.Common.Controllers;
-using Umbraco.Cms.Web.Common.Filters;
 using Umbraco.Cms.Web.Common.Routing;
 using Umbraco.Cms.Web.Website.Controllers;
 using Umbraco.Cms.Web.Website.Routing;