Reduce unnecessary dependency injection.

framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Auditing/AbpAuditActionFilter.cs

@@ -3,6 +3,7 @@ using System.Diagnostics;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc.Abstractions;
 using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using Volo.Abp.Aspects;
 using Volo.Abp.Auditing;
@@ -12,17 +13,6 @@ namespace Volo.Abp.AspNetCore.Mvc.Auditing
 {
     public class AbpAuditActionFilter : IAsyncActionFilter, ITransientDependency
     {
-        protected AbpAuditingOptions Options { get; }
-        private readonly IAuditingHelper _auditingHelper;
-        private readonly IAuditingManager _auditingManager;
-
-        public AbpAuditActionFilter(IOptions<AbpAuditingOptions> options, IAuditingHelper auditingHelper, IAuditingManager auditingManager)
-        {
-            Options = options.Value;
-            _auditingHelper = auditingHelper;
-            _auditingManager = auditingManager;
-        }
-
         public async Task OnActionExecutionAsync(ActionExecutingContext context, ActionExecutionDelegate next)
         {
             if (!ShouldSaveAudit(context, out var auditLog, out var auditLogAction))
@@ -63,7 +53,8 @@ namespace Volo.Abp.AspNetCore.Mvc.Auditing
             auditLog = null;
             auditLogAction = null;
 
-            if (!Options.IsEnabled)
+            var options = context.HttpContext.RequestServices.GetRequiredService<IOptions<AbpAuditingOptions>>().Value;
+            if (!options.IsEnabled)
             {
                 return false;
             }
@@ -73,19 +64,20 @@ namespace Volo.Abp.AspNetCore.Mvc.Auditing
                 return false;
             }
 
-            var auditLogScope = _auditingManager.Current;
+            var auditLogScope = context.HttpContext.RequestServices.GetRequiredService<IAuditingManager>().Current;
             if (auditLogScope == null)
             {
                 return false;
             }
 
-            if (!_auditingHelper.ShouldSaveAudit(context.ActionDescriptor.GetMethodInfo(), true))
+            var auditingHelper = context.HttpContext.RequestServices.GetRequiredService<IAuditingHelper>();
+            if (!auditingHelper.ShouldSaveAudit(context.ActionDescriptor.GetMethodInfo(), true))
             {
                 return false;
             }
 
             auditLog = auditLogScope.Log;
-            auditLogAction = _auditingHelper.CreateAuditLogAction(
+            auditLogAction = auditingHelper.CreateAuditLogAction(
                 auditLog,
                 context.ActionDescriptor.AsControllerActionDescriptor().ControllerTypeInfo.AsType(),
                 context.ActionDescriptor.AsControllerActionDescriptor().MethodInfo,

framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Auditing/AbpAuditPageFilter.cs

@@ -3,6 +3,7 @@ using System.Diagnostics;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc.Abstractions;
 using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using Volo.Abp.Aspects;
 using Volo.Abp.Auditing;
@@ -12,22 +13,11 @@ namespace Volo.Abp.AspNetCore.Mvc.Auditing
 {
     public class AbpAuditPageFilter : IAsyncPageFilter, ITransientDependency
     {
-        protected AbpAuditingOptions Options { get; }
-        private readonly IAuditingHelper _auditingHelper;
-        private readonly IAuditingManager _auditingManager;
-
-        public AbpAuditPageFilter(IOptions<AbpAuditingOptions> options, IAuditingHelper auditingHelper, IAuditingManager auditingManager)
-        {
-            Options = options.Value;
-            _auditingHelper = auditingHelper;
-            _auditingManager = auditingManager;
-        }
-        
         public Task OnPageHandlerSelectionAsync(PageHandlerSelectedContext context)
         {
             return Task.CompletedTask;
         }
-        
+
         public async Task OnPageHandlerExecutionAsync(PageHandlerExecutingContext context, PageHandlerExecutionDelegate next)
         {
             if (context.HandlerMethod == null || !ShouldSaveAudit(context, out var auditLog, out var auditLogAction))
@@ -68,7 +58,8 @@ namespace Volo.Abp.AspNetCore.Mvc.Auditing
             auditLog = null;
             auditLogAction = null;
 
-            if (!Options.IsEnabled)
+            var options = context.HttpContext.RequestServices.GetRequiredService<IOptions<AbpAuditingOptions>>().Value;
+            if (!options.IsEnabled)
             {
                 return false;
             }
@@ -78,19 +69,20 @@ namespace Volo.Abp.AspNetCore.Mvc.Auditing
                 return false;
             }
 
-            var auditLogScope = _auditingManager.Current;
+            var auditLogScope = context.HttpContext.RequestServices.GetRequiredService<IAuditingManager>().Current;
             if (auditLogScope == null)
             {
                 return false;
             }
 
-            if (!_auditingHelper.ShouldSaveAudit(context.HandlerMethod.MethodInfo, true))
+            var auditingHelper = context.HttpContext.RequestServices.GetRequiredService<IAuditingHelper>();
+            if (!auditingHelper.ShouldSaveAudit(context.HandlerMethod.MethodInfo, true))
             {
                 return false;
             }
 
             auditLog = auditLogScope.Log;
-            auditLogAction = _auditingHelper.CreateAuditLogAction(
+            auditLogAction = auditingHelper.CreateAuditLogAction(
                 auditLog,
                 context.HandlerMethod.GetType(),
                 context.HandlerMethod.MethodInfo,
@@ -100,4 +92,4 @@ namespace Volo.Abp.AspNetCore.Mvc.Auditing
             return true;
         }
     }
-}
+}

framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ExceptionHandling/AbpExceptionFilter.cs

@@ -19,27 +19,6 @@ namespace Volo.Abp.AspNetCore.Mvc.ExceptionHandling
 {
     public class AbpExceptionFilter : IAsyncExceptionFilter, ITransientDependency
     {
-        public ILogger<AbpExceptionFilter> Logger { get; set; }
-
-        private readonly IExceptionToErrorInfoConverter _errorInfoConverter;
-        private readonly IHttpExceptionStatusCodeFinder _statusCodeFinder;
-        private readonly IJsonSerializer _jsonSerializer;
-        private readonly AbpExceptionHandlingOptions _exceptionHandlingOptions;
-
-        public AbpExceptionFilter(
-            IExceptionToErrorInfoConverter errorInfoConverter,
-            IHttpExceptionStatusCodeFinder statusCodeFinder,
-            IJsonSerializer jsonSerializer,
-            IOptions<AbpExceptionHandlingOptions> exceptionHandlingOptions)
-        {
-            _errorInfoConverter = errorInfoConverter;
-            _statusCodeFinder = statusCodeFinder;
-            _jsonSerializer = jsonSerializer;
-            _exceptionHandlingOptions = exceptionHandlingOptions.Value;
-
-            Logger = NullLogger<AbpExceptionFilter>.Instance;
-        }
-
         public async Task OnExceptionAsync(ExceptionContext context)
         {
             if (!ShouldHandleException(context))
@@ -78,9 +57,14 @@ namespace Volo.Abp.AspNetCore.Mvc.ExceptionHandling
             //TODO: Trigger an AbpExceptionHandled event or something like that.
 
             context.HttpContext.Response.Headers.Add(AbpHttpConsts.AbpErrorFormat, "true");
-            context.HttpContext.Response.StatusCode = (int)_statusCodeFinder.GetStatusCode(context.HttpContext, context.Exception);
+            context.HttpContext.Response.StatusCode = (int) context.HttpContext.RequestServices
+                .GetRequiredService<IHttpExceptionStatusCodeFinder>()
+                .GetStatusCode(context.HttpContext, context.Exception);
 
-            var remoteServiceErrorInfo = _errorInfoConverter.Convert(context.Exception, _exceptionHandlingOptions.SendExceptionsDetailsToClients);
+            var remoteServiceErrorInfo = context.HttpContext.RequestServices
+                .GetRequiredService<IExceptionToErrorInfoConverter>().Convert(context.Exception,
+                    context.HttpContext.RequestServices.GetRequiredService<IOptions<AbpExceptionHandlingOptions>>()
+                        .Value.SendExceptionsDetailsToClients);
 
             context.Result = new ObjectResult(new RemoteServiceErrorResponse(remoteServiceErrorInfo));
 
@@ -88,10 +72,15 @@ namespace Volo.Abp.AspNetCore.Mvc.ExceptionHandling
 
             var remoteServiceErrorInfoBuilder = new StringBuilder();
             remoteServiceErrorInfoBuilder.AppendLine($"---------- {nameof(RemoteServiceErrorInfo)} ----------");
-            remoteServiceErrorInfoBuilder.AppendLine( _jsonSerializer.Serialize(remoteServiceErrorInfo, indented: true));
+            remoteServiceErrorInfoBuilder.AppendLine(context.HttpContext.RequestServices
-            Logger.LogWithLevel(logLevel, remoteServiceErrorInfoBuilder.ToString());
+                .GetRequiredService<IJsonSerializer>().Serialize(remoteServiceErrorInfo, indented: true));
+
+            var logger = context.HttpContext.RequestServices.GetService<ILogger<AbpExceptionFilter>>() ??
+                         NullLogger<AbpExceptionFilter>.Instance;
+
+            logger.LogWithLevel(logLevel, remoteServiceErrorInfoBuilder.ToString());
 
-            Logger.LogException(context.Exception, logLevel);
+            logger.LogException(context.Exception, logLevel);
 
             await context.HttpContext
                 .RequestServices

framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ExceptionHandling/AbpExceptionPageFilter.cs

@@ -19,27 +19,6 @@ namespace Volo.Abp.AspNetCore.Mvc.ExceptionHandling
 {
     public class AbpExceptionPageFilter : IAsyncPageFilter, ITransientDependency
     {
-        public ILogger<AbpExceptionPageFilter> Logger { get; set; }
-
-        private readonly IExceptionToErrorInfoConverter _errorInfoConverter;
-        private readonly IHttpExceptionStatusCodeFinder _statusCodeFinder;
-        private readonly IJsonSerializer _jsonSerializer;
-        private readonly AbpExceptionHandlingOptions _exceptionHandlingOptions;
-
-        public AbpExceptionPageFilter(
-            IExceptionToErrorInfoConverter errorInfoConverter,
-            IHttpExceptionStatusCodeFinder statusCodeFinder,
-            IJsonSerializer jsonSerializer,
-            IOptions<AbpExceptionHandlingOptions> exceptionHandlingOptions)
-        {
-            _errorInfoConverter = errorInfoConverter;
-            _statusCodeFinder = statusCodeFinder;
-            _jsonSerializer = jsonSerializer;
-            _exceptionHandlingOptions = exceptionHandlingOptions.Value;
-
-            Logger = NullLogger<AbpExceptionPageFilter>.Instance;
-        }
-
         public Task OnPageHandlerSelectionAsync(PageHandlerSelectedContext context)
         {
             return Task.CompletedTask;
@@ -90,9 +69,14 @@ namespace Volo.Abp.AspNetCore.Mvc.ExceptionHandling
             //TODO: Trigger an AbpExceptionHandled event or something like that.
 
             context.HttpContext.Response.Headers.Add(AbpHttpConsts.AbpErrorFormat, "true");
-            context.HttpContext.Response.StatusCode = (int)_statusCodeFinder.GetStatusCode(context.HttpContext, context.Exception);
+            context.HttpContext.Response.StatusCode = (int) context.HttpContext.RequestServices
+                .GetRequiredService<IHttpExceptionStatusCodeFinder>()
+                .GetStatusCode(context.HttpContext, context.Exception);
 
-            var remoteServiceErrorInfo = _errorInfoConverter.Convert(context.Exception, _exceptionHandlingOptions.SendExceptionsDetailsToClients);
+            var remoteServiceErrorInfo = context.HttpContext.RequestServices
+                .GetRequiredService<IExceptionToErrorInfoConverter>().Convert(context.Exception,
+                    context.HttpContext.RequestServices.GetRequiredService<IOptions<AbpExceptionHandlingOptions>>()
+                        .Value.SendExceptionsDetailsToClients);
 
             context.Result = new ObjectResult(new RemoteServiceErrorResponse(remoteServiceErrorInfo));
 
@@ -100,10 +84,14 @@ namespace Volo.Abp.AspNetCore.Mvc.ExceptionHandling
 
             var remoteServiceErrorInfoBuilder = new StringBuilder();
             remoteServiceErrorInfoBuilder.AppendLine($"---------- {nameof(RemoteServiceErrorInfo)} ----------");
-            remoteServiceErrorInfoBuilder.AppendLine( _jsonSerializer.Serialize(remoteServiceErrorInfo, indented: true));
+            remoteServiceErrorInfoBuilder.AppendLine(context.HttpContext.RequestServices
-            Logger.LogWithLevel(logLevel, remoteServiceErrorInfoBuilder.ToString());
+                .GetRequiredService<IJsonSerializer>().Serialize(remoteServiceErrorInfo, indented: true));
+
+            var logger = context.HttpContext.RequestServices.GetService<ILogger<AbpExceptionFilter>>() ??
+                         NullLogger<AbpExceptionFilter>.Instance;
+            logger.LogWithLevel(logLevel, remoteServiceErrorInfoBuilder.ToString());
 
-            Logger.LogException(context.Exception, logLevel);
+            logger.LogException(context.Exception, logLevel);
 
             await context.HttpContext
                 .RequestServices

framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Features/AbpFeatureActionFilter.cs

@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Mvc.Filters;
-using System;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.Aspects;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Features;
@@ -10,15 +10,8 @@ namespace Volo.Abp.AspNetCore.Mvc.Features
 {
     public class AbpFeatureActionFilter : IAsyncActionFilter, ITransientDependency
     {
-        private readonly IMethodInvocationFeatureCheckerService _methodInvocationAuthorizationService;
-
-        public AbpFeatureActionFilter(IMethodInvocationFeatureCheckerService methodInvocationAuthorizationService)
-        {
-            _methodInvocationAuthorizationService = methodInvocationAuthorizationService;
-        }
-
         public async Task OnActionExecutionAsync(
-            ActionExecutingContext context, 
+            ActionExecutingContext context,
             ActionExecutionDelegate next)
         {
             if (!context.ActionDescriptor.IsControllerAction())
@@ -31,7 +24,7 @@ namespace Volo.Abp.AspNetCore.Mvc.Features
 
             using (AbpCrossCuttingConcerns.Applying(context.Controller, AbpCrossCuttingConcerns.FeatureChecking))
             {
-                await _methodInvocationAuthorizationService.CheckAsync(
+                await context.HttpContext.RequestServices.GetRequiredService<IMethodInvocationFeatureCheckerService>().CheckAsync(
                     new MethodInvocationFeatureCheckerContext(methodInfo)
                 );
 

framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Features/AbpFeaturePageFilter.cs

@@ -1,6 +1,7 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc.Abstractions;
 using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.Aspects;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Features;
@@ -9,18 +10,11 @@ namespace Volo.Abp.AspNetCore.Mvc.Features
 {
     public class AbpFeaturePageFilter : IAsyncPageFilter, ITransientDependency
     {
-        private readonly IMethodInvocationFeatureCheckerService _methodInvocationAuthorizationService;
-
-        public AbpFeaturePageFilter(IMethodInvocationFeatureCheckerService methodInvocationAuthorizationService)
-        {
-            _methodInvocationAuthorizationService = methodInvocationAuthorizationService;
-        }
-        
         public Task OnPageHandlerSelectionAsync(PageHandlerSelectedContext context)
         {
             return Task.CompletedTask;
         }
-        
+
         public async Task OnPageHandlerExecutionAsync(PageHandlerExecutingContext context, PageHandlerExecutionDelegate next)
         {
             if (context.HandlerMethod == null || !context.ActionDescriptor.IsPageAction())
@@ -33,7 +27,7 @@ namespace Volo.Abp.AspNetCore.Mvc.Features
 
             using (AbpCrossCuttingConcerns.Applying(context.HandlerInstance, AbpCrossCuttingConcerns.FeatureChecking))
             {
-                await _methodInvocationAuthorizationService.CheckAsync(
+                await context.HttpContext.RequestServices.GetRequiredService<IMethodInvocationFeatureCheckerService>().CheckAsync(
                     new MethodInvocationFeatureCheckerContext(methodInfo)
                 );
 
@@ -41,4 +35,4 @@ namespace Volo.Abp.AspNetCore.Mvc.Features
             }
         }
     }
-}
+}

framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/GlobalFeatures/GlobalFeatureActionFilter.cs

@@ -3,6 +3,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Abstractions;
 using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
 using Volo.Abp.DependencyInjection;
@@ -13,13 +14,6 @@ namespace Volo.Abp.AspNetCore.Mvc.GlobalFeatures
 {
     public class GlobalFeatureActionFilter : IAsyncActionFilter, ITransientDependency
     {
-        public ILogger<GlobalFeatureActionFilter> Logger { get; set; }
-
-        public GlobalFeatureActionFilter()
-        {
-            Logger = NullLogger<GlobalFeatureActionFilter>.Instance;
-        }
-
         public async Task OnActionExecutionAsync(ActionExecutingContext context, ActionExecutionDelegate next)
         {
             if (!context.ActionDescriptor.IsControllerAction())
@@ -30,7 +24,11 @@ namespace Volo.Abp.AspNetCore.Mvc.GlobalFeatures
 
             if (!IsGlobalFeatureEnabled(context.Controller.GetType(), out var attribute))
             {
-                Logger.LogWarning($"The '{context.Controller.GetType().FullName}' controller needs to enable '{attribute.Name}' feature.");
+                var logger =
+                    context.HttpContext.RequestServices.GetRequiredService<ILogger<GlobalFeatureActionFilter>>() ??
+                    NullLogger<GlobalFeatureActionFilter>.Instance;
+
+                logger.LogWarning($"The '{context.Controller.GetType().FullName}' controller needs to enable '{attribute.Name}' feature.");
                 context.Result = new NotFoundResult();
                 return;
             }

framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/GlobalFeatures/GlobalFeaturePageFilter.cs

@@ -3,6 +3,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Abstractions;
 using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
 using Volo.Abp.DependencyInjection;
@@ -13,13 +14,6 @@ namespace Volo.Abp.AspNetCore.Mvc.GlobalFeatures
 {
     public class GlobalFeaturePageFilter: IAsyncPageFilter, ITransientDependency
     {
-        public ILogger<GlobalFeaturePageFilter> Logger { get; set; }
-
-        public GlobalFeaturePageFilter()
-        {
-            Logger = NullLogger<GlobalFeaturePageFilter>.Instance;
-        }
-
         public Task OnPageHandlerSelectionAsync(PageHandlerSelectedContext context)
         {
             return Task.CompletedTask;
@@ -35,7 +29,11 @@ namespace Volo.Abp.AspNetCore.Mvc.GlobalFeatures
 
             if (!IsGlobalFeatureEnabled(context.HandlerInstance.GetType(), out var attribute))
             {
-                Logger.LogWarning($"The '{context.HandlerInstance.GetType().FullName}' page needs to enable '{attribute.Name}' feature.");
+                var logger =
+                    context.HttpContext.RequestServices.GetRequiredService<ILogger<GlobalFeatureActionFilter>>() ??
+                    NullLogger<GlobalFeatureActionFilter>.Instance;
+
+                logger.LogWarning($"The '{context.HandlerInstance.GetType().FullName}' page needs to enable '{attribute.Name}' feature.");
                 context.Result = new NotFoundResult();
                 return;
             }

framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Json/AbpHybridJsonInputFormatter.cs

@@ -8,8 +8,14 @@ namespace Volo.Abp.AspNetCore.Mvc.Json
 {
     public class AbpHybridJsonInputFormatter : TextInputFormatter, IInputFormatterExceptionPolicy
     {
-        public AbpHybridJsonInputFormatter()
+        private readonly SystemTextJsonInputFormatter _systemTextJsonInputFormatter;
+        private readonly NewtonsoftJsonInputFormatter _newtonsoftJsonInputFormatter;
+
+        public AbpHybridJsonInputFormatter(SystemTextJsonInputFormatter systemTextJsonInputFormatter, NewtonsoftJsonInputFormatter newtonsoftJsonInputFormatter)
         {
+            _systemTextJsonInputFormatter = systemTextJsonInputFormatter;
+            _newtonsoftJsonInputFormatter = newtonsoftJsonInputFormatter;
+
             SupportedEncodings.Add(UTF8EncodingWithoutBOM);
             SupportedEncodings.Add(UTF16EncodingLittleEndian);
 
@@ -18,7 +24,7 @@ namespace Volo.Abp.AspNetCore.Mvc.Json
             SupportedMediaTypes.Add(MediaTypeHeaderValues.ApplicationAnyJsonSyntax);
         }
 
-        public async override Task<InputFormatterResult> ReadRequestBodyAsync(InputFormatterContext context, Encoding encoding)
+        public override async Task<InputFormatterResult> ReadRequestBodyAsync(InputFormatterContext context, Encoding encoding)
         {
             return await GetTextInputFormatter(context).ReadRequestBodyAsync(context, encoding);
         }
@@ -26,12 +32,13 @@ namespace Volo.Abp.AspNetCore.Mvc.Json
         protected virtual TextInputFormatter GetTextInputFormatter(InputFormatterContext context)
         {
             var typesMatcher = context.HttpContext.RequestServices.GetRequiredService<AbpSystemTextJsonUnsupportedTypeMatcher>();
+
             if (!typesMatcher.Match(context.ModelType))
             {
-                return context.HttpContext.RequestServices.GetRequiredService<SystemTextJsonInputFormatter>();
+                return _systemTextJsonInputFormatter;
             }
 
-            return context.HttpContext.RequestServices.GetRequiredService<NewtonsoftJsonInputFormatter>();
+            return _newtonsoftJsonInputFormatter;
         }
 
         public virtual InputFormatterExceptionPolicy ExceptionPolicy => InputFormatterExceptionPolicy.MalformedInputExceptions;

framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Json/AbpHybridJsonOptionsSetup.cs

@@ -0,0 +1,73 @@
+using System.Buffers;
+using System.Text.Encodings.Web;
+using System.Text.Json;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Formatters;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.ObjectPool;
+using Microsoft.Extensions.Options;
+
+namespace Volo.Abp.AspNetCore.Mvc.Json
+{
+    public class AbpHybridJsonOptionsSetup : IConfigureOptions<MvcOptions>
+    {
+        private readonly IOptions<JsonOptions> _jsonOptions;
+        private readonly IOptions<MvcNewtonsoftJsonOptions> _mvcNewtonsoftJsonOptions;
+        private readonly ILoggerFactory _loggerFactory;
+        private readonly ArrayPool<char> _charPool;
+        private readonly ObjectPoolProvider _objectPoolProvider;
+
+        public AbpHybridJsonOptionsSetup(
+            IOptions<JsonOptions> jsonOptions,
+            IOptions<MvcNewtonsoftJsonOptions> mvcNewtonsoftJsonOptions,
+            ILoggerFactory loggerFactory,
+            ArrayPool<char> charPool,
+            ObjectPoolProvider objectPoolProvider)
+        {
+            _jsonOptions = jsonOptions;
+            _mvcNewtonsoftJsonOptions = mvcNewtonsoftJsonOptions;
+            _loggerFactory = loggerFactory;
+            _charPool = charPool;
+            _objectPoolProvider = objectPoolProvider;
+        }
+
+        public void Configure(MvcOptions options)
+        {
+            var systemTextJsonInputFormatter = new SystemTextJsonInputFormatter(
+                _jsonOptions.Value,
+                _loggerFactory.CreateLogger<SystemTextJsonInputFormatter>());
+
+            var newtonsoftJsonInputFormatter = new NewtonsoftJsonInputFormatter(
+                _loggerFactory.CreateLogger<NewtonsoftJsonInputFormatter>(),
+                _mvcNewtonsoftJsonOptions.Value.SerializerSettings,
+                _charPool,
+                _objectPoolProvider,
+                options,
+                _mvcNewtonsoftJsonOptions.Value);
+
+            options.InputFormatters.RemoveType<SystemTextJsonInputFormatter>();
+            options.InputFormatters.RemoveType<NewtonsoftJsonInputFormatter>();
+            options.InputFormatters.Add(new AbpHybridJsonInputFormatter(systemTextJsonInputFormatter, newtonsoftJsonInputFormatter));
+
+            var jsonSerializerOptions = _jsonOptions.Value.JsonSerializerOptions;
+            if (jsonSerializerOptions.Encoder is null)
+            {
+                // If the user hasn't explicitly configured the encoder, use the less strict encoder that does not encode all non-ASCII characters.
+                jsonSerializerOptions = new JsonSerializerOptions(jsonSerializerOptions)
+                {
+                    Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping,
+                };
+            }
+
+            var systemTextJsonOutputFormatter = new SystemTextJsonOutputFormatter(jsonSerializerOptions);
+            var newtonsoftJsonOutputFormatter = new NewtonsoftJsonOutputFormatter(
+                _mvcNewtonsoftJsonOptions.Value.SerializerSettings,
+                _charPool,
+                options);
+
+            options.OutputFormatters.RemoveType<SystemTextJsonOutputFormatter>();
+            options.OutputFormatters.RemoveType<NewtonsoftJsonOutputFormatter>();
+            options.OutputFormatters.Add(new AbpHybridJsonOutputFormatter(systemTextJsonOutputFormatter, newtonsoftJsonOutputFormatter));
+        }
+    }
+}

framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Json/AbpHybridJsonOutputFormatter.cs

@@ -8,8 +8,14 @@ namespace Volo.Abp.AspNetCore.Mvc.Json
 {
     public class AbpHybridJsonOutputFormatter : TextOutputFormatter
     {
-        public AbpHybridJsonOutputFormatter()
+        private readonly SystemTextJsonOutputFormatter _systemTextJsonOutputFormatter;
+        private readonly NewtonsoftJsonOutputFormatter _newtonsoftJsonOutputFormatter;
+
+        public AbpHybridJsonOutputFormatter(SystemTextJsonOutputFormatter systemTextJsonOutputFormatter, NewtonsoftJsonOutputFormatter newtonsoftJsonOutputFormatter)
         {
+            _systemTextJsonOutputFormatter = systemTextJsonOutputFormatter;
+            _newtonsoftJsonOutputFormatter = newtonsoftJsonOutputFormatter;
+
             SupportedEncodings.Add(Encoding.UTF8);
             SupportedEncodings.Add(Encoding.Unicode);
 
@@ -18,7 +24,7 @@ namespace Volo.Abp.AspNetCore.Mvc.Json
             SupportedMediaTypes.Add(MediaTypeHeaderValues.ApplicationAnyJsonSyntax);
         }
 
-        public async override Task WriteResponseBodyAsync(OutputFormatterWriteContext context, Encoding selectedEncoding)
+        public override async Task WriteResponseBodyAsync(OutputFormatterWriteContext context, Encoding selectedEncoding)
         {
             await GetTextInputFormatter(context).WriteResponseBodyAsync(context, selectedEncoding);
         }
@@ -28,10 +34,10 @@ namespace Volo.Abp.AspNetCore.Mvc.Json
             var typesMatcher = context.HttpContext.RequestServices.GetRequiredService<AbpSystemTextJsonUnsupportedTypeMatcher>();
             if (!typesMatcher.Match(context.ObjectType))
             {
-                return context.HttpContext.RequestServices.GetRequiredService<SystemTextJsonOutputFormatter>();
+                return _systemTextJsonOutputFormatter;
             }
 
-            return context.HttpContext.RequestServices.GetRequiredService<NewtonsoftJsonOutputFormatter>();
+            return _newtonsoftJsonOutputFormatter;
         }
     }
 }

framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Json/MvcCoreBuilderExtensions.cs

@@ -1,12 +1,7 @@
-using System.Buffers;
+using Microsoft.AspNetCore.Mvc;
-using System.Text.Json;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.Formatters;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Options;
-using System.Text.Encodings.Web;
-using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.ObjectPool;
 using Volo.Abp.Json;
 
@@ -24,68 +19,10 @@ namespace Volo.Abp.AspNetCore.Mvc.Json
                 return builder;
             }
 
-            //SystemTextJsonInputFormatter
-            builder.Services.AddTransient(provider =>
-            {
-                var jsonOptions = provider.GetRequiredService<IOptions<JsonOptions>>();
-                var logger = provider.GetRequiredService<ILoggerFactory>().CreateLogger<SystemTextJsonInputFormatter>();
-                return new SystemTextJsonInputFormatter(jsonOptions.Value, logger);
-            });
-
             builder.Services.TryAddTransient<DefaultObjectPoolProvider>();
-            //NewtonsoftJsonInputFormatter
-            builder.Services.AddTransient(provider =>
-            {
-                var jsonOptions = provider.GetRequiredService<IOptions<MvcNewtonsoftJsonOptions>>().Value;
-
-                return new NewtonsoftJsonInputFormatter(
-                    provider.GetRequiredService<ILoggerFactory>().CreateLogger<NewtonsoftJsonInputFormatter>(),
-                    jsonOptions.SerializerSettings,
-                    provider.GetRequiredService<ArrayPool<char>>(),
-                    provider.GetRequiredService<DefaultObjectPoolProvider>(),
-                    provider.GetRequiredService<IOptions<MvcOptions>>().Value,
-                    jsonOptions);
-            });
-
-            //SystemTextJsonOutputFormatter
-            builder.Services.AddTransient(provider =>
-            {
-                var jsonSerializerOptions = provider.GetRequiredService<IOptions<JsonOptions>>().Value.JsonSerializerOptions;
-                if (jsonSerializerOptions.Encoder is null)
-                {
-                    // If the user hasn't explicitly configured the encoder, use the less strict encoder that does not encode all non-ASCII characters.
-                    jsonSerializerOptions = new JsonSerializerOptions(jsonSerializerOptions)
-                    {
-                        Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping,
-                    };
-                }
-                return new SystemTextJsonOutputFormatter(jsonSerializerOptions);
-            });
-
-            //NewtonsoftJsonOutputFormatter
-            builder.Services.AddTransient(provider =>
-            {
-                var jsonOptions = provider.GetRequiredService<IOptions<MvcNewtonsoftJsonOptions>>().Value;
-                return new NewtonsoftJsonOutputFormatter(
-                    jsonOptions.SerializerSettings,
-                    provider.GetRequiredService<ArrayPool<char>>(),
-                    provider.GetRequiredService<IOptions<MvcOptions>>().Value);
-            });
-
             builder.Services.TryAddEnumerable(ServiceDescriptor.Transient<IConfigureOptions<JsonOptions>, AbpJsonOptionsSetup>());
             builder.Services.TryAddEnumerable(ServiceDescriptor.Transient<IConfigureOptions<MvcNewtonsoftJsonOptions>, AbpMvcNewtonsoftJsonOptionsSetup>());
-
+            builder.Services.TryAddEnumerable(ServiceDescriptor.Transient<IConfigureOptions<MvcOptions>, AbpHybridJsonOptionsSetup>());
-            builder.Services.Configure<MvcOptions>(options =>
-            {
-                options.InputFormatters.RemoveType<SystemTextJsonInputFormatter>();
-                options.InputFormatters.RemoveType<NewtonsoftJsonInputFormatter>();
-                options.InputFormatters.Add(new AbpHybridJsonInputFormatter());
-
-                options.OutputFormatters.RemoveType<SystemTextJsonOutputFormatter>();
-                options.OutputFormatters.RemoveType<NewtonsoftJsonOutputFormatter>();
-                options.OutputFormatters.Add(new AbpHybridJsonOutputFormatter());
-            });
-
             return builder;
         }
     }

framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Uow/AbpUowActionFilter.cs

@@ -1,8 +1,9 @@
-using System;
+using System;
 using System.Net.Http;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc.Abstractions;
 using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using Volo.Abp.AspNetCore.Uow;
 using Volo.Abp.DependencyInjection;
@@ -12,15 +13,6 @@ namespace Volo.Abp.AspNetCore.Mvc.Uow
 {
     public class AbpUowActionFilter : IAsyncActionFilter, ITransientDependency
     {
-        private readonly IUnitOfWorkManager _unitOfWorkManager;
-        private readonly AbpUnitOfWorkDefaultOptions _defaultOptions;
-
-        public AbpUowActionFilter(IUnitOfWorkManager unitOfWorkManager, IOptions<AbpUnitOfWorkDefaultOptions> options)
-        {
-            _unitOfWorkManager = unitOfWorkManager;
-            _defaultOptions = options.Value;
-        }
-
         public async Task OnActionExecutionAsync(ActionExecutingContext context, ActionExecutionDelegate next)
         {
             if (!context.ActionDescriptor.IsControllerAction())
@@ -45,20 +37,22 @@ namespace Volo.Abp.AspNetCore.Mvc.Uow
 
             var options = CreateOptions(context, unitOfWorkAttr);
 
+            var unitOfWorkManager = context.HttpContext.RequestServices.GetRequiredService<IUnitOfWorkManager>();
+
             //Trying to begin a reserved UOW by AbpUnitOfWorkMiddleware
-            if (_unitOfWorkManager.TryBeginReserved(AbpUnitOfWorkMiddleware.UnitOfWorkReservationName, options))
+            if (unitOfWorkManager.TryBeginReserved(AbpUnitOfWorkMiddleware.UnitOfWorkReservationName, options))
             {
                 var result = await next();
                 if (!Succeed(result))
                 {
-                    await RollbackAsync(context);
+                    await RollbackAsync(context, unitOfWorkManager);
                 }
 
                 return;
             }
 
             //Begin a new, independent unit of work
-            using (var uow = _unitOfWorkManager.Begin(options))
+            using (var uow = unitOfWorkManager.Begin(options))
             {
                 var result = await next();
                 if (Succeed(result))
@@ -76,7 +70,8 @@ namespace Volo.Abp.AspNetCore.Mvc.Uow
 
             if (unitOfWorkAttribute?.IsTransactional == null)
             {
-                options.IsTransactional = _defaultOptions.CalculateIsTransactional(
+                var abpUnitOfWorkDefaultOptions = context.HttpContext.RequestServices.GetRequiredService<IOptions<AbpUnitOfWorkDefaultOptions>>().Value;
+                options.IsTransactional = abpUnitOfWorkDefaultOptions.CalculateIsTransactional(
                     autoValue: !string.Equals(context.HttpContext.Request.Method, HttpMethod.Get.Method, StringComparison.OrdinalIgnoreCase)
                 );
             }
@@ -84,9 +79,9 @@ namespace Volo.Abp.AspNetCore.Mvc.Uow
             return options;
         }
 
-        private async Task RollbackAsync(ActionExecutingContext context)
+        private async Task RollbackAsync(ActionExecutingContext context, IUnitOfWorkManager unitOfWorkManager)
         {
-            var currentUow = _unitOfWorkManager.Current;
+            var currentUow = unitOfWorkManager.Current;
             if (currentUow != null)
             {
                 await currentUow.RollbackAsync(context.HttpContext.RequestAborted);

framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Uow/AbpUowPageFilter.cs

@@ -1,8 +1,9 @@
-using System;
+using System;
 using System.Net.Http;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc.Abstractions;
 using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using Volo.Abp.AspNetCore.Uow;
 using Volo.Abp.DependencyInjection;
@@ -12,14 +13,6 @@ namespace Volo.Abp.AspNetCore.Mvc.Uow
 {
     public class AbpUowPageFilter : IAsyncPageFilter, ITransientDependency
     {
-        private readonly IUnitOfWorkManager _unitOfWorkManager;
-        private readonly AbpUnitOfWorkDefaultOptions _defaultOptions;
-
-        public AbpUowPageFilter(IUnitOfWorkManager unitOfWorkManager, IOptions<AbpUnitOfWorkDefaultOptions> options)
-        {
-            _unitOfWorkManager = unitOfWorkManager;
-            _defaultOptions = options.Value;
-        }
         public Task OnPageHandlerSelectionAsync(PageHandlerSelectedContext context)
         {
             return Task.CompletedTask;
@@ -49,20 +42,22 @@ namespace Volo.Abp.AspNetCore.Mvc.Uow
 
             var options = CreateOptions(context, unitOfWorkAttr);
 
+            var unitOfWorkManager = context.HttpContext.RequestServices.GetRequiredService<IUnitOfWorkManager>();
+
             //Trying to begin a reserved UOW by AbpUnitOfWorkMiddleware
-            if (_unitOfWorkManager.TryBeginReserved(AbpUnitOfWorkMiddleware.UnitOfWorkReservationName, options))
+            if (unitOfWorkManager.TryBeginReserved(AbpUnitOfWorkMiddleware.UnitOfWorkReservationName, options))
             {
                 var result = await next();
                 if (!Succeed(result))
                 {
-                    await RollbackAsync(context);
+                    await RollbackAsync(context, unitOfWorkManager);
                 }
 
                 return;
             }
 
             //Begin a new, independent unit of work
-            using (var uow = _unitOfWorkManager.Begin(options))
+            using (var uow = unitOfWorkManager.Begin(options))
             {
                 var result = await next();
                 if (Succeed(result))
@@ -80,7 +75,8 @@ namespace Volo.Abp.AspNetCore.Mvc.Uow
 
             if (unitOfWorkAttribute?.IsTransactional == null)
             {
-                options.IsTransactional = _defaultOptions.CalculateIsTransactional(
+                var abpUnitOfWorkDefaultOptions = context.HttpContext.RequestServices.GetRequiredService<IOptions<AbpUnitOfWorkDefaultOptions>>().Value;
+                options.IsTransactional = abpUnitOfWorkDefaultOptions.CalculateIsTransactional(
                     autoValue: !string.Equals(context.HttpContext.Request.Method, HttpMethod.Get.Method, StringComparison.OrdinalIgnoreCase)
                 );
             }
@@ -88,9 +84,9 @@ namespace Volo.Abp.AspNetCore.Mvc.Uow
             return options;
         }
 
-        private async Task RollbackAsync(PageHandlerExecutingContext context)
+        private async Task RollbackAsync(PageHandlerExecutingContext context, IUnitOfWorkManager unitOfWorkManager)
         {
-            var currentUow = _unitOfWorkManager.Current;
+            var currentUow = unitOfWorkManager.Current;
             if (currentUow != null)
             {
                 await currentUow.RollbackAsync(context.HttpContext.RequestAborted);

framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Validation/AbpValidationActionFilter.cs

@@ -1,19 +1,13 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc.Abstractions;
 using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.DependencyInjection;
 
 namespace Volo.Abp.AspNetCore.Mvc.Validation
 {
     public class AbpValidationActionFilter : IAsyncActionFilter, ITransientDependency
     {
-        private readonly IModelStateValidator _validator;
-
-        public AbpValidationActionFilter(IModelStateValidator validator)
-        {
-            _validator = validator;
-        }
-
         public async Task OnActionExecutionAsync(ActionExecutingContext context, ActionExecutionDelegate next)
         {
             //TODO: Configuration to disable validation for controllers..?
@@ -25,7 +19,7 @@ namespace Volo.Abp.AspNetCore.Mvc.Validation
                 return;
             }
 
-            _validator.Validate(context.ModelState);
+            context.HttpContext.RequestServices.GetRequiredService<IModelStateValidator>().Validate(context.ModelState);
             await next();
         }
     }