Refactor AbpRequestLocalizationMiddleware #1718

framework/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/Builder/AbpApplicationBuilderExtensions.cs

@@ -1,9 +1,5 @@
 using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
 using JetBrains.Annotations;
-using Microsoft.AspNetCore.Localization;
 using Microsoft.AspNetCore.RequestLocalization;
 using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp;
@@ -12,9 +8,6 @@ using Volo.Abp.AspNetCore.Mvc.ExceptionHandling;
 using Volo.Abp.AspNetCore.Tracing;
 using Volo.Abp.AspNetCore.Uow;
 using Volo.Abp.DependencyInjection;
-using Volo.Abp.Localization;
-using Volo.Abp.Settings;
-using Volo.Abp.Threading;
 
 namespace Microsoft.AspNetCore.Builder
 {
@@ -51,7 +44,10 @@ namespace Microsoft.AspNetCore.Builder
 
         public static IApplicationBuilder UseAbpRequestLocalization(this IApplicationBuilder app, Action<RequestLocalizationOptions> optionsAction = null)
         {
-            app.ApplicationServices.GetRequiredService<IAbpRequestLocalizationOptionsProvider>().InitLocalizationOptions(optionsAction);
+            app.ApplicationServices
+                .GetRequiredService<IAbpRequestLocalizationOptionsProvider>()
+                .InitLocalizationOptions(optionsAction);
+
             return app.UseMiddleware<AbpRequestLocalizationMiddleware>();
         }
 

framework/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/RequestLocalization/AbpRequestLocalizationMiddleware.cs

@@ -1,6 +1,8 @@
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Localization;
+using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Volo.Abp.DependencyInjection;
 
@@ -9,17 +11,24 @@ namespace Microsoft.AspNetCore.RequestLocalization
     public class AbpRequestLocalizationMiddleware : IMiddleware, ITransientDependency
     {
         private readonly IAbpRequestLocalizationOptionsProvider _requestLocalizationOptionsProvider;
+        private readonly ILoggerFactory _loggerFactory;
 
         public AbpRequestLocalizationMiddleware(
-            IAbpRequestLocalizationOptionsProvider requestLocalizationOptionsProvider)
+            IAbpRequestLocalizationOptionsProvider requestLocalizationOptionsProvider,
+            ILoggerFactory loggerFactory)
         {
             _requestLocalizationOptionsProvider = requestLocalizationOptionsProvider;
+            _loggerFactory = loggerFactory;
         }
 
         public async Task InvokeAsync(HttpContext context, RequestDelegate next)
         {
-            var options = Options.Create(_requestLocalizationOptionsProvider.GetLocalizationOptions());
-            var middleware = new RequestLocalizationMiddleware(next, options);
+            var middleware = new RequestLocalizationMiddleware(
+                next,
+                new OptionsWrapper<RequestLocalizationOptions>(_requestLocalizationOptionsProvider.GetLocalizationOptions()),
+                _loggerFactory
+            );
+
             await middleware.Invoke(context);
         }
     }