Merge branch 'v15/dev' into v15/bugfix/18000

Author: nielslyngsoe

src/Umbraco.Cms.Api.Delivery/Querying/Filters/ContainsFilterBase.cs

@@ -37,12 +37,12 @@ public FilterOption BuildFilterOption(string filter)
     {
         GroupCollection groups = QueryParserRegex.Match(filter).Groups;
 
-        if (groups.Count != 3 || groups.ContainsKey("operator") is false || groups.ContainsKey("value") is false)
+        if (groups.Count != 3 || groups.TryGetValue("operator", out Group? operatorGroup) is false || groups.TryGetValue("value", out Group? valueGroup) is false)
         {
             return DefaultFilterOption();
         }
 
-        FilterOperation? filterOperation = ParseFilterOperation(groups["operator"].Value);
+        FilterOperation? filterOperation = ParseFilterOperation(operatorGroup.Value);
         if (filterOperation.HasValue is false)
         {
             return DefaultFilterOption();
@@ -51,7 +51,7 @@ public FilterOption BuildFilterOption(string filter)
         return new FilterOption
         {
             FieldName = FieldName,
-            Values = new[] { groups["value"].Value },
+            Values = [valueGroup.Value],
             Operator = filterOperation.Value
         };
 

src/Umbraco.Cms.Api.Delivery/Services/ApiContentQueryProvider.cs

@@ -79,10 +79,14 @@ public PagedModel<Guid> ExecuteQuery(
             return new PagedModel<Guid>();
         }
 
-        Guid[] items = results
-            .Where(r => r.Values.ContainsKey(ItemIdFieldName))
-            .Select(r => Guid.Parse(r.Values[ItemIdFieldName]))
-            .ToArray();
+        List<Guid> items = [];
+        foreach (ISearchResult result in results)
+        {
+            if (result.Values.TryGetValue(ItemIdFieldName, out string? value))
+            {
+                items.Add(Guid.Parse(value));
+            }
+        }
 
         return new PagedModel<Guid>(results.TotalItemCount, items);
     }

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

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

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

@@ -39,6 +39,6 @@ public async Task<IActionResult> ByNameWithResult(
             return HealthCheckGroupNotFound();
         }
 
-        return await Task.FromResult(Ok(_healthCheckGroupPresentationFactory.CreateHealthCheckGroupWithResultViewModel(group)));
+        return Ok(await _healthCheckGroupPresentationFactory.CreateHealthCheckGroupWithResultViewModelAsync(group));
     }
 }

src/Umbraco.Cms.Api.Management/Controllers/Template/Query/ExecuteTemplateQueryController.cs

@@ -98,7 +98,7 @@ private IEnumerable<IPublishedContent> BuildQuery(TemplateQueryExecuteModel mode
         if (model.RootDocument?.Id is not null)
         {
             rootContent = _publishedContentQuery.Content(model.RootDocument.Id);
-            queryExpression.Append($"Umbraco.Content(Guid.Parse(\"{model.RootDocument.Id}\"))");
+            queryExpression.Append("Umbraco.Content(Guid.Parse(\"").Append(model.RootDocument.Id).Append("\"))");
         }
         else
         {
@@ -115,7 +115,7 @@ private IEnumerable<IPublishedContent> GetRootContentQuery(TemplateQueryExecuteM
 
         if (model.DocumentTypeAlias.IsNullOrWhiteSpace() == false)
         {
-            queryExpression.Append($".ChildrenOfType(\"{model.DocumentTypeAlias}\")");
+            queryExpression.Append(".ChildrenOfType(\"").Append(model.DocumentTypeAlias).Append("\")");
             return rootContent == null
                 ? Enumerable.Empty<IPublishedContent>()
                 : rootContent.ChildrenOfType(_variationContextAccessor, _contentCache, _documentNavigationQueryService, model.DocumentTypeAlias);
@@ -176,7 +176,7 @@ string PropertyModelType(TemplateQueryPropertyType templateQueryPropertyType)
             //for review - this uses a tonized query rather then the normal linq query.
             contentQuery = contentQuery.Where(operation.Compile());
             queryExpression.Append(_indent);
-            queryExpression.Append($".Where({operation})");
+            queryExpression.Append(".Where(").Append(operation).Append(')');
         }
 
         return contentQuery;
@@ -220,7 +220,7 @@ private IEnumerable<IPublishedContent> ApplySorting(TemplateQueryExecuteSortMode
         return contentQuery;
     }
 
-    private IEnumerable<IPublishedContent> ApplyPaging(int take, IEnumerable<IPublishedContent> contentQuery, StringBuilder queryExpression)
+    private static IEnumerable<IPublishedContent> ApplyPaging(int take, IEnumerable<IPublishedContent> contentQuery, StringBuilder queryExpression)
     {
         if (take <= 0)
         {
@@ -229,7 +229,7 @@ private IEnumerable<IPublishedContent> ApplyPaging(int take, IEnumerable<IPublis
 
         contentQuery = contentQuery.Take(take);
         queryExpression.Append(_indent);
-        queryExpression.Append($".Take({take})");
+        queryExpression.Append(".Take(").Append(take).Append(')');
 
         return contentQuery;
     }

src/Umbraco.Cms.Api.Management/Factories/HealthCheckGroupPresentationFactory.cs

@@ -7,6 +7,7 @@
 
 namespace Umbraco.Cms.Api.Management.Factories;
 
+// TODO (V16): Make internal sealed.
 public class HealthCheckGroupPresentationFactory : IHealthCheckGroupPresentationFactory
 {
     private readonly HealthChecksSettings _healthChecksSettings;
@@ -40,13 +41,21 @@ public HealthCheckGroupPresentationFactory(
         return groups;
     }
 
+    [Obsolete("Use CreateHealthCheckGroupWithResultViewModelAsync instead. Will be removed in v17.")]
     public HealthCheckGroupWithResultResponseModel CreateHealthCheckGroupWithResultViewModel(IGrouping<string?, HealthCheck> healthCheckGroup)
+        => CreateHealthCheckGroupWithResultViewModelAsync(healthCheckGroup).GetAwaiter().GetResult();
+
+    [Obsolete("Use CreateHealthCheckGroupWithResultViewModelAsync instead. Will be removed in v17.")]
+    public HealthCheckWithResultPresentationModel CreateHealthCheckWithResultViewModel(HealthCheck healthCheck) =>
+        CreateHealthCheckWithResultViewModelAsync(healthCheck).GetAwaiter().GetResult();
+
+    public async Task<HealthCheckGroupWithResultResponseModel> CreateHealthCheckGroupWithResultViewModelAsync(IGrouping<string?, HealthCheck> healthCheckGroup)
     {
         var healthChecks = new List<HealthCheckWithResultPresentationModel>();
 
         foreach (HealthCheck healthCheck in healthCheckGroup)
         {
-            healthChecks.Add(CreateHealthCheckWithResultViewModel(healthCheck));
+            healthChecks.Add(await CreateHealthCheckWithResultViewModelAsync(healthCheck));
         }
 
         var healthCheckGroupViewModel = new HealthCheckGroupWithResultResponseModel
@@ -57,11 +66,11 @@ public HealthCheckGroupWithResultResponseModel CreateHealthCheckGroupWithResultV
         return healthCheckGroupViewModel;
     }
 
-    public HealthCheckWithResultPresentationModel CreateHealthCheckWithResultViewModel(HealthCheck healthCheck)
+    public async Task<HealthCheckWithResultPresentationModel> CreateHealthCheckWithResultViewModelAsync(HealthCheck healthCheck)
     {
         _logger.LogDebug($"Running health check: {healthCheck.Name}");
 
-        IEnumerable<HealthCheckStatus> results = healthCheck.GetStatus().Result;
+        IEnumerable<HealthCheckStatus> results = await healthCheck.GetStatusAsync();
 
         var healthCheckViewModel = new HealthCheckWithResultPresentationModel
         {

src/Umbraco.Cms.Api.Management/Factories/IHealthCheckGroupPresentationFactory.cs

@@ -7,7 +7,19 @@ public interface IHealthCheckGroupPresentationFactory
 {
     IEnumerable<IGrouping<string?, HealthCheck>> CreateGroupingFromHealthCheckCollection();
 
+    [Obsolete("Use CreateHealthCheckGroupWithResultViewModelAsync instead. Will be removed in v17.")]
     HealthCheckGroupWithResultResponseModel CreateHealthCheckGroupWithResultViewModel(IGrouping<string?, HealthCheck> healthCheckGroup);
 
+    [Obsolete("Use CreateHealthCheckGroupWithResultViewModelAsync instead. Will be removed in v17.")]
     HealthCheckWithResultPresentationModel CreateHealthCheckWithResultViewModel(HealthCheck healthCheck);
+
+    Task<HealthCheckGroupWithResultResponseModel> CreateHealthCheckGroupWithResultViewModelAsync(IGrouping<string?, HealthCheck> healthCheckGroup)
+#pragma warning disable CS0618 // Type or member is obsolete
+        => Task.FromResult(CreateHealthCheckGroupWithResultViewModel(healthCheckGroup));
+#pragma warning restore CS0618 // Type or member is obsolete
+
+    Task<HealthCheckWithResultPresentationModel> CreateHealthCheckWithResultViewModelAsync(HealthCheck healthCheck)
+#pragma warning disable CS0618 // Type or member is obsolete
+        => Task.FromResult(CreateHealthCheckWithResultViewModel(healthCheck));
+#pragma warning restore CS0618 // Type or member is obsolete
 }

src/Umbraco.Cms.Api.Management/Mapping/ContentType/ContentTypeMapDefinition.cs

@@ -25,8 +25,8 @@ protected IEnumerable<TPropertyTypeModel> MapPropertyTypes(TContentType source)
                 {
                     Id = propertyType.Key,
                     SortOrder = propertyType.SortOrder,
-                    Container = groupKeysByPropertyKeys.ContainsKey(propertyType.Key)
-                        ? new ReferenceByIdModel(groupKeysByPropertyKeys[propertyType.Key])
+                    Container = groupKeysByPropertyKeys.TryGetValue(propertyType.Key, out Guid groupKey)
+                        ? new ReferenceByIdModel(groupKey)
                         : null,
                     Name = propertyType.Name,
                     Alias = propertyType.Alias,

src/Umbraco.Cms.Api.Management/Services/ConflictingRouteService.cs

@@ -1,4 +1,5 @@
 using System.Reflection;
+using System.Runtime.InteropServices;
 using Umbraco.Cms.Api.Management.Controllers;
 using Umbraco.Cms.Core.Composing;
 using Umbraco.Cms.Core.Services;
@@ -19,7 +20,7 @@ public class ConflictingRouteService : IConflictingRouteService
     public bool HasConflictingRoutes(out string controllerName)
     {
         var controllers = _typeLoader.GetTypes<ManagementApiControllerBase>().ToList();
-        foreach (Type controller in controllers)
+        foreach (Type controller in CollectionsMarshal.AsSpan(controllers))
         {
             Type[] potentialConflicting = controllers.Where(x => x.Name == controller.Name).ToArray();
             if (potentialConflicting.Length > 1)

src/Umbraco.Cms.Persistence.EFCore/Locking/SqlServerEFCoreDistributedLockingMechanism.cs

@@ -13,7 +13,7 @@
 
 namespace Umbraco.Cms.Persistence.EFCore.Locking;
 
-internal class SqlServerEFCoreDistributedLockingMechanism<T> : IDistributedLockingMechanism
+internal sealed class SqlServerEFCoreDistributedLockingMechanism<T> : IDistributedLockingMechanism
     where T : DbContext
 {
     private ConnectionStrings _connectionStrings;
@@ -58,7 +58,7 @@ public IDistributedLock WriteLock(int lockId, TimeSpan? obtainLockTimeout = null
         return new SqlServerDistributedLock(this, lockId, DistributedLockType.WriteLock, obtainLockTimeout.Value);
     }
 
-    private class SqlServerDistributedLock : IDistributedLock
+    private sealed class SqlServerDistributedLock : IDistributedLock
     {
         private readonly SqlServerEFCoreDistributedLockingMechanism<T> _parent;
         private readonly TimeSpan _timeout;