Add AbpActionContextExtensions.

framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpActionContextExtensions.cs

@@ -0,0 +1,20 @@
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Volo.Abp.AspNetCore.Mvc
+{
+    internal static class AbpActionContextExtensions
+    {
+        public static T GetRequiredService<T>(this FilterContext context)
+            where T : class
+        {
+            return context.HttpContext.RequestServices.GetRequiredService<T>();
+        }
+
+        public static T GetService<T>(this FilterContext context, T defaultValue = default)
+            where T : class
+        {
+            return context.HttpContext.RequestServices.GetService<T>() ?? defaultValue;
+        }
+    }
+}

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

@@ -3,7 +3,6 @@ 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;
@@ -53,7 +52,7 @@ namespace Volo.Abp.AspNetCore.Mvc.Auditing
             auditLog = null;
             auditLogAction = null;
 
-            var options = context.HttpContext.RequestServices.GetRequiredService<IOptions<AbpAuditingOptions>>().Value;
+            var options = context.GetRequiredService<IOptions<AbpAuditingOptions>>().Value;
             if (!options.IsEnabled)
             {
                 return false;
@@ -64,13 +63,13 @@ namespace Volo.Abp.AspNetCore.Mvc.Auditing
                 return false;
             }
 
-            var auditLogScope = context.HttpContext.RequestServices.GetRequiredService<IAuditingManager>().Current;
+            var auditLogScope = context.GetRequiredService<IAuditingManager>().Current;
             if (auditLogScope == null)
             {
                 return false;
             }
 
-            var auditingHelper = context.HttpContext.RequestServices.GetRequiredService<IAuditingHelper>();
+            var auditingHelper = context.GetRequiredService<IAuditingHelper>();
             if (!auditingHelper.ShouldSaveAudit(context.ActionDescriptor.GetMethodInfo(), true))
             {
                 return false;

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

@@ -3,7 +3,6 @@ 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;
@@ -58,7 +57,7 @@ namespace Volo.Abp.AspNetCore.Mvc.Auditing
             auditLog = null;
             auditLogAction = null;
 
-            var options = context.HttpContext.RequestServices.GetRequiredService<IOptions<AbpAuditingOptions>>().Value;
+            var options = context.GetRequiredService<IOptions<AbpAuditingOptions>>().Value;
             if (!options.IsEnabled)
             {
                 return false;
@@ -69,13 +68,13 @@ namespace Volo.Abp.AspNetCore.Mvc.Auditing
                 return false;
             }
 
-            var auditLogScope = context.HttpContext.RequestServices.GetRequiredService<IAuditingManager>().Current;
+            var auditLogScope = context.GetRequiredService<IAuditingManager>().Current;
             if (auditLogScope == null)
             {
                 return false;
             }
 
-            var auditingHelper = context.HttpContext.RequestServices.GetRequiredService<IAuditingHelper>();
+            var auditingHelper = context.GetRequiredService<IAuditingHelper>();
             if (!auditingHelper.ShouldSaveAudit(context.HandlerMethod.MethodInfo, true))
             {
                 return false;

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

@@ -1,11 +1,10 @@
-using System;
+using System;
 using System.Text;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 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 Microsoft.Extensions.Options;
@@ -57,14 +56,13 @@ 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) context.HttpContext.RequestServices
+            context.HttpContext.Response.StatusCode = (int) context
                 .GetRequiredService<IHttpExceptionStatusCodeFinder>()
                 .GetStatusCode(context.HttpContext, context.Exception);
 
-            var remoteServiceErrorInfo = context.HttpContext.RequestServices
+            var exceptionHandlingOptions = context.GetRequiredService<IOptions<AbpExceptionHandlingOptions>>().Value;
-                .GetRequiredService<IExceptionToErrorInfoConverter>().Convert(context.Exception,
+            var exceptionToErrorInfoConverter = context.GetRequiredService<IExceptionToErrorInfoConverter>();
-                    context.HttpContext.RequestServices.GetRequiredService<IOptions<AbpExceptionHandlingOptions>>()
+            var remoteServiceErrorInfo  = exceptionToErrorInfoConverter.Convert(context.Exception, exceptionHandlingOptions.SendExceptionsDetailsToClients);
-                        .Value.SendExceptionsDetailsToClients);
 
             context.Result = new ObjectResult(new RemoteServiceErrorResponse(remoteServiceErrorInfo));
 
@@ -72,22 +70,15 @@ namespace Volo.Abp.AspNetCore.Mvc.ExceptionHandling
 
             var remoteServiceErrorInfoBuilder = new StringBuilder();
             remoteServiceErrorInfoBuilder.AppendLine($"---------- {nameof(RemoteServiceErrorInfo)} ----------");
-            remoteServiceErrorInfoBuilder.AppendLine(context.HttpContext.RequestServices
+            remoteServiceErrorInfoBuilder.AppendLine(context.GetRequiredService<IJsonSerializer>().Serialize(remoteServiceErrorInfo, indented: true));
-                .GetRequiredService<IJsonSerializer>().Serialize(remoteServiceErrorInfo, indented: true));
 
-            var logger = context.HttpContext.RequestServices.GetService<ILogger<AbpExceptionFilter>>() ??
+            var logger = context.GetService<ILogger<AbpExceptionFilter>>(NullLogger<AbpExceptionFilter>.Instance);
-                         NullLogger<AbpExceptionFilter>.Instance;
 
             logger.LogWithLevel(logLevel, remoteServiceErrorInfoBuilder.ToString());
 
             logger.LogException(context.Exception, logLevel);
 
-            await context.HttpContext
+            await context.GetRequiredService<IExceptionNotifier>().NotifyAsync(new ExceptionNotificationContext(context.Exception));
-                .RequestServices
-                .GetRequiredService<IExceptionNotifier>()
-                .NotifyAsync(
-                    new ExceptionNotificationContext(context.Exception)
-                );
 
             context.Exception = null; //Handled!
         }

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

@@ -5,7 +5,6 @@ using Microsoft.AspNetCore.Http;
 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 Microsoft.Extensions.Options;
@@ -69,14 +68,13 @@ 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) context.HttpContext.RequestServices
+            context.HttpContext.Response.StatusCode = (int) context
                 .GetRequiredService<IHttpExceptionStatusCodeFinder>()
                 .GetStatusCode(context.HttpContext, context.Exception);
 
-            var remoteServiceErrorInfo = context.HttpContext.RequestServices
+            var exceptionHandlingOptions = context.GetRequiredService<IOptions<AbpExceptionHandlingOptions>>().Value;
-                .GetRequiredService<IExceptionToErrorInfoConverter>().Convert(context.Exception,
+            var exceptionToErrorInfoConverter = context.GetRequiredService<IExceptionToErrorInfoConverter>();
-                    context.HttpContext.RequestServices.GetRequiredService<IOptions<AbpExceptionHandlingOptions>>()
+            var remoteServiceErrorInfo  = exceptionToErrorInfoConverter.Convert(context.Exception, exceptionHandlingOptions.SendExceptionsDetailsToClients);
-                        .Value.SendExceptionsDetailsToClients);
 
             context.Result = new ObjectResult(new RemoteServiceErrorResponse(remoteServiceErrorInfo));
 
@@ -84,21 +82,14 @@ namespace Volo.Abp.AspNetCore.Mvc.ExceptionHandling
 
             var remoteServiceErrorInfoBuilder = new StringBuilder();
             remoteServiceErrorInfoBuilder.AppendLine($"---------- {nameof(RemoteServiceErrorInfo)} ----------");
-            remoteServiceErrorInfoBuilder.AppendLine(context.HttpContext.RequestServices
+            remoteServiceErrorInfoBuilder.AppendLine(context.GetRequiredService<IJsonSerializer>().Serialize(remoteServiceErrorInfo, indented: true));
-                .GetRequiredService<IJsonSerializer>().Serialize(remoteServiceErrorInfo, indented: true));
 
-            var logger = context.HttpContext.RequestServices.GetService<ILogger<AbpExceptionFilter>>() ??
+            var logger = context.GetService<ILogger<AbpExceptionFilter>>(NullLogger<AbpExceptionFilter>.Instance);
-                         NullLogger<AbpExceptionFilter>.Instance;
             logger.LogWithLevel(logLevel, remoteServiceErrorInfoBuilder.ToString());
 
             logger.LogException(context.Exception, logLevel);
 
-            await context.HttpContext
+            await context.GetRequiredService<IExceptionNotifier>().NotifyAsync(new ExceptionNotificationContext(context.Exception));
-                .RequestServices
-                .GetRequiredService<IExceptionNotifier>()
-                .NotifyAsync(
-                    new ExceptionNotificationContext(context.Exception)
-                );
 
             context.Exception = null; //Handled!
         }

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

@@ -1,7 +1,6 @@
 using Microsoft.AspNetCore.Mvc.Filters;
 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,9 +9,7 @@ namespace Volo.Abp.AspNetCore.Mvc.Features
 {
     public class AbpFeatureActionFilter : IAsyncActionFilter, ITransientDependency
     {
-        public async Task OnActionExecutionAsync(
+        public async Task OnActionExecutionAsync(ActionExecutingContext context, ActionExecutionDelegate next)
-            ActionExecutingContext context,
-            ActionExecutionDelegate next)
         {
             if (!context.ActionDescriptor.IsControllerAction())
             {
@@ -24,9 +21,8 @@ namespace Volo.Abp.AspNetCore.Mvc.Features
 
             using (AbpCrossCuttingConcerns.Applying(context.Controller, AbpCrossCuttingConcerns.FeatureChecking))
             {
-                await context.HttpContext.RequestServices.GetRequiredService<IMethodInvocationFeatureCheckerService>().CheckAsync(
+                var methodInvocationFeatureCheckerService = context.GetRequiredService<IMethodInvocationFeatureCheckerService>();
-                    new MethodInvocationFeatureCheckerContext(methodInfo)
+                await methodInvocationFeatureCheckerService.CheckAsync(new MethodInvocationFeatureCheckerContext(methodInfo));
-                );
 
                 await next();
             }

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

@@ -1,7 +1,6 @@
 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;
@@ -27,9 +26,8 @@ namespace Volo.Abp.AspNetCore.Mvc.Features
 
             using (AbpCrossCuttingConcerns.Applying(context.HandlerInstance, AbpCrossCuttingConcerns.FeatureChecking))
             {
-                await context.HttpContext.RequestServices.GetRequiredService<IMethodInvocationFeatureCheckerService>().CheckAsync(
+                var methodInvocationFeatureCheckerService = context.GetRequiredService<IMethodInvocationFeatureCheckerService>();
-                    new MethodInvocationFeatureCheckerContext(methodInfo)
+                await methodInvocationFeatureCheckerService.CheckAsync(new MethodInvocationFeatureCheckerContext(methodInfo));
-                );
 
                 await next();
             }

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

@@ -3,7 +3,6 @@ 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;
@@ -24,10 +23,7 @@ namespace Volo.Abp.AspNetCore.Mvc.GlobalFeatures
 
             if (!IsGlobalFeatureEnabled(context.Controller.GetType(), out var attribute))
             {
-                var logger =
+                var logger = context.GetService<ILogger<GlobalFeatureActionFilter>>(NullLogger<GlobalFeatureActionFilter>.Instance);
-                    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,7 +3,6 @@ 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;
@@ -29,10 +28,7 @@ namespace Volo.Abp.AspNetCore.Mvc.GlobalFeatures
 
             if (!IsGlobalFeatureEnabled(context.HandlerInstance.GetType(), out var attribute))
             {
-                var logger =
+                var logger = context.GetService<ILogger<GlobalFeatureActionFilter>>(NullLogger<GlobalFeatureActionFilter>.Instance);
-                    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/Uow/AbpUowActionFilter.cs

@@ -3,7 +3,6 @@ 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;
@@ -37,7 +36,7 @@ namespace Volo.Abp.AspNetCore.Mvc.Uow
 
             var options = CreateOptions(context, unitOfWorkAttr);
 
-            var unitOfWorkManager = context.HttpContext.RequestServices.GetRequiredService<IUnitOfWorkManager>();
+            var unitOfWorkManager = context.GetRequiredService<IUnitOfWorkManager>();
 
             //Trying to begin a reserved UOW by AbpUnitOfWorkMiddleware
             if (unitOfWorkManager.TryBeginReserved(AbpUnitOfWorkMiddleware.UnitOfWorkReservationName, options))
@@ -70,7 +69,7 @@ namespace Volo.Abp.AspNetCore.Mvc.Uow
 
             if (unitOfWorkAttribute?.IsTransactional == null)
             {
-                var abpUnitOfWorkDefaultOptions = context.HttpContext.RequestServices.GetRequiredService<IOptions<AbpUnitOfWorkDefaultOptions>>().Value;
+                var abpUnitOfWorkDefaultOptions = context.GetRequiredService<IOptions<AbpUnitOfWorkDefaultOptions>>().Value;
                 options.IsTransactional = abpUnitOfWorkDefaultOptions.CalculateIsTransactional(
                     autoValue: !string.Equals(context.HttpContext.Request.Method, HttpMethod.Get.Method, StringComparison.OrdinalIgnoreCase)
                 );

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

@@ -3,7 +3,6 @@ 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;
@@ -42,7 +41,7 @@ namespace Volo.Abp.AspNetCore.Mvc.Uow
 
             var options = CreateOptions(context, unitOfWorkAttr);
 
-            var unitOfWorkManager = context.HttpContext.RequestServices.GetRequiredService<IUnitOfWorkManager>();
+            var unitOfWorkManager = context.GetRequiredService<IUnitOfWorkManager>();
 
             //Trying to begin a reserved UOW by AbpUnitOfWorkMiddleware
             if (unitOfWorkManager.TryBeginReserved(AbpUnitOfWorkMiddleware.UnitOfWorkReservationName, options))
@@ -75,7 +74,7 @@ namespace Volo.Abp.AspNetCore.Mvc.Uow
 
             if (unitOfWorkAttribute?.IsTransactional == null)
             {
-                var abpUnitOfWorkDefaultOptions = context.HttpContext.RequestServices.GetRequiredService<IOptions<AbpUnitOfWorkDefaultOptions>>().Value;
+                var abpUnitOfWorkDefaultOptions = context.GetRequiredService<IOptions<AbpUnitOfWorkDefaultOptions>>().Value;
                 options.IsTransactional = abpUnitOfWorkDefaultOptions.CalculateIsTransactional(
                     autoValue: !string.Equals(context.HttpContext.Request.Method, HttpMethod.Get.Method, StringComparison.OrdinalIgnoreCase)
                 );

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

@@ -1,7 +1,6 @@
 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
@@ -19,7 +18,7 @@ namespace Volo.Abp.AspNetCore.Mvc.Validation
                 return;
             }
 
-            context.HttpContext.RequestServices.GetRequiredService<IModelStateValidator>().Validate(context.ModelState);
+            context.GetRequiredService<IModelStateValidator>().Validate(context.ModelState);
             await next();
         }
     }