删除IHttpApiFactory接口

Author: xljiulang

Demo/Program.cs

@@ -26,7 +26,7 @@ static void Init()
  HttpServer.Start(9999);
 
  // 注册与配置IUserApi接口
- HttpApiFactory.Add<IUserApi>(c =>
+ HttpApiFactory.Add<IUserApi>().ConfigureHttpApiConfig(c =>
  {
  c.HttpHost = new Uri("http://localhost:9999/");
  c.LoggerFactory = new LoggerFactory().AddConsole();

WebApiClient/HttpApiFactory.Static.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Concurrent;
-using System.Net.Http;
 
 namespace WebApiClient
 {
@@ -19,56 +18,35 @@ public static class HttpApiFactory
  /// <summary>
  /// 工厂字典
  /// </summary>
- private static readonly ConcurrentDictionary<Type, IHttpApiFactory> factories;
+ private static readonly ConcurrentDictionary<Type, _IHttpApiFactory> factories;
 
  /// <summary>
  /// 表示HttpApi创建工厂
  /// </summary>
  static HttpApiFactory()
  {
- factories = new ConcurrentDictionary<Type, IHttpApiFactory>();
+ factories = new ConcurrentDictionary<Type, _IHttpApiFactory>();
  }
 
  /// <summary>
- /// 注册http接口
+ /// 创建并记录指定接口的HttpApiFactory
  /// </summary>
  /// <typeparam name="TInterface"></typeparam>
+ /// <exception cref="InvalidOperationException"></exception>
  /// <returns></returns>
- public static bool Add<TInterface>() where TInterface : class, IHttpApi
- {
- return Add<TInterface>(configAction: null);
- }
-
- /// <summary>
- /// 注册http接口
- /// </summary>
- /// <typeparam name="TInterface"></typeparam>
- /// <param name="configAction">HttpApiConfig的配置委托</param>
- /// <returns></returns>
- public static bool Add<TInterface>(Action<HttpApiConfig> configAction) where TInterface : class, IHttpApi
- {
- return Add<TInterface>(configAction, handlerFunc: null);
- }
-
- /// <summary>
- /// 注册http接口
- /// </summary>
- /// <typeparam name="TInterface"></typeparam>
- /// <param name="configAction">HttpApiConfig的配置</param>
- /// <param name="handlerFunc">HttpMessageHandler创建委托</param>
- /// <returns></returns>
- public static bool Add<TInterface>(Action<HttpApiConfig> configAction, Func<HttpMessageHandler> handlerFunc) where TInterface : class, IHttpApi
+ public static HttpApiFactory<TInterface> Add<TInterface>() where TInterface : class, IHttpApi
  {
  lock (syncRoot)
  {
  var apiType = typeof(TInterface);
  if (factories.ContainsKey(apiType) == true)
  {
- return false;
+ throw new InvalidOperationException($"不允许重复注册接口：{apiType}");
  }
 
- var factory = new HttpApiFactory<TInterface>(configAction, handlerFunc);
- return factories.TryAdd(apiType, factory);
+ var factory = new HttpApiFactory<TInterface>();
+ factories.TryAdd(apiType, factory);
+ return factory;
  }
  }
 

WebApiClient/HttpApiFactory.cs

@@ -11,18 +11,18 @@ namespace WebApiClient
  /// 提供HttpApi的配置注册和实例创建
  /// 并对实例的生命周期进行自动管理
  /// </summary>
- public class HttpApiFactory<TInterface> : IHttpApiFactory<TInterface>, IHttpApiFactory, _IHttpApiFactory
+ public class HttpApiFactory<TInterface> : IHttpApiFactory<TInterface>, _IHttpApiFactory
  where TInterface : class, IHttpApi
  {
  /// <summary>
  /// HttpApiConfig的配置委托
  /// </summary>
- private readonly Action<HttpApiConfig> configAction;
+ private Action<HttpApiConfig> configAction;
 
  /// <summary>
  /// HttpMessageHandler的创建委托
  /// </summary>
- private readonly Func<HttpMessageHandler> handlerFunc;
+ private Func<HttpMessageHandler> handlerFunc;
 
  /// <summary>
  /// handler的生命周期
@@ -46,84 +46,70 @@ public class HttpApiFactory<TInterface> : IHttpApiFactory<TInterface>, IHttpApiF
 
 
  /// <summary>
- /// 获取已过期但还未释放的HttpApi实例数量
+ /// HttpApi创建工厂
  /// </summary>
- public int ExpiredCount
+ public HttpApiFactory()
  {
- get => this.expiredEntries.Count;
+ this.expiredEntries = new ConcurrentQueue<ExpiredEntry>();
+
+ this.activeEntryLazy = new Lazy<ActiveEntry>(
+ this.CreateActiveEntry,
+ LazyThreadSafetyMode.ExecutionAndPublication);
+
+ this.RegisteCleanup();
  }
 
+
  /// <summary>
- /// 获取或设置HttpApi实例的生命周期
+ /// 置HttpApi实例的生命周期
  /// </summary>
+ /// <param name="lifeTime">生命周期</param>
  /// <exception cref="ArgumentOutOfRangeException"></exception>
- public TimeSpan Lifetime
+ public HttpApiFactory<TInterface> SetLifetime(TimeSpan lifeTime)
  {
- get
- {
- return this.lifeTime;
- }
- set
+ if (lifeTime <= TimeSpan.Zero)
  {
- if (value <= TimeSpan.Zero)
- {
- throw new ArgumentOutOfRangeException();
- }
- this.lifeTime = value;
+ throw new ArgumentOutOfRangeException();
  }
+ this.lifeTime = lifeTime;
+ return this;
  }
 
  /// <summary>
  /// 获取或设置清理过期的HttpApi实例的时间间隔
  /// </summary>
+ /// <param name="interval">时间间隔</param>
  /// <exception cref="ArgumentOutOfRangeException"></exception>
- public TimeSpan CleanupInterval
+ public HttpApiFactory<TInterface> SetCleanupInterval(TimeSpan interval)
  {
- get
+ if (interval <= TimeSpan.Zero)
  {
- return this.cleanupInterval;
- }
- set
- {
- if (value <= TimeSpan.Zero)
- {
- throw new ArgumentOutOfRangeException();
- }
- this.cleanupInterval = value;
+ throw new ArgumentOutOfRangeException();
  }
+ this.cleanupInterval = interval;
+ return this;
  }
 
  /// <summary>
- /// HttpApi创建工厂
+ /// 配置HttpMessageHandler的创建
  /// </summary>
- public HttpApiFactory()
- : this(configAction: null)
- {
- }
-
- /// <summary>
- /// HttpApi创建工厂
- /// </summary>
- /// <param name="configAction">HttpApiConfig的配置委托</param>
- public HttpApiFactory(Action<HttpApiConfig> configAction)
- : this(configAction, handlerFunc: null)
+ /// <param name="handlerFunc">创建委托</param>
+ /// <returns></returns>
+ public HttpApiFactory<TInterface> ConfigureHttpMessageHandler(Func<HttpMessageHandler> handlerFunc)
  {
+ this.handlerFunc = handlerFunc;
+ return this;
  }
 
  /// <summary>
- /// HttpApi创建工厂
+ /// 配置HttpApiConfig
  /// </summary>
- /// <param name="configAction">HttpApiConfig的配置委托</param>
- /// <param name="handlerFunc">HttpMessageHandler的创建委托</param>
- public HttpApiFactory(Action<HttpApiConfig> configAction, Func<HttpMessageHandler> handlerFunc)
+ /// <param name="configAction">配置委托</param>
+ /// <returns></returns>
+ public HttpApiFactory<TInterface> ConfigureHttpApiConfig(Action<HttpApiConfig> configAction)
  {
  this.configAction = configAction;
- this.handlerFunc = handlerFunc ?? new Func<HttpMessageHandler>(() => new DefaultHttpClientHandler());
-
- this.expiredEntries = new ConcurrentQueue<ExpiredEntry>();
- this.activeEntryLazy = new Lazy<ActiveEntry>(this.CreateActiveEntry, LazyThreadSafetyMode.ExecutionAndPublication);
-
- this.RegisteCleanup();
+ return this;
  }
 
  /// <summary>
@@ -132,14 +118,14 @@ public HttpApiFactory(Action<HttpApiConfig> configAction, Func<HttpMessageHandle
  /// <returns></returns>
  public TInterface CreateHttpApi()
  {
- return ((IHttpApiFactory)this).CreateHttpApi() as TInterface;
+ return ((_IHttpApiFactory)this).CreateHttpApi() as TInterface;
  }
 
  /// <summary>
  /// 创建接口的代理实例
  /// </summary>
  /// <returns></returns>
- object IHttpApiFactory.CreateHttpApi()
+ object _IHttpApiFactory.CreateHttpApi()
  {
  var interceptor = this.activeEntryLazy.Value.Interceptor;
  return HttpApiClient.Create(typeof(TInterface), interceptor);
@@ -151,7 +137,8 @@ object IHttpApiFactory.CreateHttpApi()
  /// <returns></returns>
  private ActiveEntry CreateActiveEntry()
  {
- var httpApiConfig = new HttpApiConfig(this.handlerFunc.Invoke(), true);
+ var handler = this.handlerFunc?.Invoke() ?? new DefaultHttpClientHandler();
+ var httpApiConfig = new HttpApiConfig(handler, true);
  var interceptor = new LifeTimeTrackingInterceptor(httpApiConfig);
 
  if (this.configAction != null)
@@ -173,12 +160,22 @@ private ActiveEntry CreateActiveEntry()
  void _IHttpApiFactory.OnEntryDeactivate(ActiveEntry active)
  {
  // 切换激活状态的记录的实例
- this.activeEntryLazy = new Lazy<ActiveEntry>(this.CreateActiveEntry, LazyThreadSafetyMode.ExecutionAndPublication);
+ this.activeEntryLazy = new Lazy<ActiveEntry>(
+ this.CreateActiveEntry,
+ LazyThreadSafetyMode.ExecutionAndPublication);
 
  var expired = new ExpiredEntry(active);
  this.expiredEntries.Enqueue(expired);
  }
 
+ /// <summary>
+ /// 获取生命周期
+ /// </summary>
+ TimeSpan _IHttpApiFactory.Lifetime
+ {
+ get => this.lifeTime;
+ }
+
  /// <summary>
  /// 注册清理任务
  /// </summary>

WebApiClient/IHttpApiFactory.cs

@@ -1,27 +1,15 @@
 namespace WebApiClient
 {
- /// <summary>
- /// 定义HttpApi工厂的接口
- /// </summary>
- public interface IHttpApiFactory
- {
- /// <summary>
- /// 创建接口的代理实例
- /// </summary>
- /// <returns></returns>
- object CreateHttpApi();
- }
-
  /// <summary>
  /// 定义HttpApi工厂的接口
  /// </summary>
  /// <typeparam name="TInterface"></typeparam>
- public interface IHttpApiFactory<TInterface> : IHttpApiFactory where TInterface : class, IHttpApi
+ public interface IHttpApiFactory<TInterface> where TInterface : class, IHttpApi
  {
  /// <summary>
  /// 创建接口的代理实例
  /// </summary>
  /// <returns></returns>
- new TInterface CreateHttpApi();
+ TInterface CreateHttpApi();
  }
 }

WebApiClient/Internal/HttpApiFactories/IHttpApiFactory.cs

@@ -8,9 +8,15 @@ namespace WebApiClient
  interface _IHttpApiFactory
  {
  /// <summary>
- /// 获取或设置生命周期
+ /// 获取生命周期
  /// </summary>
- TimeSpan Lifetime { get; set; }
+ TimeSpan Lifetime { get; }
+
+ /// <summary>
+ /// 创建接口的代理实例
+ /// </summary>
+ /// <returns></returns>
+ object CreateHttpApi();
 
  /// <summary>
  /// 当有记录失效时