change the way requestfilters are registered and instantiated to leverage DI

Author: sandorfr

src/GeekLearning.RestKit.Core/ClientBase.cs

@@ -1,22 +1,32 @@
-using Microsoft.Extensions.Options;
-using System.Collections.Generic;
-using System.Net;
-using System.Net.Http;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace GeekLearning.RestKit.Core
+namespace GeekLearning.RestKit.Core
 {
+    using Microsoft.Extensions.Options;
+    using System;
+    using System.Linq;
+    using System.Collections.Generic;
+    using System.Net;
+    using System.Net.Http;
+    using System.Text;
+    using System.Threading.Tasks;
+    using Microsoft.Extensions.DependencyInjection;
+
     public abstract class ClientBase<TOptions>
        where TOptions : class, IProvideRequestFilters, new()
     {
         private IMediaFormatterProvider mediaFormatterProvider;
+        private IServiceProvider serviceProvider;
+        private Lazy<IRequestFilter[]> requestFilters;
 
         public ClientBase(IOptions<TOptions> options,
-            IMediaFormatterProvider mediaFormatterProvider)
+            IMediaFormatterProvider mediaFormatterProvider,
+            IServiceProvider serviceProvider)
         {
             this.Options = options.Value;
             this.mediaFormatterProvider = mediaFormatterProvider;
+            this.serviceProvider = serviceProvider;
+            this.requestFilters = new Lazy<IRequestFilter[]>(() =>
+                this.Options.RequestFilters.Select(x=> ActivatorUtilities.CreateInstance(this.serviceProvider, x.Type, x.Arguments)).Cast<IRequestFilter>().ToArray()
+            );
         }
 
         protected TOptions Options { get; private set; }
@@ -34,7 +44,7 @@ protected Task<TTarget> TransformResponseAsync<TTarget>(HttpResponseMessage mess
         protected HttpRequestMessage ApplyFilters(HttpRequestMessage requestMessage, params string[] securityDefinitions)
         {
             HttpRequestMessage finalMessage = requestMessage;
-            foreach (var filter in this.Options.RequestFilters)
+            foreach (var filter in this.requestFilters.Value)
             {
                 finalMessage = filter.Apply(requestMessage, securityDefinitions) ?? finalMessage;
             }

src/GeekLearning.RestKit.Core/ClientOptionsBase.cs

@@ -1,20 +1,24 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace GeekLearning.RestKit.Core
+namespace GeekLearning.RestKit.Core
 {
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+
     public abstract class ClientOptionsBase : IProvideRequestFilters
     {
-        private List<IRequestFilter> requestfilters = new List<IRequestFilter>();
+        private List<InjectionDescriptor> requestfilters = new List<InjectionDescriptor>();
 
-        public void AddFilter(IRequestFilter filter)
+        public void AddFilter<TRequestFilter>(params object[] arguments)
+            where TRequestFilter: IRequestFilter
         {
-            this.requestfilters.Add(filter);
+            this.requestfilters.Add(new InjectionDescriptor {
+                Type = typeof(TRequestFilter),
+                Arguments = arguments
+            });
         }
 
-        public IEnumerable<IRequestFilter> RequestFilters
+        public IEnumerable<InjectionDescriptor> RequestFilters
         {
             get
             {

src/GeekLearning.RestKit.Core/IProvideRequestFilters.cs

@@ -7,6 +7,6 @@ namespace GeekLearning.RestKit.Core
 {
     public interface IProvideRequestFilters
     {
-        IEnumerable<IRequestFilter> RequestFilters { get; }
+        IEnumerable<InjectionDescriptor> RequestFilters { get; }
     }
 }

src/GeekLearning.RestKit.Core/InjectionDescriptor.cs

@@ -0,0 +1,14 @@
+namespace GeekLearning.RestKit.Core
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+
+
+    public struct InjectionDescriptor
+    {
+        public Type Type;
+        public object[] Arguments;
+    }
+}