V15: Remove Nucache

Directory.Packages.props

@@ -47,10 +47,10 @@
     <PackageVersion Include="Dazinator.Extensions.FileProviders" Version="2.0.0" />
     <PackageVersion Include="Examine" Version="3.3.0" />
     <PackageVersion Include="Examine.Core" Version="3.3.0" />
-    <PackageVersion Include="HtmlAgilityPack" Version="1.11.66" />
+    <PackageVersion Include="HtmlAgilityPack" Version="1.11.67" />
     <PackageVersion Include="JsonPatch.Net" Version="3.1.1" />
     <PackageVersion Include="K4os.Compression.LZ4" Version="1.3.8" />
-    <PackageVersion Include="MailKit" Version="4.7.1.1" />
+    <PackageVersion Include="MailKit" Version="4.8.0" />
     <PackageVersion Include="Markdown" Version="2.2.1" />
     <PackageVersion Include="MessagePack" Version="2.5.172" />
     <PackageVersion Include="MiniProfiler.AspNetCore.Mvc" Version="4.3.8" />
@@ -61,7 +61,7 @@
     <PackageVersion Include="OpenIddict.Abstractions" Version="5.8.0" />
     <PackageVersion Include="OpenIddict.AspNetCore" Version="5.8.0" />
     <PackageVersion Include="OpenIddict.EntityFrameworkCore" Version="5.8.0" />
-    <PackageVersion Include="Serilog" Version="4.0.1" />
+    <PackageVersion Include="Serilog" Version="4.0.2" />
     <PackageVersion Include="Serilog.AspNetCore" Version="8.0.2" />
     <PackageVersion Include="Serilog.Enrichers.Process" Version="3.0.0" />
     <PackageVersion Include="Serilog.Enrichers.Thread" Version="4.0.0" />
@@ -75,12 +75,12 @@
     <PackageVersion Include="Serilog.Sinks.Map" Version="2.0.0" />
     <PackageVersion Include="SixLabors.ImageSharp" Version="3.1.5" />
     <PackageVersion Include="SixLabors.ImageSharp.Web" Version="3.1.3" />
-    <PackageVersion Include="Swashbuckle.AspNetCore" Version="6.8.0" />
+    <PackageVersion Include="Swashbuckle.AspNetCore" Version="6.8.1" />
   </ItemGroup>
   <!-- Transitive pinned versions (only required because our direct dependencies have vulnerable versions of transitive dependencies) -->
   <ItemGroup>
     <!-- Both Microsoft.EntityFrameworkCore.SqlServer and NPoco.SqlServer bring in a vulnerable version of Azure.Identity -->
-    <PackageVersion Include="Azure.Identity" Version="1.12.0" />
+    <PackageVersion Include="Azure.Identity" Version="1.12.1" />
     <!-- Dazinator.Extensions.FileProviders brings in a vulnerable version of System.Net.Http -->
     <PackageVersion Include="System.Net.Http" Version="4.3.4" />
     <!-- Examine brings in a vulnerable version of System.Security.Cryptography.Xml -->
@@ -91,7 +91,6 @@
     <PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.1.0" />
     <!-- Both  Azure.Identity, Microsoft.EntityFrameworkCore.SqlServer, Dazinator.Extensions.FileProviders bring in legacy versions of System.Text.Encodings.Web  -->
     <PackageVersion Include="System.Text.Encodings.Web" Version="8.0.0" />
-
     <!-- NPoco.SqlServer bring in vulnerable version of Microsoft.Data.SqlClient  -->
     <PackageVersion Include="Microsoft.Data.SqlClient" Version="5.2.2" />
   </ItemGroup>

src/Umbraco.Cms.Api.Delivery/Controllers/Media/ByIdMediaApiController.cs

@@ -12,8 +12,10 @@ namespace Umbraco.Cms.Api.Delivery.Controllers.Media;
 [ApiVersion("2.0")]
 public class ByIdMediaApiController : MediaApiControllerBase
 {
-    public ByIdMediaApiController(IPublishedSnapshotAccessor publishedSnapshotAccessor, IApiMediaWithCropsResponseBuilder apiMediaWithCropsResponseBuilder)
-        : base(publishedSnapshotAccessor, apiMediaWithCropsResponseBuilder)
+    public ByIdMediaApiController(
+        IPublishedMediaCache publishedMediaCache,
+        IApiMediaWithCropsResponseBuilder apiMediaWithCropsResponseBuilder)
+        : base(publishedMediaCache, apiMediaWithCropsResponseBuilder)
     {
     }
 

src/Umbraco.Cms.Api.Delivery/Controllers/Media/ByIdsMediaApiController.cs

@@ -13,8 +13,8 @@ namespace Umbraco.Cms.Api.Delivery.Controllers.Media;
 [ApiVersion("2.0")]
 public class ByIdsMediaApiController : MediaApiControllerBase
 {
-    public ByIdsMediaApiController(IPublishedSnapshotAccessor publishedSnapshotAccessor, IApiMediaWithCropsResponseBuilder apiMediaWithCropsResponseBuilder)
-        : base(publishedSnapshotAccessor, apiMediaWithCropsResponseBuilder)
+    public ByIdsMediaApiController(IPublishedMediaCache publishedMediaCache, IApiMediaWithCropsResponseBuilder apiMediaWithCropsResponseBuilder)
+        : base(publishedMediaCache, apiMediaWithCropsResponseBuilder)
     {
     }
 

src/Umbraco.Cms.Api.Delivery/Controllers/Media/ByPathMediaApiController.cs

@@ -16,10 +16,10 @@ public class ByPathMediaApiController : MediaApiControllerBase
     private readonly IApiMediaQueryService _apiMediaQueryService;
 
     public ByPathMediaApiController(
-        IPublishedSnapshotAccessor publishedSnapshotAccessor,
+        IPublishedMediaCache publishedMediaCache,
         IApiMediaWithCropsResponseBuilder apiMediaWithCropsResponseBuilder,
         IApiMediaQueryService apiMediaQueryService)
-        : base(publishedSnapshotAccessor, apiMediaWithCropsResponseBuilder)
+        : base(publishedMediaCache, apiMediaWithCropsResponseBuilder)
         => _apiMediaQueryService = apiMediaQueryService;
 
     [HttpGet("item/{*path}")]

src/Umbraco.Cms.Api.Delivery/Controllers/Media/MediaApiControllerBase.cs

@@ -20,18 +20,15 @@ namespace Umbraco.Cms.Api.Delivery.Controllers.Media;
 public abstract class MediaApiControllerBase : DeliveryApiControllerBase
 {
     private readonly IApiMediaWithCropsResponseBuilder _apiMediaWithCropsResponseBuilder;
-    private readonly IPublishedSnapshotAccessor _publishedSnapshotAccessor;
-    private IPublishedMediaCache? _publishedMediaCache;
+    private IPublishedMediaCache _publishedMediaCache;
 
-    protected MediaApiControllerBase(IPublishedSnapshotAccessor publishedSnapshotAccessor, IApiMediaWithCropsResponseBuilder apiMediaWithCropsResponseBuilder)
+    protected MediaApiControllerBase(IPublishedMediaCache publishedMediaCache, IApiMediaWithCropsResponseBuilder apiMediaWithCropsResponseBuilder)
     {
-        _publishedSnapshotAccessor = publishedSnapshotAccessor;
+        _publishedMediaCache = publishedMediaCache;
         _apiMediaWithCropsResponseBuilder = apiMediaWithCropsResponseBuilder;
     }
 
-    protected IPublishedMediaCache PublishedMediaCache => _publishedMediaCache
-        ??= _publishedSnapshotAccessor.GetRequiredPublishedSnapshot().Media
-            ?? throw new InvalidOperationException("Could not obtain the published media cache");
+    protected IPublishedMediaCache PublishedMediaCache => _publishedMediaCache;
 
     protected IApiMediaWithCropsResponse BuildApiMediaWithCrops(IPublishedContent media)
         => _apiMediaWithCropsResponseBuilder.Build(media);

src/Umbraco.Cms.Api.Delivery/Controllers/Media/QueryMediaApiController.cs

@@ -21,10 +21,10 @@ public class QueryMediaApiController : MediaApiControllerBase
     private readonly IApiMediaQueryService _apiMediaQueryService;
 
     public QueryMediaApiController(
-        IPublishedSnapshotAccessor publishedSnapshotAccessor,
+        IPublishedMediaCache publishedMediaCache,
         IApiMediaWithCropsResponseBuilder apiMediaWithCropsResponseBuilder,
         IApiMediaQueryService apiMediaQueryService)
-        : base(publishedSnapshotAccessor, apiMediaWithCropsResponseBuilder)
+        : base(publishedMediaCache, apiMediaWithCropsResponseBuilder)
         => _apiMediaQueryService = apiMediaQueryService;
 
     [HttpGet]

src/Umbraco.Cms.Api.Delivery/Querying/QueryOptionBase.cs

@@ -7,14 +7,15 @@ namespace Umbraco.Cms.Api.Delivery.Querying;
 
 public abstract class QueryOptionBase
 {
-    private readonly IPublishedSnapshotAccessor _publishedSnapshotAccessor;
+    private readonly IPublishedContentCache _publishedContentCache;
     private readonly IRequestRoutingService _requestRoutingService;
 
+
     public QueryOptionBase(
-        IPublishedSnapshotAccessor publishedSnapshotAccessor,
+        IPublishedContentCache publishedContentCache,
         IRequestRoutingService requestRoutingService)
     {
-        _publishedSnapshotAccessor = publishedSnapshotAccessor;
+        _publishedContentCache = publishedContentCache;
         _requestRoutingService = requestRoutingService;
     }
 
@@ -30,11 +31,9 @@ public QueryOptionBase(
             return id;
         }
 
-        IPublishedSnapshot publishedSnapshot = _publishedSnapshotAccessor.GetRequiredPublishedSnapshot();
-
         // Check if the passed value is a path of a content item
         var contentRoute = _requestRoutingService.GetContentRoute(queryStringValue);
-        IPublishedContent? contentItem = publishedSnapshot.Content?.GetByRoute(contentRoute);
+        IPublishedContent? contentItem = _publishedContentCache.GetByRoute(contentRoute);
 
         return contentItem?.Key;
     }

src/Umbraco.Cms.Api.Delivery/Querying/Selectors/AncestorsSelector.cs

@@ -1,19 +1,35 @@
+using Microsoft.Extensions.DependencyInjection;
 using Umbraco.Cms.Api.Delivery.Indexing.Selectors;
 using Umbraco.Cms.Core.DeliveryApi;
+using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.Models.PublishedContent;
 using Umbraco.Cms.Core.PublishedCache;
+using Umbraco.Cms.Core.Services.Navigation;
 using Umbraco.Extensions;
 
 namespace Umbraco.Cms.Api.Delivery.Querying.Selectors;
 
 public sealed class AncestorsSelector : QueryOptionBase, ISelectorHandler
 {
+    private readonly IPublishedContentCache _publishedContentCache;
+    private readonly IDocumentNavigationQueryService _navigationQueryService;
     private const string AncestorsSpecifier = "ancestors:";
-    private readonly IPublishedSnapshotAccessor _publishedSnapshotAccessor;
 
-    public AncestorsSelector(IPublishedSnapshotAccessor publishedSnapshotAccessor, IRequestRoutingService requestRoutingService)
-        : base(publishedSnapshotAccessor, requestRoutingService) =>
-        _publishedSnapshotAccessor = publishedSnapshotAccessor;
+    public AncestorsSelector(
+        IPublishedContentCache publishedContentCache,
+        IRequestRoutingService requestRoutingService,
+        IDocumentNavigationQueryService navigationQueryService)
+        : base(publishedContentCache, requestRoutingService)
+    {
+        _publishedContentCache = publishedContentCache;
+        _navigationQueryService = navigationQueryService;
+    }
+
+    [Obsolete("Use the constructor that takes all parameters. Scheduled for removal in V17.")]
+    public AncestorsSelector(IPublishedContentCache publishedContentCache, IRequestRoutingService requestRoutingService)
+        : this(publishedContentCache, requestRoutingService, StaticServiceProvider.Instance.GetRequiredService<IDocumentNavigationQueryService>())
+    {
+    }
 
     /// <inheritdoc />
     public bool CanHandle(string query)
@@ -37,12 +53,10 @@ public SelectorOption BuildSelectorOption(string selector)
             };
         }
 
-        IPublishedSnapshot publishedSnapshot = _publishedSnapshotAccessor.GetRequiredPublishedSnapshot();
-
-        IPublishedContent contentItem = publishedSnapshot.Content?.GetById((Guid)id)
+        IPublishedContent contentItem = _publishedContentCache.GetById((Guid)id)
                                         ?? throw new InvalidOperationException("Could not obtain the content cache");
 
-        var ancestorKeys = contentItem.Ancestors().Select(a => a.Key.ToString("D")).ToArray();
+        var ancestorKeys = contentItem.Ancestors(_publishedContentCache, _navigationQueryService).Select(a => a.Key.ToString("D")).ToArray();
 
         return new SelectorOption
         {

src/Umbraco.Cms.Api.Delivery/Querying/Selectors/ChildrenSelector.cs

@@ -9,8 +9,8 @@ public sealed class ChildrenSelector : QueryOptionBase, ISelectorHandler
 {
     private const string ChildrenSpecifier = "children:";
 
-    public ChildrenSelector(IPublishedSnapshotAccessor publishedSnapshotAccessor, IRequestRoutingService requestRoutingService)
-        : base(publishedSnapshotAccessor, requestRoutingService)
+    public ChildrenSelector(IPublishedContentCache publishedContentCache, IRequestRoutingService requestRoutingService)
+        : base(publishedContentCache, requestRoutingService)
     {
     }
 

src/Umbraco.Cms.Api.Delivery/Querying/Selectors/DescendantsSelector.cs

@@ -9,8 +9,8 @@ public sealed class DescendantsSelector : QueryOptionBase, ISelectorHandler
 {
     private const string DescendantsSpecifier = "descendants:";
 
-    public DescendantsSelector(IPublishedSnapshotAccessor publishedSnapshotAccessor, IRequestRoutingService requestRoutingService)
-        : base(publishedSnapshotAccessor, requestRoutingService)
+    public DescendantsSelector(IPublishedContentCache publishedContentCache, IRequestRoutingService requestRoutingService)
+        : base(publishedContentCache, requestRoutingService)
     {
     }
 

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

@@ -4,6 +4,7 @@
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.PublishedContent;
 using Umbraco.Cms.Core.PublishedCache;
+using Umbraco.Cms.Core.Services.Navigation;
 using Umbraco.Cms.Core.Services.OperationStatus;
 using Umbraco.Extensions;
 
@@ -12,13 +13,15 @@ namespace Umbraco.Cms.Api.Delivery.Services;
 /// <inheritdoc />
 internal sealed class ApiMediaQueryService : IApiMediaQueryService
 {
-    private readonly IPublishedSnapshotAccessor _publishedSnapshotAccessor;
+    private readonly IPublishedMediaCache _publishedMediaCache;
     private readonly ILogger<ApiMediaQueryService> _logger;
+    private readonly IMediaNavigationQueryService _mediaNavigationQueryService;
 
-    public ApiMediaQueryService(IPublishedSnapshotAccessor publishedSnapshotAccessor, ILogger<ApiMediaQueryService> logger)
+    public ApiMediaQueryService(IPublishedMediaCache publishedMediaCache, ILogger<ApiMediaQueryService> logger, IMediaNavigationQueryService mediaNavigationQueryService)
     {
-        _publishedSnapshotAccessor = publishedSnapshotAccessor;
+        _publishedMediaCache = publishedMediaCache;
         _logger = logger;
+        _mediaNavigationQueryService = mediaNavigationQueryService;
     }
 
     /// <inheritdoc/>
@@ -52,8 +55,7 @@ public Attempt<PagedModel<Guid>, ApiMediaQueryOperationStatus> ExecuteQuery(stri
         => TryGetByPath(path, GetRequiredPublishedMediaCache());
 
     private IPublishedMediaCache GetRequiredPublishedMediaCache()
-        => _publishedSnapshotAccessor.GetRequiredPublishedSnapshot().Media
-           ?? throw new InvalidOperationException("Could not obtain the published media cache");
+        => _publishedMediaCache;
 
     private IPublishedContent? TryGetByPath(string path, IPublishedMediaCache mediaCache)
     {
@@ -69,7 +71,7 @@ private IPublishedMediaCache GetRequiredPublishedMediaCache()
                 break;
             }
 
-            currentChildren = resolvedMedia.Children;
+            currentChildren = resolvedMedia.Children(null, _publishedMediaCache, _mediaNavigationQueryService);
         }
 
         return resolvedMedia;
@@ -102,7 +104,7 @@ private IPublishedMediaCache GetRequiredPublishedMediaCache()
             ? mediaCache.GetById(parentKey)
             : TryGetByPath(childrenOf, mediaCache);
 
-        return parent?.Children ?? Array.Empty<IPublishedContent>();
+        return parent?.Children(null, _publishedMediaCache, _mediaNavigationQueryService) ?? Array.Empty<IPublishedContent>();
     }
 
     private IEnumerable<IPublishedContent>? ApplyFilters(IEnumerable<IPublishedContent> source, IEnumerable<string> filters)

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

@@ -21,15 +21,15 @@ internal sealed class RequestRedirectService : RoutingServiceBase, IRequestRedir
     private readonly GlobalSettings _globalSettings;
 
     public RequestRedirectService(
-        IPublishedSnapshotAccessor publishedSnapshotAccessor,
+        IDomainCache domainCache,
         IHttpContextAccessor httpContextAccessor,
         IRequestStartItemProviderAccessor requestStartItemProviderAccessor,
         IRequestCultureService requestCultureService,
         IRedirectUrlService redirectUrlService,
         IApiPublishedContentCache apiPublishedContentCache,
         IApiContentRouteBuilder apiContentRouteBuilder,
         IOptions<GlobalSettings> globalSettings)
-        : base(publishedSnapshotAccessor, httpContextAccessor, requestStartItemProviderAccessor)
+        : base(domainCache, httpContextAccessor, requestStartItemProviderAccessor)
     {
         _requestCultureService = requestCultureService;
         _redirectUrlService = redirectUrlService;

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

@@ -1,5 +1,6 @@
 using Microsoft.AspNetCore.Http;
 using Umbraco.Cms.Core.DeliveryApi;
+using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.PublishedContent;
 using Umbraco.Cms.Core.PublishedCache;
 using Umbraco.Cms.Core.Routing;
@@ -12,11 +13,11 @@ internal sealed class RequestRoutingService : RoutingServiceBase, IRequestRoutin
     private readonly IRequestCultureService _requestCultureService;
 
     public RequestRoutingService(
-        IPublishedSnapshotAccessor publishedSnapshotAccessor,
+        IDomainCache domainCache,
         IHttpContextAccessor httpContextAccessor,
         IRequestStartItemProviderAccessor requestStartItemProviderAccessor,
         IRequestCultureService requestCultureService)
-        : base(publishedSnapshotAccessor, httpContextAccessor, requestStartItemProviderAccessor) =>
+        : base(domainCache, httpContextAccessor, requestStartItemProviderAccessor) =>
         _requestCultureService = requestCultureService;
 
     /// <inheritdoc />

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

@@ -3,29 +3,34 @@
 using Umbraco.Cms.Core.DeliveryApi;
 using Umbraco.Cms.Core.Models.PublishedContent;
 using Umbraco.Cms.Core.PublishedCache;
+using Umbraco.Cms.Core.Services.Navigation;
 using Umbraco.Extensions;
 
 namespace Umbraco.Cms.Api.Delivery.Services;
 
 internal sealed class RequestStartItemProvider : RequestHeaderHandler, IRequestStartItemProvider
 {
-    private readonly IPublishedSnapshotAccessor _publishedSnapshotAccessor;
     private readonly IVariationContextAccessor _variationContextAccessor;
     private readonly IRequestPreviewService _requestPreviewService;
+    private readonly IDocumentNavigationQueryService _documentNavigationQueryService;
+    private readonly IPublishedContentCache _publishedContentCache;
 
     // this provider lifetime is Scope, so we can cache this as a field
     private IPublishedContent? _requestedStartContent;
 
     public RequestStartItemProvider(
         IHttpContextAccessor httpContextAccessor,
-        IPublishedSnapshotAccessor publishedSnapshotAccessor,
         IVariationContextAccessor variationContextAccessor,
-        IRequestPreviewService requestPreviewService)
+        IRequestPreviewService requestPreviewService,
+        IDocumentNavigationQueryService documentNavigationQueryService,
+        IPublishedContentCache publishedContentCache)
         : base(httpContextAccessor)
     {
-        _publishedSnapshotAccessor = publishedSnapshotAccessor;
+
         _variationContextAccessor = variationContextAccessor;
         _requestPreviewService = requestPreviewService;
+        _documentNavigationQueryService = documentNavigationQueryService;
+        _publishedContentCache = publishedContentCache;
     }
 
     /// <inheritdoc/>
@@ -42,13 +47,11 @@ public RequestStartItemProvider(
             return null;
         }
 
-        if (_publishedSnapshotAccessor.TryGetPublishedSnapshot(out IPublishedSnapshot? publishedSnapshot) == false ||
-            publishedSnapshot?.Content == null)
-        {
-            return null;
-        }
-
-        IEnumerable<IPublishedContent> rootContent = publishedSnapshot.Content.GetAtRoot(_requestPreviewService.IsPreview());
+        _documentNavigationQueryService.TryGetRootKeys(out IEnumerable<Guid> rootKeys);
+        IEnumerable<IPublishedContent> rootContent = rootKeys
+            .Select(_publishedContentCache.GetById)
+            .WhereNotNull()
+            .Where(x => x.IsPublished() != _requestPreviewService.IsPreview());
 
         _requestedStartContent = Guid.TryParse(headerValue, out Guid key)
             ? rootContent.FirstOrDefault(c => c.Key == key)