Remove async await where not needed

src/Umbraco.Cms.Api.Delivery/Controllers/Content/ByIdsContentApiController.cs

@@ -58,6 +58,6 @@ private async Task<IActionResult> HandleRequest(HashSet<Guid> ids)
             .WhereNotNull()
             .ToArray();
 
-        return await Task.FromResult(Ok(apiContentItems));
+        return Ok(apiContentItems);
     }
 }

src/Umbraco.Cms.Api.Delivery/Controllers/Content/ByRouteContentApiController.cs

@@ -117,7 +117,7 @@ private async Task<IActionResult> HandleRequest(string path)
                 return deniedAccessResult;
             }
 
-            return await Task.FromResult(Ok(ApiContentResponseBuilder.Build(contentItem)));
+            return Ok(ApiContentResponseBuilder.Build(contentItem));
         }
 
         IApiContentRoute? redirectRoute = _requestRedirectService.GetRedirectRoute(path);

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<IActionResult> ById(Guid id)
-        => await HandleRequest(id);
+    public Task<IActionResult> ById(Guid id)
+        => Task.FromResult(HandleRequest(id));
 
     /// <summary>
     ///     Gets a media item by id.
@@ -36,16 +36,16 @@ public async Task<IActionResult> ById(Guid id)
     [MapToApiVersion("2.0")]
     [ProducesResponseType(typeof(IApiMediaWithCropsResponse), StatusCodes.Status200OK)]
     [ProducesResponseType(StatusCodes.Status404NotFound)]
-    public async Task<IActionResult> ByIdV20(Guid id)
-        => await HandleRequest(id);
+    public Task<IActionResult> ByIdV20(Guid id)
+        => Task.FromResult(HandleRequest(id));
 
-    private async Task<IActionResult> 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));

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

@@ -36,7 +36,7 @@ public async Task<IActionResult> Item([FromQuery(Name = "id")] HashSet<Guid> ids
     public async Task<IActionResult> ItemsV20([FromQuery(Name = "id")] HashSet<Guid> ids)
         => await HandleRequest(ids);
 
-    private async Task<IActionResult> HandleRequest(HashSet<Guid> ids)
+    private Task<IActionResult> HandleRequest(HashSet<Guid> ids)
     {
         IPublishedContent[] mediaItems = ids
             .Select(PublishedMediaCache.GetById)
@@ -47,6 +47,6 @@ private async Task<IActionResult> HandleRequest(HashSet<Guid> ids)
             .Select(BuildApiMediaWithCrops)
             .ToArray();
 
-        return await Task.FromResult(Ok(apiMediaItems));
+        return Task.FromResult<IActionResult>(Ok(apiMediaItems));
     }
 }

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<IActionResult> ByPath(string path)
-        => await HandleRequest(path);
+    public Task<IActionResult> ByPath(string path)
+        => Task.FromResult(HandleRequest(path));
 
     /// <summary>
     ///     Gets a media item by its path.
@@ -39,17 +39,17 @@ public async Task<IActionResult> ByPath(string path)
     [MapToApiVersion("2.0")]
     [ProducesResponseType(typeof(IApiMediaWithCropsResponse), StatusCodes.Status200OK)]
     [ProducesResponseType(StatusCodes.Status404NotFound)]
-    public async Task<IActionResult> ByPathV20(string path)
-        => await HandleRequest(path);
+    public Task<IActionResult> ByPathV20(string path)
+        => Task.FromResult(HandleRequest(path));
 
-    private async Task<IActionResult> 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));

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

@@ -32,13 +32,13 @@ public QueryMediaApiController(
     [ProducesResponseType(typeof(PagedViewModel<IApiMediaWithCropsResponse>), StatusCodes.Status200OK)]
     [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status400BadRequest)]
     [Obsolete("Please use version 2 of this API. Will be removed in V15.")]
-    public async Task<IActionResult> Query(
+    public Task<IActionResult> 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));
 
     /// <summary>
     ///     Gets a paginated list of media item(s) from query.
@@ -53,15 +53,15 @@ public async Task<IActionResult> Query(
     [MapToApiVersion("2.0")]
     [ProducesResponseType(typeof(PagedViewModel<IApiMediaWithCropsResponse>), StatusCodes.Status200OK)]
     [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status400BadRequest)]
-    public async Task<IActionResult> QueryV20(
+    public Task<IActionResult> 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<IActionResult> 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<PagedModel<Guid>, ApiMediaQueryOperationStatus> queryAttempt = _apiMediaQueryService.ExecuteQuery(fetch, filter, sort, skip, take);
 
@@ -79,6 +79,6 @@ private async Task<IActionResult> HandleRequest(string? fetch, string[] filter,
             Items = mediaItems.Select(BuildApiMediaWithCrops)
         };
 
-        return await Task.FromResult(Ok(model));
+        return Ok(model);
     }
 }

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<CultureReponseModel>), StatusCodes.Status200OK)]
-    public async Task<PagedViewModel<CultureReponseModel>> GetAll(CancellationToken cancellationToken, int skip = 0, int take = 100)
+    public Task<PagedViewModel<CultureReponseModel>> GetAll(CancellationToken cancellationToken, int skip = 0, int take = 100)
     {
         CultureInfo[] all = _cultureService.GetValidCultureInfos();
 
@@ -38,6 +38,6 @@ public async Task<PagedViewModel<CultureReponseModel>> GetAll(CancellationToken
             Total = all.Length
         };
 
-        return await Task.FromResult(viewModel);
+        return Task.FromResult(viewModel);
     }
 }

src/Umbraco.Cms.Api.Management/Controllers/Dictionary/AllDictionaryController.cs

@@ -38,6 +38,6 @@ public async Task<ActionResult<PagedViewModel<DictionaryOverviewResponseModel>>>
             Total = items.Length,
             Items = _umbracoMapper.MapEnumerable<IDictionaryItem, DictionaryOverviewResponseModel>(items.Skip(skip).Take(take))
         };
-        return await Task.FromResult(model);
+        return model;
     }
 }

src/Umbraco.Cms.Api.Management/Controllers/Document/Item/ItemDocumentItemController.cs

@@ -24,20 +24,20 @@ public ItemDocumentItemController(IEntityService entityService, IDocumentPresent
     [HttpGet]
     [MapToApiVersion("1.0")]
     [ProducesResponseType(typeof(IEnumerable<DocumentItemResponseModel>), StatusCodes.Status200OK)]
-    public async Task<IActionResult> Item(
+    public Task<IActionResult> Item(
         CancellationToken cancellationToken,
         [FromQuery(Name = "id")] HashSet<Guid> ids)
     {
         if (ids.Count is 0)
         {
-            return Ok(Enumerable.Empty<DocumentItemResponseModel>());
+            return Task.FromResult<IActionResult>(Ok(Enumerable.Empty<DocumentItemResponseModel>()));
         }
 
         IEnumerable<IDocumentEntitySlim> documents = _entityService
             .GetAll(UmbracoObjectTypes.Document, ids.ToArray())
             .OfType<IDocumentEntitySlim>();
 
         IEnumerable<DocumentItemResponseModel> documentItemResponseModels = documents.Select(_documentPresentationFactory.CreateItemResponseModel);
-        return await Task.FromResult(Ok(documentItemResponseModels));
+        return Task.FromResult<IActionResult>(Ok(documentItemResponseModels));
     }
 }

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<IActionResult> SearchFromParentWithAllowedTypes(
     [HttpGet("search")]
     [MapToApiVersion("1.0")]
     [ProducesResponseType(typeof(PagedModel<DocumentItemResponseModel>), StatusCodes.Status200OK)]
-    public async Task<IActionResult> SearchWithTrashed(
+    public Task<IActionResult> SearchWithTrashed(
         CancellationToken cancellationToken,
         string query,
         bool? trashed = null,
@@ -63,6 +62,6 @@ public async Task<IActionResult> SearchWithTrashed(
             Total = searchResult.Total,
         };
 
-        return await Task.FromResult(Ok(result));
+        return Task.FromResult<IActionResult>(Ok(result));
     }
 }

src/Umbraco.Cms.Api.Management/Controllers/Document/UpdateNotificationsController.cs

@@ -35,6 +35,6 @@ public async Task<IActionResult> UpdateNotifications(CancellationToken cancellat
         }
 
         _notificationService.SetNotifications(_backOfficeSecurityAccessor.BackOfficeSecurity?.CurrentUser, content, updateModel.SubscribedActionIds);
-        return await Task.FromResult(Ok());
+        return Ok();
     }
 }

src/Umbraco.Cms.Api.Management/Controllers/DocumentBlueprint/Item/ItemDocumentBlueprintController.cs

@@ -25,20 +25,20 @@ public ItemDocumentBlueprintController(IEntityService entityService, IDocumentPr
     [HttpGet]
     [MapToApiVersion("1.0")]
     [ProducesResponseType(typeof(IEnumerable<DocumentBlueprintItemResponseModel>), StatusCodes.Status200OK)]
-    public async Task<IActionResult> Item(
+    public Task<IActionResult> Item(
         CancellationToken cancellationToken,
         [FromQuery(Name = "id")] HashSet<Guid> ids)
     {
         if (ids.Count is 0)
         {
-            return Ok(Enumerable.Empty<DocumentBlueprintItemResponseModel>());
+            return Task.FromResult<IActionResult>(Ok(Enumerable.Empty<DocumentBlueprintItemResponseModel>()));
         }
 
         IEnumerable<IDocumentEntitySlim> documents = _entityService
             .GetAll(UmbracoObjectTypes.DocumentBlueprint, ids.ToArray())
             .Select(x => x as IDocumentEntitySlim)
             .WhereNotNull();
         IEnumerable<DocumentBlueprintItemResponseModel> responseModels = documents.Select(x => _documentPresentationFactory.CreateBlueprintItemResponseModel(x));
-        return await Task.FromResult(Ok(responseModels));
+        return Task.FromResult<IActionResult>(Ok(responseModels));
     }
 }

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<DocumentTypeItemResponseModel>), StatusCodes.Status200OK)]
-    public async Task<IActionResult> Item(
+    public Task<IActionResult> Item(
         CancellationToken cancellationToken,
         [FromQuery(Name = "id")] HashSet<Guid> ids)
     {
         if (ids.Count is 0)
         {
-            return Ok(Enumerable.Empty<DocumentTypeItemResponseModel>());
+            return Task.FromResult<IActionResult>(Ok(Enumerable.Empty<DocumentTypeItemResponseModel>()));
         }
 
         IEnumerable<IContentType> contentTypes = _contentTypeService.GetMany(ids);
         List<DocumentTypeItemResponseModel> responseModels = _mapper.MapEnumerable<IContentType, DocumentTypeItemResponseModel>(contentTypes);
-        return await Task.FromResult(Ok(responseModels));
+        return Task.FromResult<IActionResult>(Ok(responseModels));
     }
 }

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<string>), StatusCodes.Status200OK)]
-    public async Task<IActionResult> GetQuerySteps(CancellationToken cancellationToken)
+    public Task<IActionResult> GetQuerySteps(CancellationToken cancellationToken)
     {
         IEnumerable<string> querySteps = _dynamicRootQueryStepCollection.Select(x => x.SupportedDirectionAlias);
 
-        return await Task.FromResult(Ok(querySteps));
+        return Task.FromResult<IActionResult>(Ok(querySteps));
     }
 }

src/Umbraco.Cms.Api.Management/Controllers/HealthCheck/ExecuteActionHealthCheckController.cs

@@ -63,6 +63,6 @@ public async Task<ActionResult<HealthCheckResultResponseModel>> ExecuteAction(
 
         HealthCheckStatus result = await healthCheck.ExecuteActionAsync(_umbracoMapper.Map<HealthCheckAction>(action)!);
 
-        return await Task.FromResult(Ok(_umbracoMapper.Map<HealthCheckResultResponseModel>(result)));
+        return Ok(_umbracoMapper.Map<HealthCheckResultResponseModel>(result));
     }
 }

src/Umbraco.Cms.Api.Management/Controllers/HealthCheck/Group/AllHealthCheckGroupController.cs

@@ -31,7 +31,7 @@ public AllHealthCheckGroupController(
     [HttpGet]
     [MapToApiVersion("1.0")]
     [ProducesResponseType(typeof(PagedViewModel<HealthCheckGroupResponseModel>), StatusCodes.Status200OK)]
-    public async Task<ActionResult<PagedViewModel<HealthCheckGroupResponseModel>>> All(
+    public Task<ActionResult<PagedViewModel<HealthCheckGroupResponseModel>>> All(
         CancellationToken cancellationToken,
         int skip = 0,
         int take = 100)
@@ -46,6 +46,6 @@ public async Task<ActionResult<PagedViewModel<HealthCheckGroupResponseModel>>> A
             Items = _umbracoMapper.MapEnumerable<IGrouping<string?, Core.HealthChecks.HealthCheck>, HealthCheckGroupResponseModel>(groups.Skip(skip).Take(take))
         };
 
-        return await Task.FromResult(Ok(viewModel));
+        return Task.FromResult<ActionResult<PagedViewModel<HealthCheckGroupResponseModel>>>(Ok(viewModel));
     }
 }

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<IActionResult> ByName(
+    public Task<IActionResult> ByName(
         CancellationToken cancellationToken,
         string name)
     {
@@ -42,9 +42,9 @@ public async Task<IActionResult> ByName(
 
         if (group is null)
         {
-            return HealthCheckGroupNotFound();
+            return Task.FromResult(HealthCheckGroupNotFound());
         }
 
-        return await Task.FromResult(Ok(_umbracoMapper.Map<HealthCheckGroupPresentationModel>(group)));
+        return Task.FromResult<IActionResult>(Ok(_umbracoMapper.Map<HealthCheckGroupPresentationModel>(group)));
     }
 }

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<ActionResult<IndexResponseModel?>> Details(CancellationToken cancellationToken, string indexName)
+    public Task<ActionResult<IndexResponseModel?>> Details(CancellationToken cancellationToken, string indexName)
     {
         if (_examineManager.TryGetIndex(indexName, out IIndex? index))
         {
-            return await Task.FromResult(_indexPresentationFactory.Create(index!));
+            return Task.FromResult<ActionResult<IndexResponseModel?>>(_indexPresentationFactory.Create(index!));
         }
 
         var invalidModelProblem = new ProblemDetails
@@ -49,7 +49,6 @@ public DetailsIndexerController(
             Type = "Error",
         };
 
-        return await Task.FromResult(NotFound(invalidModelProblem));
-
+        return Task.FromResult<ActionResult<IndexResponseModel?>>(NotFound(invalidModelProblem));
     }
 }

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<IActionResult> Rebuild(CancellationToken cancellationToken, string indexName)
+    public Task<IActionResult> Rebuild(CancellationToken cancellationToken, string indexName)
     {
         if (!_examineManager.TryGetIndex(indexName, out IIndex? index))
         {
@@ -48,7 +48,7 @@ public async Task<IActionResult> Rebuild(CancellationToken cancellationToken, st
                 Type = "Error",
             };
 
-            return await Task.FromResult(NotFound(invalidModelProblem));
+            return Task.FromResult<IActionResult>(NotFound(invalidModelProblem));
         }
 
         if (!_indexingRebuilderService.CanRebuild(index.Name))
@@ -62,14 +62,14 @@ public async Task<IActionResult> Rebuild(CancellationToken cancellationToken, st
                 Type = "Error",
             };
 
-            return await Task.FromResult(BadRequest(invalidModelProblem));
+            return Task.FromResult<IActionResult>(BadRequest(invalidModelProblem));
         }
 
         _logger.LogInformation("Rebuilding index '{IndexName}'", indexName);
 
         if (_indexingRebuilderService.TryRebuild(index, indexName))
         {
-            return await Task.FromResult(Ok());
+            return Task.FromResult<IActionResult>(Ok());
         }
 
         var problemDetails = new ProblemDetails
@@ -80,6 +80,6 @@ public async Task<IActionResult> Rebuild(CancellationToken cancellationToken, st
             Type = "Error",
         };
 
-        return await Task.FromResult(Conflict(problemDetails));
+        return Task.FromResult<IActionResult>(Conflict(problemDetails));
     }
 }