From 285c9c92b5e4fd687c05cdb8e08207ee9e39e7c8 Mon Sep 17 00:00:00 2001 From: Zeegaan <70372949+Zeegaan@users.noreply.github.com> Date: Tue, 17 Aug 2021 11:41:28 +0200 Subject: [PATCH] Fixed duplications --- .../Controllers/PluginController.cs | 5 +---- .../Controllers/RenderController.cs | 6 ++---- .../Extensions/PublishedContentExtensions.cs | 17 ++++------------- 3 files changed, 7 insertions(+), 21 deletions(-) diff --git a/src/Umbraco.Web.Common/Controllers/PluginController.cs b/src/Umbraco.Web.Common/Controllers/PluginController.cs index 93e9534a95..b1006455ea 100644 --- a/src/Umbraco.Web.Common/Controllers/PluginController.cs +++ b/src/Umbraco.Web.Common/Controllers/PluginController.cs @@ -31,10 +31,7 @@ namespace Umbraco.Cms.Web.Common.Controllers { get { - if (!UmbracoContextAccessor.TryGetUmbracoContext(out var umbracoContext)) - { - throw new InvalidOperationException("Wasn't able to get an UmbracoContext"); - } + var umbracoContext = UmbracoContextAccessor.GetRequiredUmbracoContext(); return umbracoContext; } } diff --git a/src/Umbraco.Web.Common/Controllers/RenderController.cs b/src/Umbraco.Web.Common/Controllers/RenderController.cs index d46a6c1a87..84354e4988 100644 --- a/src/Umbraco.Web.Common/Controllers/RenderController.cs +++ b/src/Umbraco.Web.Common/Controllers/RenderController.cs @@ -11,6 +11,7 @@ using Umbraco.Cms.Core.Routing; using Umbraco.Cms.Core.Web; using Umbraco.Cms.Web.Common.ActionsResults; using Umbraco.Cms.Web.Common.Filters; +using Umbraco.Extensions; namespace Umbraco.Cms.Web.Common.Controllers { @@ -42,10 +43,7 @@ namespace Umbraco.Cms.Web.Common.Controllers { get { - if (!_umbracoContextAccessor.TryGetUmbracoContext(out var umbracoContext)) - { - throw new InvalidOperationException("Wasn't able to get an UmbracoContext"); - } + var umbracoContext = _umbracoContextAccessor.GetRequiredUmbracoContext(); return umbracoContext; } } diff --git a/src/Umbraco.Web.Common/Extensions/PublishedContentExtensions.cs b/src/Umbraco.Web.Common/Extensions/PublishedContentExtensions.cs index edfd30293d..07bad33b50 100644 --- a/src/Umbraco.Web.Common/Extensions/PublishedContentExtensions.cs +++ b/src/Umbraco.Web.Common/Extensions/PublishedContentExtensions.cs @@ -49,11 +49,8 @@ namespace Umbraco.Extensions /// public static string GetCultureFromDomains(this IPublishedContent content, IUmbracoContextAccessor umbracoContextAccessor, ISiteDomainMapper siteDomainHelper, Uri current = null) { - if (!umbracoContextAccessor.TryGetUmbracoContext(out var umbracoContext)) - { - throw new InvalidOperationException("Wasn't able to get an UmbracoContext"); - } - return DomainUtilities.GetCultureFromDomains(content.Id, content.Path, current, umbracoContext, siteDomainHelper); + var umbracoContext = umbracoContextAccessor.GetRequiredUmbracoContext(); + return DomainUtilities.GetCultureFromDomains(content.Id, content.Path, current, umbracoContext, siteDomainHelper); } #endregion @@ -75,10 +72,7 @@ namespace Umbraco.Extensions .Field(UmbracoExamineFieldNames.IndexPathFieldName, (content.Path + ",").MultipleCharacterWildcard()) .And() .ManagedQuery(term); - if (!umbracoContextAccessor.TryGetUmbracoContext(out var umbracoContext)) - { - throw new InvalidOperationException("Wasn't able to get an UmbracoContext"); - } + var umbracoContext = umbracoContextAccessor.GetRequiredUmbracoContext(); return query.Execute().ToPublishedSearchResults(umbracoContext.Content); } @@ -97,10 +91,7 @@ namespace Umbraco.Extensions .Field("parentID", content.Id) .And() .ManagedQuery(term); - if (!umbracoContextAccessor.TryGetUmbracoContext(out var umbracoContext)) - { - throw new InvalidOperationException("Wasn't able to get an UmbracoContext"); - } + var umbracoContext = umbracoContextAccessor.GetRequiredUmbracoContext(); return query.Execute().ToPublishedSearchResults(umbracoContext.Content); }