Merge pull request #171 from Lombiq/issue/OSOE-867

OSOE-867: Addressing analyzer warnings
Lombiq · Jun 11, 2024 · 1c6e4a8 · 1c6e4a8
2 parents eed6318 + 12b804f
commit 1c6e4a8
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 19 deletions.
diff --git a/Lombiq.HelpfulExtensions/Controllers/ContentSetController.cs b/Lombiq.HelpfulExtensions/Controllers/ContentSetController.cs
@@ -1,4 +1,4 @@
-using Lombiq.HelpfulExtensions.Extensions.ContentSets.Services;
+using Lombiq.HelpfulExtensions.Extensions.ContentSets.Services;
 using Microsoft.AspNetCore.Mvc;
 using OrchardCore;
 using OrchardCore.Modules;
@@ -18,8 +18,12 @@ public ContentSetController(IContentSetManager contentSetManager, IOrchardHelper
         _orchardHelper = orchardHelper;
     }
 
-    public async Task<IActionResult> Create(string fromContentItemId, string fromPartName, string newKey) =>
-        await _contentSetManager.CloneContentItemAsync(fromContentItemId, fromPartName, newKey) is { } content
+    public async Task<IActionResult> Create(string fromContentItemId, string fromPartName, string newKey)
+    {
+        if (!ModelState.IsValid) return BadRequest(ModelState);
+
+        return await _contentSetManager.CloneContentItemAsync(fromContentItemId, fromPartName, newKey) is { } content
             ? Redirect(_orchardHelper.GetItemEditUrl(content))
             : NotFound();
+    }
 }
diff --git a/Lombiq.HelpfulExtensions/Controllers/OrchardRecipeMigrationAdminController.cs b/Lombiq.HelpfulExtensions/Controllers/OrchardRecipeMigrationAdminController.cs
@@ -37,6 +37,8 @@ public OrchardRecipeMigrationAdminController(
     [ValidateAntiForgeryToken]
     public async Task<IActionResult> Convert(IFormFile file)
     {
+        if (!ModelState.IsValid) return BadRequest(ModelState);
+
         Stream stream;
         string json;
 

diff --git a/Lombiq.HelpfulExtensions/Extensions/ContentSets/Indexes/ContentSetIndex.cs b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Indexes/ContentSetIndex.cs
@@ -39,7 +39,7 @@ public ContentSetIndexProvider(IServiceProvider provider) =>
     public override void Describe(DescribeContext<ContentItem> context) =>
         context.For<ContentSetIndex>().Map(async contentItem =>
         {
-            if (!contentItem.Latest) return Enumerable.Empty<ContentSetIndex>();
+            if (!contentItem.Latest) return [];
 
             using var scope = _provider.CreateScope();
             var contentDefinitionManager = scope.ServiceProvider.GetRequiredService<IContentDefinitionManager>();

diff --git a/Lombiq.HelpfulExtensions/Extensions/ContentSets/ViewModels/ContentSetPartViewModel.cs b/Lombiq.HelpfulExtensions/Extensions/ContentSets/ViewModels/ContentSetPartViewModel.cs
@@ -1,4 +1,4 @@
-using Lombiq.HelpfulExtensions.Extensions.ContentSets.Events;
+using Lombiq.HelpfulExtensions.Extensions.ContentSets.Events;
 using Lombiq.HelpfulExtensions.Extensions.ContentSets.Models;
 using Lombiq.HelpfulExtensions.Extensions.ContentSets.Services;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
@@ -24,7 +24,7 @@ public class ContentSetPartViewModel
     public ContentSetPart ContentSetPart { get; set; }
 
     [BindNever]
-    public IEnumerable<ContentSetLinkViewModel> MemberLinks { get; set; } = Enumerable.Empty<ContentSetLinkViewModel>();
+    public IEnumerable<ContentSetLinkViewModel> MemberLinks { get; set; } = [];
 
     [BindNever]
     public bool IsNew { get; set; }
@@ -84,13 +84,16 @@ public async ValueTask InitializeAsync(
                 pair.Key));
         options.AddRange(inapplicableSetMembers, link => link.Key);
 
+        // Using collection expression greatly reduces readability.
+#pragma warning disable IDE0305 // Simplify collection initialization
         MemberLinks = options
             .Values
             .Where(link => link.Key != Key && link.ContentItemId != part.ContentItem.ContentItemId)
             .OrderBy(link => string.IsNullOrEmpty(link.ContentItemId) ? 1 : 0)
             .ThenBy(link => link.IsDeleted ? 1 : 0)
             .ThenBy(link => link.DisplayText)
             .ToList();
+#pragma warning restore IDE0305 // Simplify collection initialization
     }
 }
 

diff --git a/...ulExtensions/Extensions/OrchardRecipeMigration/Services/OrchardExportToRecipeConverter.cs b/...ulExtensions/Extensions/OrchardRecipeMigration/Services/OrchardExportToRecipeConverter.cs
@@ -40,7 +40,7 @@ public OrchardExportToRecipeConverter(
     public async Task<string> ConvertAsync(XDocument export)
     {
         var contentItems = new List<ContentItem>();
-        var contents = export.XPathSelectElement("//Content")?.Elements() ?? Enumerable.Empty<XElement>();
+        var contents = export.XPathSelectElement("//Content")?.Elements() ?? [];
         var contentTypes = (await _contentDefinitionManager.ListTypeDefinitionsAsync())
             .Select(definition => definition.Name)
             .ToList();

diff --git a/...ulExtensions/Extensions/Security/Services/StrictSecurityPermissionAuthorizationHandler.cs b/...ulExtensions/Extensions/Security/Services/StrictSecurityPermissionAuthorizationHandler.cs
@@ -20,7 +20,7 @@ public class StrictSecurityPermissionAuthorizationHandler : AuthorizationHandler
         .PermissionTemplates
         .ToDictionary(
             pair => pair.Key,
-            pair => GetPermissionTemplates(pair.Value, new List<string>()));
+            pair => GetPermissionTemplates(pair.Value, []));
 
     private readonly IContentDefinitionManager _contentDefinitionManager;
 

diff --git a/Lombiq.HelpfulExtensions/Extensions/Widgets/Liquid/MenuWidgetLiquidFilter.cs b/Lombiq.HelpfulExtensions/Extensions/Widgets/Liquid/MenuWidgetLiquidFilter.cs
@@ -1,4 +1,4 @@
-using Fluid;
+using Fluid;
 using Fluid.Values;
 using Lombiq.HelpfulExtensions.Extensions.Widgets.ViewModels;
 using Lombiq.HelpfulLibraries.OrchardCore.Liquid;
@@ -59,9 +59,9 @@ public ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments argu
             FluidValues.Object => input!.ToObjectValue() switch
             {
                 IEnumerable<MenuItem> enumerable => enumerable.AsList(),
-                MenuItem single => new[] { single },
+                MenuItem single => [single],
                 JArray jArray => jArray.ToObject<IList<MenuItem>>(serializer),
-                JObject jObject => new[] { jObject.ToObject<MenuItem>(serializer) },
+                JObject jObject => [jObject.ToObject<MenuItem>(serializer)],
                 _ => null,
             },
             _ => null,
@@ -74,7 +74,7 @@ public ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments argu
             model =>
             {
                 model.NoWrapper = noWrapper;
-                model.MenuItems = menuItems ?? Array.Empty<MenuItem>();
+                model.MenuItems = menuItems ?? [];
                 model.HtmlClasses = classes;
             });
     }

diff --git a/Lombiq.HelpfulExtensions/Extensions/Widgets/ViewModels/MenuWidgetViewModel.cs b/Lombiq.HelpfulExtensions/Extensions/Widgets/ViewModels/MenuWidgetViewModel.cs
@@ -1,6 +1,5 @@
-using OrchardCore.Navigation;
+using OrchardCore.Navigation;
 using System.Collections.Generic;
-using System.Linq;
 
 namespace Lombiq.HelpfulExtensions.Extensions.Widgets.ViewModels;
 
@@ -13,14 +12,14 @@ public class MenuWidgetViewModel
     public string HtmlClasses { get; set; } = string.Empty;
 
     public MenuWidgetViewModel()
-        : this(noWrapper: false, menuItems: Enumerable.Empty<MenuItem>())
+        : this(noWrapper: false, menuItems: [])
     {
     }
 
     public MenuWidgetViewModel(bool noWrapper, IEnumerable<MenuItem> menuItems)
     {
         NoWrapper = noWrapper;
-        MenuItems = menuItems ?? Enumerable.Empty<MenuItem>();
+        MenuItems = menuItems ?? [];
     }
 
     public MenuWidgetViewModel(dynamic model)

diff --git a/Lombiq.HelpfulExtensions/Extensions/Widgets/ViewModels/MvcConditionViewModel.cs b/Lombiq.HelpfulExtensions/Extensions/Widgets/ViewModels/MvcConditionViewModel.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 
 namespace Lombiq.HelpfulExtensions.Extensions.Widgets.ViewModels;
 
@@ -8,6 +8,6 @@ public class MvcConditionViewModel
     public string Controller { get; set; }
     public string Action { get; set; }
 
-    public IList<string> OtherRouteNames { get; } = new List<string>();
-    public IList<string> OtherRouteValues { get; } = new List<string>();
+    public IList<string> OtherRouteNames { get; } = [];
+    public IList<string> OtherRouteValues { get; } = [];
 }