增加CollectionExtensions类型

Author: xljiulang

WebApiClient/Attributes/ParameterAttributes/PathQueryAttribute.cs

@@ -88,66 +88,31 @@ public async Task BeforeRequestAsync(ApiActionContext context, ApiParameterDescr
                 return;
             }
 
-            var options = context.HttpApiConfig.FormatOptions.CloneChange(this.DateTimeFormat);
-            var keyValues = context.HttpApiConfig.KeyValueFormatter.Serialize(parameter, options);
-            var query = this.FormateCollection(keyValues);
-
-            context.RequestMessage.RequestUri = this.UsePathQuery(uri, query);
+            var options = context
+                .HttpApiConfig
+                .FormatOptions
+                .CloneChange(this.DateTimeFormat);
+
+            var keyValues = context
+                .HttpApiConfig
+                .KeyValueFormatter
+                .Serialize(parameter, options)
+                .FormateAs(this.CollectionFormat);
+
+            context.RequestMessage.RequestUri = this.UsePathQuery(uri, keyValues);
             await ApiTask.CompletedTask;
         }
 
-        /// <summary>
-        /// 格式化集合
-        /// </summary>
-        /// <param name="keyValues">键值对</param>
-        /// <returns></returns>
-        private IEnumerable<KeyValuePair<string, string>> FormateCollection(IEnumerable<KeyValuePair<string, string>> keyValues)
-        {
-            IEnumerable<KeyValuePair<string, string>> JoinValue(IEnumerable<IGrouping<string, KeyValuePair<string, string>>> grouping, string separator)
-            {
-                return grouping.Select(item =>
-                {
-                    var value = string.Join(separator, item.Select(i => i.Value));
-                    return new KeyValuePair<string, string>(item.Key, value);
-                });
-            }
-
-            if (this.CollectionFormat == CollectionFormat.Multi)
-            {
-                return keyValues;
-            }
-
-            var groups = keyValues.GroupBy(item => item.Key);
-            switch (this.CollectionFormat)
-            {
-                case CollectionFormat.Csv:
-                    return JoinValue(groups, @",");
-
-                case CollectionFormat.Ssv:
-                    return JoinValue(groups, @" ");
-
-                case CollectionFormat.Tsv:
-                    return JoinValue(groups, @"\");
-
-                case CollectionFormat.Pipes:
-                    return JoinValue(groups, @"|");
-
-                default:
-                    throw new NotImplementedException();
-            }
-        }
-
-
         /// <summary>
         /// url添加query或替换segment
         /// </summary>
         /// <param name="uri">url</param>
-        /// <param name="query">键值对</param>
+        /// <param name="keyValues">键值对</param>
         /// <returns></returns>
-        protected Uri UsePathQuery(Uri uri, IEnumerable<KeyValuePair<string, string>> query)
+        protected Uri UsePathQuery(Uri uri, IEnumerable<KeyValuePair<string, string>> keyValues)
         {
             var editor = new UriEditor(uri, this.encoding);
-            foreach (var keyValue in query)
+            foreach (var keyValue in keyValues)
             {
                 if (editor.Replace(keyValue.Key, keyValue.Value) == false)
                 {

WebApiClient/Extensions.cs

@@ -10,22 +10,6 @@ namespace WebApiClient
     /// </summary>
     public static class Extensions
     {
-        /// <summary>
-        /// 转换为只读列表
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="source"></param>
-        /// <exception cref="ArgumentNullException"></exception>
-        /// <returns></returns>
-        public static IReadOnlyList<T> ToReadOnlyList<T>(this IEnumerable<T> source)
-        {
-            if (source == null)
-            {
-                throw new ArgumentNullException(nameof(source));
-            }
-            return source.ToList().AsReadOnly();
-        }
-
         /// <summary>
         /// 返回提供请求重试的请求任务对象
         /// </summary>

WebApiClient/Internal/Extensions/CollectionExtensions.cs

@@ -0,0 +1,76 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace WebApiClient
+{
+    /// <summary>
+    /// 提供集合扩展
+    /// </summary>
+    static class CollectionExtensions
+    {
+        /// <summary>
+        /// 格式化集合
+        /// </summary>
+        /// <param name="collection">集合</param>
+        /// <param name="format">格式</param>
+        /// <returns></returns>
+        public static IEnumerable<KeyValuePair<string, string>> FormateAs(this IEnumerable<KeyValuePair<string, string>> collection, CollectionFormat format)
+        {
+            if (format == CollectionFormat.Multi)
+            {
+                return collection;
+            }
+
+            switch (format)
+            {
+                case CollectionFormat.Csv:
+                    return collection.FormateAs(@",");
+
+                case CollectionFormat.Ssv:
+                    return collection.FormateAs(@" ");
+
+                case CollectionFormat.Tsv:
+                    return collection.FormateAs(@"\");
+
+                case CollectionFormat.Pipes:
+                    return collection.FormateAs(@"|");
+
+                default:
+                    throw new NotImplementedException();
+            }
+        }
+
+        /// <summary>
+        /// 格式化集合
+        /// </summary>
+        /// <param name="collection">集合</param>
+        /// <param name="separator">分隔符</param>
+        /// <returns></returns>
+        private static IEnumerable<KeyValuePair<string, string>> FormateAs(this IEnumerable<KeyValuePair<string, string>> collection, string separator)
+        {
+            return collection.GroupBy(item => item.Key).Select(item =>
+            {
+                var value = string.Join(separator, item.Select(i => i.Value));
+                return new KeyValuePair<string, string>(item.Key, value);
+            });
+        }
+
+
+        /// <summary>
+        /// 转换为只读列表
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="source"></param>
+        /// <exception cref="ArgumentNullException"></exception>
+        /// <returns></returns>
+        public static IReadOnlyList<T> ToReadOnlyList<T>(this IEnumerable<T> source)
+        {
+            if (source == null)
+            {
+                throw new ArgumentNullException(nameof(source));
+            }
+            return source.ToList().AsReadOnly();
+        }
+    }
+}