From 923fdf91996a048aa6306f524ac6c03452d91843 Mon Sep 17 00:00:00 2001 From: Stephan Date: Fri, 27 Apr 2018 19:21:29 +0200 Subject: [PATCH] ISystemDefaultCultureAccessor --- .../PublishedCache/PublishedContentCacheTests.cs | 2 +- .../PublishedContentOtherTests.cs | 6 +++++- src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs | 2 +- .../TestHelpers/TestWithDatabaseBase.cs | 9 ++++----- .../TestSystemDefaultCultureAccessor.cs | 9 +++++++++ .../TestSystemDefaultCultureProvider.cs | 9 --------- src/Umbraco.Tests/Umbraco.Tests.csproj | 2 +- .../Web/Mvc/UmbracoViewPageTests.cs | 4 ++-- ...vider.cs => ISystemDefaultCultureAccessor.cs} | 2 +- .../NuCache/PublishedSnapshotService.cs | 8 ++++---- ...ovider.cs => SystemDefaultCultureAccessor.cs} | 8 ++++---- .../XmlPublishedCache/DomainCache.cs | 4 ++-- .../PublishedSnapshotService.cs | 16 ++++++++-------- .../XmlPublishedCache/XmlCacheComponent.cs | 2 +- src/Umbraco.Web/Runtime/WebRuntimeComponent.cs | 2 +- src/Umbraco.Web/Umbraco.Web.csproj | 4 ++-- 16 files changed, 46 insertions(+), 43 deletions(-) create mode 100644 src/Umbraco.Tests/Testing/Objects/Accessors/TestSystemDefaultCultureAccessor.cs delete mode 100644 src/Umbraco.Tests/Testing/Objects/AccessorsAndProviders/TestSystemDefaultCultureProvider.cs rename src/Umbraco.Web/PublishedCache/{ISystemDefaultCultureProvider.cs => ISystemDefaultCultureAccessor.cs} (83%) rename src/Umbraco.Web/PublishedCache/{SystemDefaultCultureProvider.cs => SystemDefaultCultureAccessor.cs} (76%) diff --git a/src/Umbraco.Tests/Cache/PublishedCache/PublishedContentCacheTests.cs b/src/Umbraco.Tests/Cache/PublishedCache/PublishedContentCacheTests.cs index 8212243e26..1068ba3243 100644 --- a/src/Umbraco.Tests/Cache/PublishedCache/PublishedContentCacheTests.cs +++ b/src/Umbraco.Tests/Cache/PublishedCache/PublishedContentCacheTests.cs @@ -62,7 +62,7 @@ namespace Umbraco.Tests.Cache.PublishedCache _xml.LoadXml(GetXml()); var xmlStore = new XmlStore(() => _xml, null, null, null); var cacheProvider = new StaticCacheProvider(); - var domainCache = new DomainCache(ServiceContext.DomainService, SystemDefaultCultureProvider); + var domainCache = new DomainCache(ServiceContext.DomainService, SystemDefaultCultureAccessor); var publishedShapshot = new Umbraco.Web.PublishedCache.XmlPublishedCache.PublishedSnapshot( new PublishedContentCache(xmlStore, domainCache, cacheProvider, globalSettings, new SiteDomainHelper(), ContentTypesCache, null, null), new PublishedMediaCache(xmlStore, ServiceContext.MediaService, ServiceContext.UserService, cacheProvider, ContentTypesCache), diff --git a/src/Umbraco.Tests/PublishedContent/PublishedContentOtherTests.cs b/src/Umbraco.Tests/PublishedContent/PublishedContentOtherTests.cs index a131076a3a..e1c2ed9d5a 100644 --- a/src/Umbraco.Tests/PublishedContent/PublishedContentOtherTests.cs +++ b/src/Umbraco.Tests/PublishedContent/PublishedContentOtherTests.cs @@ -18,8 +18,10 @@ using Umbraco.Tests.TestHelpers; using Umbraco.Tests.TestHelpers.Stubs; using Umbraco.Tests.Testing.Objects.Accessors; using Umbraco.Web; +using Umbraco.Web.PublishedCache; using Umbraco.Web.PublishedCache.NuCache; using Umbraco.Web.PublishedCache.NuCache.DataSource; +using Umbraco.Web.Routing; namespace Umbraco.Tests.PublishedContent { @@ -129,8 +131,10 @@ namespace Umbraco.Tests.PublishedContent documentRepository, mediaRepository, memberRepository, + new TestSystemDefaultCultureAccessor(), dataSource, - globalSettings); + globalSettings, + new SiteDomainHelper()); var snapshot = snapshotService.CreatePublishedSnapshot(previewToken: null); var publishedContent = snapshot.Content.GetById(1); diff --git a/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs b/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs index 70ff7d8341..fb9b3ee0e4 100644 --- a/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs +++ b/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs @@ -93,8 +93,8 @@ namespace Umbraco.Tests.Scoping Logger, ScopeProvider, documentRepository, mediaRepository, memberRepository, + SystemDefaultCultureAccessor, new DatabaseDataSource(), - SystemDefaultCultureProvider, Container.GetInstance(), new SiteDomainHelper()); } diff --git a/src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs b/src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs index cede329bd0..75b9d6b0fd 100644 --- a/src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs +++ b/src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs @@ -32,7 +32,6 @@ using LightInject; using Umbraco.Core.Migrations.Install; using Umbraco.Core.Models.PublishedContent; using Umbraco.Core.Persistence.Repositories; -using Umbraco.Tests.Testing.Objects.AccessorsAndProviders; using Umbraco.Tests.Testing.Objects.Accessors; namespace Umbraco.Tests.TestHelpers @@ -79,7 +78,7 @@ namespace Umbraco.Tests.TestHelpers Container.Register(); Container.Register(factory => PublishedSnapshotService); - Container.Register(factory => SystemDefaultCultureProvider); + Container.Register(factory => SystemDefaultCultureAccessor); Container.GetInstance() .Clear() @@ -232,7 +231,7 @@ namespace Umbraco.Tests.TestHelpers } } - protected ISystemDefaultCultureProvider SystemDefaultCultureProvider { get; set; } + protected ISystemDefaultCultureAccessor SystemDefaultCultureAccessor { get; set; } protected IPublishedSnapshotService PublishedSnapshotService { get; set; } @@ -240,7 +239,7 @@ namespace Umbraco.Tests.TestHelpers { base.Initialize(); - SystemDefaultCultureProvider = new TestSystemDefaultCultureProvider(); + SystemDefaultCultureAccessor = new TestSystemDefaultCultureAccessor(); CreateAndInitializeDatabase(); @@ -272,7 +271,7 @@ namespace Umbraco.Tests.TestHelpers ScopeProvider, cache, publishedSnapshotAccessor, variationContextAccessor, Container.GetInstance(), Container.GetInstance(), Container.GetInstance(), - SystemDefaultCultureProvider, + SystemDefaultCultureAccessor, Logger, Container.GetInstance(), new SiteDomainHelper(), ContentTypesCache, diff --git a/src/Umbraco.Tests/Testing/Objects/Accessors/TestSystemDefaultCultureAccessor.cs b/src/Umbraco.Tests/Testing/Objects/Accessors/TestSystemDefaultCultureAccessor.cs new file mode 100644 index 0000000000..fe94a0237f --- /dev/null +++ b/src/Umbraco.Tests/Testing/Objects/Accessors/TestSystemDefaultCultureAccessor.cs @@ -0,0 +1,9 @@ +using Umbraco.Web.PublishedCache; + +namespace Umbraco.Tests.Testing.Objects.Accessors +{ + public class TestSystemDefaultCultureAccessor : ISystemDefaultCultureAccessor + { + public string DefaultCulture { get; set; } + } +} diff --git a/src/Umbraco.Tests/Testing/Objects/AccessorsAndProviders/TestSystemDefaultCultureProvider.cs b/src/Umbraco.Tests/Testing/Objects/AccessorsAndProviders/TestSystemDefaultCultureProvider.cs deleted file mode 100644 index f7e5484500..0000000000 --- a/src/Umbraco.Tests/Testing/Objects/AccessorsAndProviders/TestSystemDefaultCultureProvider.cs +++ /dev/null @@ -1,9 +0,0 @@ -using Umbraco.Web.PublishedCache; - -namespace Umbraco.Tests.Testing.Objects.AccessorsAndProviders -{ - public class TestSystemDefaultCultureProvider : ISystemDefaultCultureProvider - { - public string DefaultCulture { get; set; } - } -} diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj index dc38dd54ee..c1d1da0b54 100644 --- a/src/Umbraco.Tests/Umbraco.Tests.csproj +++ b/src/Umbraco.Tests/Umbraco.Tests.csproj @@ -182,7 +182,7 @@ - + diff --git a/src/Umbraco.Tests/Web/Mvc/UmbracoViewPageTests.cs b/src/Umbraco.Tests/Web/Mvc/UmbracoViewPageTests.cs index 8e9e6a3e22..a71612823e 100644 --- a/src/Umbraco.Tests/Web/Mvc/UmbracoViewPageTests.cs +++ b/src/Umbraco.Tests/Web/Mvc/UmbracoViewPageTests.cs @@ -19,7 +19,7 @@ using Umbraco.Core.Services; using Umbraco.Core.Strings; using Umbraco.Tests.TestHelpers; using Umbraco.Tests.Testing; -using Umbraco.Tests.Testing.Objects.AccessorsAndProviders; +using Umbraco.Tests.Testing.Objects.Accessors; using Umbraco.Web; using Umbraco.Web.Models; using Umbraco.Web.Mvc; @@ -427,7 +427,7 @@ namespace Umbraco.Tests.Web.Mvc _service = new PublishedSnapshotService(svcCtx, factory, scopeProvider, cache, Enumerable.Empty(), null, null, null, null, null, - new TestSystemDefaultCultureProvider(), + new TestSystemDefaultCultureAccessor(), Current.Logger, TestObjects.GetGlobalSettings(), new SiteDomainHelper(), null, true, false); // no events var http = GetHttpContextFactory(url, routeData).HttpContext; diff --git a/src/Umbraco.Web/PublishedCache/ISystemDefaultCultureProvider.cs b/src/Umbraco.Web/PublishedCache/ISystemDefaultCultureAccessor.cs similarity index 83% rename from src/Umbraco.Web/PublishedCache/ISystemDefaultCultureProvider.cs rename to src/Umbraco.Web/PublishedCache/ISystemDefaultCultureAccessor.cs index 022b6d3e25..109187c770 100644 --- a/src/Umbraco.Web/PublishedCache/ISystemDefaultCultureProvider.cs +++ b/src/Umbraco.Web/PublishedCache/ISystemDefaultCultureAccessor.cs @@ -3,7 +3,7 @@ /// /// Provides the system default culture. /// - public interface ISystemDefaultCultureProvider + public interface ISystemDefaultCultureAccessor { /// /// Gets the system default culture. diff --git a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs index 1ca5770060..af84f54c11 100644 --- a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs +++ b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs @@ -43,7 +43,7 @@ namespace Umbraco.Web.PublishedCache.NuCache private readonly IMemberRepository _memberRepository; private readonly IGlobalSettings _globalSettings; private readonly ISiteDomainHelper _siteDomainHelper; - private readonly ISystemDefaultCultureProvider _systemDefaultCultureProvider; + private readonly ISystemDefaultCultureAccessor _systemDefaultCultureAccessor; // volatile because we read it with no lock private volatile bool _isReady; @@ -84,7 +84,7 @@ namespace Umbraco.Web.PublishedCache.NuCache IPublishedSnapshotAccessor publishedSnapshotAccessor, IPublishedVariationContextAccessor variationContextAccessor, ILogger logger, IScopeProvider scopeProvider, IDocumentRepository documentRepository, IMediaRepository mediaRepository, IMemberRepository memberRepository, - ISystemDefaultCultureProvider systemDefaultCultureProvider, + ISystemDefaultCultureAccessor systemDefaultCultureAccessor, IDataSource dataSource, IGlobalSettings globalSettings, ISiteDomainHelper siteDomainHelper) : base(publishedSnapshotAccessor, variationContextAccessor) { @@ -99,7 +99,7 @@ namespace Umbraco.Web.PublishedCache.NuCache _documentRepository = documentRepository; _mediaRepository = mediaRepository; _memberRepository = memberRepository; - _systemDefaultCultureProvider = systemDefaultCultureProvider; + _systemDefaultCultureAccessor = systemDefaultCultureAccessor; _globalSettings = globalSettings; _siteDomainHelper = siteDomainHelper; @@ -1017,7 +1017,7 @@ namespace Umbraco.Web.PublishedCache.NuCache var memberTypeCache = new PublishedContentTypeCache(null, null, _serviceContext.MemberTypeService, _publishedContentTypeFactory, _logger); - var defaultCulture = _systemDefaultCultureProvider.DefaultCulture; + var defaultCulture = _systemDefaultCultureAccessor.DefaultCulture; var domainCache = new DomainCache(domainSnap, defaultCulture); var domainHelper = new DomainHelper(domainCache, _siteDomainHelper); diff --git a/src/Umbraco.Web/PublishedCache/SystemDefaultCultureProvider.cs b/src/Umbraco.Web/PublishedCache/SystemDefaultCultureAccessor.cs similarity index 76% rename from src/Umbraco.Web/PublishedCache/SystemDefaultCultureProvider.cs rename to src/Umbraco.Web/PublishedCache/SystemDefaultCultureAccessor.cs index 6838d483b0..34910bfe1b 100644 --- a/src/Umbraco.Web/PublishedCache/SystemDefaultCultureProvider.cs +++ b/src/Umbraco.Web/PublishedCache/SystemDefaultCultureAccessor.cs @@ -3,17 +3,17 @@ namespace Umbraco.Web.PublishedCache { /// - /// Provides the default implementation of . + /// Provides the default implementation of . /// - public class SystemDefaultCultureProvider : ISystemDefaultCultureProvider + public class SystemDefaultCultureAccessor : ISystemDefaultCultureAccessor { private readonly ILocalizationService _localizationService; /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// /// - public SystemDefaultCultureProvider(ILocalizationService localizationService) + public SystemDefaultCultureAccessor(ILocalizationService localizationService) { _localizationService = localizationService; } diff --git a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/DomainCache.cs b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/DomainCache.cs index 9a82840024..b0c5033c41 100644 --- a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/DomainCache.cs +++ b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/DomainCache.cs @@ -11,10 +11,10 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache { private readonly IDomainService _domainService; - public DomainCache(IDomainService domainService, ISystemDefaultCultureProvider systemDefaultCultureProvider) + public DomainCache(IDomainService domainService, ISystemDefaultCultureAccessor systemDefaultCultureAccessor) { _domainService = domainService; - DefaultCulture = systemDefaultCultureProvider.DefaultCulture; + DefaultCulture = systemDefaultCultureAccessor.DefaultCulture; } public IEnumerable GetAll(bool includeWildcards) diff --git a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedSnapshotService.cs b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedSnapshotService.cs index a0efd14ba9..259229a600 100644 --- a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedSnapshotService.cs +++ b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedSnapshotService.cs @@ -32,7 +32,7 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache private readonly IUserService _userService; private readonly ICacheProvider _requestCache; private readonly IGlobalSettings _globalSettings; - private readonly ISystemDefaultCultureProvider _systemDefaultCultureProvider; + private readonly ISystemDefaultCultureAccessor _systemDefaultCultureAccessor; private readonly ISiteDomainHelper _siteDomainHelper; #region Constructors @@ -45,7 +45,7 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache IEnumerable segmentProviders, IPublishedSnapshotAccessor publishedSnapshotAccessor, IPublishedVariationContextAccessor variationContextAccessor, IDocumentRepository documentRepository, IMediaRepository mediaRepository, IMemberRepository memberRepository, - ISystemDefaultCultureProvider systemDefaultCultureProvider, + ISystemDefaultCultureAccessor systemDefaultCultureAccessor, ILogger logger, IGlobalSettings globalSettings, ISiteDomainHelper siteDomainHelper, @@ -54,7 +54,7 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache : this(serviceContext, publishedContentTypeFactory, scopeProvider, requestCache, segmentProviders, publishedSnapshotAccessor, variationContextAccessor, documentRepository, mediaRepository, memberRepository, - systemDefaultCultureProvider, + systemDefaultCultureAccessor, logger, globalSettings, siteDomainHelper, null, mainDom, testing, enableRepositoryEvents) { } @@ -65,7 +65,7 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache ICacheProvider requestCache, IPublishedSnapshotAccessor publishedSnapshotAccessor, IPublishedVariationContextAccessor variationContextAccessor, IDocumentRepository documentRepository, IMediaRepository mediaRepository, IMemberRepository memberRepository, - ISystemDefaultCultureProvider systemDefaultCultureProvider, + ISystemDefaultCultureAccessor systemDefaultCultureAccessor, ILogger logger, IGlobalSettings globalSettings, ISiteDomainHelper siteDomainHelper, @@ -75,7 +75,7 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache : this(serviceContext, publishedContentTypeFactory, scopeProvider, requestCache, Enumerable.Empty(), publishedSnapshotAccessor, variationContextAccessor, documentRepository, mediaRepository, memberRepository, - systemDefaultCultureProvider, + systemDefaultCultureAccessor, logger, globalSettings, siteDomainHelper, contentTypeCache, mainDom, testing, enableRepositoryEvents) { } @@ -86,7 +86,7 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache IEnumerable segmentProviders, IPublishedSnapshotAccessor publishedSnapshotAccessor, IPublishedVariationContextAccessor variationContextAccessor, IDocumentRepository documentRepository, IMediaRepository mediaRepository, IMemberRepository memberRepository, - ISystemDefaultCultureProvider systemDefaultCultureProvider, + ISystemDefaultCultureAccessor systemDefaultCultureAccessor, ILogger logger, IGlobalSettings globalSettings, ISiteDomainHelper siteDomainHelper, @@ -108,7 +108,7 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache _memberService = serviceContext.MemberService; _mediaService = serviceContext.MediaService; _userService = serviceContext.UserService; - _systemDefaultCultureProvider = systemDefaultCultureProvider; + _systemDefaultCultureAccessor = systemDefaultCultureAccessor; _requestCache = requestCache; _globalSettings = globalSettings; @@ -153,7 +153,7 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache // the current caches, but that would mean creating an extra cache (StaticCache // probably) so better use RequestCache. - var domainCache = new DomainCache(_domainService, _systemDefaultCultureProvider); + var domainCache = new DomainCache(_domainService, _systemDefaultCultureAccessor); return new PublishedSnapshot( new PublishedContentCache(_xmlStore, domainCache, _requestCache, _globalSettings, _siteDomainHelper, _contentTypeCache, _routesCache, previewToken), diff --git a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlCacheComponent.cs b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlCacheComponent.cs index aea2fc60c6..a574575cbd 100644 --- a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlCacheComponent.cs +++ b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlCacheComponent.cs @@ -33,7 +33,7 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache factory.GetInstance(), factory.GetInstance(), factory.GetInstance(), - factory.GetInstance(), + factory.GetInstance(), factory.GetInstance(), factory.GetInstance(), factory.GetInstance(), diff --git a/src/Umbraco.Web/Runtime/WebRuntimeComponent.cs b/src/Umbraco.Web/Runtime/WebRuntimeComponent.cs index 54afd0ad75..17078826ff 100644 --- a/src/Umbraco.Web/Runtime/WebRuntimeComponent.cs +++ b/src/Umbraco.Web/Runtime/WebRuntimeComponent.cs @@ -70,7 +70,7 @@ namespace Umbraco.Web.Runtime composition.Container.RegisterFrom(); // register the system culture provider - composition.Container.RegisterSingleton(); + composition.Container.RegisterSingleton(); var typeLoader = composition.Container.GetInstance(); var logger = composition.Container.GetInstance(); diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj index 2760229030..e0380c898e 100644 --- a/src/Umbraco.Web/Umbraco.Web.csproj +++ b/src/Umbraco.Web/Umbraco.Web.csproj @@ -343,7 +343,7 @@ - + @@ -389,7 +389,7 @@ - +