yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

V10: Pass in variation context to published cache (#15563)

Browse Source 
* Make sure that we always have variation context

* Fix references
This commit is contained in:
Elitsa Marinovska
2024-01-11 12:46:31 +01:00
committed by GitHub
parent dff90c6ec0
commit 57b3a196bf
3 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/Umbraco.Core/PublishedCache/PublishedCacheBase.cs
View File

@@ -1,6 +1,8 @@
using System.Xml.XPath; using System.Xml.XPath;
using Microsoft.Extensions.DependencyInjection;
using Umbraco.Cms.Core.Models.PublishedContent; using Umbraco.Cms.Core.Models.PublishedContent;
using Umbraco.Cms.Core.Xml; using Umbraco.Cms.Core.Xml;
using Umbraco.Cms.Web.Common.DependencyInjection;
using Umbraco.Extensions; using Umbraco.Extensions;
namespace Umbraco.Cms.Core.PublishedCache; namespace Umbraco.Cms.Core.PublishedCache;
@@ -9,10 +11,24 @@ public abstract class PublishedCacheBase : IPublishedCache
{ {
private readonly IVariationContextAccessor? _variationContextAccessor; private readonly IVariationContextAccessor? _variationContextAccessor;
public PublishedCacheBase(IVariationContextAccessor variationContextAccessor) => _variationContextAccessor =
variationContextAccessor ?? throw new ArgumentNullException(nameof(variationContextAccessor));
protected PublishedCacheBase(bool previewDefault) => PreviewDefault = previewDefault; [Obsolete("Use ctor with all parameters. This will be removed in V15")]
public PublishedCacheBase(IVariationContextAccessor variationContextAccessor)
: this(variationContextAccessor, false)
{
}
[Obsolete("Use ctor with all parameters. This will be removed in V15")]
protected PublishedCacheBase(bool previewDefault)
: this(StaticServiceProvider.Instance.GetRequiredService<IVariationContextAccessor>(), previewDefault)
{
}
public PublishedCacheBase(IVariationContextAccessor variationContextAccessor, bool previewDefault)
{
_variationContextAccessor = variationContextAccessor;
PreviewDefault = previewDefault;
}
public bool PreviewDefault { get; } public bool PreviewDefault { get; }

2
src/Umbraco.PublishedCache.NuCache/ContentCache.cs
View File

@@ -36,7 +36,7 @@ public class ContentCache : PublishedCacheBase, IPublishedContentCache, INavigab
IDomainCache domainCache, IDomainCache domainCache,
IOptions<GlobalSettings> globalSettings, IOptions<GlobalSettings> globalSettings,
IVariationContextAccessor variationContextAccessor) IVariationContextAccessor variationContextAccessor)
: base(previewDefault) : base(variationContextAccessor, previewDefault)
{ {
_snapshot = snapshot; _snapshot = snapshot;
_snapshotCache = snapshotCache; _snapshotCache = snapshotCache;

2
src/Umbraco.PublishedCache.NuCache/MediaCache.cs
View File

@@ -17,7 +17,7 @@ public class MediaCache : PublishedCacheBase, IPublishedMediaCache, INavigableDa
#region Constructors #region Constructors
public MediaCache(bool previewDefault, ContentStore.Snapshot snapshot, IVariationContextAccessor variationContextAccessor) public MediaCache(bool previewDefault, ContentStore.Snapshot snapshot, IVariationContextAccessor variationContextAccessor)
: base(previewDefault) : base(variationContextAccessor, previewDefault)
{ {
_snapshot = snapshot; _snapshot = snapshot;
_variationContextAccessor = variationContextAccessor; _variationContextAccessor = variationContextAccessor;