Refactoring

Author: hishamco

src/My.Extensions.Localization.Json/Internal/JsonResourceManager.cs

@@ -9,12 +9,12 @@ namespace My.Extensions.Localization.Json.Internal;
 
 public class JsonResourceManager
 {
-    private readonly List<JsonFileWatcher> _jsonFileWatchers = new();
+    private readonly List<JsonFileWatcher> _jsonFileWatchers = [];
     private readonly ConcurrentDictionary<string, ConcurrentDictionary<string, string>> _resourcesCache = new();
     private readonly ConcurrentDictionary<string, HashSet<string>> _loadedFilesCache = new();
 
     public JsonResourceManager(string resourcesPath, string resourceName = null)
-        : this(new[] { resourcesPath }, fallBackToParentUICultures: true, resourceName)
+        : this([resourcesPath], fallBackToParentUICultures: true, resourceName)
     {
     }
 

src/My.Extensions.Localization.Json/JsonLocalizationOptions.cs

@@ -1,11 +1,10 @@
-using System;
-using Microsoft.Extensions.Localization;
+using Microsoft.Extensions.Localization;
 
 namespace My.Extensions.Localization.Json;
 
 public class JsonLocalizationOptions : LocalizationOptions
 {
     public ResourcesType ResourcesType { get; set; } = ResourcesType.TypeBased;
 
-    public new string[] ResourcesPath { get; set; } = Array.Empty<string>();
+    public new string[] ResourcesPath { get; set; } = [];
 }

src/My.Extensions.Localization.Json/JsonStringLocalizerFactory.cs

@@ -37,7 +37,7 @@ public JsonStringLocalizerFactory(
     {
         ArgumentNullException.ThrowIfNull(localizationOptions);
 
-        _resourcesPaths = localizationOptions.Value.ResourcesPath ?? Array.Empty<string>();
+        _resourcesPaths = localizationOptions.Value.ResourcesPath ?? [];
         _resourcesType = localizationOptions.Value.ResourcesType;
         _fallBackToParentUICultures = requestLocalizationOptions?.Value?.FallBackToParentUICultures ?? true;
         _loggerFactory = loggerFactory ?? throw new ArgumentNullException(nameof(loggerFactory));
@@ -115,12 +115,10 @@ private string[] GetResourcePaths(Assembly assembly)
 
         if (resourceLocationAttribute != null)
         {
-            return new[] { Path.Combine(PathHelpers.GetApplicationRoot(), resourceLocationAttribute.ResourceLocation) };
+            return [Path.Combine(PathHelpers.GetApplicationRoot(), resourceLocationAttribute.ResourceLocation)];
         }
 
-        return _resourcesPaths
-            .Select(p => Path.Combine(PathHelpers.GetApplicationRoot(), p))
-            .ToArray();
+        return [.. _resourcesPaths.Select(p => Path.Combine(PathHelpers.GetApplicationRoot(), p))];
     }
 
     private static string GetRootNamespace(Assembly assembly)

test/My.Extensions.Localization.Json.Tests/JsonStringLocalizerTests.cs

@@ -1,7 +1,4 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.TestHost;
 using Microsoft.Extensions.DependencyInjection;
@@ -10,6 +7,8 @@
 using Microsoft.Extensions.Options;
 using Moq;
 using My.Extensions.Localization.Json.Tests.Common;
+using System.Linq;
+using System.Threading.Tasks;
 using Xunit;
 
 namespace My.Extensions.Localization.Json.Tests;
@@ -22,7 +21,7 @@ public JsonStringLocalizerTests()
     {
         var _localizationOptions = new Mock<IOptions<JsonLocalizationOptions>>();
         _localizationOptions.Setup(o => o.Value)
-            .Returns(() => new JsonLocalizationOptions { ResourcesPath = new[] { "Resources" } });
+            .Returns(() => new JsonLocalizationOptions { ResourcesPath = ["Resources"] });
         var localizerFactory = new JsonStringLocalizerFactory(_localizationOptions.Object, NullLoggerFactory.Instance);
         var location = "My.Extensions.Localization.Json.Tests";
         var basename = $"{location}.Common.{nameof(Test)}";
@@ -135,7 +134,7 @@ public async void CultureBasedResourcesUsesIStringLocalizer()
             {
                 services.AddJsonLocalization(options =>
                 {
-                    options.ResourcesPath = new[] { "Resources" };
+                    options.ResourcesPath = ["Resources"];
                     options.ResourcesType = ResourcesType.CultureBased;
                 });
             })
@@ -185,7 +184,7 @@ public void GetTranslation_WithFallBackToParentUICulturesDisabled_DoesNotFallbac
         localizationOptions.Setup(o => o.Value)
             .Returns(() => new JsonLocalizationOptions 
             { 
-                ResourcesPath = new[] { "Resources" }
+                ResourcesPath = ["Resources"]
             });
 
         var requestLocalizationOptions = new Mock<IOptions<RequestLocalizationOptions>>();
@@ -224,7 +223,7 @@ public void GetTranslation_WithFallBackToParentUICulturesEnabled_FallsBackToPare
         localizationOptions.Setup(o => o.Value)
             .Returns(() => new JsonLocalizationOptions 
             { 
-                ResourcesPath = new[] { "Resources" }
+                ResourcesPath = ["Resources"]
             });
 
         var requestLocalizationOptions = new Mock<IOptions<RequestLocalizationOptions>>();