mvc and webapi2 action attributes modified to inject IExecuteFunctionProvider

Author: VladimirDimov

src/JQDT.MVC/JQDataTableAttribute.cs

@@ -16,12 +16,13 @@
  public class JQDataTableAttribute : ActionFilterAttribute, IJQDTActionFilter
  {
  private readonly IServiceLocator serviceLocator;
+ private readonly IExecuteFunctionProvider<ActionExecutedContext> executeFunctionProvider;
 
  /// <summary>
  /// Initializes a new instance of the <see cref="JQDataTableAttribute"/> class.
  /// </summary>
  public JQDataTableAttribute()
- : this(new ServiceLocator())
+ : this(new ServiceLocator(), new ExecuteFunctionProvider<ActionExecutedContext>())
  {
  }
 
@@ -30,9 +31,10 @@ public JQDataTableAttribute()
  /// This constructor is provided for testing purposes.
  /// </summary>
  /// <param name="serviceLocator">The service locator.</param>
- internal JQDataTableAttribute(IServiceLocator serviceLocator)
+ internal JQDataTableAttribute(IServiceLocator serviceLocator, IExecuteFunctionProvider<ActionExecutedContext> executeFunctionProvider)
  {
  this.serviceLocator = serviceLocator;
+ this.executeFunctionProvider = executeFunctionProvider;
  }
 
  /// <summary>
@@ -168,7 +170,7 @@ public virtual void OnPagingDataProcessed(ref object data, RequestInfoModel requ
  private void PerformOnActionExecuted(ActionExecutedContext filterContext)
  {
  var dataCollectionType = filterContext.Controller.ViewData.Model.GetType();
- var applicationInitizlizationFunction = ExecuteFunctionProvider<ActionExecutedContext>.GetAppInicializationFunc(dataCollectionType, typeof(ApplicationMvc<>));
+ var applicationInitizlizationFunction = this.executeFunctionProvider.GetAppInicializationFunc(dataCollectionType, typeof(ApplicationMvc<>));
  var formModelBinder = this.serviceLocator.GetFormModelBinder();
  var mvcApplication = applicationInitizlizationFunction(filterContext, this.serviceLocator, formModelBinder);
  this.SubscribeToEvents(mvcApplication);

src/JQDT.WebAPI/JQDataTableAttribute.cs

@@ -18,12 +18,13 @@
  public class JQDataTableAttribute : ActionFilterAttribute, IJQDTActionFilter
  {
  private readonly IServiceLocator serviceLocator;
+ private readonly IExecuteFunctionProvider<HttpActionExecutedContext> executeFunctionProvider;
 
  /// <summary>
  /// Initializes a new instance of the <see cref="JQDataTableAttribute"/> class.
  /// </summary>
  public JQDataTableAttribute()
- : this(new ServiceLocator())
+ : this(new ServiceLocator(), new ExecuteFunctionProvider<HttpActionExecutedContext>())
  {
  }
 
@@ -32,9 +33,10 @@ public JQDataTableAttribute()
  /// This constructor is provided for testing purposes.
  /// </summary>
  /// <param name="serviceLocator">The service locator.</param>
- internal JQDataTableAttribute(IServiceLocator serviceLocator)
+ internal JQDataTableAttribute(IServiceLocator serviceLocator, IExecuteFunctionProvider<HttpActionExecutedContext> executeFunctionProvider)
  {
  this.serviceLocator = serviceLocator;
+ this.executeFunctionProvider = executeFunctionProvider;
  }
 
  /// <summary>
@@ -167,7 +169,7 @@ public void OnPagingDataProcessed(ref object data, RequestInfoModel requestInfoM
  private void PerformOnActionExecuted(HttpActionExecutedContext actionExecutedContext)
  {
  var modelType = ((System.Net.Http.ObjectContent)actionExecutedContext.Response.Content).ObjectType;
- var applicationInitizlizationFunction = ExecuteFunctionProvider<HttpActionExecutedContext>.GetAppInicializationFunc(modelType, typeof(ApplicationWebApi<>));
+ var applicationInitizlizationFunction = this.executeFunctionProvider.GetAppInicializationFunc(modelType, typeof(ApplicationWebApi<>));
  var serviceLocator = new DI.ServiceLocator();
  var formModelBinder = serviceLocator.GetFormModelBinder();
  var webApiApplication = applicationInitizlizationFunction(actionExecutedContext, serviceLocator, formModelBinder);

src/JQDT/Application/ExecuteFunctionProvider.cs

@@ -10,7 +10,7 @@
  /// Creates and caches application execute function.
  /// </summary>
  /// <typeparam name="TContext">The type of the request context.</typeparam>
- public static class ExecuteFunctionProvider<TContext>
+ public class ExecuteFunctionProvider<TContext> : IExecuteFunctionProvider<TContext>
  {
  private static ConcurrentDictionary<Type, Func<TContext, DI.IServiceLocator, IFormModelBinder, IApplicationBase>> appInitFunctionsCache = new ConcurrentDictionary<Type, Func<TContext, DI.IServiceLocator, IFormModelBinder, IApplicationBase>>();
 
@@ -20,7 +20,7 @@ public static class ExecuteFunctionProvider<TContext>
  /// <param name="dataCollectionType">Type of the data collection.</param>
  /// <param name="appType">Type of the application.</param>
  /// <returns><see cref="Func{T, TResult}"/> that return new <see cref="IApplicationBaseIFormModelBinder"/> instance</returns>
- public static Func<TContext, DI.IServiceLocator, IFormModelBinder, IApplicationBase> GetAppInicializationFunc(Type dataCollectionType, Type appType)
+ public Func<TContext, DI.IServiceLocator, IFormModelBinder, IApplicationBase> GetAppInicializationFunc(Type dataCollectionType, Type appType)
  {
  Func<TContext, DI.IServiceLocator, IFormModelBinder, IApplicationBase> executeFunc = null;
 

src/JQDT/Application/IExecuteFunctionProvider.cs

@@ -0,0 +1,10 @@
+namespace JQDT.Application
+{
+ using System;
+ using JQDT.ModelBinders;
+
+ public interface IExecuteFunctionProvider<TContext>
+ {
+ Func<TContext, DI.IServiceLocator, IFormModelBinder, IApplicationBase> GetAppInicializationFunc(Type dataCollectionType, Type appType);
+ }
+}

src/JQDT/JQDT.csproj

@@ -61,6 +61,7 @@
  <Compile Include="Application\ApplicationBase.cs" />
  <Compile Include="Application\ExecuteFunctionProvider.cs" />
  <Compile Include="Application\IApplicationBase.cs" />
+ <Compile Include="Application\IExecuteFunctionProvider.cs" />
  <Compile Include="DataProcessing\ColumnsFilterDataProcessing\ColumnsFilterDataProcessor.cs" />
  <Compile Include="DataProcessing\Common\ConstantExpressionBuilder.cs" />
  <Compile Include="DataProcessing\Common\ContainsExpressionBuilder.cs" />