GenericType->IsITaskDefinition

xljiulang · xljiulang · commit db44afcab021 · 2018-01-15T13:20:43.000+08:00
diff --git a/WebApiClient/ApiReturnDescriptor.cs b/WebApiClient/ApiReturnDescriptor.cs
@@ -25,17 +25,18 @@ public class ApiReturnDescriptor
         public Type ReturnType { get; internal set; }
 
         /// <summary>
-        /// 获取返回类型的泛型定义
+        /// 获取Api返回的ITaskOf(T)或TaskOf(T)的T类型
         /// </summary>
-        public Type GenericType { get; internal set; }
+        public Type DataType { get; internal set; }
 
         /// <summary>
-        /// 获取Api返回的TaskOf(T)的T类型
+        /// 获取返回类型是ITaskOf(T)而不是TaskOf(T)
         /// </summary>
-        public Type DataType { get; internal set; }
+        public bool IsITaskDefinition { get; internal set; }
 
         /// <summary>
-        /// 返回类型对应的ITask泛型构造器
+        /// 获取返回类型对应的ITask泛型构造器
+        /// 用于构造ITaskOf(T)的实例
         /// </summary>
         public ConstructorInfo ITaskCtor { get; internal set; }
     }
diff --git a/WebApiClient/Attributes/ParameterAttributes/FormContentAttribute.cs b/WebApiClient/Attributes/ParameterAttributes/FormContentAttribute.cs
@@ -11,10 +11,7 @@
 namespace WebApiClient.Attributes
 {
     /// <summary>
-    /// 表示将参数值作为x-www-form-urlencoded请求
-    /// 支持单一值类型如string、int、guid、枚举等，以及他们的可空类型或集合
-    /// 支持POCO类型、IDictionaryOf(string,string)类型、IDictionaryOf(string,object)类型
-    /// 依赖于HttpApiConfig.KeyValueFormatter
+    /// 使用KeyValueFormatter序列化参数值得到的键值对作为x-www-form-urlencoded请求
     /// </summary>
     public class FormContentAttribute : HttpContentAttribute
     {
diff --git a/WebApiClient/Attributes/ParameterAttributes/HttpContentAttribute.cs b/WebApiClient/Attributes/ParameterAttributes/HttpContentAttribute.cs
@@ -11,8 +11,7 @@
 namespace WebApiClient.Attributes
 {
     /// <summary>
-    /// 表示参数为HttpContent或派生类型的特性    
-    /// 此类型的参数可以不用注明HttpContentAttribute
+    /// 表示参数值理解为HttpContent类型的特性    
     /// </summary>
     [AttributeUsage(AttributeTargets.Parameter, AllowMultiple = false, Inherited = true)]
     public class HttpContentAttribute : Attribute, IApiParameterAttribute
diff --git a/WebApiClient/Attributes/ParameterAttributes/JsonContentAttribute.cs b/WebApiClient/Attributes/ParameterAttributes/JsonContentAttribute.cs
@@ -9,9 +9,8 @@
 namespace WebApiClient.Attributes
 {
     /// <summary>
-    /// 表示将参数值作为application/json请求
+    /// 使用JsonFormatter序列化参数值得到的json文本作为application/json请求
     /// 每个Api只能注明于其中的一个参数
-    /// 依赖于HttpApiConfig.JsonFormatter
     /// </summary>
     public class JsonContentAttribute : HttpContentAttribute
     {
diff --git a/WebApiClient/Attributes/ParameterAttributes/MulitpartContentAttribute.cs b/WebApiClient/Attributes/ParameterAttributes/MulitpartContentAttribute.cs
@@ -11,10 +11,7 @@
 namespace WebApiClient.Attributes
 {
     /// <summary>
-    /// 表示参数值作为multipart/form-data表单或表单的一个项
-    /// 支持单一值类型如string、int、guid、枚举等，以及他们的可空类型或集合
-    /// 支持POCO类型、IDictionaryOf(string,string)类型、IDictionaryOf(string,object)类型
-    /// 依赖于HttpApiConfig.KeyValueFormatter
+    /// 使用KeyValueFormatter序列化参数值得到的键值对分别作为multipart/form-data表单的一个文本项 
     /// </summary>
     public class MulitpartContentAttribute : HttpContentAttribute
     {
diff --git a/WebApiClient/Attributes/ParameterAttributes/PathQueryAttribute.cs b/WebApiClient/Attributes/ParameterAttributes/PathQueryAttribute.cs
@@ -9,12 +9,8 @@
 namespace WebApiClient.Attributes
 {
     /// <summary>
-    /// 表示将参数值作为url路径参数或query参数的特性
-    /// 支持单一值类型如string、int、guid、枚举等，以及他们的可空类型或集合
-    /// 支持POCO类型、IDictionaryOf(string,string)类型、IDictionaryOf(string,object)类型
-    /// 没有任何特性修饰的普通参数，将默认为PathQuery修饰
-    /// 依赖于HttpApiConfig.KeyValueFormatter
-    /// 不可继承
+    /// 使用KeyValueFormatter序列化参数值得到的键值对作为url路径参数或query参数的特性
+    /// 没有任何特性修饰的参数，将默认被PathQueryAttribute修饰
     /// </summary>
     [AttributeUsage(AttributeTargets.Parameter, AllowMultiple = false, Inherited = true)]
     public sealed class PathQueryAttribute : Attribute, IApiParameterAttribute
diff --git a/WebApiClient/Attributes/ParameterAttributes/XmlContentAttribute.cs b/WebApiClient/Attributes/ParameterAttributes/XmlContentAttribute.cs
@@ -11,9 +11,7 @@
 namespace WebApiClient.Attributes
 {
     /// <summary>
-    /// 表示将参数值作为application/xml请求
-    /// 每个Api只能注明于其中的一个参数
-    /// 依赖于HttpApiConfig.XmlFormatter
+    /// 使用XmlFormatter序列化参数值得到的json文本作为application/xml请求
     /// </summary>
     public class XmlContentAttribute : HttpContentAttribute
     {
diff --git a/WebApiClient/Attributes/ReturnAttributes/JsonReturnAttribute.cs b/WebApiClient/Attributes/ReturnAttributes/JsonReturnAttribute.cs
@@ -8,8 +8,7 @@
 namespace WebApiClient.Attributes
 {
     /// <summary>
-    /// 表示将回复的Json结果作反序化为指定类型
-    /// 依赖于HttpApiConfig.JsonFormatter
+    /// 使用JsonFormatter反序列化回复内容作为返回值
     /// </summary>
     public class JsonReturnAttribute : ApiReturnAttribute
     {
diff --git a/WebApiClient/Attributes/ReturnAttributes/XmlReturnAttribute.cs b/WebApiClient/Attributes/ReturnAttributes/XmlReturnAttribute.cs
@@ -10,8 +10,7 @@
 namespace WebApiClient.Attributes
 {
     /// <summary>
-    /// 表示将回复的Xml结果作反序化为指定类型
-    /// 依赖于HttpApiConfig.XmlFormatter
+    /// 使用XmlFormatter反序列化回复内容作为返回值
     /// </summary>
     public class XmlReturnAttribute :  ApiReturnAttribute 
     {
diff --git a/WebApiClient/DataAnnotations/AliasAsAttribute.cs b/WebApiClient/DataAnnotations/AliasAsAttribute.cs
@@ -7,6 +7,7 @@
 namespace WebApiClient
 {
     /// <summary>
+    /// DataAnnotation
     /// 表示将参数名或属性名进行别名
     /// 当修饰属性时，JsonFormatter或KeyValueFormatter序列化将使用此别名
     /// </summary>
diff --git a/WebApiClient/DataAnnotations/DateTimeFormatAttribute.cs b/WebApiClient/DataAnnotations/DateTimeFormatAttribute.cs
@@ -8,6 +8,7 @@ namespace WebApiClient
 {
     /// <summary>
     /// 表示属性在JsonFormatter或KeyValueFormatter序列化时使用的日期时间格式
+    /// DataAnnotation
     /// </summary>
     [AttributeUsage(AttributeTargets.Property, AllowMultiple = false, Inherited = true)]
     public sealed class DateTimeFormatAttribute : Attribute
diff --git a/WebApiClient/DataAnnotations/IgnoreSerializedAttribute.cs b/WebApiClient/DataAnnotations/IgnoreSerializedAttribute.cs
@@ -7,6 +7,7 @@
 namespace WebApiClient
 {
     /// <summary>
+    /// DataAnnotation
     /// 表示当JsonFormatter或KeyValueFormatter序列化对象时，此属性将忽略
     /// </summary>
     [AttributeUsage(AttributeTargets.Property, AllowMultiple = false, Inherited = true)]
diff --git a/WebApiClient/HttpApiConfig.cs b/WebApiClient/HttpApiConfig.cs
@@ -41,7 +41,8 @@ public class HttpApiConfig : IDisposable
         public Uri HttpHost { get; set; }
 
         /// <summary>
-        /// 获取或设置请求时序列化使用的默认格式    
+        /// 获取或设置请求时序列化使用的默认格式   
+        /// 影响JsonFormatter或KeyValueFormatter的序列化
         /// </summary>
         public FormatOptions FormatOptions { get; set; }
 
diff --git a/WebApiClient/Internal/ApiDescriptorCache.cs b/WebApiClient/Internal/ApiDescriptorCache.cs
@@ -125,8 +125,8 @@ private static ApiReturnDescriptor GetReturnDescriptor(MethodInfo method)
             {
                 Attribute = returnAttribute,
                 ReturnType = method.ReturnType,
-                GenericType = method.ReturnType.GetGenericTypeDefinition(),
                 DataType = dataType,
+                IsITaskDefinition = method.ReturnType.GetGenericTypeDefinition() == typeof(ITask<>),
                 ITaskCtor = ApiTask.GetConstructor(dataType),
             };
             return descriptor;
diff --git a/WebApiClient/Internal/ApiInterceptor.cs b/WebApiClient/Internal/ApiInterceptor.cs
@@ -54,7 +54,7 @@ public object Intercept(object target, MethodInfo method, object[] parameters)
             var apiActionDescripter = this.GetApiActionDescriptor(method, parameters);
             var apiTask = ApiTask.CreateInstance(this.httpApiConfig, apiActionDescripter);
 
-            if (apiActionDescripter.Return.GenericType == typeof(ITask<>))
+            if (apiActionDescripter.Return.IsITaskDefinition == true)
             {
                 return apiTask;
             }

Original file line number	Diff line number	Diff line change
`@@ -11,10 +11,7 @@`
`11`	`11`	`namespace WebApiClient.Attributes`
`12`	`12`	`{`
`13`	`13`	`/// <summary>`
`14`		`- /// 表示将参数值作为x-www-form-urlencoded请求`
`15`		`- /// 支持单一值类型如string、int、guid、枚举等，以及他们的可空类型或集合`
`16`		`- /// 支持POCO类型、IDictionaryOf(string,string)类型、IDictionaryOf(string,object)类型`
`17`		`- /// 依赖于HttpApiConfig.KeyValueFormatter`
	`14`	`+ /// 使用KeyValueFormatter序列化参数值得到的键值对作为x-www-form-urlencoded请求`
`18`	`15`	`/// </summary>`
`19`	`16`	`public class FormContentAttribute : HttpContentAttribute`
`20`	`17`	`{`
Original file line number	Diff line number	Diff line change
`@@ -9,9 +9,8 @@`
`9`	`9`	`namespace WebApiClient.Attributes`
`10`	`10`	`{`
`11`	`11`	`/// <summary>`
`12`		`- /// 表示将参数值作为application/json请求`
	`12`	`+ /// 使用JsonFormatter序列化参数值得到的json文本作为application/json请求`
`13`	`13`	`/// 每个Api只能注明于其中的一个参数`
`14`		`- /// 依赖于HttpApiConfig.JsonFormatter`
`15`	`14`	`/// </summary>`
`16`	`15`	`public class JsonContentAttribute : HttpContentAttribute`
`17`	`16`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,9 +11,7 @@`
`11`	`11`	`namespace WebApiClient.Attributes`
`12`	`12`	`{`
`13`	`13`	`/// <summary>`
`14`		`- /// 表示将参数值作为application/xml请求`
`15`		`- /// 每个Api只能注明于其中的一个参数`
`16`		`- /// 依赖于HttpApiConfig.XmlFormatter`
	`14`	`+ /// 使用XmlFormatter序列化参数值得到的json文本作为application/xml请求`
`17`	`15`	`/// </summary>`
`18`	`16`	`public class XmlContentAttribute : HttpContentAttribute`
`19`	`17`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,7 @@`
`8`	`8`	`namespace WebApiClient.Attributes`
`9`	`9`	`{`
`10`	`10`	`/// <summary>`
`11`		`- /// 表示将回复的Json结果作反序化为指定类型`
`12`		`- /// 依赖于HttpApiConfig.JsonFormatter`
	`11`	`+ /// 使用JsonFormatter反序列化回复内容作为返回值`
`13`	`12`	`/// </summary>`
`14`	`13`	`public class JsonReturnAttribute : ApiReturnAttribute`
`15`	`14`	`{`
Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,7 @@`
`10`	`10`	`namespace WebApiClient.Attributes`
`11`	`11`	`{`
`12`	`12`	`/// <summary>`
`13`		`- /// 表示将回复的Xml结果作反序化为指定类型`
`14`		`- /// 依赖于HttpApiConfig.XmlFormatter`
	`13`	`+ /// 使用XmlFormatter反序列化回复内容作为返回值`
`15`	`14`	`/// </summary>`
`16`	`15`	`public class XmlReturnAttribute : ApiReturnAttribute`
`17`	`16`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`namespace WebApiClient`
`8`	`8`	`{`
`9`	`9`	`/// <summary>`
	`10`	`+ /// DataAnnotation`
`10`	`11`	`/// 表示将参数名或属性名进行别名`
`11`	`12`	`/// 当修饰属性时，JsonFormatter或KeyValueFormatter序列化将使用此别名`
`12`	`13`	`/// </summary>`