HttpApiFactory修改为非泛型

Author: xljiulang

WebApiClientCore/BuildInProxies/HttpApiActivator.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Linq;
+using System.Threading;
 
 namespace WebApiClientCore
 {
@@ -12,14 +13,22 @@ abstract class HttpApiActivator<THttpApi>
         /// <summary>
         /// 实例工厂
         /// </summary>
-        private readonly Func<IActionInterceptor, THttpApi> factory;
+        private static Func<IActionInterceptor, THttpApi>? _factory;
 
         /// <summary>
-        /// THttpApi的实例创建器抽象
+        /// 创建接口的实例
         /// </summary>
-        public HttpApiActivator()
+        /// <param name="interceptor">拦截器</param>
+        /// <returns></returns>
+        public THttpApi CreateInstance(IActionInterceptor interceptor)
         {
-            this.factory = this.CreateFactory();
+            var factory = Volatile.Read(ref _factory);
+            if (factory == null)
+            {
+                Interlocked.CompareExchange(ref _factory, this.CreateFactory(), null);
+                factory = _factory;
+            }
+            return factory(interceptor);
         }
 
         /// <summary>
@@ -28,16 +37,6 @@ public HttpApiActivator()
         /// <returns></returns>
         protected abstract Func<IActionInterceptor, THttpApi> CreateFactory();
 
-        /// <summary>
-        /// 创建接口的实例
-        /// </summary>
-        /// <param name="interceptor">拦截器</param>
-        /// <returns></returns>
-        public THttpApi CreateInstance(IActionInterceptor interceptor)
-        {
-            return this.factory(interceptor);
-        }
-
         /// <summary>
         /// 返回接口的action执行器
         /// </summary>

WebApiClientCore/BuildInProxies/HttpApiEmitActivator.cs

@@ -15,6 +15,8 @@ class HttpApiEmitActivator<THttpApi> : HttpApiActivator<THttpApi>
         /// <summary>
         /// 创建实例工厂
         /// </summary>
+        /// <exception cref="NotSupportedException"></exception>
+        /// <exception cref="ProxyTypeCreateException"></exception>
         /// <returns></returns>
         protected override Func<IActionInterceptor, THttpApi> CreateFactory()
         {
@@ -27,7 +29,7 @@ protected override Func<IActionInterceptor, THttpApi> CreateFactory()
         /// <summary>
         /// 提供IHttpApi代理类的类型创建
         /// </summary>
-        static class ProxyTypeBuilder
+        private static class ProxyTypeBuilder
         {
             /// <summary>
             /// IActionInterceptor的Intercept方法

WebApiClientCore/BuildInProxies/HttpApiFactory.cs

@@ -1,37 +1,24 @@
 using System;
-using System.Threading;
 using WebApiClientCore.Exceptions;
 
 namespace WebApiClientCore
 {
     /// <summary>
     /// 表示THttpApi的创建工厂
-    /// </summary>
-    /// <typeparam name="THttpApi">接口类型</typeparam>
-    static class HttpApiFactory<THttpApi>
+    /// </summary> 
+    static class HttpApiFactory
     {
-        /// <summary>
-        /// 实例创建者
-        /// </summary>
-        private static HttpApiActivator<THttpApi>? _activator;
-
         /// <summary>
         /// 创建接口的实例
         /// </summary>
+        /// <typeparam name="THttpApi"></typeparam>
         /// <param name="actionInterceptor">拦截器</param>
         /// <exception cref="NotSupportedException"></exception>
         /// <exception cref="ProxyTypeCreateException"></exception>
         /// <returns></returns>
-        public static THttpApi Create(IActionInterceptor actionInterceptor)
+        public static THttpApi Create<THttpApi>(IActionInterceptor actionInterceptor)
         {
-            var activator = Volatile.Read(ref _activator);
-            if (activator == null)
-            {
-                Interlocked.CompareExchange(ref _activator, new HttpApiEmitActivator<THttpApi>(), null);
-                activator = _activator;
-            }
-
-            return activator.CreateInstance(actionInterceptor);
+            return new HttpApiEmitActivator<THttpApi>().CreateInstance(actionInterceptor);
         }
     }
 }

WebApiClientCore/HttpApi.cs

@@ -64,7 +64,7 @@ public static THttpApi Create<THttpApi>(HttpClientContext httpClientContext)
         /// <returns></returns>
         public static THttpApi Create<THttpApi>(IActionInterceptor actionInterceptor)
         {
-            return HttpApiFactory<THttpApi>.Create(actionInterceptor);
+            return HttpApiFactory.Create<THttpApi>(actionInterceptor);
         }