修复接口继承时获取方法特性和过滤器的问题

Author: xljiulang

WebApiClientCore.Test/BuildinExtensions/AttributeExtensionsTest.cs

@@ -50,8 +50,8 @@ public void GetAttributesTest()
             var m1 = typeof(D1).GetMethod("M1");
             var m2 = typeof(D1).GetMethod("M2");
 
-            Assert.True(m1.GetAttributes<MyAttribute>(true).Count() == 0);
-            Assert.True(m2.GetAttributes<MyAttribute>(true).Count() == 1);
+            Assert.True(m1.GetAttributes<MyAttribute>().Count() == 0);
+            Assert.True(m2.GetAttributes<MyAttribute>().Count() == 1);
         }
     }
 }

WebApiClientCore/ApiActionDescriptor.cs

@@ -83,23 +83,18 @@ public ApiActionDescriptor(MethodInfo method, Type? interfaceType = default)
             {
                 interfaceType = method.DeclaringType;
             }
-             
-            var methodAttributes = method.GetAttributes<IApiActionAttribute>(false);
-            var interfaceAttributes = interfaceType.GetAttributes<IApiActionAttribute>(false);
-            var declaringInterfaceAttributes = interfaceType == method.DeclaringType
-                ? Enumerable.Empty<IApiActionAttribute>()
-                : method.DeclaringType.GetAttributes<IApiActionAttribute>(false);
 
             // 接口特性优先于方法所在类型的特性
-            var actionAttributes = methodAttributes
-                .Concat(interfaceAttributes)
-                .Concat(declaringInterfaceAttributes)
+            var actionAttributes = method
+                .GetAttributes<IApiActionAttribute>()
+                .Concat(interfaceType.GetAttributes<IApiActionAttribute>())
                 .Distinct(MultiplableComparer<IApiActionAttribute>.Default)
                 .OrderBy(item => item.OrderIndex)
                 .ToReadOnlyList();
 
             var filterAttributes = method
-                .GetAttributes<IApiFilterAttribute>(true)
+                .GetAttributes<IApiFilterAttribute>()
+                .Concat(interfaceType.GetAttributes<IApiFilterAttribute>())
                 .Distinct(MultiplableComparer<IApiFilterAttribute>.Default)
                 .OrderBy(item => item.OrderIndex)
                 .Where(item => item.Enable)
@@ -114,7 +109,7 @@ public ApiActionDescriptor(MethodInfo method, Type? interfaceType = default)
             this.CacheAttribute = method.GetAttribute<IApiCacheAttribute>();
             this.FilterAttributes = filterAttributes;
 
-            this.Return = new ApiReturnDescriptor(method);
+            this.Return = new ApiReturnDescriptor(method, interfaceType);
             this.Parameters = method.GetParameters().Select(p => new ApiParameterDescriptor(p)).ToReadOnlyList();
             this.Properties = new ConcurrentDictionary<object, object>();
         }

WebApiClientCore/ApiReturnDescriptor.cs

@@ -32,9 +32,20 @@ public class ApiReturnDescriptor
         /// <summary>
         /// 请求Api的返回描述
         /// </summary>
-        /// <param name="method">方法信息</param>
+        /// <param name="method">方法信息</param> 
         /// <exception cref="ArgumentNullException"></exception>
         public ApiReturnDescriptor(MethodInfo method)
+            : this(method, method.DeclaringType)
+        {
+        }
+
+        /// <summary>
+        /// 请求Api的返回描述
+        /// </summary>
+        /// <param name="method">方法信息</param>
+        /// <param name="interfaceType">接口类型</param>
+        /// <exception cref="ArgumentNullException"></exception>
+        public ApiReturnDescriptor(MethodInfo method, Type interfaceType)
         {
             if (method == null)
             {
@@ -50,7 +61,8 @@ public ApiReturnDescriptor(MethodInfo method)
             this.ReturnType = method.ReturnType;
             this.DataType = dataType;
             this.Attributes = method
-                .GetAttributes<IApiReturnAttribute>(true)
+                .GetAttributes<IApiReturnAttribute>()
+                .Concat(interfaceType.GetAttributes<IApiReturnAttribute>())
                 .Concat(GetDefaultAttributes(dataType))
                 .Distinct(MultiplableComparer<IApiReturnAttribute>.Default)
                 .OrderBy(item => item.OrderIndex)

WebApiClientCore/BuildinExtensions/AttributeExtensions.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 
@@ -10,37 +11,29 @@ namespace WebApiClientCore
     static class AttributeExtensions
     {
         /// <summary>
-        /// 获取成员的特性
+        /// 获取方法的特性
         /// </summary>
         /// <typeparam name="TAttribute"></typeparam>
-        /// <param name="member">成员</param> 
+        /// <param name="method">方法</param> 
         /// <returns></returns>
-        public static TAttribute? GetAttribute<TAttribute>(this MemberInfo member) where TAttribute : class
+        public static TAttribute? GetAttribute<TAttribute>(this MethodInfo method) where TAttribute : class
         {
-            return member.GetCustomAttributes().OfType<TAttribute>().FirstOrDefault();
+            return method.GetAttributes<TAttribute>().FirstOrDefault();
         }
 
         /// <summary>
-        /// 获取成员的特性
+        /// 获取方法的特性
         /// </summary>
         /// <typeparam name="TAttribute"></typeparam>
-        /// <param name="member">成员</param>
-        /// <param name="includeDeclaringType">是否也包括声明类型</param>
+        /// <param name="method">方法</param> 
         /// <returns></returns>
-        public static IEnumerable<TAttribute> GetAttributes<TAttribute>(this MemberInfo member, bool includeDeclaringType) where TAttribute : class
+        public static IEnumerable<TAttribute> GetAttributes<TAttribute>(this MethodInfo method) where TAttribute : class
         {
-            var self = member.GetCustomAttributes().OfType<TAttribute>();
-            if (includeDeclaringType == false || member.DeclaringType == null)
-            {
-                return self;
-            }
-
-            var decalring = member.DeclaringType.GetCustomAttributes().OfType<TAttribute>();
-            return self.Concat(decalring);
+            return method.GetCustomAttributes().OfType<TAttribute>();
         }
 
         /// <summary>
-        /// 获取成员的特性
+        /// 获取参数的特性
         /// </summary>
         /// <typeparam name="TAttribute"></typeparam>
         /// <param name="parameter">参数</param> 
@@ -49,5 +42,19 @@ public static IEnumerable<TAttribute> GetAttributes<TAttribute>(this ParameterIn
         {
             return parameter.GetCustomAttributes().OfType<TAttribute>();
         }
+
+        /// <summary>
+        /// 获取接口以及其基础接口定义的特性
+        /// </summary>
+        /// <typeparam name="TAttribute"></typeparam>
+        /// <param name="interfaceType">接口类型</param> 
+        /// <returns></returns>
+        public static IEnumerable<TAttribute> GetAttributes<TAttribute>(this Type interfaceType) where TAttribute : class
+        {
+            return new[] { interfaceType }
+                .Concat(interfaceType.GetInterfaces())
+                .SelectMany(item => item.GetCustomAttributes()
+                .OfType<TAttribute>());
+        }
     }
 }