diff --git a/src/Umbraco.Cms.Api.Delivery/Controllers/Content/ByIdsContentApiController.cs b/src/Umbraco.Cms.Api.Delivery/Controllers/Content/ByIdsContentApiController.cs index 0771c357581d..7eb653e9d22c 100644 --- a/src/Umbraco.Cms.Api.Delivery/Controllers/Content/ByIdsContentApiController.cs +++ b/src/Umbraco.Cms.Api.Delivery/Controllers/Content/ByIdsContentApiController.cs @@ -58,6 +58,6 @@ private async Task HandleRequest(HashSet ids) .WhereNotNull() .ToArray(); - return await Task.FromResult(Ok(apiContentItems)); + return Ok(apiContentItems); } } diff --git a/src/Umbraco.Cms.Api.Delivery/Controllers/Content/ByRouteContentApiController.cs b/src/Umbraco.Cms.Api.Delivery/Controllers/Content/ByRouteContentApiController.cs index 54fe5785a9f4..2b94e1169fb6 100644 --- a/src/Umbraco.Cms.Api.Delivery/Controllers/Content/ByRouteContentApiController.cs +++ b/src/Umbraco.Cms.Api.Delivery/Controllers/Content/ByRouteContentApiController.cs @@ -117,7 +117,7 @@ private async Task HandleRequest(string path) return deniedAccessResult; } - return await Task.FromResult(Ok(ApiContentResponseBuilder.Build(contentItem))); + return Ok(ApiContentResponseBuilder.Build(contentItem)); } IApiContentRoute? redirectRoute = _requestRedirectService.GetRedirectRoute(path); diff --git a/src/Umbraco.Cms.Api.Delivery/Controllers/Media/ByIdMediaApiController.cs b/src/Umbraco.Cms.Api.Delivery/Controllers/Media/ByIdMediaApiController.cs index f7fa2f6d927d..106978c4544d 100644 --- a/src/Umbraco.Cms.Api.Delivery/Controllers/Media/ByIdMediaApiController.cs +++ b/src/Umbraco.Cms.Api.Delivery/Controllers/Media/ByIdMediaApiController.cs @@ -24,8 +24,8 @@ public ByIdMediaApiController( [ProducesResponseType(typeof(IApiMediaWithCropsResponse), StatusCodes.Status200OK)] [ProducesResponseType(StatusCodes.Status404NotFound)] [Obsolete("Please use version 2 of this API. Will be removed in V15.")] - public async Task ById(Guid id) - => await HandleRequest(id); + public Task ById(Guid id) + => Task.FromResult(HandleRequest(id)); /// /// Gets a media item by id. @@ -36,16 +36,16 @@ public async Task ById(Guid id) [MapToApiVersion("2.0")] [ProducesResponseType(typeof(IApiMediaWithCropsResponse), StatusCodes.Status200OK)] [ProducesResponseType(StatusCodes.Status404NotFound)] - public async Task ByIdV20(Guid id) - => await HandleRequest(id); + public Task ByIdV20(Guid id) + => Task.FromResult(HandleRequest(id)); - private async Task HandleRequest(Guid id) + private IActionResult HandleRequest(Guid id) { IPublishedContent? media = PublishedMediaCache.GetById(id); if (media is null) { - return await Task.FromResult(NotFound()); + return NotFound(); } return Ok(BuildApiMediaWithCrops(media)); diff --git a/src/Umbraco.Cms.Api.Delivery/Controllers/Media/ByIdsMediaApiController.cs b/src/Umbraco.Cms.Api.Delivery/Controllers/Media/ByIdsMediaApiController.cs index 957c982c38f1..03a1911a3274 100644 --- a/src/Umbraco.Cms.Api.Delivery/Controllers/Media/ByIdsMediaApiController.cs +++ b/src/Umbraco.Cms.Api.Delivery/Controllers/Media/ByIdsMediaApiController.cs @@ -36,7 +36,7 @@ public async Task Item([FromQuery(Name = "id")] HashSet ids public async Task ItemsV20([FromQuery(Name = "id")] HashSet ids) => await HandleRequest(ids); - private async Task HandleRequest(HashSet ids) + private Task HandleRequest(HashSet ids) { IPublishedContent[] mediaItems = ids .Select(PublishedMediaCache.GetById) @@ -47,6 +47,6 @@ private async Task HandleRequest(HashSet ids) .Select(BuildApiMediaWithCrops) .ToArray(); - return await Task.FromResult(Ok(apiMediaItems)); + return Task.FromResult(Ok(apiMediaItems)); } } diff --git a/src/Umbraco.Cms.Api.Delivery/Controllers/Media/ByPathMediaApiController.cs b/src/Umbraco.Cms.Api.Delivery/Controllers/Media/ByPathMediaApiController.cs index 0afedddffb7d..9465e796a678 100644 --- a/src/Umbraco.Cms.Api.Delivery/Controllers/Media/ByPathMediaApiController.cs +++ b/src/Umbraco.Cms.Api.Delivery/Controllers/Media/ByPathMediaApiController.cs @@ -27,8 +27,8 @@ public ByPathMediaApiController( [ProducesResponseType(typeof(IApiMediaWithCropsResponse), StatusCodes.Status200OK)] [ProducesResponseType(StatusCodes.Status404NotFound)] [Obsolete("Please use version 2 of this API. Will be removed in V15.")] - public async Task ByPath(string path) - => await HandleRequest(path); + public Task ByPath(string path) + => Task.FromResult(HandleRequest(path)); /// /// Gets a media item by its path. @@ -39,17 +39,17 @@ public async Task ByPath(string path) [MapToApiVersion("2.0")] [ProducesResponseType(typeof(IApiMediaWithCropsResponse), StatusCodes.Status200OK)] [ProducesResponseType(StatusCodes.Status404NotFound)] - public async Task ByPathV20(string path) - => await HandleRequest(path); + public Task ByPathV20(string path) + => Task.FromResult(HandleRequest(path)); - private async Task HandleRequest(string path) + private IActionResult HandleRequest(string path) { path = DecodePath(path); IPublishedContent? media = _apiMediaQueryService.GetByPath(path); if (media is null) { - return await Task.FromResult(NotFound()); + return NotFound(); } return Ok(BuildApiMediaWithCrops(media)); diff --git a/src/Umbraco.Cms.Api.Delivery/Controllers/Media/QueryMediaApiController.cs b/src/Umbraco.Cms.Api.Delivery/Controllers/Media/QueryMediaApiController.cs index c61aaf876493..00a221f1d829 100644 --- a/src/Umbraco.Cms.Api.Delivery/Controllers/Media/QueryMediaApiController.cs +++ b/src/Umbraco.Cms.Api.Delivery/Controllers/Media/QueryMediaApiController.cs @@ -32,13 +32,13 @@ public QueryMediaApiController( [ProducesResponseType(typeof(PagedViewModel), StatusCodes.Status200OK)] [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status400BadRequest)] [Obsolete("Please use version 2 of this API. Will be removed in V15.")] - public async Task Query( + public Task Query( string? fetch, [FromQuery] string[] filter, [FromQuery] string[] sort, int skip = 0, int take = 10) - => await HandleRequest(fetch, filter, sort, skip, take); + => Task.FromResult(HandleRequest(fetch, filter, sort, skip, take)); /// /// Gets a paginated list of media item(s) from query. @@ -53,15 +53,15 @@ public async Task Query( [MapToApiVersion("2.0")] [ProducesResponseType(typeof(PagedViewModel), StatusCodes.Status200OK)] [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status400BadRequest)] - public async Task QueryV20( + public Task QueryV20( string? fetch, [FromQuery] string[] filter, [FromQuery] string[] sort, int skip = 0, int take = 10) - => await HandleRequest(fetch, filter, sort, skip, take); + => Task.FromResult(HandleRequest(fetch, filter, sort, skip, take)); - private async Task HandleRequest(string? fetch, string[] filter, string[] sort, int skip, int take) + private IActionResult HandleRequest(string? fetch, string[] filter, string[] sort, int skip, int take) { Attempt, ApiMediaQueryOperationStatus> queryAttempt = _apiMediaQueryService.ExecuteQuery(fetch, filter, sort, skip, take); @@ -79,6 +79,6 @@ private async Task HandleRequest(string? fetch, string[] filter, Items = mediaItems.Select(BuildApiMediaWithCrops) }; - return await Task.FromResult(Ok(model)); + return Ok(model); } } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Culture/AllCultureController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Culture/AllCultureController.cs index 20d677044431..7b4ae11a9216 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Culture/AllCultureController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Culture/AllCultureController.cs @@ -28,7 +28,7 @@ public AllCultureController(IUmbracoMapper umbracoMapper, ICultureService cultur [HttpGet] [MapToApiVersion("1.0")] [ProducesResponseType(typeof(PagedViewModel), StatusCodes.Status200OK)] - public async Task> GetAll(CancellationToken cancellationToken, int skip = 0, int take = 100) + public Task> GetAll(CancellationToken cancellationToken, int skip = 0, int take = 100) { CultureInfo[] all = _cultureService.GetValidCultureInfos(); @@ -38,6 +38,6 @@ public async Task> GetAll(CancellationToken Total = all.Length }; - return await Task.FromResult(viewModel); + return Task.FromResult(viewModel); } } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/AllDictionaryController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/AllDictionaryController.cs index b40db7607a30..5af50f4f520d 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/AllDictionaryController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/AllDictionaryController.cs @@ -38,6 +38,6 @@ public async Task>> Total = items.Length, Items = _umbracoMapper.MapEnumerable(items.Skip(skip).Take(take)) }; - return await Task.FromResult(model); + return model; } } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Document/Item/ItemDocumentItemController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Document/Item/ItemDocumentItemController.cs index bea90daf42ed..dc93221facc7 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Document/Item/ItemDocumentItemController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Document/Item/ItemDocumentItemController.cs @@ -24,13 +24,13 @@ public ItemDocumentItemController(IEntityService entityService, IDocumentPresent [HttpGet] [MapToApiVersion("1.0")] [ProducesResponseType(typeof(IEnumerable), StatusCodes.Status200OK)] - public async Task Item( + public Task Item( CancellationToken cancellationToken, [FromQuery(Name = "id")] HashSet ids) { if (ids.Count is 0) { - return Ok(Enumerable.Empty()); + return Task.FromResult(Ok(Enumerable.Empty())); } IEnumerable documents = _entityService @@ -38,6 +38,6 @@ public async Task Item( .OfType(); IEnumerable documentItemResponseModels = documents.Select(_documentPresentationFactory.CreateItemResponseModel); - return await Task.FromResult(Ok(documentItemResponseModels)); + return Task.FromResult(Ok(documentItemResponseModels)); } } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Document/Item/SearchDocumentItemController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Document/Item/SearchDocumentItemController.cs index 1e8bb5054b43..36a7b5f1df2b 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Document/Item/SearchDocumentItemController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Document/Item/SearchDocumentItemController.cs @@ -1,5 +1,4 @@ -using System.Text.Json.Serialization; -using Asp.Versioning; +using Asp.Versioning; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.Factories; @@ -47,7 +46,7 @@ public async Task SearchFromParentWithAllowedTypes( [HttpGet("search")] [MapToApiVersion("1.0")] [ProducesResponseType(typeof(PagedModel), StatusCodes.Status200OK)] - public async Task SearchWithTrashed( + public Task SearchWithTrashed( CancellationToken cancellationToken, string query, bool? trashed = null, @@ -63,6 +62,6 @@ public async Task SearchWithTrashed( Total = searchResult.Total, }; - return await Task.FromResult(Ok(result)); + return Task.FromResult(Ok(result)); } } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Document/UpdateNotificationsController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Document/UpdateNotificationsController.cs index d02e1456f9c5..9e8231cc1c23 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Document/UpdateNotificationsController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Document/UpdateNotificationsController.cs @@ -35,6 +35,6 @@ public async Task UpdateNotifications(CancellationToken cancellat } _notificationService.SetNotifications(_backOfficeSecurityAccessor.BackOfficeSecurity?.CurrentUser, content, updateModel.SubscribedActionIds); - return await Task.FromResult(Ok()); + return Ok(); } } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/DocumentBlueprint/Item/ItemDocumentBlueprintController.cs b/src/Umbraco.Cms.Api.Management/Controllers/DocumentBlueprint/Item/ItemDocumentBlueprintController.cs index 5694d5b0b9c0..9b0b6b9e46fb 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/DocumentBlueprint/Item/ItemDocumentBlueprintController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/DocumentBlueprint/Item/ItemDocumentBlueprintController.cs @@ -25,13 +25,13 @@ public ItemDocumentBlueprintController(IEntityService entityService, IDocumentPr [HttpGet] [MapToApiVersion("1.0")] [ProducesResponseType(typeof(IEnumerable), StatusCodes.Status200OK)] - public async Task Item( + public Task Item( CancellationToken cancellationToken, [FromQuery(Name = "id")] HashSet ids) { if (ids.Count is 0) { - return Ok(Enumerable.Empty()); + return Task.FromResult(Ok(Enumerable.Empty())); } IEnumerable documents = _entityService @@ -39,6 +39,6 @@ public async Task Item( .Select(x => x as IDocumentEntitySlim) .WhereNotNull(); IEnumerable responseModels = documents.Select(x => _documentPresentationFactory.CreateBlueprintItemResponseModel(x)); - return await Task.FromResult(Ok(responseModels)); + return Task.FromResult(Ok(responseModels)); } } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/DocumentType/Item/ItemDocumentTypeItemController.cs b/src/Umbraco.Cms.Api.Management/Controllers/DocumentType/Item/ItemDocumentTypeItemController.cs index 55211c75556f..c0a3a4a6a2c8 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/DocumentType/Item/ItemDocumentTypeItemController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/DocumentType/Item/ItemDocumentTypeItemController.cs @@ -23,17 +23,17 @@ public ItemDocumentTypeItemController(IContentTypeService contentTypeService, IU [HttpGet] [MapToApiVersion("1.0")] [ProducesResponseType(typeof(IEnumerable), StatusCodes.Status200OK)] - public async Task Item( + public Task Item( CancellationToken cancellationToken, [FromQuery(Name = "id")] HashSet ids) { if (ids.Count is 0) { - return Ok(Enumerable.Empty()); + return Task.FromResult(Ok(Enumerable.Empty())); } IEnumerable contentTypes = _contentTypeService.GetMany(ids); List responseModels = _mapper.MapEnumerable(contentTypes); - return await Task.FromResult(Ok(responseModels)); + return Task.FromResult(Ok(responseModels)); } } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/DynamicRoot/GetQueryStepsController.cs b/src/Umbraco.Cms.Api.Management/Controllers/DynamicRoot/GetQueryStepsController.cs index 1271c2ab3fc3..5dc68f4522d0 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/DynamicRoot/GetQueryStepsController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/DynamicRoot/GetQueryStepsController.cs @@ -21,10 +21,10 @@ public GetQueryStepsController(DynamicRootQueryStepCollection dynamicRootQuerySt [HttpGet($"steps")] [MapToApiVersion("1.0")] [ProducesResponseType(typeof(IEnumerable), StatusCodes.Status200OK)] - public async Task GetQuerySteps(CancellationToken cancellationToken) + public Task GetQuerySteps(CancellationToken cancellationToken) { IEnumerable querySteps = _dynamicRootQueryStepCollection.Select(x => x.SupportedDirectionAlias); - return await Task.FromResult(Ok(querySteps)); + return Task.FromResult(Ok(querySteps)); } } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/HealthCheck/ExecuteActionHealthCheckController.cs b/src/Umbraco.Cms.Api.Management/Controllers/HealthCheck/ExecuteActionHealthCheckController.cs index 6f3e5ea933e2..4a8583f4fddb 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/HealthCheck/ExecuteActionHealthCheckController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/HealthCheck/ExecuteActionHealthCheckController.cs @@ -63,6 +63,6 @@ public async Task> ExecuteAction( HealthCheckStatus result = await healthCheck.ExecuteActionAsync(_umbracoMapper.Map(action)!); - return await Task.FromResult(Ok(_umbracoMapper.Map(result))); + return Ok(_umbracoMapper.Map(result)); } } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/HealthCheck/Group/AllHealthCheckGroupController.cs b/src/Umbraco.Cms.Api.Management/Controllers/HealthCheck/Group/AllHealthCheckGroupController.cs index baaaf467bfe7..f41f352cc76d 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/HealthCheck/Group/AllHealthCheckGroupController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/HealthCheck/Group/AllHealthCheckGroupController.cs @@ -31,7 +31,7 @@ public AllHealthCheckGroupController( [HttpGet] [MapToApiVersion("1.0")] [ProducesResponseType(typeof(PagedViewModel), StatusCodes.Status200OK)] - public async Task>> All( + public Task>> All( CancellationToken cancellationToken, int skip = 0, int take = 100) @@ -46,6 +46,6 @@ public async Task>> A Items = _umbracoMapper.MapEnumerable, HealthCheckGroupResponseModel>(groups.Skip(skip).Take(take)) }; - return await Task.FromResult(Ok(viewModel)); + return Task.FromResult>>(Ok(viewModel)); } } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/HealthCheck/Group/ByNameHealthCheckGroupController.cs b/src/Umbraco.Cms.Api.Management/Controllers/HealthCheck/Group/ByNameHealthCheckGroupController.cs index 1aa97c624980..6ffa173e9b5e 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/HealthCheck/Group/ByNameHealthCheckGroupController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/HealthCheck/Group/ByNameHealthCheckGroupController.cs @@ -31,7 +31,7 @@ public ByNameHealthCheckGroupController( [MapToApiVersion("1.0")] [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status404NotFound)] [ProducesResponseType(typeof(HealthCheckGroupPresentationModel), StatusCodes.Status200OK)] - public async Task ByName( + public Task ByName( CancellationToken cancellationToken, string name) { @@ -42,9 +42,9 @@ public async Task ByName( if (group is null) { - return HealthCheckGroupNotFound(); + return Task.FromResult(HealthCheckGroupNotFound()); } - return await Task.FromResult(Ok(_umbracoMapper.Map(group))); + return Task.FromResult(Ok(_umbracoMapper.Map(group))); } } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Indexer/DetailsIndexerController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Indexer/DetailsIndexerController.cs index a6d8a7c4070e..ad9a6638ed4d 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Indexer/DetailsIndexerController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Indexer/DetailsIndexerController.cs @@ -34,11 +34,11 @@ public DetailsIndexerController( [MapToApiVersion("1.0")] [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status400BadRequest)] [ProducesResponseType(typeof(IndexResponseModel), StatusCodes.Status200OK)] - public async Task> Details(CancellationToken cancellationToken, string indexName) + public Task> Details(CancellationToken cancellationToken, string indexName) { if (_examineManager.TryGetIndex(indexName, out IIndex? index)) { - return await Task.FromResult(_indexPresentationFactory.Create(index!)); + return Task.FromResult>(_indexPresentationFactory.Create(index!)); } var invalidModelProblem = new ProblemDetails @@ -49,7 +49,6 @@ public DetailsIndexerController( Type = "Error", }; - return await Task.FromResult(NotFound(invalidModelProblem)); - + return Task.FromResult>(NotFound(invalidModelProblem)); } } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Indexer/RebuildIndexerController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Indexer/RebuildIndexerController.cs index 97131adcb904..cba22529913a 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Indexer/RebuildIndexerController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Indexer/RebuildIndexerController.cs @@ -36,7 +36,7 @@ public RebuildIndexerController( [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status404NotFound)] [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status409Conflict)] [ProducesResponseType(StatusCodes.Status200OK)] - public async Task Rebuild(CancellationToken cancellationToken, string indexName) + public Task Rebuild(CancellationToken cancellationToken, string indexName) { if (!_examineManager.TryGetIndex(indexName, out IIndex? index)) { @@ -48,7 +48,7 @@ public async Task Rebuild(CancellationToken cancellationToken, st Type = "Error", }; - return await Task.FromResult(NotFound(invalidModelProblem)); + return Task.FromResult(NotFound(invalidModelProblem)); } if (!_indexingRebuilderService.CanRebuild(index.Name)) @@ -62,14 +62,14 @@ public async Task Rebuild(CancellationToken cancellationToken, st Type = "Error", }; - return await Task.FromResult(BadRequest(invalidModelProblem)); + return Task.FromResult(BadRequest(invalidModelProblem)); } _logger.LogInformation("Rebuilding index '{IndexName}'", indexName); if (_indexingRebuilderService.TryRebuild(index, indexName)) { - return await Task.FromResult(Ok()); + return Task.FromResult(Ok()); } var problemDetails = new ProblemDetails @@ -80,6 +80,6 @@ public async Task Rebuild(CancellationToken cancellationToken, st Type = "Error", }; - return await Task.FromResult(Conflict(problemDetails)); + return Task.FromResult(Conflict(problemDetails)); } } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/LogViewer/AllSinkLevelLogViewerController.cs b/src/Umbraco.Cms.Api.Management/Controllers/LogViewer/AllSinkLevelLogViewerController.cs index f2ec9e034ffe..e3bd05292266 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/LogViewer/AllSinkLevelLogViewerController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/LogViewer/AllSinkLevelLogViewerController.cs @@ -30,7 +30,7 @@ public AllSinkLevelLogViewerController(ILogViewerService logViewerService, IUmbr [HttpGet("level")] [MapToApiVersion("1.0")] [ProducesResponseType(typeof(PagedViewModel), StatusCodes.Status200OK)] - public async Task>> AllLogLevels( + public Task>> AllLogLevels( CancellationToken cancellationToken, int skip = 0, int take = 100) @@ -45,6 +45,6 @@ public async Task>> AllLogLevel Items = _umbracoMapper.MapEnumerable, LoggerResponseModel>(logLevels.Skip(skip).Take(take)) }; - return await Task.FromResult(Ok(viewModel)); + return Task.FromResult>>(Ok(viewModel)); } } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Media/Item/ItemMediaItemController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Media/Item/ItemMediaItemController.cs index ddea5cfbcba6..8efee26fa0c0 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Media/Item/ItemMediaItemController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Media/Item/ItemMediaItemController.cs @@ -3,7 +3,6 @@ using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.Factories; using Umbraco.Cms.Api.Management.ViewModels.Media.Item; -using Umbraco.Cms.Core.Mapping; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.Entities; using Umbraco.Cms.Core.Services; @@ -25,13 +24,13 @@ public ItemMediaItemController(IEntityService entityService, IMediaPresentationF [HttpGet] [MapToApiVersion("1.0")] [ProducesResponseType(typeof(IEnumerable), StatusCodes.Status200OK)] - public async Task Item( + public Task Item( CancellationToken cancellationToken, [FromQuery(Name = "id")] HashSet ids) { if (ids.Count is 0) { - return Ok(Enumerable.Empty()); + return Task.FromResult(Ok(Enumerable.Empty())); } IEnumerable media = _entityService @@ -39,6 +38,6 @@ public async Task Item( .OfType(); IEnumerable responseModels = media.Select(_mediaPresentationFactory.CreateItemResponseModel); - return await Task.FromResult(Ok(responseModels)); + return Task.FromResult(Ok(responseModels)); } } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Media/Item/SearchMediaItemController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Media/Item/SearchMediaItemController.cs index 6db5950179bb..f61552020659 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Media/Item/SearchMediaItemController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Media/Item/SearchMediaItemController.cs @@ -40,7 +40,7 @@ public async Task SearchFromParentWithAllowedTypes(CancellationTo [HttpGet("search")] [MapToApiVersion("1.0")] [ProducesResponseType(typeof(PagedModel), StatusCodes.Status200OK)] - public async Task SearchFromParentWithAllowedTypes(CancellationToken cancellationToken, string query, bool? trashed = null, int skip = 0, int take = 100, Guid? parentId = null, [FromQuery]IEnumerable? allowedMediaTypes = null) + public Task SearchFromParentWithAllowedTypes(CancellationToken cancellationToken, string query, bool? trashed = null, int skip = 0, int take = 100, Guid? parentId = null, [FromQuery]IEnumerable? allowedMediaTypes = null) { PagedModel searchResult = _indexedEntitySearchService.Search(UmbracoObjectTypes.Media, query, parentId, allowedMediaTypes, trashed, skip, take); var result = new PagedModel @@ -49,6 +49,6 @@ public async Task SearchFromParentWithAllowedTypes(CancellationTo Total = searchResult.Total, }; - return await Task.FromResult(Ok(result)); + return Task.FromResult(Ok(result)); } } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Media/MediaUrlController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Media/MediaUrlController.cs index d967bd943513..692500ce7010 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Media/MediaUrlController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Media/MediaUrlController.cs @@ -25,10 +25,10 @@ public MediaUrlController( [MapToApiVersion("1.0")] [HttpGet("urls")] [ProducesResponseType(typeof(IEnumerable), StatusCodes.Status200OK)] - public async Task GetUrls([FromQuery(Name = "id")] HashSet ids) + public Task GetUrls([FromQuery(Name = "id")] HashSet ids) { IEnumerable items = _mediaService.GetByIds(ids); - return await Task.FromResult(Ok(_mediaUrlFactory.CreateUrlSets(items))); + return Task.FromResult(Ok(_mediaUrlFactory.CreateUrlSets(items))); } } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/MediaType/ByKeyMediaTypeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/MediaType/ByKeyMediaTypeController.cs index ec3d955b2f60..35c5a14ba442 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/MediaType/ByKeyMediaTypeController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/MediaType/ByKeyMediaTypeController.cs @@ -34,6 +34,6 @@ public async Task ByKey(CancellationToken cancellationToken, Guid } MediaTypeResponseModel model = _umbracoMapper.Map(mediaType)!; - return await Task.FromResult(Ok(model)); + return Ok(model); } } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/MediaType/Item/ItemMediaTypeItemController.cs b/src/Umbraco.Cms.Api.Management/Controllers/MediaType/Item/ItemMediaTypeItemController.cs index 14bcff0e5135..56456700ddda 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/MediaType/Item/ItemMediaTypeItemController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/MediaType/Item/ItemMediaTypeItemController.cs @@ -23,17 +23,17 @@ public ItemMediaTypeItemController(IMediaTypeService mediaTypeService, IUmbracoM [HttpGet] [MapToApiVersion("1.0")] [ProducesResponseType(typeof(IEnumerable), StatusCodes.Status200OK)] - public async Task Item( + public Task Item( CancellationToken cancellationToken, [FromQuery(Name = "id")] HashSet ids) { if (ids.Count is 0) { - return Ok(Enumerable.Empty()); + return Task.FromResult(Ok(Enumerable.Empty())); } IEnumerable mediaTypes = _mediaTypeService.GetMany(ids); List responseModels = _mapper.MapEnumerable(mediaTypes); - return await Task.FromResult(Ok(responseModels)); + return Task.FromResult(Ok(responseModels)); } } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/MediaType/Item/SearchMediaTypeItemController.cs b/src/Umbraco.Cms.Api.Management/Controllers/MediaType/Item/SearchMediaTypeItemController.cs index 475087766f96..3f04095422ed 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/MediaType/Item/SearchMediaTypeItemController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/MediaType/Item/SearchMediaTypeItemController.cs @@ -27,12 +27,12 @@ public SearchMediaTypeItemController(IEntitySearchService entitySearchService, I [HttpGet("search")] [MapToApiVersion("1.0")] [ProducesResponseType(typeof(PagedModel), StatusCodes.Status200OK)] - public async Task Search(CancellationToken cancellationToken, string query, int skip = 0, int take = 100) + public Task Search(CancellationToken cancellationToken, string query, int skip = 0, int take = 100) { PagedModel searchResult = _entitySearchService.Search(UmbracoObjectTypes.MediaType, query, skip, take); if (searchResult.Items.Any() is false) { - return await Task.FromResult(Ok(new PagedModel { Total = searchResult.Total })); + return Task.FromResult(Ok(new PagedModel { Total = searchResult.Total })); } IEnumerable mediaTypes = _mediaTypeService.GetMany(searchResult.Items.Select(item => item.Key).ToArray().EmptyNull()); @@ -42,6 +42,6 @@ public async Task Search(CancellationToken cancellationToken, str Total = searchResult.Total }; - return Ok(result); + return Task.FromResult(Ok(result)); } } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Member/Item/ItemMemberItemController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Member/Item/ItemMemberItemController.cs index eb81efed183e..ca9bf2163ed9 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Member/Item/ItemMemberItemController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Member/Item/ItemMemberItemController.cs @@ -3,7 +3,6 @@ using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.Factories; using Umbraco.Cms.Api.Management.ViewModels.Member.Item; -using Umbraco.Cms.Core.Mapping; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.Entities; using Umbraco.Cms.Core.Services; @@ -25,13 +24,13 @@ public ItemMemberItemController(IEntityService entityService, IMemberPresentatio [HttpGet] [MapToApiVersion("1.0")] [ProducesResponseType(typeof(IEnumerable), StatusCodes.Status200OK)] - public async Task Item( + public Task Item( CancellationToken cancellationToken, [FromQuery(Name = "id")] HashSet ids) { if (ids.Count is 0) { - return Ok(Enumerable.Empty()); + return Task.FromResult(Ok(Enumerable.Empty())); } IEnumerable members = _entityService @@ -39,6 +38,6 @@ public async Task Item( .OfType(); IEnumerable responseModels = members.Select(_memberPresentationFactory.CreateItemResponseModel); - return await Task.FromResult(Ok(responseModels)); + return Task.FromResult(Ok(responseModels)); } } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Member/Item/SearchMemberItemController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Member/Item/SearchMemberItemController.cs index 187dc239b399..9224e414a9d2 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Member/Item/SearchMemberItemController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Member/Item/SearchMemberItemController.cs @@ -29,7 +29,7 @@ public async Task Search(CancellationToken cancellationToken, str [HttpGet("search")] [MapToApiVersion("1.0")] [ProducesResponseType(typeof(PagedModel), StatusCodes.Status200OK)] - public async Task SearchWithAllowedTypes(CancellationToken cancellationToken, string query, int skip = 0, int take = 100, [FromQuery]IEnumerable? allowedMemberTypes = null) + public Task SearchWithAllowedTypes(CancellationToken cancellationToken, string query, int skip = 0, int take = 100, [FromQuery]IEnumerable? allowedMemberTypes = null) { PagedModel searchResult = _indexedEntitySearchService.Search(UmbracoObjectTypes.Member, query, null, allowedMemberTypes, skip, take); var result = new PagedModel @@ -38,6 +38,6 @@ public async Task SearchWithAllowedTypes(CancellationToken cancel Total = searchResult.Total }; - return await Task.FromResult(Ok(result)); + return Task.FromResult(Ok(result)); } } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/MemberGroup/AllMemberGroupController.cs b/src/Umbraco.Cms.Api.Management/Controllers/MemberGroup/AllMemberGroupController.cs index 8f2bfd73182f..31ec594d745e 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/MemberGroup/AllMemberGroupController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/MemberGroup/AllMemberGroupController.cs @@ -36,6 +36,6 @@ public async Task>> All( Items = _mapper.MapEnumerable(memberGroups.Skip(skip).Take(take)), }; - return await Task.FromResult(Ok(viewModel)); + return Ok(viewModel); } } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/MemberType/Item/SearchMemberTypeItemController.cs b/src/Umbraco.Cms.Api.Management/Controllers/MemberType/Item/SearchMemberTypeItemController.cs index 6e8151d8a29e..65470635d8d7 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/MemberType/Item/SearchMemberTypeItemController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/MemberType/Item/SearchMemberTypeItemController.cs @@ -26,12 +26,12 @@ public SearchMemberTypeItemController(IEntitySearchService entitySearchService, [HttpGet("search")] [MapToApiVersion("1.0")] [ProducesResponseType(typeof(PagedModel), StatusCodes.Status200OK)] - public async Task Search(CancellationToken cancellationToken, string query, int skip = 0, int take = 100) + public Task Search(CancellationToken cancellationToken, string query, int skip = 0, int take = 100) { PagedModel searchResult = _entitySearchService.Search(UmbracoObjectTypes.MemberType, query, skip, take); if (searchResult.Items.Any() is false) { - return await Task.FromResult(Ok(new PagedModel { Total = searchResult.Total })); + return Task.FromResult(Ok(new PagedModel { Total = searchResult.Total })); } IEnumerable memberTypes = _memberTypeService.GetMany(searchResult.Items.Select(item => item.Key).ToArray()); @@ -41,6 +41,6 @@ public async Task Search(CancellationToken cancellationToken, str Total = searchResult.Total }; - return Ok(result); + return Task.FromResult(Ok(result)); } } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/ModelsBuilder/GetModelsBuilderController.cs b/src/Umbraco.Cms.Api.Management/Controllers/ModelsBuilder/GetModelsBuilderController.cs index 764ba65b75ce..5aa6038aeec7 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/ModelsBuilder/GetModelsBuilderController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/ModelsBuilder/GetModelsBuilderController.cs @@ -16,6 +16,6 @@ public class GetModelsBuilderController : ModelsBuilderControllerBase [HttpGet("dashboard")] [ProducesResponseType(typeof(ModelsBuilderResponseModel), StatusCodes.Status200OK)] [MapToApiVersion("1.0")] - public async Task> GetDashboard(CancellationToken cancellationToken) - => await Task.FromResult(Ok(_modelsBuilderPresentationFactory.Create())); + public Task> GetDashboard(CancellationToken cancellationToken) + => Task.FromResult>(Ok(_modelsBuilderPresentationFactory.Create())); } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/ModelsBuilder/StatusModelsBuilderController.cs b/src/Umbraco.Cms.Api.Management/Controllers/ModelsBuilder/StatusModelsBuilderController.cs index fcbcd9e3cc15..aa9b2feb0494 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/ModelsBuilder/StatusModelsBuilderController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/ModelsBuilder/StatusModelsBuilderController.cs @@ -1,5 +1,4 @@ -using System.Threading.Tasks; -using Asp.Versioning; +using Asp.Versioning; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Infrastructure.ModelsBuilder; @@ -18,7 +17,7 @@ public class StatusModelsBuilderController : ModelsBuilderControllerBase [HttpGet("status")] [ProducesResponseType(typeof(OutOfDateStatusResponseModel), StatusCodes.Status200OK)] [MapToApiVersion("1.0")] - public async Task> GetModelsOutOfDateStatus(CancellationToken cancellationToken) + public Task> GetModelsOutOfDateStatus(CancellationToken cancellationToken) { OutOfDateStatusResponseModel status = _outOfDateModelsStatus.IsEnabled ? _outOfDateModelsStatus.IsOutOfDate @@ -26,6 +25,6 @@ public async Task> GetModelsOutOfDate : new OutOfDateStatusResponseModel { Status = OutOfDateType.Current } : new OutOfDateStatusResponseModel { Status = OutOfDateType.Unknown }; - return await Task.FromResult(Ok(status)); + return Task.FromResult>(Ok(status)); } } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/ObjectTypes/AllowedObjectTypesController.cs b/src/Umbraco.Cms.Api.Management/Controllers/ObjectTypes/AllowedObjectTypesController.cs index 394ddb657370..41045aa5b389 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/ObjectTypes/AllowedObjectTypesController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/ObjectTypes/AllowedObjectTypesController.cs @@ -17,11 +17,11 @@ public class AllowedObjectTypesController : ObjectTypesControllerBase [HttpGet] [MapToApiVersion("1.0")] [ProducesResponseType(typeof(PagedViewModel), StatusCodes.Status200OK)] - public async Task Allowed(CancellationToken cancellationToken, int skip = 0, int take = 100) + public Task Allowed(CancellationToken cancellationToken, int skip = 0, int take = 100) { ObjectTypeResponseModel[] objectTypes = _objectTypePresentationFactory.Create().ToArray(); - return await Task.FromResult(Ok(new PagedViewModel + return Task.FromResult(Ok(new PagedViewModel { Total = objectTypes.Length, Items = objectTypes.Skip(skip).Take(take), diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Package/Created/AllCreatedPackageController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Package/Created/AllCreatedPackageController.cs index 64ab3dec4755..73ef8030115f 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Package/Created/AllCreatedPackageController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Package/Created/AllCreatedPackageController.cs @@ -44,6 +44,6 @@ public async Task>> Items = _umbracoMapper.MapEnumerable(createdPackages.Items) }; - return await Task.FromResult(Ok(viewModel)); + return Ok(viewModel); } } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Item/ItemPartialViewItemController.cs b/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Item/ItemPartialViewItemController.cs index 370f1ab8f525..a60007fd2fe3 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Item/ItemPartialViewItemController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Item/ItemPartialViewItemController.cs @@ -18,17 +18,17 @@ public ItemPartialViewItemController(IFileItemPresentationFactory fileItemPresen [HttpGet] [MapToApiVersion("1.0")] [ProducesResponseType(typeof(IEnumerable), StatusCodes.Status200OK)] - public async Task Item( + public Task Item( CancellationToken cancellationToken, [FromQuery(Name = "path")] HashSet paths) { if (paths.Count is 0) { - return Ok(Enumerable.Empty()); + return Task.FromResult(Ok(Enumerable.Empty())); } paths = paths.Select(path => path.VirtualPathToSystemPath()).ToHashSet(); IEnumerable responseModels = _fileItemPresentationFactory.CreatePartialViewItemResponseModels(paths); - return await Task.FromResult(Ok(responseModels)); + return Task.FromResult(Ok(responseModels)); } } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/PublishedCache/RebuildPublishedCacheController.cs b/src/Umbraco.Cms.Api.Management/Controllers/PublishedCache/RebuildPublishedCacheController.cs index 8592f6722b83..32d56ed17e20 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/PublishedCache/RebuildPublishedCacheController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/PublishedCache/RebuildPublishedCacheController.cs @@ -15,7 +15,7 @@ public class RebuildPublishedCacheController : PublishedCacheControllerBase [HttpPost("rebuild")] [MapToApiVersion("1.0")] [ProducesResponseType(StatusCodes.Status200OK)] - public async Task Rebuild(CancellationToken cancellationToken) + public Task Rebuild(CancellationToken cancellationToken) { if (_databaseCacheRebuilder.IsRebuilding()) { @@ -27,10 +27,10 @@ public async Task Rebuild(CancellationToken cancellationToken) Type = "Error", }; - return await Task.FromResult(Conflict(problemDetails)); + return Task.FromResult(Conflict(problemDetails)); } _databaseCacheRebuilder.Rebuild(true); - return await Task.FromResult(Ok()); + return Task.FromResult(Ok()); } } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/PublishedCache/ReloadPublishedCacheController.cs b/src/Umbraco.Cms.Api.Management/Controllers/PublishedCache/ReloadPublishedCacheController.cs index da655627f5bb..ad70734510c8 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/PublishedCache/ReloadPublishedCacheController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/PublishedCache/ReloadPublishedCacheController.cs @@ -16,10 +16,10 @@ public class ReloadPublishedCacheController : PublishedCacheControllerBase [HttpPost("reload")] [MapToApiVersion("1.0")] [ProducesResponseType(StatusCodes.Status200OK)] - public async Task Reload(CancellationToken cancellationToken) + public Task Reload(CancellationToken cancellationToken) { _distributedCache.RefreshAllPublishedSnapshot(); - return await Task.FromResult(Ok()); + return Task.FromResult(Ok()); } } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/RecycleBin/RecycleBinControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/RecycleBin/RecycleBinControllerBase.cs index 69ae9b0b9d4b..337e2691289b 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/RecycleBin/RecycleBinControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/RecycleBin/RecycleBinControllerBase.cs @@ -23,17 +23,17 @@ protected RecycleBinControllerBase(IEntityService entityService) protected abstract Guid RecycleBinRootKey { get; } - protected async Task>> GetRoot(int skip, int take) + protected Task>> GetRoot(int skip, int take) { IEntitySlim[] rootEntities = GetPagedRootEntities(skip, take, out var totalItems); TItem[] treeItemViewModels = MapRecycleBinViewModels(null, rootEntities); PagedViewModel result = PagedViewModel(treeItemViewModels, totalItems); - return await Task.FromResult(Ok(result)); + return Task.FromResult>>(Ok(result)); } - protected async Task>> GetChildren(Guid parentKey, int skip, int take) + protected Task>> GetChildren(Guid parentKey, int skip, int take) { IEntitySlim[] children = GetPagedChildEntities(parentKey, skip, take, out var totalItems); @@ -41,7 +41,7 @@ protected async Task>> GetChildren(Guid paren PagedViewModel result = PagedViewModel(treeItemViewModels, totalItems); - return await Task.FromResult(Ok(result)); + return Task.FromResult>>(Ok(result)); } protected virtual TItem MapRecycleBinViewModel(Guid? parentKey, IEntitySlim entity) @@ -133,6 +133,6 @@ private IEntitySlim[] GetPagedChildEntities(Guid parentKey, int skip, int take, private TItem[] MapRecycleBinViewModels(Guid? parentKey, IEntitySlim[] entities) => entities.Select(entity => MapRecycleBinViewModel(parentKey, entity)).ToArray(); - private PagedViewModel PagedViewModel(IEnumerable treeItemViewModels, long totalItems) + private static PagedViewModel PagedViewModel(IEnumerable treeItemViewModels, long totalItems) => new() { Total = totalItems, Items = treeItemViewModels }; } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Relation/ByRelationTypeKeyRelationController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Relation/ByRelationTypeKeyRelationController.cs index cde52b5884bb..189019cc85dd 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Relation/ByRelationTypeKeyRelationController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Relation/ByRelationTypeKeyRelationController.cs @@ -43,16 +43,15 @@ public async Task ByRelationTypeKey( if (relationsAttempt.Success is false) { - return await Task.FromResult(RelationOperationStatusResult(relationsAttempt.Status)); + return RelationOperationStatusResult(relationsAttempt.Status); } IEnumerable mappedRelations = relationsAttempt.Result.Items.Select(_relationPresentationFactory.Create); - return await Task.FromResult(Ok(new PagedViewModel + return Ok(new PagedViewModel { Total = relationsAttempt.Result.Total, Items = mappedRelations, - })); - + }); } } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/RelationType/ByKeyRelationTypeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/RelationType/ByKeyRelationTypeController.cs index a0d6ae4a46e8..a77d63433f8a 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/RelationType/ByKeyRelationTypeController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/RelationType/ByKeyRelationTypeController.cs @@ -24,16 +24,16 @@ public ByKeyRelationTypeController(IRelationService relationService, IUmbracoMap [MapToApiVersion("1.0")] [ProducesResponseType(typeof(RelationTypeResponseModel), StatusCodes.Status200OK)] [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status404NotFound)] - public async Task ByKey(CancellationToken cancellationToken, Guid id) + public Task ByKey(CancellationToken cancellationToken, Guid id) { IRelationType? relationType = _relationService.GetRelationTypeById(id); if (relationType is null) { - return RelationTypeNotFound(); + return Task.FromResult(RelationTypeNotFound()); } RelationTypeResponseModel mappedRelationType = _mapper.Map(relationType)!; - return await Task.FromResult(Ok(mappedRelationType)); + return Task.FromResult(Ok(mappedRelationType)); } } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/RelationType/Item/ItemRelationTypeItemController.cs b/src/Umbraco.Cms.Api.Management/Controllers/RelationType/Item/ItemRelationTypeItemController.cs index 6745108b93e7..c5892011f63b 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/RelationType/Item/ItemRelationTypeItemController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/RelationType/Item/ItemRelationTypeItemController.cs @@ -23,13 +23,13 @@ public ItemRelationTypeItemController(IRelationService relationService, IUmbraco [HttpGet] [MapToApiVersion("1.0")] [ProducesResponseType(typeof(IEnumerable), StatusCodes.Status200OK)] - public async Task Item( + public Task Item( CancellationToken cancellationToken, [FromQuery(Name = "id")] HashSet ids) { if (ids.Count is 0) { - return Ok(Enumerable.Empty()); + return Task.FromResult(Ok(Enumerable.Empty())); } // relation service does not allow fetching a collection of relation types by their ids; instead it relies @@ -40,6 +40,6 @@ public async Task Item( List responseModels = _mapper.MapEnumerable(relationTypes); - return await Task.FromResult(Ok(responseModels)); + return Task.FromResult(Ok(responseModels)); } } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Script/Item/ItemScriptItemController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Script/Item/ItemScriptItemController.cs index 5786c7aaf6b1..de19c5c13579 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Script/Item/ItemScriptItemController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Script/Item/ItemScriptItemController.cs @@ -18,17 +18,17 @@ public ItemScriptItemController(IFileItemPresentationFactory fileItemPresentatio [HttpGet] [MapToApiVersion("1.0")] [ProducesResponseType(typeof(IEnumerable), StatusCodes.Status200OK)] - public async Task Item( + public Task Item( CancellationToken cancellationToken, [FromQuery(Name = "path")] HashSet paths) { if (paths.Count is 0) { - return Ok(Enumerable.Empty()); + return Task.FromResult(Ok(Enumerable.Empty())); } paths = paths.Select(path => path.VirtualPathToSystemPath()).ToHashSet(); IEnumerable responseModels = _fileItemPresentationFactory.CreateScriptItemResponseModels(paths); - return await Task.FromResult(Ok(responseModels)); + return Task.FromResult(Ok(responseModels)); } } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Searcher/AllSearcherController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Searcher/AllSearcherController.cs index 76cd2f639b92..173cc2147d58 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Searcher/AllSearcherController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Searcher/AllSearcherController.cs @@ -22,7 +22,7 @@ public class AllSearcherController : SearcherControllerBase [HttpGet] [MapToApiVersion("1.0")] [ProducesResponseType(typeof(PagedViewModel), StatusCodes.Status200OK)] - public async Task>> All( + public Task>> All( CancellationToken cancellationToken, int skip = 0, int take = 100) @@ -37,6 +37,6 @@ public async Task>> All( Total = searchers.Count, }; - return await Task.FromResult(Ok(viewModel)); + return Task.FromResult>>(Ok(viewModel)); } } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Searcher/QuerySearcherController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Searcher/QuerySearcherController.cs index f3f7d0acaddd..2b23313cc080 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Searcher/QuerySearcherController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Searcher/QuerySearcherController.cs @@ -1,7 +1,6 @@ using Asp.Versioning; using Examine; using Examine.Lucene.Search; -using Examine.Search; using Lucene.Net.QueryParsers.Classic; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; @@ -23,7 +22,7 @@ public class QuerySearcherController : SearcherControllerBase [MapToApiVersion("1.0")] [ProducesResponseType(typeof(PagedViewModel), StatusCodes.Status200OK)] [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status404NotFound)] - public async Task>> Query( + public Task>> Query( CancellationToken cancellationToken, string searcherName, string? term, @@ -34,7 +33,7 @@ public async Task>> Query if (term.IsNullOrWhiteSpace()) { - return new PagedViewModel(); + return Task.FromResult>>(new PagedViewModel()); } if (!_examineManagerService.TryFindSearcher(searcherName, out ISearcher searcher)) @@ -47,7 +46,7 @@ public async Task>> Query Type = "Error", }; - return NotFound(invalidModelProblem); + return Task.FromResult>>(NotFound(invalidModelProblem)); } ISearchResults results; @@ -71,10 +70,10 @@ public async Task>> Query Type = "Error", }; - return BadRequest(invalidModelProblem); + return Task.FromResult>>(BadRequest(invalidModelProblem)); } - return await Task.FromResult(new PagedViewModel + return Task.FromResult>>(new PagedViewModel { Total = results.TotalItemCount, Items = results.Select(x => new SearchResultResponseModel diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Security/ConfigurationSecurityController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Security/ConfigurationSecurityController.cs index e65ea9752c25..fd9c39c7623c 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Security/ConfigurationSecurityController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Security/ConfigurationSecurityController.cs @@ -20,13 +20,13 @@ public ConfigurationSecurityController(IPasswordConfigurationPresentationFactory [HttpGet("configuration")] [MapToApiVersion("1.0")] [ProducesResponseType(typeof(SecurityConfigurationResponseModel), StatusCodes.Status200OK)] - public async Task Configuration(CancellationToken cancellationToken) + public Task Configuration(CancellationToken cancellationToken) { var viewModel = new SecurityConfigurationResponseModel { PasswordConfiguration = _passwordConfigurationPresentationFactory.CreatePasswordConfigurationResponseModel(), }; - return await Task.FromResult(Ok(viewModel)); + return Task.FromResult(Ok(viewModel)); } } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Server/StatusServerController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Server/StatusServerController.cs index 0e25c9d3c65c..4b2b1b3e8da1 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Server/StatusServerController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Server/StatusServerController.cs @@ -19,6 +19,6 @@ public class StatusServerController : ServerControllerBase [MapToApiVersion("1.0")] [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status400BadRequest)] [ProducesResponseType(typeof(ServerStatusResponseModel), StatusCodes.Status200OK)] - public async Task> Get(CancellationToken cancellationToken) => - await Task.FromResult(new ServerStatusResponseModel { ServerStatus = _runtimeState.Level }); + public Task> Get(CancellationToken cancellationToken) => + Task.FromResult>(new ServerStatusResponseModel { ServerStatus = _runtimeState.Level }); } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/StaticFile/Item/ItemStaticFileItemController.cs b/src/Umbraco.Cms.Api.Management/Controllers/StaticFile/Item/ItemStaticFileItemController.cs index 3301ecf8e1e0..acecba56401e 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/StaticFile/Item/ItemStaticFileItemController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/StaticFile/Item/ItemStaticFileItemController.cs @@ -18,17 +18,17 @@ public ItemStaticFileItemController(IFileItemPresentationFactory fileItemPresent [HttpGet] [MapToApiVersion("1.0")] [ProducesResponseType(typeof(IEnumerable), StatusCodes.Status200OK)] - public async Task Item( + public Task Item( CancellationToken cancellationToken, [FromQuery(Name = "path")] HashSet paths) { if (paths.Count is 0) { - return Ok(Enumerable.Empty()); + return Task.FromResult(Ok(Enumerable.Empty())); } paths = paths.Select(path => path.VirtualPathToSystemPath()).ToHashSet(); IEnumerable responseModels = _fileItemPresentationFactory.CreateStaticFileItemResponseModels(paths); - return await Task.FromResult(Ok(responseModels)); + return Task.FromResult(Ok(responseModels)); } } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/Item/ItemStylesheetItemController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/Item/ItemStylesheetItemController.cs index d9ab9b4aa93a..4c35d4c310b3 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/Item/ItemStylesheetItemController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/Item/ItemStylesheetItemController.cs @@ -18,17 +18,17 @@ public ItemStylesheetItemController(IFileItemPresentationFactory fileItemPresent [HttpGet] [MapToApiVersion("1.0")] [ProducesResponseType(typeof(IEnumerable), StatusCodes.Status200OK)] - public async Task Item( + public Task Item( CancellationToken cancellationToken, [FromQuery(Name = "path")] HashSet paths) { if (paths.Count is 0) { - return Ok(Enumerable.Empty()); + return Task.FromResult(Ok(Enumerable.Empty())); } paths = paths.Select(path => path.VirtualPathToSystemPath()).ToHashSet(); IEnumerable responseModels = _fileItemPresentationFactory.CreateStylesheetItemResponseModels(paths); - return await Task.FromResult(Ok(responseModels)); + return Task.FromResult(Ok(responseModels)); } } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Tag/ByQueryTagController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Tag/ByQueryTagController.cs index d528eabbc43f..18380ad07017 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Tag/ByQueryTagController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Tag/ByQueryTagController.cs @@ -42,6 +42,6 @@ public async Task>> ByQuery( Total = responseModels.Count, }; - return await Task.FromResult(Ok(pagedViewModel)); + return Ok(pagedViewModel); } } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Telemetry/AllTelemetryController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Telemetry/AllTelemetryController.cs index 625b8b146b79..df18521fbc6b 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Telemetry/AllTelemetryController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Telemetry/AllTelemetryController.cs @@ -13,13 +13,13 @@ public class AllTelemetryController : TelemetryControllerBase [HttpGet] [MapToApiVersion("1.0")] [ProducesResponseType(typeof(PagedViewModel), StatusCodes.Status200OK)] - public async Task> GetAll( + public Task> GetAll( CancellationToken cancellationToken, int skip = 0, int take = 100) { TelemetryLevel[] levels = Enum.GetValues(); - return await Task.FromResult(new PagedViewModel + return Task.FromResult(new PagedViewModel { Total = levels.Length, Items = levels.Skip(skip).Take(take).Select(level => new TelemetryResponseModel { TelemetryLevel = level }), diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Telemetry/GetTelemetryController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Telemetry/GetTelemetryController.cs index d3bfe107a392..bd72021c46ae 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Telemetry/GetTelemetryController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Telemetry/GetTelemetryController.cs @@ -16,6 +16,6 @@ public class GetTelemetryController : TelemetryControllerBase [HttpGet("level")] [MapToApiVersion("1.0")] [ProducesResponseType(typeof(TelemetryResponseModel), StatusCodes.Status200OK)] - public async Task Get(CancellationToken cancellationToken) - => await Task.FromResult(new TelemetryResponseModel { TelemetryLevel = _metricsConsentService.GetConsentLevel() }); + public Task Get(CancellationToken cancellationToken) + => Task.FromResult(new TelemetryResponseModel { TelemetryLevel = _metricsConsentService.GetConsentLevel() }); } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Telemetry/SetTelemetryController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Telemetry/SetTelemetryController.cs index b0f8110e4095..ed8255e198e3 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Telemetry/SetTelemetryController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Telemetry/SetTelemetryController.cs @@ -34,6 +34,6 @@ public async Task SetConsentLevel( } await _metricsConsentService.SetConsentLevelAsync(telemetryRepresentationBase.TelemetryLevel); - return await Task.FromResult(Ok()); + return Ok(); } } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Template/Query/ExecuteTemplateQueryController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Template/Query/ExecuteTemplateQueryController.cs index 3634b3fa1cfe..07063b69f7df 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Template/Query/ExecuteTemplateQueryController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Template/Query/ExecuteTemplateQueryController.cs @@ -81,7 +81,7 @@ public ExecuteTemplateQueryController( [HttpPost("execute")] [MapToApiVersion("1.0")] [ProducesResponseType(typeof(TemplateQueryResultResponseModel), StatusCodes.Status200OK)] - public async Task> Execute( + public Task> Execute( CancellationToken cancellationToken, TemplateQueryExecuteModel query) { @@ -97,7 +97,7 @@ public async Task> Execute( .GetMany(results.Select(content => content.ContentType.Key).Distinct()) .ToDictionary(contentType => contentType.Key, contentType => contentType.Icon); - return await Task.FromResult(Ok(new TemplateQueryResultResponseModel + return Task.FromResult>(Ok(new TemplateQueryResultResponseModel { QueryExpression = queryExpression.ToString(), ResultCount = results.Count, diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Template/Query/SettingsTemplateQueryController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Template/Query/SettingsTemplateQueryController.cs index d5d5026c4f1f..091c7f8aa66f 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Template/Query/SettingsTemplateQueryController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Template/Query/SettingsTemplateQueryController.cs @@ -17,7 +17,7 @@ public SettingsTemplateQueryController(IContentTypeService contentTypeService) [HttpGet("settings")] [MapToApiVersion("1.0")] [ProducesResponseType(typeof(TemplateQuerySettingsResponseModel), StatusCodes.Status200OK)] - public async Task> Settings(CancellationToken cancellationToken) + public Task> Settings(CancellationToken cancellationToken) { var contentTypeAliases = _contentTypeService .GetAll() @@ -29,7 +29,7 @@ public async Task> Settings(Can IEnumerable operators = GetOperators(); - return await Task.FromResult(Ok(new TemplateQuerySettingsResponseModel + return Task.FromResult>(Ok(new TemplateQuerySettingsResponseModel { DocumentTypeAliases = contentTypeAliases, Properties = properties, diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Tree/EntityTreeControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/Tree/EntityTreeControllerBase.cs index 57f575fd8ab7..cd5c4ebf68c7 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Tree/EntityTreeControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Tree/EntityTreeControllerBase.cs @@ -22,24 +22,24 @@ protected EntityTreeControllerBase(IEntityService entityService) protected virtual Ordering ItemOrdering => Ordering.By(nameof(Infrastructure.Persistence.Dtos.NodeDto.Text)); - protected async Task>> GetRoot(int skip, int take) + protected Task>> GetRoot(int skip, int take) { IEntitySlim[] rootEntities = GetPagedRootEntities(skip, take, out var totalItems); TItem[] treeItemViewModels = MapTreeItemViewModels(null, rootEntities); PagedViewModel result = PagedViewModel(treeItemViewModels, totalItems); - return await Task.FromResult(Ok(result)); + return Task.FromResult>>(Ok(result)); } - protected async Task>> GetChildren(Guid parentId, int skip, int take) + protected Task>> GetChildren(Guid parentId, int skip, int take) { IEntitySlim[] children = GetPagedChildEntities(parentId, skip, take, out var totalItems); TItem[] treeItemViewModels = MapTreeItemViewModels(parentId, children); PagedViewModel result = PagedViewModel(treeItemViewModels, totalItems); - return await Task.FromResult(Ok(result)); + return Task.FromResult>>(Ok(result)); } protected virtual async Task>> GetAncestors(Guid descendantKey, bool includeSelf = true) @@ -60,13 +60,13 @@ protected virtual async Task>> GetAncestors(Guid return Ok(result); } - protected virtual async Task GetAncestorEntitiesAsync(Guid descendantKey, bool includeSelf) + protected virtual Task GetAncestorEntitiesAsync(Guid descendantKey, bool includeSelf) { IEntitySlim? entity = EntityService.Get(descendantKey, ItemObjectType); if (entity is null) { // not much else we can do here but return nothing - return await Task.FromResult(Array.Empty()); + return Task.FromResult(Array.Empty()); } var ancestorIds = entity.AncestorIds(); @@ -76,7 +76,7 @@ protected virtual async Task GetAncestorEntitiesAsync(Guid descen : Array.Empty(); ancestors = ancestors.Union(includeSelf ? new[] { entity } : Array.Empty()); - return ancestors.OrderBy(item => item.Level).ToArray(); + return Task.FromResult(ancestors.OrderBy(item => item.Level).ToArray()); } protected virtual IEntitySlim[] GetPagedRootEntities(int skip, int take, out long totalItems) diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Tree/FileSystemTreeControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/Tree/FileSystemTreeControllerBase.cs index 80b1edffeb58..c420647d5292 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Tree/FileSystemTreeControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Tree/FileSystemTreeControllerBase.cs @@ -12,28 +12,28 @@ public abstract class FileSystemTreeControllerBase : ManagementApiControllerBase { protected abstract IFileSystem FileSystem { get; } - protected async Task>> GetRoot(int skip, int take) + protected Task>> GetRoot(int skip, int take) { FileSystemTreeItemPresentationModel[] viewModels = GetPathViewModels(string.Empty, skip, take, out var totalItems); PagedViewModel result = PagedViewModel(viewModels, totalItems); - return await Task.FromResult(Ok(result)); + return Task.FromResult>>(Ok(result)); } - protected async Task>> GetChildren(string path, int skip, int take) + protected Task>> GetChildren(string path, int skip, int take) { FileSystemTreeItemPresentationModel[] viewModels = GetPathViewModels(path, skip, take, out var totalItems); PagedViewModel result = PagedViewModel(viewModels, totalItems); - return await Task.FromResult(Ok(result)); + return Task.FromResult>>(Ok(result)); } - protected virtual async Task>> GetAncestors(string path, bool includeSelf = true) + protected virtual Task>> GetAncestors(string path, bool includeSelf = true) { path = path.VirtualPathToSystemPath(); FileSystemTreeItemPresentationModel[] models = GetAncestorModels(path, includeSelf); - return await Task.FromResult(Ok(models)); + return Task.FromResult>>(Ok(models)); } protected virtual FileSystemTreeItemPresentationModel[] GetAncestorModels(string path, bool includeSelf) @@ -92,7 +92,7 @@ private string GetFileSystemItemName(bool isFolder, string itemPath) => isFolder ? Path.GetFileName(itemPath) : FileSystem.GetFileName(itemPath); - private PagedViewModel PagedViewModel(IEnumerable viewModels, long totalItems) + private static PagedViewModel PagedViewModel(IEnumerable viewModels, long totalItems) => new() { Total = totalItems, Items = viewModels }; private FileSystemTreeItemPresentationModel MapViewModel(string path, string name, bool isFolder) diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Tree/FolderTreeControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/Tree/FolderTreeControllerBase.cs index 2a33d95aa313..3d09c276b0ec 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Tree/FolderTreeControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Tree/FolderTreeControllerBase.cs @@ -63,14 +63,14 @@ protected override TItem MapTreeItemViewModel(Guid? parentKey, IEntitySlim entit return viewModel; } - protected override async Task GetAncestorEntitiesAsync(Guid descendantKey, bool includeSelf = true) + protected override Task GetAncestorEntitiesAsync(Guid descendantKey, bool includeSelf = true) { IEntitySlim? entity = EntityService.Get(descendantKey, ItemObjectType) ?? EntityService.Get(descendantKey, FolderObjectType); if (entity is null) { // not much else we can do here but return nothing - return await Task.FromResult(Array.Empty()); + return Task.FromResult(Array.Empty()); } var ancestorIds = entity.AncestorIds(); @@ -83,7 +83,7 @@ protected override async Task GetAncestorEntitiesAsync(Guid desce : Array.Empty(); ancestors = ancestors.Union(includeSelf ? new[] { entity } : Array.Empty()); - return ancestors.OrderBy(item => item.Level).ToArray(); + return Task.FromResult(ancestors.OrderBy(item => item.Level).ToArray()); } private IEntitySlim[] GetEntities(Guid? parentKey, int skip, int take, out long totalItems) diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Upgrade/SettingsUpgradeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Upgrade/SettingsUpgradeController.cs index 66e212650f04..e1f4c446535d 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Upgrade/SettingsUpgradeController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Upgrade/SettingsUpgradeController.cs @@ -26,7 +26,7 @@ public SettingsUpgradeController( [MapToApiVersion("1.0")] [ProducesResponseType(typeof(UpgradeSettingsResponseModel), StatusCodes.Status200OK)] [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status428PreconditionRequired)] - public async Task> Settings(CancellationToken cancellationToken) + public Task> Settings(CancellationToken cancellationToken) { // TODO: Async - We need to figure out what we want to do with async endpoints that doesn't do anything async // We want these to be async for future use (Ideally we'll have more async things), @@ -34,6 +34,6 @@ public async Task> Settings(Cancellat UpgradeSettingsModel upgradeSettings = _upgradeSettingsFactory.GetUpgradeSettings(); UpgradeSettingsResponseModel responseModel = _mapper.Map(upgradeSettings)!; - return await Task.FromResult(responseModel); + return Task.FromResult>(responseModel); } } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/UrlSegment/ResizeImagingController.cs b/src/Umbraco.Cms.Api.Management/Controllers/UrlSegment/ResizeImagingController.cs index 2c2dba9a19dc..c388e71d96d8 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/UrlSegment/ResizeImagingController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/UrlSegment/ResizeImagingController.cs @@ -23,10 +23,10 @@ public ResizeImagingController(IMediaService mediaService, IReziseImageUrlFactor [MapToApiVersion("1.0")] [HttpGet("resize/urls")] [ProducesResponseType(typeof(IEnumerable), StatusCodes.Status200OK)] - public async Task Urls([FromQuery(Name = "id")] HashSet ids, int height = 200, int width = 200, ImageCropMode? mode = null) + public Task Urls([FromQuery(Name = "id")] HashSet ids, int height = 200, int width = 200, ImageCropMode? mode = null) { IEnumerable items = _mediaService.GetByIds(ids); - return await Task.FromResult(Ok(_reziseImageUrlFactory.CreateUrlSets(items, height, width, mode))); + return Task.FromResult(Ok(_reziseImageUrlFactory.CreateUrlSets(items, height, width, mode))); } } diff --git a/src/Umbraco.Cms.Api.Management/Factories/DocumentNotificationPresentationFactory.cs b/src/Umbraco.Cms.Api.Management/Factories/DocumentNotificationPresentationFactory.cs index 7daf762b781a..0565f3d0cf4d 100644 --- a/src/Umbraco.Cms.Api.Management/Factories/DocumentNotificationPresentationFactory.cs +++ b/src/Umbraco.Cms.Api.Management/Factories/DocumentNotificationPresentationFactory.cs @@ -19,15 +19,15 @@ public DocumentNotificationPresentationFactory(ActionCollection actionCollection _backOfficeSecurityAccessor = backOfficeSecurityAccessor; } - public async Task> CreateNotificationModelsAsync(IContent content) + public Task> CreateNotificationModelsAsync(IContent content) { var subscribedActionIds = _notificationService .GetUserNotifications(_backOfficeSecurityAccessor.BackOfficeSecurity?.CurrentUser, content.Path)? .Select(n => n.Action) .ToArray() - ?? Array.Empty(); + ?? []; - return await Task.FromResult(_actionCollection + return Task.FromResult>(_actionCollection .Where(action => action.ShowInNotifier) .Select(action => new DocumentNotificationResponseModel { diff --git a/src/Umbraco.Cms.Api.Management/Factories/RelationTypePresentationFactory.cs b/src/Umbraco.Cms.Api.Management/Factories/RelationTypePresentationFactory.cs index a6fb1cbae85f..c45d03bc287d 100644 --- a/src/Umbraco.Cms.Api.Management/Factories/RelationTypePresentationFactory.cs +++ b/src/Umbraco.Cms.Api.Management/Factories/RelationTypePresentationFactory.cs @@ -40,7 +40,7 @@ public RelationTypePresentationFactory( _scopeProvider = scopeProvider; } - public async Task> CreateReferenceResponseModelsAsync( + public Task> CreateReferenceResponseModelsAsync( IEnumerable relationItemModels) { IReadOnlyCollection relationItemModelsCollection = relationItemModels.ToArray(); @@ -62,7 +62,7 @@ public async Task> CreateReferenceResponseM _ => _umbracoMapper.Map(relationItemModel), }).WhereNotNull().ToArray(); - return await Task.FromResult(result); + return Task.FromResult>(result); } private IReferenceResponseModel? MapDocumentReference(RelationItemModel relationItemModel, diff --git a/src/Umbraco.Cms.Api.Management/Factories/UserPresentationFactory.cs b/src/Umbraco.Cms.Api.Management/Factories/UserPresentationFactory.cs index e1ee38d51a5e..ff3b7c5cc9e2 100644 --- a/src/Umbraco.Cms.Api.Management/Factories/UserPresentationFactory.cs +++ b/src/Umbraco.Cms.Api.Management/Factories/UserPresentationFactory.cs @@ -96,7 +96,7 @@ public UserItemResponseModel CreateItemResponseModel(IUser user) => Kind = user.Kind }; - public async Task CreateCreationModelAsync(CreateUserRequestModel requestModel) + public Task CreateCreationModelAsync(CreateUserRequestModel requestModel) { var createModel = new UserCreateModel { @@ -108,10 +108,10 @@ public async Task CreateCreationModelAsync(CreateUserRequestMod Kind = requestModel.Kind }; - return await Task.FromResult(createModel); + return Task.FromResult(createModel); } - public async Task CreateInviteModelAsync(InviteUserRequestModel requestModel) + public Task CreateInviteModelAsync(InviteUserRequestModel requestModel) { var inviteModel = new UserInviteModel { @@ -122,10 +122,10 @@ public async Task CreateInviteModelAsync(InviteUserRequestModel Message = requestModel.Message, }; - return await Task.FromResult(inviteModel); + return Task.FromResult(inviteModel); } - public async Task CreateResendInviteModelAsync(ResendInviteUserRequestModel requestModel) + public Task CreateResendInviteModelAsync(ResendInviteUserRequestModel requestModel) { var inviteModel = new UserResendInviteModel { @@ -133,10 +133,10 @@ public async Task CreateResendInviteModelAsync(ResendInvi Message = requestModel.Message, }; - return await Task.FromResult(inviteModel); + return Task.FromResult(inviteModel); } - public async Task CreateCurrentUserConfigurationModelAsync() + public Task CreateCurrentUserConfigurationModelAsync() { var model = new CurrenUserConfigurationResponseModel { @@ -149,7 +149,7 @@ public async Task CreateCurrentUserConfigu AllowTwoFactor = _externalLoginProviders.HasDenyLocalLogin() is false, }; - return await Task.FromResult(model); + return Task.FromResult(model); } public Task CreateUserConfigurationModelAsync() => @@ -165,7 +165,7 @@ public Task CreateUserConfigurationModelAsync() AllowTwoFactor = _externalLoginProviders.HasDenyLocalLogin() is false, }); - public async Task CreateUpdateModelAsync(Guid existingUserKey, UpdateUserRequestModel updateModel) + public Task CreateUpdateModelAsync(Guid existingUserKey, UpdateUserRequestModel updateModel) { var model = new UserUpdateModel { @@ -182,7 +182,7 @@ public async Task CreateUpdateModelAsync(Guid existingUserKey, model.UserGroupKeys = updateModel.UserGroupIds.Select(x => x.Id).ToHashSet(); - return await Task.FromResult(model); + return Task.FromResult(model); } public async Task CreateCurrentUserResponseModelAsync(IUser user) @@ -202,7 +202,7 @@ public async Task CreateCurrentUserResponseModelAsync( var allowedSections = presentationGroups.SelectMany(x => x.Sections).ToHashSet(); - return await Task.FromResult(new CurrentUserResponseModel() + return new CurrentUserResponseModel { Id = presentationUser.Id, Email = presentationUser.Email, @@ -222,17 +222,17 @@ public async Task CreateCurrentUserResponseModelAsync( AllowedSections = allowedSections, IsAdmin = user.IsAdmin(), UserGroupIds = presentationUser.UserGroupIds, - }); + }; } - public async Task CreateCalculatedUserStartNodesResponseModelAsync(IUser user) + public Task CreateCalculatedUserStartNodesResponseModelAsync(IUser user) { var mediaStartNodeIds = user.CalculateMediaStartNodeIds(_entityService, _appCaches); ISet mediaStartNodeKeys = GetKeysFromIds(mediaStartNodeIds, UmbracoObjectTypes.Media); var contentStartNodeIds = user.CalculateContentStartNodeIds(_entityService, _appCaches); ISet documentStartNodeKeys = GetKeysFromIds(contentStartNodeIds, UmbracoObjectTypes.Document); - return await Task.FromResult(new CalculatedUserStartNodesResponseModel() + return Task.FromResult(new CalculatedUserStartNodesResponseModel() { Id = user.Key, MediaStartNodeIds = mediaStartNodeKeys, @@ -242,7 +242,7 @@ public async Task CreateCalculatedUserSta }); } - private ISet GetKeysFromIds(IEnumerable? ids, UmbracoObjectTypes type) + private HashSet GetKeysFromIds(IEnumerable? ids, UmbracoObjectTypes type) { IEnumerable? models = ids? .Select(x => _entityService.GetKey(x, type)) @@ -251,10 +251,10 @@ private ISet GetKeysFromIds(IEnumerable? ids, UmbracoOb .Select(x => new ReferenceByIdModel(x)); return models is null - ? new HashSet() - : new HashSet(models); + ? [] + : [..models]; } - private bool HasRootAccess(IEnumerable? startNodeIds) + private static bool HasRootAccess(IEnumerable? startNodeIds) => startNodeIds?.Contains(Constants.System.Root) is true; } diff --git a/src/Umbraco.Core/Security/Authorization/FeatureAuthorizer.cs b/src/Umbraco.Core/Security/Authorization/FeatureAuthorizer.cs index 1d238070fb97..1df490efd93e 100644 --- a/src/Umbraco.Core/Security/Authorization/FeatureAuthorizer.cs +++ b/src/Umbraco.Core/Security/Authorization/FeatureAuthorizer.cs @@ -10,6 +10,6 @@ internal sealed class FeatureAuthorizer : IFeatureAuthorizer public FeatureAuthorizer(UmbracoFeatures umbracoFeatures) => _umbracoFeatures = umbracoFeatures; /// - public async Task IsDeniedAsync(Type type) => - await Task.FromResult(_umbracoFeatures.IsControllerEnabled(type) is false); + public Task IsDeniedAsync(Type type) => + Task.FromResult(_umbracoFeatures.IsControllerEnabled(type) is false); } diff --git a/src/Umbraco.Core/Services/AuditService.cs b/src/Umbraco.Core/Services/AuditService.cs index 737314201324..636b1950730b 100644 --- a/src/Umbraco.Core/Services/AuditService.cs +++ b/src/Umbraco.Core/Services/AuditService.cs @@ -225,7 +225,7 @@ public IEnumerable GetPagedItemsByUser( if (userId < Constants.Security.SuperUserId) { totalRecords = 0; - return Enumerable.Empty(); + return []; } using (ScopeProvider.CreateCoreScope(autoComplete: true)) @@ -236,7 +236,7 @@ public IEnumerable GetPagedItemsByUser( } } - public async Task> GetItemsByKeyAsync( + public Task> GetItemsByKeyAsync( Guid entityKey, UmbracoObjectTypes entityType, int skip, @@ -258,7 +258,7 @@ public async Task> GetItemsByKeyAsync( Attempt keyToIdAttempt = _entityService.GetId(entityKey, entityType); if (keyToIdAttempt.Success is false) { - return await Task.FromResult(new PagedModel { Items = Enumerable.Empty(), Total = 0 }); + return Task.FromResult(new PagedModel { Items = Enumerable.Empty(), Total = 0 }); } using (ScopeProvider.CreateCoreScope(autoComplete: true)) @@ -268,7 +268,7 @@ public async Task> GetItemsByKeyAsync( PaginationHelper.ConvertSkipTakeToPaging(skip, take, out var pageNumber, out var pageSize); IEnumerable auditItems = _auditRepository.GetPagedResultsByQuery(query, pageNumber, pageSize, out var totalRecords, orderDirection, auditTypeFilter, customFilter); - return new PagedModel { Items = auditItems, Total = totalRecords }; + return Task.FromResult(new PagedModel { Items = auditItems, Total = totalRecords }); } } @@ -294,7 +294,7 @@ public async Task> GetPagedItemsByUserAsync( if (user is null) { - return await Task.FromResult(new PagedModel()); + return new PagedModel(); } using (ScopeProvider.CreateCoreScope(autoComplete: true)) @@ -304,7 +304,7 @@ public async Task> GetPagedItemsByUserAsync( PaginationHelper.ConvertSkipTakeToPaging(skip, take, out var pageNumber, out var pageSize); IEnumerable auditItems = _auditRepository.GetPagedResultsByQuery(query, pageNumber, pageSize, out var totalRecords, orderDirection, auditTypeFilter, customFilter); - return await Task.FromResult(new PagedModel { Items = auditItems, Total = totalRecords }); + return new PagedModel { Items = auditItems, Total = totalRecords }; } } @@ -386,7 +386,7 @@ public IAuditEntry Write(int performingUserId, string perfomingDetails, string p { if (_isAvailable.Value == false) { - return Enumerable.Empty(); + return []; } using (ScopeProvider.CreateCoreScope(autoComplete: true)) @@ -401,7 +401,7 @@ internal IEnumerable GetPage(long pageIndex, int pageCount, out lon if (_isAvailable.Value == false) { records = 0; - return Enumerable.Empty(); + return []; } using (ScopeProvider.CreateCoreScope(autoComplete: true)) diff --git a/src/Umbraco.Core/Services/ContentBlueprintEditingService.cs b/src/Umbraco.Core/Services/ContentBlueprintEditingService.cs index 44fdc4bacab5..b33d19a4d6a9 100644 --- a/src/Umbraco.Core/Services/ContentBlueprintEditingService.cs +++ b/src/Umbraco.Core/Services/ContentBlueprintEditingService.cs @@ -29,10 +29,10 @@ public ContentBlueprintEditingService( : base(contentService, contentTypeService, propertyEditorCollection, dataTypeService, logger, scopeProvider, userIdKeyResolver, validationService, optionsMonitor, relationService) => _containerService = containerService; - public async Task GetAsync(Guid key) + public Task GetAsync(Guid key) { IContent? blueprint = ContentService.GetBlueprintById(key); - return await Task.FromResult(blueprint); + return Task.FromResult(blueprint); } public async Task?, ContentEditingOperationStatus>> GetPagedByContentTypeAsync(Guid contentTypeKey, int skip, int take) diff --git a/src/Umbraco.Core/Services/ContentEditingService.cs b/src/Umbraco.Core/Services/ContentEditingService.cs index 1dc54426d000..ad223141147b 100644 --- a/src/Umbraco.Core/Services/ContentEditingService.cs +++ b/src/Umbraco.Core/Services/ContentEditingService.cs @@ -58,10 +58,10 @@ public ContentEditingService( _languageService = languageService; } - public async Task GetAsync(Guid key) + public Task GetAsync(Guid key) { IContent? content = ContentService.GetById(key); - return await Task.FromResult(content); + return Task.FromResult(content); } [Obsolete("Please use the validate update method that is not obsoleted. Will be removed in V16.")] diff --git a/src/Umbraco.Core/Services/ContentEditingServiceBase.cs b/src/Umbraco.Core/Services/ContentEditingServiceBase.cs index 63232f72624b..9381499907bb 100644 --- a/src/Umbraco.Core/Services/ContentEditingServiceBase.cs +++ b/src/Umbraco.Core/Services/ContentEditingServiceBase.cs @@ -185,7 +185,7 @@ private async Task(status, content)); + return Attempt.FailWithStatus(status, content); } if (disabledWhenReferenced && _relationService.IsRelated(content.Id)) @@ -217,12 +217,12 @@ private async Task(ContentEditingOperationStatus.NotInTrash, content)); + return Attempt.FailWithStatus(ContentEditingOperationStatus.NotInTrash, content); } TContentType contentType = ContentTypeService.Get(content.ContentType.Key)!; @@ -265,7 +265,7 @@ private async Task TryGetAndValidateParentIdAsync(Guid? parentKey, TContentType contentType) + protected virtual Task<(int? ParentId, ContentEditingOperationStatus OperationStatus)> TryGetAndValidateParentIdAsync(Guid? parentKey, TContentType contentType) { TContent? parent = parentKey.HasValue ? ContentService.GetById(parentKey.Value) @@ -378,35 +378,35 @@ protected ContentEditingOperationStatus OperationResultToOperationStatus(Operati if (parentKey.HasValue && parent == null) { - return await Task.FromResult<(int? ParentId, ContentEditingOperationStatus OperationStatus)>((null, ContentEditingOperationStatus.ParentNotFound)); + return Task.FromResult<(int? ParentId, ContentEditingOperationStatus OperationStatus)>((null, ContentEditingOperationStatus.ParentNotFound)); } if (parent == null && contentType.AllowedAsRoot == false) { - return (null, ContentEditingOperationStatus.NotAllowed); + return Task.FromResult<(int? ParentId, ContentEditingOperationStatus OperationStatus)>((null, ContentEditingOperationStatus.NotAllowed)); } if (parent != null) { if (parent.Trashed) { - return (null, ContentEditingOperationStatus.InTrash); + return Task.FromResult<(int? ParentId, ContentEditingOperationStatus OperationStatus)>((null, ContentEditingOperationStatus.InTrash)); } TContentType? parentContentType = ContentTypeService.Get(parent.ContentType.Key); Guid[] allowedContentTypeKeys = parentContentType?.AllowedContentTypes?.Select(c => c.Key).ToArray() - ?? Array.Empty(); + ?? []; if (allowedContentTypeKeys.Contains(contentType.Key) == false) { - return (null, ContentEditingOperationStatus.NotAllowed); + return Task.FromResult<(int? ParentId, ContentEditingOperationStatus OperationStatus)>((null, ContentEditingOperationStatus.NotAllowed)); } } - return (parent?.Id ?? Constants.System.Root, ContentEditingOperationStatus.Success); + return Task.FromResult<(int? ParentId, ContentEditingOperationStatus OperationStatus)>((parent?.Id ?? Constants.System.Root, ContentEditingOperationStatus.Success)); } - private void UpdateNames(ContentEditingModelBase contentEditingModelBase, TContent content, TContentType contentType) + private static void UpdateNames(ContentEditingModelBase contentEditingModelBase, TContent content, TContentType contentType) { if (contentType.VariesByCulture()) { @@ -467,7 +467,7 @@ private async Task UpdateExistingProperties(ContentEditingModelBase contentEditi } } - private void RemoveMissingProperties(ContentEditingModelBase contentEditingModelBase, TContent content, TContentType contentType) + private static void RemoveMissingProperties(ContentEditingModelBase contentEditingModelBase, TContent content, TContentType contentType) { // create a mapping dictionary for all content type property types by their property aliases Dictionary propertyTypesByAlias = GetPropertyTypesByAlias(contentType); diff --git a/src/Umbraco.Core/Services/ContentEditingServiceWithSortingBase.cs b/src/Umbraco.Core/Services/ContentEditingServiceWithSortingBase.cs index 47335566bd46..6467aebf2178 100644 --- a/src/Umbraco.Core/Services/ContentEditingServiceWithSortingBase.cs +++ b/src/Umbraco.Core/Services/ContentEditingServiceWithSortingBase.cs @@ -62,7 +62,7 @@ protected async Task HandleSortAsync( if (contentId.HasValue is false) { - return await Task.FromResult(ContentEditingOperationStatus.NotFound); + return ContentEditingOperationStatus.NotFound; } const int pageSize = 500; diff --git a/src/Umbraco.Core/Services/ContentTypeEditing/ContentTypeEditingServiceBase.cs b/src/Umbraco.Core/Services/ContentTypeEditing/ContentTypeEditingServiceBase.cs index a86d9186e0b4..9613276b0880 100644 --- a/src/Umbraco.Core/Services/ContentTypeEditing/ContentTypeEditingServiceBase.cs +++ b/src/Umbraco.Core/Services/ContentTypeEditing/ContentTypeEditingServiceBase.cs @@ -142,9 +142,9 @@ protected async Task> FindAv return Attempt.SucceedWithStatus(ContentTypeOperationStatus.Success, contentType); } - protected virtual async Task AdditionalCreateValidationAsync( + protected virtual Task AdditionalCreateValidationAsync( ContentTypeEditingModelBase model) - => await Task.FromResult(ContentTypeOperationStatus.Success); + => Task.FromResult(ContentTypeOperationStatus.Success); #region Sanitization @@ -337,7 +337,7 @@ private ContentTypeOperationStatus ValidateCompositions(TContentType? contentTyp return ContentTypeOperationStatus.Success; } - private ContentTypeOperationStatus ValidateProperties(ContentTypeEditingModelBase model, IContentTypeComposition[] allContentTypeCompositions) + private static ContentTypeOperationStatus ValidateProperties(ContentTypeEditingModelBase model, IContentTypeComposition[] allContentTypeCompositions) { // grab all content types used for composition and/or inheritance Guid[] allCompositionKeys = KeysForCompositionTypes(model, CompositionType.Composition, CompositionType.Inheritance); @@ -356,7 +356,7 @@ private ContentTypeOperationStatus ValidateProperties(ContentTypeEditingModelBas return ContentTypeOperationStatus.Success; } - private ContentTypeOperationStatus ValidateContainers(ContentTypeEditingModelBase model, IContentTypeComposition[] allContentTypeCompositions) + private static ContentTypeOperationStatus ValidateContainers(ContentTypeEditingModelBase model, IContentTypeComposition[] allContentTypeCompositions) { if (model.Containers.Any(container => Enum.TryParse(container.Type, out _) is false)) { @@ -411,7 +411,7 @@ private bool ContentTypeAliasCanBeUsedFor(string alias, Guid key) return ContentTypeAliasIsInUse(alias) is false; } - private bool IsReservedContentTypeAlias(string alias) + private static bool IsReservedContentTypeAlias(string alias) { var reservedAliases = new[] { "system" }; return reservedAliases.InvariantContains(alias); @@ -465,7 +465,7 @@ private async Task UpdateAsync( return contentType; } - private void UpdateAllowedContentTypes( + private static void UpdateAllowedContentTypes( TContentType contentType, ContentTypeEditingModelBase model, IContentTypeComposition[] allContentTypeCompositions) @@ -564,7 +564,7 @@ private async Task UpdatePropertiesAsync( } } - private string PropertyGroupAlias(string? containerName) + private static string PropertyGroupAlias(string? containerName) { if (containerName.IsNullOrWhiteSpace()) { @@ -616,7 +616,7 @@ private IPropertyType MapProperty( return propertyType; } - private void UpdateCompositions( + private static void UpdateCompositions( TContentType contentType, ContentTypeEditingModelBase model, IContentTypeComposition[] allContentTypeCompositions) @@ -649,7 +649,7 @@ private void UpdateCompositions( } } - private void UpdateParentContentType( + private static void UpdateParentContentType( TContentType contentType, ContentTypeEditingModelBase model, IContentTypeComposition[] allContentTypeCompositions) @@ -668,7 +668,7 @@ private void UpdateParentContentType( #region Shared between model validation and model update - private Guid[] GetDataTypeKeys(ContentTypeEditingModelBase model) + private static Guid[] GetDataTypeKeys(ContentTypeEditingModelBase model) => model.Properties.Select(property => property.DataTypeKey).Distinct().ToArray(); private async Task GetDataTypesAsync(ContentTypeEditingModelBase model) @@ -676,7 +676,7 @@ private async Task GetDataTypesAsync(ContentTypeEditingModelBase(); + : []; } private int? GetParentId(ContentTypeEditingModelBase model, Guid? containerKey) @@ -702,7 +702,7 @@ private async Task GetDataTypesAsync(ContentTypeEditingModelBase model, params CompositionType[] compositionTypes) + private static Guid[] KeysForCompositionTypes(ContentTypeEditingModelBase model, params CompositionType[] compositionTypes) => model.Compositions .Where(c => compositionTypes.Contains(c.CompositionType)) .Select(c => c.Key) diff --git a/src/Umbraco.Core/Services/ContentTypeEditing/ElementSwitchValidator.cs b/src/Umbraco.Core/Services/ContentTypeEditing/ElementSwitchValidator.cs index bf02fa67590b..4d41e78b1e32 100644 --- a/src/Umbraco.Core/Services/ContentTypeEditing/ElementSwitchValidator.cs +++ b/src/Umbraco.Core/Services/ContentTypeEditing/ElementSwitchValidator.cs @@ -20,27 +20,27 @@ public ElementSwitchValidator( _dataTypeService = dataTypeService; } - public async Task AncestorsAreAlignedAsync(IContentType contentType) + public Task AncestorsAreAlignedAsync(IContentType contentType) { // this call does not return the system roots var ancestorIds = contentType.AncestorIds(); if (ancestorIds.Length == 0) { // if there are no ancestors, validation passes - return true; + return Task.FromResult(true); } // if there are any ancestors where IsElement is different from the contentType, the validation fails - return await Task.FromResult(_contentTypeService.GetMany(ancestorIds) + return Task.FromResult(_contentTypeService.GetMany(ancestorIds) .Any(ancestor => ancestor.IsElement != contentType.IsElement) is false); } - public async Task DescendantsAreAlignedAsync(IContentType contentType) + public Task DescendantsAreAlignedAsync(IContentType contentType) { IEnumerable descendants = _contentTypeService.GetDescendants(contentType.Id, false); // if there are any descendants where IsElement is different from the contentType, the validation fails - return await Task.FromResult(descendants.Any(descendant => descendant.IsElement != contentType.IsElement) is false); + return Task.FromResult(descendants.Any(descendant => descendant.IsElement != contentType.IsElement) is false); } public async Task ElementToDocumentNotUsedInBlockStructuresAsync(IContentTypeBase contentType) @@ -59,8 +59,8 @@ public async Task ElementToDocumentNotUsedInBlockStructuresAsync(IContentT .ConfiguredElementTypeKeys().Contains(contentType.Key)) is false; } - public async Task DocumentToElementHasNoContentAsync(IContentTypeBase contentType) => + public Task DocumentToElementHasNoContentAsync(IContentTypeBase contentType) => // if any content for the content type exists, the validation fails. - await Task.FromResult(_contentTypeService.HasContentNodes(contentType.Id) is false); + Task.FromResult(_contentTypeService.HasContentNodes(contentType.Id) is false); } diff --git a/src/Umbraco.Core/Services/ContentVersionService.cs b/src/Umbraco.Core/Services/ContentVersionService.cs index a0b64a764a30..78b584e01ba0 100644 --- a/src/Umbraco.Core/Services/ContentVersionService.cs +++ b/src/Umbraco.Core/Services/ContentVersionService.cs @@ -15,7 +15,7 @@ // ReSharper disable once CheckNamespace namespace Umbraco.Cms.Core.Services; -internal class ContentVersionService : IContentVersionService +internal sealed class ContentVersionService : IContentVersionService { private readonly IAuditRepository _auditRepository; private readonly IContentVersionCleanupPolicy _contentVersionCleanupPolicy; @@ -112,46 +112,46 @@ public IReadOnlyCollection PerformContentVersionCleanup(Date public void SetPreventCleanup(int versionId, bool preventCleanup, int userId = Constants.Security.SuperUserId) => HandleSetPreventCleanup(versionId, preventCleanup, userId); - public async Task?, ContentVersionOperationStatus>> GetPagedContentVersionsAsync(Guid contentId, string? culture, int skip, int take) + public Task?, ContentVersionOperationStatus>> GetPagedContentVersionsAsync(Guid contentId, string? culture, int skip, int take) { - IEntitySlim? document = await Task.FromResult(_entityService.Get(contentId, UmbracoObjectTypes.Document)); + IEntitySlim? document = _entityService.Get(contentId, UmbracoObjectTypes.Document); if (document is null) { - return Attempt?, ContentVersionOperationStatus>.Fail(ContentVersionOperationStatus.ContentNotFound); + return Task.FromResult(Attempt?, ContentVersionOperationStatus>.Fail(ContentVersionOperationStatus.ContentNotFound)); } if (PaginationConverter.ConvertSkipTakeToPaging(skip, take, out var pageNumber, out var pageSize) == false) { - return Attempt?, ContentVersionOperationStatus>.Fail(ContentVersionOperationStatus.InvalidSkipTake); + return Task.FromResult(Attempt?, ContentVersionOperationStatus>.Fail(ContentVersionOperationStatus.InvalidSkipTake)); } IEnumerable? versions = - await Task.FromResult(HandleGetPagedContentVersions( + HandleGetPagedContentVersions( document.Id, pageNumber, pageSize, out var total, - culture)); + culture); if (versions is null) { - return Attempt?, ContentVersionOperationStatus>.Fail(ContentVersionOperationStatus.NotFound); + return Task.FromResult(Attempt?, ContentVersionOperationStatus>.Fail(ContentVersionOperationStatus.NotFound)); } - return Attempt?, ContentVersionOperationStatus>.Succeed( - ContentVersionOperationStatus.Success, new PagedModel(total, versions)); + return Task.FromResult(Attempt?, ContentVersionOperationStatus>.Succeed( + ContentVersionOperationStatus.Success, new PagedModel(total, versions))); } - public async Task> GetAsync(Guid versionId) + public Task> GetAsync(Guid versionId) { - IContent? version = await Task.FromResult(_contentService.GetVersion(versionId.ToInt())); + IContent? version = _contentService.GetVersion(versionId.ToInt()); if (version is null) { - return Attempt.Fail(ContentVersionOperationStatus - .NotFound); + return Task.FromResult(Attempt.Fail(ContentVersionOperationStatus + .NotFound)); } - return Attempt.Succeed(ContentVersionOperationStatus.Success, version); + return Task.FromResult(Attempt.Succeed(ContentVersionOperationStatus.Success, version)); } public async Task> SetPreventCleanupAsync(Guid versionId, bool preventCleanup, Guid userKey) diff --git a/src/Umbraco.Core/Services/DataTypeService.cs b/src/Umbraco.Core/Services/DataTypeService.cs index f22948968a56..71eea167092a 100644 --- a/src/Umbraco.Core/Services/DataTypeService.cs +++ b/src/Umbraco.Core/Services/DataTypeService.cs @@ -323,13 +323,13 @@ public Task> GetByEditorAliasAsync(string propertyEditorA } /// - public async Task> GetByEditorAliasAsync(string[] propertyEditorAlias) + public Task> GetByEditorAliasAsync(string[] propertyEditorAlias) { using ICoreScope scope = ScopeProvider.CreateCoreScope(autoComplete: true); IQuery query = Query().Where(x => propertyEditorAlias.Contains(x.EditorAlias)); IEnumerable dataTypes = _dataTypeRepository.Get(query).ToArray(); ConvertMissingEditorsOfDataTypesToLabels(dataTypes); - return await Task.FromResult(dataTypes); + return Task.FromResult(dataTypes); } /// @@ -690,17 +690,17 @@ public IReadOnlyDictionary> GetReferences(int id) } /// - public async Task>, DataTypeOperationStatus>> GetReferencesAsync(Guid id) + public Task>, DataTypeOperationStatus>> GetReferencesAsync(Guid id) { using ICoreScope scope = ScopeProvider.CreateCoreScope(autoComplete:true); IDataType? dataType = GetDataTypeFromRepository(id); if (dataType == null) { - return Attempt.FailWithStatus>, DataTypeOperationStatus>(DataTypeOperationStatus.NotFound, new Dictionary>()); + return Task.FromResult(Attempt.FailWithStatus>, DataTypeOperationStatus>(DataTypeOperationStatus.NotFound, new Dictionary>())); } IReadOnlyDictionary> usages = _dataTypeRepository.FindUsages(dataType.Id); - return await Task.FromResult(Attempt.SucceedWithStatus(DataTypeOperationStatus.Success, usages)); + return Task.FromResult(Attempt.SucceedWithStatus(DataTypeOperationStatus.Success, usages)); } public IReadOnlyDictionary> GetListViewReferences(int id) diff --git a/src/Umbraco.Core/Services/DictionaryItemService.cs b/src/Umbraco.Core/Services/DictionaryItemService.cs index 38e37afedb4e..a091905f0b21 100644 --- a/src/Umbraco.Core/Services/DictionaryItemService.cs +++ b/src/Umbraco.Core/Services/DictionaryItemService.cs @@ -33,42 +33,42 @@ public DictionaryItemService( } /// - public async Task GetAsync(Guid id) + public Task GetAsync(Guid id) { using (ScopeProvider.CreateCoreScope(autoComplete: true)) { IDictionaryItem? item = _dictionaryRepository.Get(id); - return await Task.FromResult(item); + return Task.FromResult(item); } } /// - public async Task GetAsync(string key) + public Task GetAsync(string key) { using (ScopeProvider.CreateCoreScope(autoComplete: true)) { IDictionaryItem? item = _dictionaryRepository.Get(key); - return await Task.FromResult(item); + return Task.FromResult(item); } } /// - public async Task> GetManyAsync(params Guid[] ids) + public Task> GetManyAsync(params Guid[] ids) { using (ScopeProvider.CreateCoreScope(autoComplete: true)) { IEnumerable items = _dictionaryRepository.GetMany(ids).ToArray(); - return await Task.FromResult(items); + return Task.FromResult(items); } } /// - public async Task> GetManyAsync(params string[] keys) + public Task> GetManyAsync(params string[] keys) { using (ScopeProvider.CreateCoreScope(autoComplete: true)) { IEnumerable items = _dictionaryRepository.GetManyByKeys(keys).ToArray(); - return await Task.FromResult(items); + return Task.FromResult(items); } } @@ -83,8 +83,8 @@ public async Task> GetPagedAsync(Guid? parentId, int if (take == 0) { return parentId is null - ? new PagedModel(await CountRootAsync(), Enumerable.Empty()) - : new PagedModel(await CountChildrenAsync(parentId.Value), Enumerable.Empty()); + ? new PagedModel(await CountRootAsync(), []) + : new PagedModel(await CountChildrenAsync(parentId.Value), []); } IDictionaryItem[] items = (parentId is null @@ -99,36 +99,36 @@ public async Task> GetPagedAsync(Guid? parentId, int } /// - public async Task> GetChildrenAsync(Guid parentId) - => await GetByQueryAsync(Query().Where(x => x.ParentId == parentId)); + public Task> GetChildrenAsync(Guid parentId) + => Task.FromResult>(GetByQueryAsync(Query().Where(x => x.ParentId == parentId))); - public async Task CountChildrenAsync(Guid parentId) - => await CountByQueryAsync(Query().Where(x => x.ParentId == parentId)); + public Task CountChildrenAsync(Guid parentId) + => Task.FromResult(CountByQueryAsync(Query().Where(x => x.ParentId == parentId))); /// - public async Task> GetDescendantsAsync(Guid? parentId, string? filter = null) + public Task> GetDescendantsAsync(Guid? parentId, string? filter = null) { using (ScopeProvider.CreateCoreScope(autoComplete: true)) { IDictionaryItem[] items = _dictionaryRepository.GetDictionaryItemDescendants(parentId, filter).ToArray(); - return await Task.FromResult(items); + return Task.FromResult>(items); } } /// - public async Task> GetAtRootAsync() - => await GetByQueryAsync(Query().Where(x => x.ParentId == null)); + public Task> GetAtRootAsync() + => Task.FromResult>(GetByQueryAsync(Query().Where(x => x.ParentId == null))); - public async Task CountRootAsync() - => await CountByQueryAsync(Query().Where(x => x.ParentId == null)); + public Task CountRootAsync() + => Task.FromResult(CountByQueryAsync(Query().Where(x => x.ParentId == null))); /// - public async Task ExistsAsync(string key) + public Task ExistsAsync(string key) { using (ScopeProvider.CreateCoreScope(autoComplete: true)) { IDictionaryItem? item = _dictionaryRepository.Get(key); - return await Task.FromResult(item != null); + return Task.FromResult(item != null); } } @@ -203,7 +203,7 @@ public async Task> Updat Audit(AuditType.Delete, "Delete DictionaryItem", currentUserId, dictionaryItem.Id, nameof(DictionaryItem)); scope.Complete(); - return await Task.FromResult(Attempt.SucceedWithStatus(DictionaryItemOperationStatus.Success, dictionaryItem)); + return Attempt.SucceedWithStatus(DictionaryItemOperationStatus.Success, dictionaryItem); } } @@ -265,16 +265,16 @@ public async Task> MoveA Audit(AuditType.Move, "Move DictionaryItem", currentUserId, dictionaryItem.Id, nameof(DictionaryItem)); scope.Complete(); - return await Task.FromResult(Attempt.SucceedWithStatus(DictionaryItemOperationStatus.Success, dictionaryItem)); + return Attempt.SucceedWithStatus(DictionaryItemOperationStatus.Success, dictionaryItem); } } - private async Task CountByQueryAsync(IQuery query) + private int CountByQueryAsync(IQuery query) { using (ScopeProvider.CreateCoreScope(autoComplete: true)) { var items = _dictionaryRepository.Count(query); - return await Task.FromResult(items); + return items; } } @@ -326,16 +326,16 @@ private async Task> Save Audit(auditType, auditMessage, currentUserId, dictionaryItem.Id, nameof(DictionaryItem)); scope.Complete(); - return await Task.FromResult(Attempt.SucceedWithStatus(DictionaryItemOperationStatus.Success, dictionaryItem)); + return Attempt.SucceedWithStatus(DictionaryItemOperationStatus.Success, dictionaryItem); } } - private async Task> GetByQueryAsync(IQuery query) + private IDictionaryItem[] GetByQueryAsync(IQuery query) { using (ScopeProvider.CreateCoreScope(autoComplete: true)) { IDictionaryItem[] items = _dictionaryRepository.Get(query).ToArray(); - return await Task.FromResult(items); + return items; } } @@ -345,7 +345,7 @@ private void Audit(AuditType type, string message, int userId, int objectId, str private bool HasValidParent(IDictionaryItem dictionaryItem) => dictionaryItem.ParentId.HasValue == false || _dictionaryRepository.Get(dictionaryItem.ParentId.Value) != null; - private void RemoveInvalidTranslations(IDictionaryItem dictionaryItem, IEnumerable allLanguages) + private static void RemoveInvalidTranslations(IDictionaryItem dictionaryItem, IEnumerable allLanguages) { IDictionaryTranslation[] translationsAsArray = dictionaryItem.Translations.ToArray(); if (translationsAsArray.Any() == false) diff --git a/src/Umbraco.Core/Services/DomainService.cs b/src/Umbraco.Core/Services/DomainService.cs index 58f776a45a56..3bbc7a90e1ee 100644 --- a/src/Umbraco.Core/Services/DomainService.cs +++ b/src/Umbraco.Core/Services/DomainService.cs @@ -6,7 +6,6 @@ using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.Notifications; using Umbraco.Cms.Core.Persistence.Repositories; -using Umbraco.Cms.Core.Routing; using Umbraco.Cms.Core.Scoping; using Umbraco.Cms.Core.Services.OperationStatus; using Umbraco.Extensions; @@ -159,23 +158,23 @@ public IEnumerable GetAssignedDomains(int contentId, bool includeWildca } /// - public async Task> GetAssignedDomainsAsync(Guid contentKey, bool includeWildcards) + public Task> GetAssignedDomainsAsync(Guid contentKey, bool includeWildcards) { IContent? content = _contentService.GetById(contentKey); if (content == null) { - return await Task.FromResult(Enumerable.Empty()); + return Task.FromResult(Enumerable.Empty()); } using ICoreScope scope = ScopeProvider.CreateCoreScope(autoComplete: true); - return _domainRepository.GetAssignedDomains(content.Id, includeWildcards); + return Task.FromResult(_domainRepository.GetAssignedDomains(content.Id, includeWildcards)); } /// - public async Task> GetAllAsync(bool includeWildcards) + public Task> GetAllAsync(bool includeWildcards) { using ICoreScope scope = ScopeProvider.CreateCoreScope(autoComplete: true); - return await Task.FromResult(_domainRepository.GetAll(includeWildcards)); + return Task.FromResult(_domainRepository.GetAll(includeWildcards)); } /// @@ -263,7 +262,7 @@ public async Task> UpdateDoma /// /// Tests if any of the ISO codes in the update model are invalid /// - private bool HasInvalidIsoCode(DomainsUpdateModel updateModel, IEnumerable allIsoCodes) + private static bool HasInvalidIsoCode(DomainsUpdateModel updateModel, IEnumerable allIsoCodes) => new[] { updateModel.DefaultIsoCode } .Union(updateModel.Domains.Select(domainModel => domainModel.IsoCode)) .WhereNotNull() @@ -273,7 +272,7 @@ private bool HasInvalidIsoCode(DomainsUpdateModel updateModel, IEnumerable /// Returns any current domain assignments in conflict with the updateModel domain names /// - private IDomain[] GetDomainNameConflicts(int contentId, DomainsUpdateModel updateModel, IEnumerable allDomains) + private static IDomain[] GetDomainNameConflicts(int contentId, DomainsUpdateModel updateModel, IEnumerable allDomains) { IDomain[] domainsAssignedToOtherContent = allDomains .Where(domain => domain.IsWildcard == false && domain.RootContentId != contentId) @@ -289,7 +288,7 @@ private IDomain[] GetDomainNameConflicts(int contentId, DomainsUpdateModel updat /// /// Calculates the new domain assignment incl. wildcard domains /// - private IDomain[] CalculateNewAssignedDomains(int contentId, DomainsUpdateModel updateModel, IDomain[] currentlyAssignedDomains, IDictionary languageIdByIsoCode) + private static IDomain[] CalculateNewAssignedDomains(int contentId, DomainsUpdateModel updateModel, IDomain[] currentlyAssignedDomains, Dictionary languageIdByIsoCode) { // calculate the assigned domains as they should be after updating (including wildcard domains) var newAssignedDomains = new List(); diff --git a/src/Umbraco.Core/Services/EntityTypeContainerService.cs b/src/Umbraco.Core/Services/EntityTypeContainerService.cs index 962d853ce818..1452f3cb1733 100644 --- a/src/Umbraco.Core/Services/EntityTypeContainerService.cs +++ b/src/Umbraco.Core/Services/EntityTypeContainerService.cs @@ -43,36 +43,36 @@ protected EntityTypeContainerService( } /// - public async Task GetAsync(Guid id) + public Task GetAsync(Guid id) { using ICoreScope scope = ScopeProvider.CreateCoreScope(autoComplete: true); ReadLock(scope); - return await Task.FromResult(_entityContainerRepository.Get(id)); + return Task.FromResult(_entityContainerRepository.Get(id)); } /// - public async Task> GetAsync(string name, int level) + public Task> GetAsync(string name, int level) { using ICoreScope scope = ScopeProvider.CreateCoreScope(autoComplete: true); ReadLock(scope); - return await Task.FromResult(_entityContainerRepository.Get(name, level)); + return Task.FromResult(_entityContainerRepository.Get(name, level)); } /// - public async Task> GetAllAsync() + public Task> GetAllAsync() { using ICoreScope scope = ScopeProvider.CreateCoreScope(autoComplete: true); ReadLock(scope); - return await Task.FromResult(_entityContainerRepository.GetMany()); + return Task.FromResult(_entityContainerRepository.GetMany()); } /// - public async Task GetParentAsync(EntityContainer container) - => await Task.FromResult(GetParent(container)); + public Task GetParentAsync(EntityContainer container) + => Task.FromResult(GetParent(container)); /// - public async Task GetParentAsync(TTreeEntity entity) - => await Task.FromResult(GetParent(entity)); + public Task GetParentAsync(TTreeEntity entity) + => Task.FromResult(GetParent(entity)); /// public async Task> CreateAsync(Guid? key, string name, Guid? parentKey, Guid userKey) diff --git a/src/Umbraco.Core/Services/FileSystem/FolderServiceOperationBase.cs b/src/Umbraco.Core/Services/FileSystem/FolderServiceOperationBase.cs index 68523d14433f..2a987a11b9f8 100644 --- a/src/Umbraco.Core/Services/FileSystem/FolderServiceOperationBase.cs +++ b/src/Umbraco.Core/Services/FileSystem/FolderServiceOperationBase.cs @@ -32,7 +32,7 @@ protected FolderServiceOperationBase(TRepository repository, ICoreScopeProvider protected abstract TOperationStatus InvalidName { get; } - protected async Task> HandleCreateAsync(string name, string? parentPath) + protected Task> HandleCreateAsync(string name, string? parentPath) { using ICoreScope scope = _scopeProvider.CreateCoreScope(); @@ -40,7 +40,7 @@ protected FolderServiceOperationBase(TRepository repository, ICoreScopeProvider TOperationStatus validateResult = ValidateCreate(name, path, parentPath); if (Success.Equals(validateResult) is false) { - return Attempt.FailWithStatus(validateResult, null); + return Task.FromResult(Attempt.FailWithStatus(validateResult, null)); } _repository.AddFolder(path); @@ -53,34 +53,34 @@ protected FolderServiceOperationBase(TRepository repository, ICoreScopeProvider Path = path, ParentPath = GetParentFolderPath(path) }; - return await Task.FromResult(Attempt.SucceedWithStatus(Success, result)); + return Task.FromResult(Attempt.SucceedWithStatus(Success, result)); } - protected async Task HandleDeleteAsync(string path) + protected Task HandleDeleteAsync(string path) { using ICoreScope scope = _scopeProvider.CreateCoreScope(); TOperationStatus validateResult = ValidateDelete(path); if (Success.Equals(validateResult) is false) { - return await Task.FromResult(validateResult); + return Task.FromResult(validateResult); } _repository.DeleteFolder(path); scope.Complete(); - return Success; + return Task.FromResult(Success); } - protected async Task HandleGetAsync(string path) + protected Task HandleGetAsync(string path) { using ICoreScope scope = _scopeProvider.CreateCoreScope(); // There's not much we can actually get when it's a folder, so it more a matter of ensuring the folder exists and returning a model. if (_repository.FolderExists(path) is false) { - return await Task.FromResult(null); + return Task.FromResult(null); } var result = new TFolderModel @@ -91,7 +91,7 @@ protected async Task HandleDeleteAsync(string path) }; scope.Complete(); - return result; + return Task.FromResult(result); } private TOperationStatus ValidateCreate(string name, string path, string? parentPath) @@ -129,12 +129,12 @@ private TOperationStatus ValidateDelete(string path) return Success; } - private string GetFolderPath(string folderName, string? parentPath) + private static string GetFolderPath(string folderName, string? parentPath) => Path.Join(parentPath, folderName); - private string GetFolderName(string path) + private static string GetFolderName(string path) => Path.GetFileName(path); - private string? GetParentFolderPath(string path) + private static string? GetParentFolderPath(string path) => Path.GetDirectoryName(path); } diff --git a/src/Umbraco.Core/Services/LanguageService.cs b/src/Umbraco.Core/Services/LanguageService.cs index 343a76236729..ab01c771347f 100644 --- a/src/Umbraco.Core/Services/LanguageService.cs +++ b/src/Umbraco.Core/Services/LanguageService.cs @@ -1,5 +1,4 @@ -using System.Globalization; -using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Logging; using Umbraco.Cms.Core.Events; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Notifications; @@ -34,46 +33,46 @@ public LanguageService( } /// - public async Task GetAsync(string isoCode) + public Task GetAsync(string isoCode) { using (ScopeProvider.CreateCoreScope(autoComplete: true)) { - return await Task.FromResult(_languageRepository.GetByIsoCode(isoCode)); + return Task.FromResult(_languageRepository.GetByIsoCode(isoCode)); } } /// - public async Task GetDefaultLanguageAsync() + public Task GetDefaultLanguageAsync() { using (ScopeProvider.CreateCoreScope(autoComplete: true)) { - return await Task.FromResult(_languageRepository.GetByIsoCode(_languageRepository.GetDefaultIsoCode())); + return Task.FromResult(_languageRepository.GetByIsoCode(_languageRepository.GetDefaultIsoCode())); } } /// - public async Task GetDefaultIsoCodeAsync() + public Task GetDefaultIsoCodeAsync() { using (ScopeProvider.CreateCoreScope(autoComplete: true)) { - return await Task.FromResult(_languageRepository.GetDefaultIsoCode()); + return Task.FromResult(_languageRepository.GetDefaultIsoCode()); } } /// - public async Task> GetAllAsync() + public Task> GetAllAsync() { using (ScopeProvider.CreateCoreScope(autoComplete: true)) { - return await Task.FromResult(_languageRepository.GetMany()); + return Task.FromResult(_languageRepository.GetMany()); } } - public async Task GetIsoCodesByIdsAsync(ICollection ids) + public Task GetIsoCodesByIdsAsync(ICollection ids) { using ICoreScope scope = ScopeProvider.CreateCoreScope(autoComplete:true); - return await Task.FromResult(_languageRepository.GetIsoCodesByIds(ids, throwOnNotFound: true)); + return Task.FromResult(_languageRepository.GetIsoCodesByIds(ids, throwOnNotFound: true)); } public async Task> GetMultipleAsync(IEnumerable isoCodes) => (await GetAllAsync()).Where(x => isoCodes.Contains(x.IsoCode)); @@ -163,7 +162,7 @@ public async Task> CreateAsync(ILang var currentUserId = await _userIdKeyResolver.GetAsync(userKey); Audit(AuditType.Delete, "Delete Language", currentUserId, language.Id, UmbracoObjectTypes.Language.GetName()); scope.Complete(); - return await Task.FromResult(Attempt.SucceedWithStatus(LanguageOperationStatus.Success, language)); + return Attempt.SucceedWithStatus(LanguageOperationStatus.Success, language); } } @@ -217,7 +216,7 @@ private async Task> SaveAsync( Audit(auditType, auditMessage, currentUserId, language.Id, UmbracoObjectTypes.Language.GetName()); scope.Complete(); - return await Task.FromResult(Attempt.SucceedWithStatus(LanguageOperationStatus.Success, language)); + return Attempt.SucceedWithStatus(LanguageOperationStatus.Success, language); } } @@ -252,7 +251,7 @@ private bool HasInvalidFallbackLanguage(ILanguage language) return false; } - private bool CreatesCycle(ILanguage language, IDictionary languagesByIsoCode) + private static bool CreatesCycle(ILanguage language, Dictionary languagesByIsoCode) { // a new language is not referenced yet, so cannot be part of a cycle if (!language.HasIdentity) diff --git a/src/Umbraco.Core/Services/LogViewerService.cs b/src/Umbraco.Core/Services/LogViewerService.cs index aa1b1478ad3c..8c050e454bdd 100644 --- a/src/Umbraco.Core/Services/LogViewerService.cs +++ b/src/Umbraco.Core/Services/LogViewerService.cs @@ -31,7 +31,7 @@ public LogViewerService( } /// - public async Task?, LogViewerOperationStatus>> GetPagedLogsAsync( + public Task?, LogViewerOperationStatus>> GetPagedLogsAsync( DateTimeOffset? startDate, DateTimeOffset? endDate, int skip, @@ -45,33 +45,33 @@ public LogViewerService( // We will need to stop the request if trying to do this on a 1GB file if (CanViewLogs(logTimePeriod) == false) { - return Attempt.FailWithStatus?, LogViewerOperationStatus>( + return Task.FromResult(Attempt.FailWithStatus?, LogViewerOperationStatus>( LogViewerOperationStatus.CancelledByLogsSizeValidation, - null); + null)); } PagedModel filteredLogs = GetFilteredLogs(logTimePeriod, filterExpression, logLevels, orderDirection, skip, take); - return Attempt.SucceedWithStatus?, LogViewerOperationStatus>( + return Task.FromResult(Attempt.SucceedWithStatus?, LogViewerOperationStatus>( LogViewerOperationStatus.Success, - filteredLogs); + filteredLogs)); } /// - public async Task> GetSavedLogQueriesAsync(int skip, int take) + public Task> GetSavedLogQueriesAsync(int skip, int take) { using ICoreScope scope = _provider.CreateCoreScope(autoComplete: true); ILogViewerQuery[] savedLogQueries = _logViewerQueryRepository.GetMany().ToArray(); var pagedModel = new PagedModel(savedLogQueries.Length, savedLogQueries.Skip(skip).Take(take)); - return await Task.FromResult(pagedModel); + return Task.FromResult(pagedModel); } /// - public async Task GetSavedLogQueryByNameAsync(string name) + public Task GetSavedLogQueryByNameAsync(string name) { using ICoreScope scope = _provider.CreateCoreScope(autoComplete: true); - return await Task.FromResult(_logViewerQueryRepository.GetByName(name)); + return Task.FromResult(_logViewerQueryRepository.GetByName(name)); } /// @@ -109,57 +109,57 @@ public async Task> GetSavedLogQueriesAsync(int skip, } /// - public async Task> CanViewLogsAsync(DateTimeOffset? startDate, DateTimeOffset? endDate) + public Task> CanViewLogsAsync(DateTimeOffset? startDate, DateTimeOffset? endDate) { LogTimePeriod logTimePeriod = GetTimePeriod(startDate, endDate); bool isAllowed = CanViewLogs(logTimePeriod); if (isAllowed == false) { - return Attempt.FailWithStatus(LogViewerOperationStatus.CancelledByLogsSizeValidation, isAllowed); + return Task.FromResult(Attempt.FailWithStatus(LogViewerOperationStatus.CancelledByLogsSizeValidation, isAllowed)); } - return Attempt.SucceedWithStatus(LogViewerOperationStatus.Success, isAllowed); + return Task.FromResult(Attempt.SucceedWithStatus(LogViewerOperationStatus.Success, isAllowed)); } /// - public async Task> GetLogLevelCountsAsync(DateTimeOffset? startDate, DateTimeOffset? endDate) + public Task> GetLogLevelCountsAsync(DateTimeOffset? startDate, DateTimeOffset? endDate) { LogTimePeriod logTimePeriod = GetTimePeriod(startDate, endDate); // We will need to stop the request if trying to do this on a 1GB file if (CanViewLogs(logTimePeriod) == false) { - return Attempt.FailWithStatus( + return Task.FromResult(Attempt.FailWithStatus( LogViewerOperationStatus.CancelledByLogsSizeValidation, - null); + null)); } LogLevelCounts counter = _logViewerRepository.GetLogCount(logTimePeriod); - return Attempt.SucceedWithStatus( + return Task.FromResult(Attempt.SucceedWithStatus( LogViewerOperationStatus.Success, - counter); + counter)); } /// - public async Task, LogViewerOperationStatus>> GetMessageTemplatesAsync(DateTimeOffset? startDate, DateTimeOffset? endDate, int skip, int take) + public Task, LogViewerOperationStatus>> GetMessageTemplatesAsync(DateTimeOffset? startDate, DateTimeOffset? endDate, int skip, int take) { LogTimePeriod logTimePeriod = GetTimePeriod(startDate, endDate); // We will need to stop the request if trying to do this on a 1GB file if (CanViewLogs(logTimePeriod) == false) { - return Attempt.FailWithStatus, LogViewerOperationStatus>( + return Task.FromResult(Attempt.FailWithStatus, LogViewerOperationStatus>( LogViewerOperationStatus.CancelledByLogsSizeValidation, - null!); + null!)); } LogTemplate[] messageTemplates = _logViewerRepository.GetMessageTemplates(logTimePeriod); - return Attempt.SucceedWithStatus( + return Task.FromResult(Attempt.SucceedWithStatus( LogViewerOperationStatus.Success, - new PagedModel(messageTemplates.Length, messageTemplates.Skip(skip).Take(take))); + new PagedModel(messageTemplates.Length, messageTemplates.Skip(skip).Take(take)))); } /// @@ -183,7 +183,7 @@ public ReadOnlyDictionary GetLogLevelsFromSinks() /// The start date for the date range (can be null). /// The end date for the date range (can be null). /// The LogTimePeriod object used to filter logs. - private LogTimePeriod GetTimePeriod(DateTimeOffset? startDate, DateTimeOffset? endDate) + private static LogTimePeriod GetTimePeriod(DateTimeOffset? startDate, DateTimeOffset? endDate) { if (startDate is null || endDate is null) { @@ -277,5 +277,5 @@ private PagedModel GetFilteredLogs( }; } - private string GetSearchPattern(DateTime day) => $"*{day:yyyyMMdd}*.json"; + private static string GetSearchPattern(DateTime day) => $"*{day:yyyyMMdd}*.json"; } diff --git a/src/Umbraco.Core/Services/MediaEditingService.cs b/src/Umbraco.Core/Services/MediaEditingService.cs index 2a27c048a66f..26fbc5c0333f 100644 --- a/src/Umbraco.Core/Services/MediaEditingService.cs +++ b/src/Umbraco.Core/Services/MediaEditingService.cs @@ -40,10 +40,10 @@ public MediaEditingService( relationService) => _logger = logger; - public async Task GetAsync(Guid key) + public Task GetAsync(Guid key) { IMedia? media = ContentService.GetById(key); - return await Task.FromResult(media); + return Task.FromResult(media); } public async Task> ValidateUpdateAsync(Guid key, MediaUpdateModel updateModel) diff --git a/src/Umbraco.Core/Services/NoopSegmentService.cs b/src/Umbraco.Core/Services/NoopSegmentService.cs index 90a3076db4c2..5b1f65029b15 100644 --- a/src/Umbraco.Core/Services/NoopSegmentService.cs +++ b/src/Umbraco.Core/Services/NoopSegmentService.cs @@ -5,9 +5,9 @@ namespace Umbraco.Cms.Core.Services; public class NoopSegmentService : ISegmentService { - public async Task?, SegmentOperationStatus>> GetPagedSegmentsAsync(int skip = 0, int take = 100) + public Task?, SegmentOperationStatus>> GetPagedSegmentsAsync(int skip = 0, int take = 100) { - return await Task.FromResult(Attempt.SucceedWithStatus?, SegmentOperationStatus>( + return Task.FromResult(Attempt.SucceedWithStatus?, SegmentOperationStatus>( SegmentOperationStatus.Success, new PagedModel { Total = 0, Items = Enumerable.Empty() })); } diff --git a/src/Umbraco.Core/Services/PartialViewService.cs b/src/Umbraco.Core/Services/PartialViewService.cs index d4bfb5dc6d00..ae5e4e2883f4 100644 --- a/src/Umbraco.Core/Services/PartialViewService.cs +++ b/src/Umbraco.Core/Services/PartialViewService.cs @@ -62,7 +62,7 @@ protected override IPartialView CreateEntity(string path, string? content) => new PartialView(path) { Content = content }; /// - public async Task> GetSnippetsAsync(int skip, int take) + public Task> GetSnippetsAsync(int skip, int take) { using ICoreScope scope = ScopeProvider.CreateCoreScope(autoComplete: true); var result = new PagedModel( @@ -72,15 +72,15 @@ public async Task> GetSnippetsAsync(int skip, .Take(take) .Select(snippet => new PartialViewSnippetSlim(snippet.Id, snippet.Name)) .ToArray()); - return await Task.FromResult(result); + return Task.FromResult(result); } /// - public async Task GetSnippetAsync(string id) + public Task GetSnippetAsync(string id) { using ICoreScope scope = ScopeProvider.CreateCoreScope(autoComplete: true); PartialViewSnippet? snippet = _snippetCollection.FirstOrDefault(s => s.Id == id); - return await Task.FromResult(snippet); + return Task.FromResult(snippet); } /// diff --git a/src/Umbraco.Core/Services/Querying/ContentQueryService.cs b/src/Umbraco.Core/Services/Querying/ContentQueryService.cs index 241236f5509d..22c4eb40df9a 100644 --- a/src/Umbraco.Core/Services/Querying/ContentQueryService.cs +++ b/src/Umbraco.Core/Services/Querying/ContentQueryService.cs @@ -23,23 +23,23 @@ public ContentQueryService( _coreScopeProvider = coreScopeProvider; } - public async Task> GetWithSchedulesAsync(Guid id) + public Task> GetWithSchedulesAsync(Guid id) { using ICoreScope scope = _coreScopeProvider.CreateCoreScope(autoComplete: true); - IContent? content = await Task.FromResult(_contentService.GetById(id)); + IContent? content = _contentService.GetById(id); if (content == null) { - return Attempt.Fail(ContentQueryOperationStatus - .ContentNotFound); + return Task.FromResult(Attempt.Fail(ContentQueryOperationStatus + .ContentNotFound)); } ContentScheduleCollection schedules = _contentService.GetContentScheduleByContentId(id); - return Attempt + return Task.FromResult(Attempt .Succeed( ContentQueryOperationStatus.Success, - new ContentScheduleQueryResult(content, schedules)); + new ContentScheduleQueryResult(content, schedules))); } } diff --git a/src/Umbraco.Core/Services/RelationService.cs b/src/Umbraco.Core/Services/RelationService.cs index 6c54ee6e54a5..7895b43bcbfe 100644 --- a/src/Umbraco.Core/Services/RelationService.cs +++ b/src/Umbraco.Core/Services/RelationService.cs @@ -126,22 +126,22 @@ public IEnumerable GetAllRelationTypes(params int[] ids) /// Gets the Relation types in a paged manner. /// Currently implements the paging in memory on the name property because the underlying repository does not support paging yet /// - public async Task> GetPagedRelationTypesAsync(int skip, int take, params int[] ids) + public Task> GetPagedRelationTypesAsync(int skip, int take, params int[] ids) { using ICoreScope scope = ScopeProvider.CreateCoreScope(autoComplete: true); if (take == 0) { - return new PagedModel(CountRelationTypes(), Enumerable.Empty()); + return Task.FromResult(new PagedModel(CountRelationTypes(), [])); } - IRelationType[] items = await Task.FromResult(_relationTypeRepository.GetMany(ids).ToArray()); + IRelationType[] items = _relationTypeRepository.GetMany(ids).ToArray(); - return new PagedModel( + return Task.FromResult(new PagedModel( items.Length, items.OrderBy(relationType => relationType.Name) .Skip(skip) - .Take(take)); + .Take(take))); } public int CountRelationTypes() @@ -166,7 +166,7 @@ public IEnumerable GetByParentId(int id, string? relationTypeAlias) IRelationType? relationType = GetRelationType(relationTypeAlias!); if (relationType == null) { - return Enumerable.Empty(); + return []; } IQuery qry2 = @@ -199,7 +199,7 @@ public IEnumerable GetByChildId(int id, string? relationTypeAlias) IRelationType? relationType = GetRelationType(relationTypeAlias!); if (relationType == null) { - return Enumerable.Empty(); + return []; } IQuery qry2 = @@ -232,7 +232,7 @@ public IEnumerable GetByParentOrChildId(int id, string relationTypeAl IRelationType? relationType = GetRelationType(relationTypeAlias); if (relationType == null) { - return Enumerable.Empty(); + return []; } IQuery query = Query().Where(x => @@ -266,7 +266,7 @@ public IEnumerable GetByRelationTypeName(string relationTypeName) } return relationTypeIds.Count == 0 - ? Enumerable.Empty() + ? [] : GetRelationsByListOfTypeIds(relationTypeIds); } @@ -276,7 +276,7 @@ public IEnumerable GetByRelationTypeAlias(string relationTypeAlias) IRelationType? relationType = GetRelationType(relationTypeAlias); return relationType == null - ? Enumerable.Empty() + ? [] : GetRelationsByListOfTypeIds(new[] { relationType.Id }); } @@ -308,21 +308,21 @@ public async Task> GetPagedByChildKeyAsync(Guid childKey, } } - public async Task, RelationOperationStatus>> GetPagedByRelationTypeKeyAsync(Guid key, int skip, int take, Ordering? ordering = null) + public Task, RelationOperationStatus>> GetPagedByRelationTypeKeyAsync(Guid key, int skip, int take, Ordering? ordering = null) { using (ICoreScope scope = ScopeProvider.CreateCoreScope(autoComplete: true)) { IRelationType? relationType = _relationTypeRepository.Get(key); if (relationType is null) { - return await Task.FromResult(Attempt.FailWithStatus, RelationOperationStatus>(RelationOperationStatus.RelationTypeNotFound, null!)); + return Task.FromResult(Attempt.FailWithStatus, RelationOperationStatus>(RelationOperationStatus.RelationTypeNotFound, null!)); } PaginationHelper.ConvertSkipTakeToPaging(skip, take, out var pageNumber, out var pageSize); IQuery query = Query().Where(x => x.RelationTypeId == relationType.Id); IEnumerable relations = _relationRepository.GetPagedRelationsByQuery(query, pageNumber, pageSize, out var totalRecords, ordering); - return await Task.FromResult(Attempt.SucceedWithStatus(RelationOperationStatus.Success, new PagedModel(totalRecords, relations))); + return Task.FromResult(Attempt.SucceedWithStatus(RelationOperationStatus.Success, new PagedModel(totalRecords, relations))); } } @@ -663,7 +663,7 @@ private async Task> SaveAsyn new RelationTypeSavedNotification(relationType, eventMessages).WithStateFrom(savingNotification)); } - return await Task.FromResult(Attempt.SucceedWithStatus(RelationTypeOperationStatus.Success, relationType)); + return Attempt.SucceedWithStatus(RelationTypeOperationStatus.Success, relationType); } /// @@ -729,19 +729,17 @@ public void Delete(IRelationType relationType) Audit(AuditType.Delete, currentUser, relationType.Id, "Deleted relation type"); scope.Notifications.Publish(new RelationTypeDeletedNotification(relationType, eventMessages).WithStateFrom(deletingNotification)); scope.Complete(); - return await Task.FromResult(Attempt.SucceedWithStatus(RelationTypeOperationStatus.Success, relationType)); + return Attempt.SucceedWithStatus(RelationTypeOperationStatus.Success, relationType); } } /// public void DeleteRelationsOfType(IRelationType relationType) { - var relations = new List(); using (ICoreScope scope = ScopeProvider.CreateCoreScope()) { IQuery query = Query().Where(x => x.RelationTypeId == relationType.Id); - var allRelations = _relationRepository.Get(query).ToList(); - relations.AddRange(allRelations); + List relations = _relationRepository.Get(query).ToList(); // TODO: N+1, we should be able to do this in a single call foreach (IRelation relation in relations) @@ -791,7 +789,7 @@ public IEnumerable GetAllowedObjectTypes() => } } - private IEnumerable GetRelationsByListOfTypeIds(IEnumerable relationTypeIds) + private List GetRelationsByListOfTypeIds(IEnumerable relationTypeIds) { var relations = new List(); using (ICoreScope scope = ScopeProvider.CreateCoreScope(autoComplete: true)) diff --git a/src/Umbraco.Core/Services/TemplateService.cs b/src/Umbraco.Core/Services/TemplateService.cs index a3531f02e7d1..92593b13a5b5 100644 --- a/src/Umbraco.Core/Services/TemplateService.cs +++ b/src/Umbraco.Core/Services/TemplateService.cs @@ -1,6 +1,5 @@ using Microsoft.Extensions.Logging; using Umbraco.Cms.Core.Events; -using Umbraco.Cms.Core.IO; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Notifications; using Umbraco.Cms.Core.Persistence.Querying; @@ -19,7 +18,6 @@ public class TemplateService : RepositoryService, ITemplateService private readonly IAuditRepository _auditRepository; private readonly ITemplateContentParserService _templateContentParserService; private readonly IUserIdKeyResolver _userIdKeyResolver; - private readonly IDefaultViewContentProvider _defaultViewContentProvider; public TemplateService( ICoreScopeProvider provider, @@ -29,8 +27,7 @@ public TemplateService( ITemplateRepository templateRepository, IAuditRepository auditRepository, ITemplateContentParserService templateContentParserService, - IUserIdKeyResolver userIdKeyResolver, - IDefaultViewContentProvider defaultViewContentProvider) + IUserIdKeyResolver userIdKeyResolver) : base(provider, loggerFactory, eventMessagesFactory) { _shortStringHelper = shortStringHelper; @@ -38,7 +35,6 @@ public TemplateService( _auditRepository = auditRepository; _templateContentParserService = templateContentParserService; _userIdKeyResolver = userIdKeyResolver; - _defaultViewContentProvider = defaultViewContentProvider; } /// @@ -86,7 +82,7 @@ public async Task> CreateForContentT scope.Complete(); } - return await Task.FromResult(Attempt.SucceedWithStatus(TemplateOperationStatus.Success, template)); + return Attempt.SucceedWithStatus(TemplateOperationStatus.Success, template); } /// @@ -126,11 +122,11 @@ private TemplateOperationStatus ValidateCreate(ITemplate templateToCreate) } /// - public async Task> GetAllAsync(params string[] aliases) + public Task> GetAllAsync(params string[] aliases) { using (ICoreScope scope = ScopeProvider.CreateCoreScope(autoComplete: true)) { - return await Task.FromResult(_templateRepository.GetAll(aliases).OrderBy(x => x.Name)); + return Task.FromResult>(_templateRepository.GetAll(aliases).OrderBy(x => x.Name)); } } @@ -151,48 +147,48 @@ public Task> GetAllAsync(params Guid[] keys) } /// - public async Task> GetChildrenAsync(int masterTemplateId) + public Task> GetChildrenAsync(int masterTemplateId) { using (ICoreScope scope = ScopeProvider.CreateCoreScope(autoComplete: true)) { - return await Task.FromResult(_templateRepository.GetChildren(masterTemplateId).OrderBy(x => x.Name)); + return Task.FromResult>(_templateRepository.GetChildren(masterTemplateId).OrderBy(x => x.Name)); } } /// - public async Task GetAsync(string? alias) + public Task GetAsync(string? alias) { using (ICoreScope scope = ScopeProvider.CreateCoreScope(autoComplete: true)) { - return await Task.FromResult(_templateRepository.Get(alias)); + return Task.FromResult(_templateRepository.Get(alias)); } } /// - public async Task GetAsync(int id) + public Task GetAsync(int id) { using (ICoreScope scope = ScopeProvider.CreateCoreScope(autoComplete: true)) { - return await Task.FromResult(_templateRepository.Get(id)); + return Task.FromResult(_templateRepository.Get(id)); } } /// - public async Task GetAsync(Guid id) + public Task GetAsync(Guid id) { using (ICoreScope scope = ScopeProvider.CreateCoreScope(autoComplete: true)) { IQuery? query = Query().Where(x => x.Key == id); - return await Task.FromResult(_templateRepository.Get(query)?.SingleOrDefault()); + return Task.FromResult(_templateRepository.Get(query)?.SingleOrDefault()); } } /// - public async Task> GetDescendantsAsync(int masterTemplateId) + public Task> GetDescendantsAsync(int masterTemplateId) { using (ICoreScope scope = ScopeProvider.CreateCoreScope(autoComplete: true)) { - return await Task.FromResult(_templateRepository.GetDescendants(masterTemplateId)); + return Task.FromResult(_templateRepository.GetDescendants(masterTemplateId)); } } @@ -286,31 +282,31 @@ private async Task> SaveAsync(ITempl => await DeleteAsync(async () => await GetAsync(key), userKey); /// - public async Task GetFileContentStreamAsync(string filepath) + public Task GetFileContentStreamAsync(string filepath) { using (ICoreScope scope = ScopeProvider.CreateCoreScope(autoComplete: true)) { - return await Task.FromResult(_templateRepository.GetFileContentStream(filepath)); + return Task.FromResult(_templateRepository.GetFileContentStream(filepath)); } } /// - public async Task SetFileContentAsync(string filepath, Stream content) + public Task SetFileContentAsync(string filepath, Stream content) { using (ICoreScope scope = ScopeProvider.CreateCoreScope()) { _templateRepository.SetFileContent(filepath, content); scope.Complete(); - await Task.CompletedTask; + return Task.CompletedTask; } } /// - public async Task GetFileSizeAsync(string filepath) + public Task GetFileSizeAsync(string filepath) { using (ICoreScope scope = ScopeProvider.CreateCoreScope(autoComplete: true)) { - return await Task.FromResult(_templateRepository.GetFileSize(filepath)); + return Task.FromResult(_templateRepository.GetFileSize(filepath)); } } diff --git a/src/Umbraco.Core/Services/TrackedReferencesService.cs b/src/Umbraco.Core/Services/TrackedReferencesService.cs index 5d5d76f7f041..d8103e69824b 100644 --- a/src/Umbraco.Core/Services/TrackedReferencesService.cs +++ b/src/Umbraco.Core/Services/TrackedReferencesService.cs @@ -83,13 +83,13 @@ public PagedModel GetPagedRelationsForItem(int id, long skip, return pagedModel; } - public async Task> GetPagedRelationsForItemAsync(Guid key, long skip, long take, bool filterMustBeIsDependency) + public Task> GetPagedRelationsForItemAsync(Guid key, long skip, long take, bool filterMustBeIsDependency) { using ICoreScope scope = _scopeProvider.CreateCoreScope(autoComplete: true); IEnumerable items = _trackedReferencesRepository.GetPagedRelationsForItem(key, skip, take, filterMustBeIsDependency, out var totalItems); var pagedModel = new PagedModel(totalItems, items); - return await Task.FromResult(pagedModel); + return Task.FromResult(pagedModel); } [Obsolete("Use overload that takes key instead of id. This will be removed in Umbraco 15.")] @@ -108,7 +108,7 @@ public PagedModel GetPagedDescendantsInReferences(int parentI return pagedModel; } - public async Task> GetPagedDescendantsInReferencesAsync(Guid parentKey, long skip, long take, bool filterMustBeIsDependency) + public Task> GetPagedDescendantsInReferencesAsync(Guid parentKey, long skip, long take, bool filterMustBeIsDependency) { using ICoreScope scope = _scopeProvider.CreateCoreScope(autoComplete: true); @@ -120,7 +120,7 @@ public async Task> GetPagedDescendantsInReferences out var totalItems); var pagedModel = new PagedModel(totalItems, items); - return await Task.FromResult(pagedModel); + return Task.FromResult(pagedModel); } [Obsolete("Use overload that takes key instead of id. This will be removed in Umbraco 15.")] @@ -133,13 +133,13 @@ public PagedModel GetPagedItemsWithRelations(int[] ids, long return pagedModel; } - public async Task> GetPagedItemsWithRelationsAsync(ISet keys, long skip, long take, bool filterMustBeIsDependency) + public Task> GetPagedItemsWithRelationsAsync(ISet keys, long skip, long take, bool filterMustBeIsDependency) { using ICoreScope scope = _scopeProvider.CreateCoreScope(autoComplete: true); IEnumerable items = _trackedReferencesRepository.GetPagedItemsWithRelations(keys, skip, take, filterMustBeIsDependency, out var totalItems); var pagedModel = new PagedModel(totalItems, items); - return await Task.FromResult(pagedModel); + return Task.FromResult(pagedModel); } public async Task> GetPagedKeysWithDependentReferencesAsync(ISet keys, Guid objectTypeId, long skip, long take) diff --git a/src/Umbraco.Core/Services/WebProfilerService.cs b/src/Umbraco.Core/Services/WebProfilerService.cs index e895bba6e7a7..9a42e0ee5785 100644 --- a/src/Umbraco.Core/Services/WebProfilerService.cs +++ b/src/Umbraco.Core/Services/WebProfilerService.cs @@ -15,30 +15,30 @@ public WebProfilerService(IWebProfilerRepository webProfilerRepository, IBackOff _backOfficeSecurityAccessor = backOfficeSecurityAccessor; } - public async Task> GetStatus() + public Task> GetStatus() { Attempt userIdAttempt = GetExecutingUserId(); if (userIdAttempt.Success is false) { - return Attempt.FailWithStatus(WebProfilerOperationStatus.ExecutingUserNotFound, false); + return Task.FromResult(Attempt.FailWithStatus(WebProfilerOperationStatus.ExecutingUserNotFound, false)); } var result = _webProfilerRepository.GetStatus(userIdAttempt.Result); - return await Task.FromResult(Attempt.SucceedWithStatus(WebProfilerOperationStatus.Success, result)); + return Task.FromResult(Attempt.SucceedWithStatus(WebProfilerOperationStatus.Success, result)); } - public async Task> SetStatus(bool status) + public Task> SetStatus(bool status) { Attempt userIdAttempt = GetExecutingUserId(); if (userIdAttempt.Success is false) { - return Attempt.FailWithStatus(WebProfilerOperationStatus.ExecutingUserNotFound, false); + return Task.FromResult(Attempt.FailWithStatus(WebProfilerOperationStatus.ExecutingUserNotFound, false)); } _webProfilerRepository.SetStatus(userIdAttempt.Result, status); - return await Task.FromResult(Attempt.SucceedWithStatus(WebProfilerOperationStatus.Success, status)); + return Task.FromResult(Attempt.SucceedWithStatus(WebProfilerOperationStatus.Success, status)); } private Attempt GetExecutingUserId() diff --git a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/DataTypeUsageRepository.cs b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/DataTypeUsageRepository.cs index 32ea15718b77..dd58cd0716c0 100644 --- a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/DataTypeUsageRepository.cs +++ b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/DataTypeUsageRepository.cs @@ -38,7 +38,7 @@ public bool HasSavedValues(int dataTypeId) return database.ExecuteScalar(hasValueQuery); } - public async Task HasSavedValuesAsync(Guid dataTypeKey) + public Task HasSavedValuesAsync(Guid dataTypeKey) { IUmbracoDatabase? database = _scopeAccessor.AmbientScope?.Database; @@ -59,6 +59,6 @@ public async Task HasSavedValuesAsync(Guid dataTypeKey) Sql hasValueQuery = database.SqlContext.Sql() .SelectAnyIfExists(selectQuery); - return await Task.FromResult(database.ExecuteScalar(hasValueQuery)); + return Task.FromResult(database.ExecuteScalar(hasValueQuery)); } } diff --git a/src/Umbraco.Infrastructure/Services/Implement/ContentListViewService.cs b/src/Umbraco.Infrastructure/Services/Implement/ContentListViewService.cs index ecbc6e400389..e9d46ddaa85f 100644 --- a/src/Umbraco.Infrastructure/Services/Implement/ContentListViewService.cs +++ b/src/Umbraco.Infrastructure/Services/Implement/ContentListViewService.cs @@ -49,7 +49,7 @@ public ContentListViewService( return await GetListViewResultAsync(user, content, dataTypeKey, orderBy, orderCulture, orderDirection, filter, skip, take); } - protected override async Task> GetPagedChildrenAsync( + protected override Task> GetPagedChildrenAsync( int id, IQuery? filter, Ordering? ordering, @@ -58,13 +58,13 @@ protected override async Task> GetPagedChildrenAsync( { PaginationHelper.ConvertSkipTakeToPaging(skip, take, out var pageNumber, out var pageSize); - IEnumerable items = await Task.FromResult(_contentService.GetPagedChildren( + IEnumerable items = _contentService.GetPagedChildren( id, pageNumber, pageSize, out var total, filter, - ordering)); + ordering); var pagedResult = new PagedModel { @@ -72,7 +72,7 @@ protected override async Task> GetPagedChildrenAsync( Total = total, }; - return pagedResult; + return Task.FromResult(pagedResult); } // We can use an authorizer here, as it already handles all the necessary checks for this filtering. diff --git a/src/Umbraco.Infrastructure/Services/Implement/MediaListViewService.cs b/src/Umbraco.Infrastructure/Services/Implement/MediaListViewService.cs index 42b6bbf42119..63d9298ec343 100644 --- a/src/Umbraco.Infrastructure/Services/Implement/MediaListViewService.cs +++ b/src/Umbraco.Infrastructure/Services/Implement/MediaListViewService.cs @@ -50,17 +50,17 @@ public MediaListViewService( return await GetListViewResultAsync(user, media, dataTypeKey, orderBy, null, orderDirection, filter, skip, take); } - protected override async Task> GetPagedChildrenAsync(int id, IQuery? filter, Ordering? ordering, int skip, int take) + protected override Task> GetPagedChildrenAsync(int id, IQuery? filter, Ordering? ordering, int skip, int take) { PaginationHelper.ConvertSkipTakeToPaging(skip, take, out var pageNumber, out var pageSize); - IEnumerable items = await Task.FromResult(_mediaService.GetPagedChildren( + IEnumerable items = _mediaService.GetPagedChildren( id, pageNumber, pageSize, out var total, filter, - ordering)); + ordering); var pagedResult = new PagedModel { @@ -68,7 +68,7 @@ protected override async Task> GetPagedChildrenAsync(int id, Total = total, }; - return pagedResult; + return Task.FromResult(pagedResult); } // We can use an authorizer here, as it already handles all the necessary checks for this filtering. diff --git a/src/Umbraco.Infrastructure/Services/MemberEditingService.cs b/src/Umbraco.Infrastructure/Services/MemberEditingService.cs index d87c9d43ce11..bbf4b8919fd7 100644 --- a/src/Umbraco.Infrastructure/Services/MemberEditingService.cs +++ b/src/Umbraco.Infrastructure/Services/MemberEditingService.cs @@ -70,8 +70,8 @@ public MemberEditingService( _securitySettings = securitySettings.Value; } - public async Task GetAsync(Guid key) - => await Task.FromResult(_memberService.GetByKey(key)); + public Task GetAsync(Guid key) + => Task.FromResult(_memberService.GetByKey(key)); public async Task> ValidateCreateAsync(MemberCreateModel createModel) => await _memberContentEditingService.ValidateAsync(createModel, createModel.ContentTypeKey);