fixed valdisiljuconoks/LocalizationProvider#285

valdisiljuconoks · May 5, 2024 · 74556cb · 74556cb
1 parent 187c7b8
commit 74556cb
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/lib/localization-provider b/lib/localization-provider
diff --git a/src/DbLocalizationProvider.AspNetCore/ClientsideProvider/IApplicationBuilderExtensions.cs b/src/DbLocalizationProvider.AspNetCore/ClientsideProvider/IApplicationBuilderExtensions.cs
@@ -11,9 +11,14 @@
 // ReSharper disable once CheckNamespace
 namespace DbLocalizationProvider.AspNetCore;
 
+/// <summary>
+/// Unfortunately extension methods needs to have their homes somewhere
+/// </summary>
 public static class IApplicationBuilderClientsideExtensions
 {
+#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
     private static ICacheManager _cache;
+#pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
 
     /// <summary>
     /// Makes sure that usage of the clientside resource provider is added to your app.
@@ -25,8 +30,9 @@ public static IApplicationBuilder UseDbLocalizationClientsideProvider(this IAppl
         AppContext.Configure(builder.ApplicationServices.GetRequiredService<IHttpContextAccessor>());
         _cache = builder.ApplicationServices.GetRequiredService<ICacheManager>();
 
-        var cacheManager = builder.ApplicationServices.GetService<ICacheManager>();
+        var cacheManager = builder.ApplicationServices.GetRequiredService<ICacheManager>();
         cacheManager.OnRemove += OnRemove;
+
         builder.ApplicationServices
             .GetRequiredService<IHostApplicationLifetime>()
             .ApplicationStopping

diff --git a/src/DbLocalizationProvider.AspNetCore/Queries/CachedGetAllResourcesHandler.cs b/src/DbLocalizationProvider.AspNetCore/Queries/CachedGetAllResourcesHandler.cs
@@ -49,13 +49,13 @@ public IEnumerable<LocalizationResource> Execute(GetAllResources.Query query)
 
         // if keys = 0, execute inner query to actually get resources from the db
         // this is usually called during initialization when cache is not yet filled up
-        if (_configurationContext.Value.BaseCacheManager.KnownKeyCount == 0)
+        if (_configurationContext.Value._baseCacheManager.KnownKeyCount == 0)
         {
             return _inner.Execute(query);
         }
 
         var result = new List<LocalizationResource>();
-        var keys = _configurationContext.Value.BaseCacheManager.KnownKeys;
+        var keys = _configurationContext.Value._baseCacheManager.KnownKeys;
 
         foreach (var key in keys)
         {
+9 −9		push-packages.ps1
+4 −4		src/DbLocalizationProvider.Abstractions/DbLocalizationProvider.Abstractions.csproj
+4 −4		src/DbLocalizationProvider.AdminUI.Models/DbLocalizationProvider.AdminUI.Models.csproj
+4 −4		src/DbLocalizationProvider.Csv/DbLocalizationProvider.Csv.csproj
+4 −4		src/DbLocalizationProvider.Storage.AzureTables/DbLocalizationProvider.Storage.AzureTables.csproj
+5 −5		src/DbLocalizationProvider.Storage.PostgreSQL/DbLocalizationProvider.Storage.PostgreSql.csproj
+4 −4		src/DbLocalizationProvider.Storage.SqlServer/DbLocalizationProvider.Storage.SqlServer.csproj
+4 −4		src/DbLocalizationProvider.Translator.Azure/DbLocalizationProvider.Translator.Azure.csproj
+4 −4		src/DbLocalizationProvider.Xliff/DbLocalizationProvider.Xliff.csproj
+11 −20		src/DbLocalizationProvider/Cache/BaseCacheManager.cs
+2 −2		src/DbLocalizationProvider/Cache/ICacheManager.cs
+1 −1		src/DbLocalizationProvider/Commands/CreateNewResources.cs
+10 −3		src/DbLocalizationProvider/ConfigurationContext.cs
+4 −4		src/DbLocalizationProvider/DbLocalizationProvider.csproj
+9 −3		src/DbLocalizationProvider/Queries/GetTranslation.cs
+2 −2		src/DbLocalizationProvider/Sync/Synchronizer.cs