增加mediaType比较器

Author: xljiulang

WebApiClientCore/ApiActionDescriptor.cs

@@ -93,13 +93,13 @@ public ApiActionDescriptor(MethodInfo method, Type? interfaceType = default)
             var actionAttributes = methodAttributes
                 .Concat(interfaceAttributes)
                 .Concat(decalringAttributes)
-                .Distinct(new MultiplableComparer<IApiActionAttribute>())
+                .Distinct(MultiplableComparer<IApiActionAttribute>.Default)
                 .OrderBy(item => item.OrderIndex)
                 .ToReadOnlyList();
 
             var filterAttributes = method
                 .GetAttributes<IApiFilterAttribute>(true)
-                .Distinct(new MultiplableComparer<IApiFilterAttribute>())
+                .Distinct(MultiplableComparer<IApiFilterAttribute>.Default)
                 .OrderBy(item => item.OrderIndex)
                 .Where(item => item.Enable)
                 .ToReadOnlyList();

WebApiClientCore/ApiReturnDescriptor.cs

@@ -22,7 +22,7 @@ public class ApiReturnDescriptor
         /// <summary>
         /// 获取ITask(Of T)或Task(Of T)的T类型描述
         /// </summary>
-        public ApiDataTypeDescriptor DataType { get; } 
+        public ApiDataTypeDescriptor DataType { get; }
 
         /// <summary>
         /// 获取关联的IApiReturnAttribute
@@ -48,13 +48,15 @@ public ApiReturnDescriptor(MethodInfo method)
             var dataType = new ApiDataTypeDescriptor(type);
 
             this.ReturnType = method.ReturnType;
-            this.DataType = dataType;         
+            this.DataType = dataType;
             this.Attributes = method
                 .GetAttributes<IApiReturnAttribute>(true)
                 .Concat(GetDefaultAttributes(dataType))
-                .Distinct(new MultiplableComparer<IApiReturnAttribute>())
+                .Distinct(MultiplableComparer<IApiReturnAttribute>.Default)
                 .OrderBy(item => item.OrderIndex)
                 .Where(item => item.Enable)
+                // 最后步骤为比较媒体类型
+                .Distinct(MediaTypeComparer.Default)
                 .ToReadOnlyList();
         }
 
@@ -79,5 +81,51 @@ private static IEnumerable<IApiReturnAttribute> GetDefaultAttributes(ApiDataType
                 yield return new RawReturnAttribute(acceptQuality);
             }
         }
+
+
+        /// <summary>
+        /// MediaType比较器
+        /// </summary>
+        private class MediaTypeComparer : IEqualityComparer<IApiReturnAttribute>
+        {
+            /// <summary>
+            /// 获取默认实例
+            /// </summary>
+            public static MediaTypeComparer Default { get; } = new MediaTypeComparer();
+
+            /// <summary>
+            /// 是否相等
+            /// </summary>
+            /// <param name="x"></param>
+            /// <param name="y"></param>
+            /// <returns></returns>
+            public bool Equals(IApiReturnAttribute x, IApiReturnAttribute y)
+            {
+                var xVal = x.AcceptContentType?.MediaType;
+                var yVal = y.AcceptContentType?.MediaType;
+
+                // 允许多个无AcceptContentType的ApiReturnAttribute存在
+                if (xVal == null && yVal == null)
+                {
+                    return false;
+                }
+
+                return string.Equals(xVal, yVal, StringComparison.OrdinalIgnoreCase);
+            }
+
+            /// <summary>
+            /// 获取哈希码
+            /// </summary>
+            /// <param name="obj"></param>
+            /// <returns></returns> 
+            public int GetHashCode(IApiReturnAttribute obj)
+            {
+                if (obj.AcceptContentType == null)
+                {
+                    return 0;
+                }
+                return obj.AcceptContentType.MediaType.GetHashCode();
+            }
+        }
     }
 }

WebApiClientCore/Attributes/ReturnAttributes/ApiReturnAttribute.cs

@@ -16,7 +16,7 @@ public abstract class ApiReturnAttribute : Attribute, IApiReturnAttribute
         /// <summary>
         /// 获取接受的媒体类型
         /// </summary>
-        protected MediaTypeWithQualityHeaderValue? AcceptContentType { get; }
+        public MediaTypeWithQualityHeaderValue? AcceptContentType { get; }
 
         /// <summary>
         /// 获取执行排序索引
@@ -99,7 +99,7 @@ public async Task OnResponseAsync(ApiResponseContext context)
         }
 
         /// <summary>
-        /// 指示响应的ContentType与Accept-ContentType是否匹配
+        /// 指示响应的ContentType与AcceptContentType是否匹配
         /// 返回false则调用下一个ApiReturnAttribute来处理响应结果
         /// </summary>
         /// <param name="responseContentType">响应的ContentType</param>

WebApiClientCore/BuildinUtils/MultiplableComparer.cs

@@ -5,8 +5,13 @@ namespace WebApiClientCore
     /// <summary>
     /// 是否允许重复的特性比较器
     /// </summary>
-    class MultiplableComparer<TAttributeMultiplable> : IEqualityComparer<TAttributeMultiplable> where TAttributeMultiplable : IAttributeMultiplable
+    sealed class MultiplableComparer<TAttributeMultiplable> : IEqualityComparer<TAttributeMultiplable> where TAttributeMultiplable : IAttributeMultiplable
     {
+        /// <summary>
+        /// 获取默认实例
+        /// </summary>
+        public static MultiplableComparer<TAttributeMultiplable> Default { get; } = new MultiplableComparer<TAttributeMultiplable>();
+
         /// <summary>
         /// 是否相等
         /// </summary>

WebApiClientCore/IApiReturnAttribute.cs

@@ -1,4 +1,5 @@
-using System.Threading.Tasks;
+using System.Net.Http.Headers;
+using System.Threading.Tasks;
 
 namespace WebApiClientCore
 {
@@ -7,6 +8,11 @@ namespace WebApiClientCore
     /// </summary>
     public interface IApiReturnAttribute : IAttributeMultiplable, IAttributeEnable
     {
+        /// <summary>
+        /// 获取期望的媒体类型
+        /// </summary>
+        MediaTypeWithQualityHeaderValue? AcceptContentType { get; }
+
         /// <summary>
         /// 请求前
         /// </summary>