移除未使用的ParameterAttributeCollection类型

Author: xljiulang

WebApiClient/Contexts/ApiActionDescriptor.cs

@@ -8,7 +8,7 @@ namespace WebApiClient.Contexts
     /// 表示请求Api描述
     /// </summary>
     [DebuggerDisplay("Name = {Name}")]
-    public class ApiActionDescriptor 
+    public class ApiActionDescriptor
     {
         /// <summary>
         /// 获取Api名称
@@ -38,22 +38,36 @@ public class ApiActionDescriptor
         /// <summary>
         /// 获取Api的返回描述
         /// </summary>
-        public ApiReturnDescriptor Return { get; internal set; }      
+        public ApiReturnDescriptor Return { get; internal set; }
 
         /// <summary>
         /// 克隆
         /// </summary>
         /// <returns></returns>
         public ApiActionDescriptor Clone()
         {
+            return this.Clone(null);
+        }
+
+        /// <summary>
+        /// 克隆并设置新的参数值
+        /// </summary>
+        /// <param name="parameterValues">新的参数值集合</param>
+        /// <returns></returns>
+        public ApiActionDescriptor Clone(object[] parameterValues)
+        {
+            var parameters = parameterValues == null ?
+                this.Parameters.Select(p => p.Clone()).ToArray() :
+                this.Parameters.Select((p, i) => p.Clone(parameterValues[i])).ToArray();
+
             return new ApiActionDescriptor
             {
                 Name = this.Name,
                 Member = this.Member,
                 Return = this.Return,
                 Filters = this.Filters,
                 Attributes = this.Attributes,
-                Parameters = this.Parameters.Select(item => item.Clone()).ToArray()
+                Parameters = parameters
             };
         }
     }

WebApiClient/Contexts/ApiParameterDescriptor.cs

@@ -60,12 +60,22 @@ public override string ToString()
         /// </summary>
         /// <returns></returns>
         public ApiParameterDescriptor Clone()
+        {
+            return this.Clone(this.Value);
+        }
+
+        /// <summary>
+        /// 克隆新设置新的值
+        /// </summary>
+        /// <param name="value">新的参数值</param>
+        /// <returns></returns>
+        public ApiParameterDescriptor Clone(object value)
         {
             return new ApiParameterDescriptor
             {
                 Name = this.Name,
                 Index = this.Index,
-                Value = this.Value,
+                Value = value,
                 Member = this.Member,
                 Attributes = this.Attributes,
                 ParameterType = this.ParameterType,

WebApiClient/Defaults/ApiInterceptor.cs

@@ -54,16 +54,12 @@ public virtual object Intercept(object target, MethodInfo method, object[] param
         /// 获取api的描述
         /// </summary>
         /// <param name="method">接口的方法</param>
-        /// <param name="parameters">参数集合</param>
+        /// <param name="parameters">参数值集合</param>
         /// <returns></returns>
         protected virtual ApiActionDescriptor GetApiActionDescriptor(MethodInfo method, object[] parameters)
         {
-            var actionDescripter = ApiDescriptorCache.GetApiActionDescriptor(method).Clone();
-            for (var i = 0; i < actionDescripter.Parameters.Length; i++)
-            {
-                actionDescripter.Parameters[i].Value = parameters[i];
-            }
-            return actionDescripter;
+            var descriptor = ApiDescriptorCache.GetApiActionDescriptor(method);
+            return descriptor.Clone(parameters);
         }
 
         /// <summary>

WebApiClient/Internal/ApiDescriptorCache.cs

@@ -33,7 +33,7 @@ static ApiDescriptorCache()
         /// </summary>
         /// <param name="method">接口的方法</param>
         /// <returns></returns>
-        public static ApiActionDescriptor GetApiActionDescriptor(MethodInfo method)
+        public static ApiActionDescriptor GetApiActionDescriptor(this MethodInfo method)
         {
             return cache.GetOrAdd(method, GetApiActionDescriptorNoCache);
         }
@@ -122,72 +122,6 @@ private static ApiReturnDescriptor GetReturnDescriptor(this MethodInfo method)
             return descriptor;
         }
 
-        /// <summary>
-        /// 表示参数特性集合
-        /// </summary>
-        private class ParameterAttributeCollection
-        {
-            /// <summary>
-            /// 特性列表
-            /// </summary>
-            private readonly List<IApiParameterAttribute> attribueList = new List<IApiParameterAttribute>();
-
-            /// <summary>
-            /// 获取元素数量
-            /// </summary>
-            public int Count
-            {
-                get
-                {
-                    return this.attribueList.Count;
-                }
-            }
-
-            /// <summary>
-            /// 参数特性集合
-            /// </summary>
-            /// <param name="defined">声明的特性</param>
-            public ParameterAttributeCollection(IEnumerable<IApiParameterAttribute> defined)
-            {
-                this.attribueList.AddRange(defined);
-            }
-
-            /// <summary>
-            /// 添加新特性
-            /// </summary>
-            /// <param name="attribute">新特性</param>
-            public void Add(IApiParameterAttribute attribute)
-            {
-                this.attribueList.Add(attribute);
-            }
-
-            /// <summary>
-            /// 添加新特性
-            /// </summary>
-            /// <param name="attribute">新特性</param>
-            /// <returns></returns>
-            public bool AddIfNotExists(IApiParameterAttribute attribute)
-            {
-                var type = attribute.GetType();
-                if (this.attribueList.Any(item => item.GetType() == type) == true)
-                {
-                    return false;
-                }
-
-                this.attribueList.Add(attribute);
-                return true;
-            }
-
-            /// <summary>
-            /// 转换为数组
-            /// </summary>
-            /// <returns></returns>
-            public IApiParameterAttribute[] ToArray()
-            {
-                return this.attribueList.ToArray();
-            }
-        }
-
         /// <summary>
         /// 是否允许重复的特性比较器
         /// </summary>