From c018ab27bc5f8779b0817f2428ae1b83abeecc12 Mon Sep 17 00:00:00 2001 From: $+j Date: Tue, 4 Aug 2015 20:54:02 +0800 Subject: [PATCH 01/45] refine url request --- .../Templates/CSharpProxyTemplate.cs | 363 ++++++++++-------- .../Templates/CSharpProxyTemplate.tt | 81 ++-- 2 files changed, 259 insertions(+), 185 deletions(-) diff --git a/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.cs b/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.cs index 10292db..831b630 100644 --- a/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.cs +++ b/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.cs @@ -1,10 +1,10 @@ // ------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version: 12.0.0.0 +// 此代码由工具生成。 +// 运行时版本: 12.0.0.0 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// 对此文件的更改可能会导致不正确的行为。此外，如果 +// 重新生成代码，这些更改将会丢失。 // // ------------------------------------------------------------------------------ namespace WebApiProxy.Tasks.Templates @@ -19,7 +19,7 @@ namespace WebApiProxy.Tasks.Templates /// Class to produce the template output /// - #line 1 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 1 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "12.0.0.0")] public partial class CSharpProxyTemplate : CSharpProxyTemplateBase { @@ -44,14 +44,14 @@ public virtual string TransformText() using System.Web; using "); - #line 20 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 20 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Configuration.Namespace)); #line default #line hidden this.Write(".Models;\r\n\r\n#region Proxies\r\nnamespace "); - #line 23 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 23 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Configuration.Namespace)); #line default @@ -60,210 +60,196 @@ public virtual string TransformText() " class Configuration\r\n\t{\r\n\t\t/// \r\n\t\t/// Web Api Base Address.\r\n\t\t/// \r\n\t\tpublic static string "); - #line 33 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 33 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Configuration.Name)); #line default #line hidden this.Write("BaseAddress = \""); - #line 33 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 33 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Configuration.Metadata.Host)); #line default #line hidden this.Write("\";\r\n\t\t\r\n\t}\r\n}\r\n#endregion\r\n\r\n#region Models\r\nnamespace "); - #line 40 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 40 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Configuration.Namespace)); #line default #line hidden - this.Write(@".Models -{ - public class WebApiProxyResponseException : Exception - { - public HttpStatusCode StatusCode { get; private set; } - public string Content { get; private set; } - - public WebApiProxyResponseException(HttpStatusCode statusCode, string content) : base(""A "" + statusCode + "" ("" + (int)statusCode + "") http exception occured. See Content for response body."") - { - StatusCode = statusCode; - Content = content; - } - } - -"); + this.Write(".Models\r\n{\r\n\r\n"); - #line 54 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 43 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var model in Configuration.Metadata.Models.Where(m => m.Type.Equals("class"))) { #line default #line hidden this.Write("\t\r\n\t/// \r\n\t/// "); - #line 56 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 45 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(model.Description.ToSummary())); #line default #line hidden this.Write("\r\n\t/// \r\n\tpublic partial class "); - #line 58 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 47 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(model.Name)); #line default #line hidden this.Write("\r\n\t{\r\n\t\t#region Constants\r\n"); - #line 61 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 50 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var constantItem in model.Constants) { #line default #line hidden this.Write("\t\t/// \r\n\t\t/// "); - #line 63 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 52 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(constantItem.Description.ToSummary())); #line default #line hidden this.Write("\r\n\t\t/// \r\n\t\tpublic const "); - #line 65 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 54 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(constantItem.Type)); #line default #line hidden this.Write(" "); - #line 65 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 54 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(constantItem.Name)); #line default #line hidden this.Write(" = "); - #line 65 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 54 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(constantItem.Value)); #line default #line hidden this.Write(";\r\n"); - #line 66 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 55 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\t\t#endregion\r\n\r\n\t\t#region Properties\r\n"); - #line 70 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 59 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var propertyItem in model.Properties) { #line default #line hidden this.Write("\t\t/// \r\n\t\t/// "); - #line 72 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 61 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(propertyItem.Description.ToSummary())); #line default #line hidden this.Write("\r\n\t\t/// \r\n\t\tpublic virtual "); - #line 74 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 63 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(propertyItem.Type)); #line default #line hidden this.Write(" "); - #line 74 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 63 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(propertyItem.Name)); #line default #line hidden this.Write(" { get; set; }\r\n"); - #line 75 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 64 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\t\t#endregion\r\n\t}\t\r\n"); - #line 78 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 67 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\r\n"); - #line 80 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 69 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var model in Configuration.Metadata.Models.Where(m => m.Type.Equals("enum"))) { #line default #line hidden this.Write("\t\r\n\t/// \r\n\t/// "); - #line 82 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 71 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(model.Description.ToSummary())); #line default #line hidden this.Write("\r\n\t/// \r\n\tpublic enum "); - #line 84 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 73 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(model.Name)); #line default #line hidden this.Write("\r\n\t{\r\n"); - #line 86 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 75 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var constantItem in model.Constants) { #line default #line hidden this.Write("\r\n\t\t/// \r\n\t\t/// "); - #line 89 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 78 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(constantItem.Description.ToSummary())); #line default #line hidden this.Write("\r\n\t\t/// \r\n\t\t"); - #line 91 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 80 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(constantItem.Name)); #line default #line hidden this.Write(" = "); - #line 91 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 80 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(constantItem.Value)); #line default #line hidden this.Write(",\r\n"); - #line 92 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 81 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\t\t\r\n\t}\r\n"); - #line 94 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 83 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\t\r\n}\r\n#endregion\r\n\r\n#region Interfaces\r\nnamespace "); - #line 100 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 89 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Configuration.Namespace)); #line default @@ -271,27 +257,27 @@ public class WebApiProxyResponseException : Exception this.Write(".Interfaces\r\n{\r\n\tpublic interface IClientBase : IDisposable\r\n\t{\r\n\t\tHttpClient Htt" + "pClient { get; }\r\n\t}\r\n\r\n"); - #line 107 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 96 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var definition in Configuration.Metadata.Definitions) { #line default #line hidden this.Write("\t\r\n\tpublic partial interface I"); - #line 108 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 97 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(definition.Name)); #line default #line hidden - #line 108 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 97 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Configuration.ClientSuffix)); #line default #line hidden this.Write(" : IClientBase\r\n\t{\t\r\n"); - #line 110 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 99 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var method in definition.ActionMethods) { var allParameters = method.UrlParameters.AsEnumerable().Where(m => m != null); @@ -316,114 +302,121 @@ public class WebApiProxyResponseException : Exception #line default #line hidden - this.Write("\r\n"); + this.Write("\r\n\t\t/// \r\n\t\t/// "); + + #line 122 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + this.Write(this.ToStringHelper.ToStringWithCulture(method.Description)); + + #line default + #line hidden + this.Write("\r\n\t\t/// \r\n"); - #line 132 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 124 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var p in method.UrlParameters) { #line default #line hidden this.Write("\t\t/// "); - #line 133 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 125 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(p.Description)); #line default #line hidden this.Write("\r\n"); - #line 134 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 126 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden - this.Write("\t\t/// \r\n\t\tTask "); + this.Write("\t\tTask "); - #line 136 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 127 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Name)); #line default #line hidden this.Write("Async("); - #line 136 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 127 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(parameterList)); #line default #line hidden this.Write(");\r\n\r\n"); - #line 138 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 129 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var p in method.UrlParameters) { #line default #line hidden this.Write("\t\t/// "); - #line 139 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 130 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(p.Description)); #line default #line hidden this.Write("\r\n"); - #line 140 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 131 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden - this.Write("\t\t/// \r\n\t\t"); + this.Write("\t\t"); - #line 142 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 132 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(String.IsNullOrEmpty(method.ReturnType) ? "void" : method.ReturnType)); #line default #line hidden this.Write(" "); - #line 142 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 132 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Name)); #line default #line hidden this.Write("("); - #line 142 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 132 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(parameterList)); #line default #line hidden this.Write(");\r\n"); - #line 143 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 133 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\t\t\t\t\r\n\t}\r\n"); - #line 145 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 135 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\r\n}\r\n#endregion\r\n\r\n#region Clients\r\nnamespace "); - #line 151 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 141 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Configuration.Namespace)); #line default @@ -449,7 +442,7 @@ protected ClientBase() { BaseAddress = new Uri(Configuration."); - #line 170 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 160 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Configuration.Name)); #line default @@ -463,8 +456,7 @@ public virtual void EnsureSuccess(HttpResponseMessage response) if (response.IsSuccessStatusCode) return; - var content = response.Content.ReadAsStringAsync().Result; - throw new WebApiProxyResponseException(response.StatusCode, content); + throw new HttpResponseException(response); } /// @@ -478,89 +470,75 @@ protected ClientBase(HttpMessageHandler handler, bool disposeHandler = true) { BaseAddress = new Uri(Configuration."); - #line 192 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 181 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Configuration.Name)); #line default #line hidden this.Write("BaseAddress)\r\n\t\t\t};\r\n\t\t}\r\n\r\n\t\t/// \r\n\t\t/// Releases the unmanaged resourc" + "es and disposes of the managed resources. \r\n\t\t/// \r\n\t\tpublic voi" + - "d Dispose()\r\n\t\t{\r\n\t\t\tHttpClient.Dispose();\r\n\t\t}\r\n\t}\r\n"); + "d Dispose()\r\n\t\t{\r\n\t\t\tHttpClient.Dispose();\r\n\t\t}\r\n\t}\r\n\r\n"); - #line 204 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 194 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var definition in Configuration.Metadata.Definitions) { #line default #line hidden this.Write("\t/// \r\n\t/// "); - #line 206 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 196 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(definition.Description.ToSummary())); #line default #line hidden this.Write("\r\n\t/// \r\n\tpublic partial class "); - #line 208 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 198 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(definition.Name)); #line default #line hidden - #line 208 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 198 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Configuration.ClientSuffix)); #line default #line hidden this.Write(" : ClientBase, Interfaces.I"); - #line 208 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 198 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(definition.Name)); #line default #line hidden - #line 208 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 198 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Configuration.ClientSuffix)); #line default #line hidden - this.Write("\r\n\t{\t\t\r\n\r\n\t\t/// \r\n\t\t/// "); + this.Write("\r\n\t{\t\t\r\n\t\tpublic "); - #line 212 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" - this.Write(this.ToStringHelper.ToStringWithCulture(definition.Description.ToSummary())); - - #line default - #line hidden - this.Write("\r\n\t\t/// \r\n\t\tpublic "); - - #line 214 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 200 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(definition.Name)); #line default #line hidden - #line 214 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 200 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Configuration.ClientSuffix)); #line default #line hidden - this.Write("() : base()\r\n\t\t{\r\n\t\t}\r\n\r\n\t\t/// \r\n\t\t/// "); - - #line 219 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" - this.Write(this.ToStringHelper.ToStringWithCulture(definition.Description.ToSummary())); - - #line default - #line hidden - this.Write("\r\n\t\t/// \r\n\t\tpublic "); + this.Write("() : base()\r\n\t\t{\r\n\t\t}\r\n\r\n\t\tpublic "); - #line 221 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 204 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(definition.Name)); #line default #line hidden - #line 221 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 204 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Configuration.ClientSuffix)); #line default @@ -568,7 +546,7 @@ protected ClientBase(HttpMessageHandler handler, bool disposeHandler = true) this.Write("(HttpMessageHandler handler, bool disposeHandler = true) : base(handler, disposeH" + "andler)\r\n\t\t{\r\n\t\t}\r\n\r\n\t\t#region Methods\r\n"); - #line 226 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 209 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var method in definition.ActionMethods) { var allParameters = method.UrlParameters.AsEnumerable(); @@ -599,203 +577,282 @@ protected ClientBase(HttpMessageHandler handler, bool disposeHandler = true) } var postOrPut = method.Type.ToTitle() == "Post" || method.Type.ToTitle() == "Put"; - var url = ("\"" + method.Url.Replace("{", "\" + ").Replace("}", " + \"") + "\"").Replace(" + \"\"",""); + + var urlParts = method.Url.Split(new[] {"?"}, StringSplitOptions.RemoveEmptyEntries); + var requestUrl = urlParts[0]; + var urlQueryString = string.Empty; + var isGetRequestAndHasQueryString = falst; + + if (urlParts.Length > 1) + { + urlQueryString = urlParts[1]; + isGetRequestAndHasQueryString = method.Type.ToTitle() == "Get"; + } + + + + if(!hasQueryString){ + requestUrl = Regex.Replace(requestUrl, @"\{(.*?)\}", "\"+Uri.EscapeUriString(Convert.ToString($1))+\""); + } #line default #line hidden - this.Write("\t\t/// \r\n\t\t/// "); + this.Write("\r\n\t\t/// \r\n\t\t/// "); - #line 259 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 259 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Description)); #line default #line hidden this.Write("\r\n\t\t/// \r\n"); - #line 261 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 261 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var p in method.UrlParameters) { #line default #line hidden this.Write("\t\t/// "); - #line 262 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 262 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(p.Description)); #line default #line hidden this.Write("\r\n"); - #line 263 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 263 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden - this.Write("\t\t/// \r\n\t\tpublic virtual async Task "); + this.Write("\t\tpublic virtual async Task "); - #line 265 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 264 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Name)); #line default #line hidden this.Write("Async("); - #line 265 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 264 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(parameterList)); #line default #line hidden - this.Write(")\r\n\t\t{\r\n\t\t\treturn await HttpClient."); + this.Write(")\r\n\t\t{\r\n\t\t\tvar requestUrl = "); + + #line 266 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + this.Write(this.ToStringHelper.ToStringWithCulture(requestUrl)); + + #line default + #line hidden + this.Write(";\r\n\t\t\t"); + + #line 267 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + if(isGetRequestAndHasQueryString){ + + #line default + #line hidden + this.Write("\t\t\t\t\r\n\t\t\t\tvar urlQueryString = Generate"); + + #line 269 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + this.Write(this.ToStringHelper.ToStringWithCulture(method.Name)); + + #line default + #line hidden + this.Write("Url("); + + #line 269 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + this.Write(this.ToStringHelper.ToStringWithCulture(urlQueryString)); + + #line default + #line hidden + this.Write(", "); + + #line 269 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + this.Write(this.ToStringHelper.ToStringWithCulture(parameterNameList)); + + #line default + #line hidden + this.Write(");\r\n\t\t\t\tif (!string.IsNullOrEmpty(urlQueryString))\r\n\t\t\t\t{\r\n\t\t\t\t\trequestUrl = requ" + + "estUrl + \"?\" + urlQueryString;\r\n\t\t\t\t}\r\n\r\n\t\t\t"); + + #line 275 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + }else{ + + #line default + #line hidden + this.Write("\t\t\treturn await HttpClient."); - #line 267 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 276 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Type.ToTitle())); #line default #line hidden - #line 267 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 276 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(postOrPut ? "AsJson" : "")); #line default #line hidden this.Write("Async"); - #line 267 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 276 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(postOrPut && method.BodyParameter != null ? "<" + method.BodyParameter.Type + ">" : "")); #line default #line hidden - this.Write("("); + this.Write("(requestUrl "); - #line 267 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" - this.Write(this.ToStringHelper.ToStringWithCulture(url)); + #line 276 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + this.Write(this.ToStringHelper.ToStringWithCulture(postOrPut ? bodyParameterString:"")); #line default #line hidden + this.Write(").ConfigureAwait(false);\r\n\t\t\t"); - #line 267 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" - this.Write(this.ToStringHelper.ToStringWithCulture(postOrPut ? bodyParameterString:"")); + #line 277 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + } + + #line default + #line hidden + this.Write("\t\t}\r\n\r\n\t\t"); + + #line 280 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + if(isGetRequestAndHasQueryString){ + + #line default + #line hidden + this.Write("\t\t\t\t\r\n\t\t\tpublic virtual string Generate"); + + #line 282 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + this.Write(this.ToStringHelper.ToStringWithCulture(method.Name)); + + #line default + #line hidden + this.Write("Url(string urlQueryString, "); + + #line 282 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + this.Write(this.ToStringHelper.ToStringWithCulture(parameterList)); + + #line default + #line hidden + this.Write(")\r\n\t\t\t{\r\n\t\t\t\tthrow new NotImplementedException();\r\n\t\t\t}\r\n\r\n\t\t"); + + #line 287 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" +} #line default #line hidden - this.Write(");\r\n\t\t}\r\n\r\n\t\t/// \r\n\t\t/// "); + this.Write("\r\n\r\n\t\t/// \r\n\t\t/// "); - #line 271 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 291 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Description)); #line default #line hidden this.Write("\r\n\t\t/// \r\n"); - #line 273 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 293 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var p in method.UrlParameters) { #line default #line hidden this.Write("\t\t/// "); - #line 274 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 294 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(p.Description)); #line default #line hidden this.Write("\r\n"); - #line 275 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 295 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\t\tpublic virtual "); - #line 276 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 296 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(String.IsNullOrEmpty(method.ReturnType) ? "void" : method.ReturnType)); #line default #line hidden this.Write(" "); - #line 276 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 296 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Name)); #line default #line hidden this.Write("("); - #line 276 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 296 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(parameterList)); #line default #line hidden - this.Write(")\r\n\t\t{\r\n\t\t\t"); - - #line 278 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" - - var parametersValues = String.IsNullOrEmpty(bodyParameterString) ? (url.IndexOf("+") > -1 ? url.Substring(url.IndexOf("+") + 1) : "") : bodyParameterString.Substring(2); - - - #line default - #line hidden - this.Write("\t\t\t var result = Task.Run(() => "); + this.Write(")\r\n\t\t{\r\n\t\t\tvar result = "); - #line 281 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 298 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Name)); #line default #line hidden this.Write("Async("); - #line 281 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 298 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(parameterNameList)); #line default #line hidden - this.Write(")).Result;\t\t \r\n\t\t\t \r\n\t\t\tEnsureSuccess(result);\r\n\t\t\t\t \r\n\t\t\t "); + this.Write(").Result;\t\t \r\n\t\t\t \r\n\t\t\tEnsureSuccess(result);\r\n\t\t\t\t \r\n\t\t\t"); - #line 285 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 302 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" if(!String.IsNullOrEmpty(method.ReturnType)) { #line default #line hidden - this.Write("\t\t\t \t\t\t \r\n\t\t\t return result.Content.ReadAsAsync<"); + this.Write("\t\t\t \t\t\t \r\n\t\t\treturn result.Content.ReadAsAsync<"); - #line 286 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 303 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.ReturnType)); #line default #line hidden - this.Write(">().Result;\r\n\t\t\t "); + this.Write(">().Result;\r\n\t\t\t"); - #line 287 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 304 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\t\t}\r\n\r\n"); - #line 290 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 307 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\t\t#endregion\r\n\t}\r\n"); - #line 293 "D:\Projects\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 310 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default diff --git a/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.tt b/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.tt index e60b388..8782baa 100644 --- a/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.tt +++ b/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.tt @@ -39,17 +39,6 @@ namespace <#= Configuration.Namespace#> #region Models namespace <#= Configuration.Namespace#>.Models { - public class WebApiProxyResponseException : Exception - { - public HttpStatusCode StatusCode { get; private set; } - public string Content { get; private set; } - - public WebApiProxyResponseException(HttpStatusCode statusCode, string content) : base("A " + statusCode + " (" + (int)statusCode + ") http exception occured. See Content for response body.") - { - StatusCode = statusCode; - Content = content; - } - } <# foreach(var model in Configuration.Metadata.Models.Where(m => m.Type.Equals("class"))) { #> /// @@ -129,16 +118,17 @@ namespace <#= Configuration.Namespace#>.Interfaces } #> + /// + /// <#= method.Description #> + /// <# foreach(var p in method.UrlParameters) { #> /// <#= p.Description #> <# } #> - /// Task <#= method.Name #>Async(<#= parameterList#>); <# foreach(var p in method.UrlParameters) {#> /// <#= p.Description #> <# } #> - /// <#= String.IsNullOrEmpty(method.ReturnType) ? "void" : method.ReturnType #> <#= method.Name #>(<#= parameterList#>); <#}#> } @@ -176,8 +166,7 @@ namespace <#= Configuration.Namespace#>.Clients if (response.IsSuccessStatusCode) return; - var content = response.Content.ReadAsStringAsync().Result; - throw new WebApiProxyResponseException(response.StatusCode, content); + throw new HttpResponseException(response); } /// @@ -201,23 +190,17 @@ namespace <#= Configuration.Namespace#>.Clients HttpClient.Dispose(); } } + <# foreach(var definition in Configuration.Metadata.Definitions) { #> /// /// <#= definition.Description.ToSummary() #> /// public partial class <#=definition.Name#><#= Configuration.ClientSuffix#> : ClientBase, Interfaces.I<#=definition.Name#><#=Configuration.ClientSuffix#> { - - /// - /// <#= definition.Description.ToSummary() #> - /// public <#=definition.Name#><#= Configuration.ClientSuffix#>() : base() { } - /// - /// <#= definition.Description.ToSummary() #> - /// public <#=definition.Name#><#= Configuration.ClientSuffix#>(HttpMessageHandler handler, bool disposeHandler = true) : base(handler, disposeHandler) { } @@ -253,20 +236,57 @@ namespace <#= Configuration.Namespace#>.Clients } var postOrPut = method.Type.ToTitle() == "Post" || method.Type.ToTitle() == "Put"; - var url = ("\"" + method.Url.Replace("{", "\" + ").Replace("}", " + \"") + "\"").Replace(" + \"\"",""); + + var urlParts = method.Url.Split(new[] {"?"}, StringSplitOptions.RemoveEmptyEntries); + var requestUrl = urlParts[0]; + var urlQueryString = string.Empty; + var isGetRequestAndHasQueryString = falst; + + if (urlParts.Length > 1) + { + urlQueryString = urlParts[1]; + isGetRequestAndHasQueryString = method.Type.ToTitle() == "Get"; + } + + + + if(!hasQueryString){ + requestUrl = Regex.Replace(requestUrl, @"\{(.*?)\}", "\"+Uri.EscapeUriString(Convert.ToString($1))+\""); + } #> + /// /// <#= method.Description #> /// <# foreach(var p in method.UrlParameters) { #> /// <#= p.Description #> <# } #> - /// public virtual async Task <#= method.Name #>Async(<#= parameterList#>) { - return await HttpClient.<#=method.Type.ToTitle()#><#= postOrPut ? "AsJson" : "" #>Async<#= postOrPut && method.BodyParameter != null ? "<" + method.BodyParameter.Type + ">" : "" #>(<#=url#><#= postOrPut ? bodyParameterString:""#>); + var requestUrl = <#= requestUrl #>; + <# if(isGetRequestAndHasQueryString){ #> + + var urlQueryString = Generate<#= method.Name #>Url(<#= urlQueryString #>, <#=parameterNameList#>); + if (!string.IsNullOrEmpty(urlQueryString)) + { + requestUrl = requestUrl + "?" + urlQueryString; + } + + <# }else{ #> + return await HttpClient.<#=method.Type.ToTitle()#><#= postOrPut ? "AsJson" : "" #>Async<#= postOrPut && method.BodyParameter != null ? "<" + method.BodyParameter.Type + ">" : "" #>(requestUrl <#= postOrPut ? bodyParameterString:""#>).ConfigureAwait(false); + <# } #> } + <# if(isGetRequestAndHasQueryString){ #> + + public virtual string Generate<#= method.Name #>Url(string urlQueryString, <#= parameterList#>) + { + throw new NotImplementedException(); + } + + <#}#> + + /// /// <#= method.Description #> /// @@ -275,16 +295,13 @@ namespace <#= Configuration.Namespace#>.Clients <# } #> public virtual <#= String.IsNullOrEmpty(method.ReturnType) ? "void" : method.ReturnType #> <#= method.Name #>(<#= parameterList#>) { - <# - var parametersValues = String.IsNullOrEmpty(bodyParameterString) ? (url.IndexOf("+") > -1 ? url.Substring(url.IndexOf("+") + 1) : "") : bodyParameterString.Substring(2); - #> - var result = Task.Run(() => <#= method.Name #>Async(<#=parameterNameList#>)).Result; + var result = <#= method.Name #>Async(<#=parameterNameList#>).Result; EnsureSuccess(result); - <# if(!String.IsNullOrEmpty(method.ReturnType)) { #> - return result.Content.ReadAsAsync<<#= method.ReturnType #>>().Result; - <# } #> + <# if(!String.IsNullOrEmpty(method.ReturnType)) { #> + return result.Content.ReadAsAsync<<#= method.ReturnType #>>().Result; + <# } #> } <#}#> From bc96313a9031d374240e74fd65ee27420c0641a8 Mon Sep 17 00:00:00 2001 From: $+j Date: Wed, 5 Aug 2015 01:42:42 +0800 Subject: [PATCH 02/45] url encode and process complex param type --- Nuget/build-nuget-csharp.bat | 2 +- .../Templates/CSharpProxyTemplate.cs | 182 +++++++++++------- .../Templates/CSharpProxyTemplate.tt | 71 +++++-- 3 files changed, 173 insertions(+), 82 deletions(-) diff --git a/Nuget/build-nuget-csharp.bat b/Nuget/build-nuget-csharp.bat index 99b02ff..2997783 100644 --- a/Nuget/build-nuget-csharp.bat +++ b/Nuget/build-nuget-csharp.bat @@ -5,7 +5,7 @@ if not [%1]==[] set path=%1 IF NOT EXIST Packages MKDIR Packages echo Creating WebProxyApi CSharp Package - %path%\..\.nuget\nuget pack %path%\..\WebApiProxy.Tasks\WebApiProxy.Tasks.csproj -IncludeReferencedProjects -OutputDirectory %path%\Packages -Properties Configuration=Release -Verbose + %path%\..\.nuget\nuget pack %path%\..\WebApiProxy.Tasks\WebApiProxy.Tasks.csproj -Build -IncludeReferencedProjects -OutputDirectory %path%\Packages -Properties Configuration=Release -Verbose if errorlevel 1 echo Error creating WebApiProxy CSharp Package diff --git a/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.cs b/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.cs index 831b630..12a21de 100644 --- a/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.cs +++ b/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.cs @@ -1,10 +1,10 @@ // ------------------------------------------------------------------------------ // -// 此代码由工具生成。 -// 运行时版本: 12.0.0.0 +// This code was generated by a tool. +// Runtime Version: 12.0.0.0 // -// 对此文件的更改可能会导致不正确的行为。此外，如果 -// 重新生成代码，这些更改将会丢失。 +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. // // ------------------------------------------------------------------------------ namespace WebApiProxy.Tasks.Templates @@ -581,278 +581,328 @@ protected ClientBase(HttpMessageHandler handler, bool disposeHandler = true) var urlParts = method.Url.Split(new[] {"?"}, StringSplitOptions.RemoveEmptyEntries); var requestUrl = urlParts[0]; var urlQueryString = string.Empty; - var isGetRequestAndHasQueryString = falst; + var hasQueryString = false; if (urlParts.Length > 1) { urlQueryString = urlParts[1]; - isGetRequestAndHasQueryString = method.Type.ToTitle() == "Get"; + hasQueryString = true; } + requestUrl = System.Text.RegularExpressions.Regex.Replace(requestUrl, @"\{(.*?)\}", "\"+Uri.EscapeUriString(Convert.ToString($1))+\""); - if(!hasQueryString){ - requestUrl = Regex.Replace(requestUrl, @"\{(.*?)\}", "\"+Uri.EscapeUriString(Convert.ToString($1))+\""); - } + var urlQueryParts = urlQueryString.Split(new[] {"&"}, StringSplitOptions.RemoveEmptyEntries) + .Select(item => + { + var kvParts = item.Split(new[] {"="}, + StringSplitOptions.RemoveEmptyEntries); + return new KeyValuePair(kvParts[0], kvParts[1]); + }) + .ToList(); + + var queryHasParams = + urlQueryParts.Where( + item => + allParameters.Any(param => + string.Equals(item.Value, "{" + param.Name + "}", + StringComparison.OrdinalIgnoreCase))) + .ToList(); + + var queryHasParamUrlTpl = string.Join("&", + queryHasParams.Select( + item => + string.Format("{0}={1}", item.Key, item.Value))); + + var queryHasParamUrl = System.Text.RegularExpressions.Regex.Replace(queryHasParamUrlTpl, @"\{(.*?)\}", "\"+Uri.EscapeDataString(Convert.ToString($1))+\""); + + + var queryHasNoParams = urlQueryParts.Except(queryHasParams).ToList(); + var queryNoParamUrlTpl = string.Join("&", + queryHasNoParams.Select( + item => + string.Format("{0}={1}", item.Key, item.Value))); #line default #line hidden this.Write("\r\n\t\t/// \r\n\t\t/// "); - #line 259 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 287 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Description)); #line default #line hidden this.Write("\r\n\t\t/// \r\n"); - #line 261 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 289 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var p in method.UrlParameters) { #line default #line hidden this.Write("\t\t/// "); - #line 262 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 290 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(p.Description)); #line default #line hidden this.Write("\r\n"); - #line 263 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 291 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\t\tpublic virtual async Task "); - #line 264 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 292 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Name)); #line default #line hidden this.Write("Async("); - #line 264 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 292 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(parameterList)); #line default #line hidden - this.Write(")\r\n\t\t{\r\n\t\t\tvar requestUrl = "); + this.Write(")\r\n\t\t{\r\n\t\t\tvar requestUrl = \""); - #line 266 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 294 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(requestUrl)); #line default #line hidden - this.Write(";\r\n\t\t\t"); + this.Write("\";\r\n\t\t\t"); - #line 267 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" - if(isGetRequestAndHasQueryString){ + #line 295 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + if(hasQueryString){ #line default #line hidden - this.Write("\t\t\t\t\r\n\t\t\t\tvar urlQueryString = Generate"); + this.Write("\r\n\t\t\t\tvar queryHasParamUrl = \""); - #line 269 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" - this.Write(this.ToStringHelper.ToStringWithCulture(method.Name)); + #line 297 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + this.Write(this.ToStringHelper.ToStringWithCulture(queryHasParamUrl)); #line default #line hidden - this.Write("Url("); + this.Write("\";\r\n\r\n\r\n\t\t\t\t"); - #line 269 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" - this.Write(this.ToStringHelper.ToStringWithCulture(urlQueryString)); + #line 300 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + if(!string.IsNullOrEmpty(queryNoParamUrlTpl)){ #line default #line hidden - this.Write(", "); + this.Write("\t\t\t\t\tvar queryNoParamUrlTpl = \""); + + #line 301 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + this.Write(this.ToStringHelper.ToStringWithCulture(queryNoParamUrlTpl)); - #line 269 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line default + #line hidden + this.Write("\";\r\n\t\t\t\t\tvar queryNoParamUrl = Generate"); + + #line 302 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + this.Write(this.ToStringHelper.ToStringWithCulture(method.Name)); + + #line default + #line hidden + this.Write("QueryString(queryNoParamUrlTpl, "); + + #line 302 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(parameterNameList)); #line default #line hidden - this.Write(");\r\n\t\t\t\tif (!string.IsNullOrEmpty(urlQueryString))\r\n\t\t\t\t{\r\n\t\t\t\t\trequestUrl = requ" + - "estUrl + \"?\" + urlQueryString;\r\n\t\t\t\t}\r\n\r\n\t\t\t"); + this.Write(");\r\n\t\t\t\t"); - #line 275 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 303 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" }else{ #line default #line hidden - this.Write("\t\t\treturn await HttpClient."); + this.Write("\t\t\t\t\tvar queryNoParamUrl = string.Empty;\r\n\t\t\t\t"); - #line 276 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 305 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + } + + #line default + #line hidden + this.Write("\t\t\t\r\n\t\t\t\tif (string.IsNullOrEmpty(queryHasParamUrl))\r\n\t\t\t\t{\r\n\t\t\t\t\trequestUrl = re" + + "questUrl + \"?\" + queryNoParamUrl;\r\n\t\t\t\t}\r\n\t\t\t\telse\r\n\t\t\t\t{\r\n\t\t\t\t\trequestUrl = req" + + "uestUrl + \"?\" + queryHasParamUrl + \"&\" + queryNoParamUrl;\r\n\t\t\t\t}\r\n\r\n\t\t\t"); + + #line 316 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + } + + #line default + #line hidden + this.Write("\r\n\t\t\t\treturn await HttpClient."); + + #line 318 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Type.ToTitle())); #line default #line hidden - #line 276 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 318 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(postOrPut ? "AsJson" : "")); #line default #line hidden this.Write("Async"); - #line 276 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 318 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(postOrPut && method.BodyParameter != null ? "<" + method.BodyParameter.Type + ">" : "")); #line default #line hidden this.Write("(requestUrl "); - #line 276 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 318 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(postOrPut ? bodyParameterString:"")); #line default #line hidden - this.Write(").ConfigureAwait(false);\r\n\t\t\t"); - - #line 277 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" - } - - #line default - #line hidden - this.Write("\t\t}\r\n\r\n\t\t"); + this.Write(").ConfigureAwait(false);\r\n\t\t}\r\n\r\n\t\t"); - #line 280 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" - if(isGetRequestAndHasQueryString){ + #line 321 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + if(hasQueryString && !string.IsNullOrEmpty(queryNoParamUrlTpl)){ #line default #line hidden this.Write("\t\t\t\t\r\n\t\t\tpublic virtual string Generate"); - #line 282 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 323 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Name)); #line default #line hidden - this.Write("Url(string urlQueryString, "); + this.Write("QueryString(string urlQueryString, "); - #line 282 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 323 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(parameterList)); #line default #line hidden this.Write(")\r\n\t\t\t{\r\n\t\t\t\tthrow new NotImplementedException();\r\n\t\t\t}\r\n\r\n\t\t"); - #line 287 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 328 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\r\n\r\n\t\t/// \r\n\t\t/// "); - #line 291 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 332 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Description)); #line default #line hidden this.Write("\r\n\t\t/// \r\n"); - #line 293 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 334 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var p in method.UrlParameters) { #line default #line hidden this.Write("\t\t/// "); - #line 294 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 335 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(p.Description)); #line default #line hidden this.Write("\r\n"); - #line 295 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 336 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\t\tpublic virtual "); - #line 296 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 337 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(String.IsNullOrEmpty(method.ReturnType) ? "void" : method.ReturnType)); #line default #line hidden this.Write(" "); - #line 296 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 337 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Name)); #line default #line hidden this.Write("("); - #line 296 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 337 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(parameterList)); #line default #line hidden this.Write(")\r\n\t\t{\r\n\t\t\tvar result = "); - #line 298 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 339 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Name)); #line default #line hidden this.Write("Async("); - #line 298 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 339 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(parameterNameList)); #line default #line hidden this.Write(").Result;\t\t \r\n\t\t\t \r\n\t\t\tEnsureSuccess(result);\r\n\t\t\t\t \r\n\t\t\t"); - #line 302 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 343 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" if(!String.IsNullOrEmpty(method.ReturnType)) { #line default #line hidden this.Write("\t\t\t \t\t\t \r\n\t\t\treturn result.Content.ReadAsAsync<"); - #line 303 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 344 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.ReturnType)); #line default #line hidden this.Write(">().Result;\r\n\t\t\t"); - #line 304 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 345 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\t\t}\r\n\r\n"); - #line 307 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 348 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\t\t#endregion\r\n\t}\r\n"); - #line 310 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 351 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default diff --git a/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.tt b/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.tt index 8782baa..b9982c1 100644 --- a/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.tt +++ b/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.tt @@ -240,19 +240,47 @@ namespace <#= Configuration.Namespace#>.Clients var urlParts = method.Url.Split(new[] {"?"}, StringSplitOptions.RemoveEmptyEntries); var requestUrl = urlParts[0]; var urlQueryString = string.Empty; - var isGetRequestAndHasQueryString = falst; + var hasQueryString = false; if (urlParts.Length > 1) { urlQueryString = urlParts[1]; - isGetRequestAndHasQueryString = method.Type.ToTitle() == "Get"; + hasQueryString = true; } + requestUrl = System.Text.RegularExpressions.Regex.Replace(requestUrl, @"\{(.*?)\}", "\"+Uri.EscapeUriString(Convert.ToString($1))+\""); - if(!hasQueryString){ - requestUrl = Regex.Replace(requestUrl, @"\{(.*?)\}", "\"+Uri.EscapeUriString(Convert.ToString($1))+\""); - } + var urlQueryParts = urlQueryString.Split(new[] {"&"}, StringSplitOptions.RemoveEmptyEntries) + .Select(item => + { + var kvParts = item.Split(new[] {"="}, + StringSplitOptions.RemoveEmptyEntries); + return new KeyValuePair(kvParts[0], kvParts[1]); + }) + .ToList(); + + var queryHasParams = + urlQueryParts.Where( + item => + allParameters.Any(param => + string.Equals(item.Value, "{" + param.Name + "}", + StringComparison.OrdinalIgnoreCase))) + .ToList(); + + var queryHasParamUrlTpl = string.Join("&", + queryHasParams.Select( + item => + string.Format("{0}={1}", item.Key, item.Value))); + + var queryHasParamUrl = System.Text.RegularExpressions.Regex.Replace(queryHasParamUrlTpl, @"\{(.*?)\}", "\"+Uri.EscapeDataString(Convert.ToString($1))+\""); + + + var queryHasNoParams = urlQueryParts.Except(queryHasParams).ToList(); + var queryNoParamUrlTpl = string.Join("&", + queryHasNoParams.Select( + item => + string.Format("{0}={1}", item.Key, item.Value))); #> /// @@ -263,23 +291,36 @@ namespace <#= Configuration.Namespace#>.Clients <# } #> public virtual async Task <#= method.Name #>Async(<#= parameterList#>) { - var requestUrl = <#= requestUrl #>; - <# if(isGetRequestAndHasQueryString){ #> - - var urlQueryString = Generate<#= method.Name #>Url(<#= urlQueryString #>, <#=parameterNameList#>); - if (!string.IsNullOrEmpty(urlQueryString)) + var requestUrl = "<#= requestUrl #>"; + <# if(hasQueryString){ #> + + var queryHasParamUrl = "<#= queryHasParamUrl #>"; + + + <# if(!string.IsNullOrEmpty(queryNoParamUrlTpl)){ #> + var queryNoParamUrlTpl = "<#= queryNoParamUrlTpl #>"; + var queryNoParamUrl = Generate<#= method.Name #>QueryString(queryNoParamUrlTpl, <#=parameterNameList#>); + <# }else{ #> + var queryNoParamUrl = string.Empty; + <# } #> + + if (string.IsNullOrEmpty(queryHasParamUrl)) { - requestUrl = requestUrl + "?" + urlQueryString; + requestUrl = requestUrl + "?" + queryNoParamUrl; + } + else + { + requestUrl = requestUrl + "?" + queryHasParamUrl + "&" + queryNoParamUrl; } - <# }else{ #> - return await HttpClient.<#=method.Type.ToTitle()#><#= postOrPut ? "AsJson" : "" #>Async<#= postOrPut && method.BodyParameter != null ? "<" + method.BodyParameter.Type + ">" : "" #>(requestUrl <#= postOrPut ? bodyParameterString:""#>).ConfigureAwait(false); <# } #> + + return await HttpClient.<#=method.Type.ToTitle()#><#= postOrPut ? "AsJson" : "" #>Async<#= postOrPut && method.BodyParameter != null ? "<" + method.BodyParameter.Type + ">" : "" #>(requestUrl <#= postOrPut ? bodyParameterString:""#>).ConfigureAwait(false); } - <# if(isGetRequestAndHasQueryString){ #> + <# if(hasQueryString && !string.IsNullOrEmpty(queryNoParamUrlTpl)){ #> - public virtual string Generate<#= method.Name #>Url(string urlQueryString, <#= parameterList#>) + public virtual string Generate<#= method.Name #>QueryString(string urlQueryString, <#= parameterList#>) { throw new NotImplementedException(); } From 4c91b11b2835c9bd2d58485e784d853a7acbe5e3 Mon Sep 17 00:00:00 2001 From: $+j Date: Wed, 5 Aug 2015 18:27:22 +0800 Subject: [PATCH 03/45] add type from job --- WebApiProxy.Tasks/WebApiProxyCSharp.psm1 | 41 +++++++++++++----------- WebApiProxy.Tasks/init.ps1 | 1 - 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/WebApiProxy.Tasks/WebApiProxyCSharp.psm1 b/WebApiProxy.Tasks/WebApiProxyCSharp.psm1 index ca91ca0..384e786 100644 --- a/WebApiProxy.Tasks/WebApiProxyCSharp.psm1 +++ b/WebApiProxy.Tasks/WebApiProxyCSharp.psm1 @@ -1,32 +1,35 @@ function WebApiProxy-Generate-CSharp() { + $project = Get-Project - $projectPath = [System.IO.Path]::GetDirectoryName($project.FullName) - $root = (Join-Path $projectPath "WebApiProxy\") - $rootSpaces = "$root" - $config = [WebApiProxy.Tasks.Models.Configuration]::Load($rootSpaces); + $generateJob = Start-Job -ScriptBlock { + param($project,$projectPath,$rootSpace) - $generator = New-Object WebApiProxy.Tasks.Infrastructure.CSharpGenerator -ArgumentList @($config) - - - - $fileName = (Join-Path $projectPath "WebApiProxy\WebApiProxy.generated.cs") + Add-Type -Path (Join-Path $projectPath "bin\Debug\WebApiProxy.Tasks.dll") + $config = [WebApiProxy.Tasks.Models.Configuration]::Load($rootSpaces); + + $generator = New-Object WebApiProxy.Tasks.Infrastructure.CSharpGenerator -ArgumentList @($config) + $fileName = (Join-Path $projectPath "WebApiProxy\WebApiProxy.generated.cs") - Write-Host "Generating proxy code..." + Write-Host "Generating proxy code..." - $source = $generator.Generate() + $source = $generator.Generate() - $result = New-Item $fileName ` - -ItemType "file" -Force ` - -Value $source + $result = New-Item $fileName ` + -ItemType "file" -Force ` + -Value $source - $item = $project.ProjectItems.AddFromFile($fileName) - - Write-Host "Done." - -} + $item = $project.ProjectItems.AddFromFile($fileName) + $source + Write-Host "Done..." + } -ArgumentList @($project,$projectPath,$rootSpace) + + $result = Receive-Job -Job $generateJob -Wait + Write-Host $result + Write-Host "Done." +} Export-ModuleMember "WebApiProxy-Generate-CSharp" \ No newline at end of file diff --git a/WebApiProxy.Tasks/init.ps1 b/WebApiProxy.Tasks/init.ps1 index 4eadf04..efdbddf 100644 --- a/WebApiProxy.Tasks/init.ps1 +++ b/WebApiProxy.Tasks/init.ps1 @@ -1,4 +1,3 @@ param($installPath, $toolsPath, $package) -Add-Type -Path (Join-Path $installPath "build\WebApiProxy.Tasks.dll") Import-Module (Join-Path $toolsPath "WebApiProxyCSharp.psm1") -DisableNameChecking \ No newline at end of file From e8559a5027e7f29b92a9bf75389aed2e7b2d4993 Mon Sep 17 00:00:00 2001 From: $+j Date: Wed, 5 Aug 2015 18:35:51 +0800 Subject: [PATCH 04/45] powershell script refine --- WebApiProxy.Tasks/WebApiProxyCSharp.psm1 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/WebApiProxy.Tasks/WebApiProxyCSharp.psm1 b/WebApiProxy.Tasks/WebApiProxyCSharp.psm1 index 384e786..2d9d540 100644 --- a/WebApiProxy.Tasks/WebApiProxyCSharp.psm1 +++ b/WebApiProxy.Tasks/WebApiProxyCSharp.psm1 @@ -6,9 +6,11 @@ $rootSpaces = "$root" $generateJob = Start-Job -ScriptBlock { - param($project,$projectPath,$rootSpace) + param($project,$projectPath,$rootSpaces) Add-Type -Path (Join-Path $projectPath "bin\Debug\WebApiProxy.Tasks.dll") + + $config = [WebApiProxy.Tasks.Models.Configuration]::Load($rootSpaces); $generator = New-Object WebApiProxy.Tasks.Infrastructure.CSharpGenerator -ArgumentList @($config) @@ -22,10 +24,8 @@ -ItemType "file" -Force ` -Value $source - $item = $project.ProjectItems.AddFromFile($fileName) - $source - Write-Host "Done..." - } -ArgumentList @($project,$projectPath,$rootSpace) + # $item = $project.ProjectItems.AddFromFile($fileName) + } -ArgumentList @($project,$projectPath,$rootSpaces) $result = Receive-Job -Job $generateJob -Wait Write-Host $result From b8ed042d0cc7cf92adab73bc8a3606790238034d Mon Sep 17 00:00:00 2001 From: $+j Date: Wed, 5 Aug 2015 22:57:24 +0800 Subject: [PATCH 05/45] return statement remove when return type is void --- .../Templates/CSharpProxyTemplate.cs | 220 ++++++++++-------- .../Templates/CSharpProxyTemplate.tt | 17 +- 2 files changed, 133 insertions(+), 104 deletions(-) diff --git a/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.cs b/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.cs index 12a21de..d3d1a3c 100644 --- a/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.cs +++ b/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.cs @@ -79,177 +79,193 @@ public virtual string TransformText() #line default #line hidden - this.Write(".Models\r\n{\r\n\r\n"); + this.Write(@".Models +{ + + public class WebApiProxyResponseException : Exception + { + + public HttpResponseMessage Response { get; private set; } + + + public WebApiProxyResponseException(HttpResponseMessage response): base(""A "" + response.StatusCode + "" ("" + (int)response.StatusCode + "") http exception occured. See response."") + { + Response = response; + } + } + + +"); - #line 43 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 56 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var model in Configuration.Metadata.Models.Where(m => m.Type.Equals("class"))) { #line default #line hidden this.Write("\t\r\n\t/// \r\n\t/// "); - #line 45 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 58 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(model.Description.ToSummary())); #line default #line hidden this.Write("\r\n\t/// \r\n\tpublic partial class "); - #line 47 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 60 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(model.Name)); #line default #line hidden this.Write("\r\n\t{\r\n\t\t#region Constants\r\n"); - #line 50 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 63 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var constantItem in model.Constants) { #line default #line hidden this.Write("\t\t/// \r\n\t\t/// "); - #line 52 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 65 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(constantItem.Description.ToSummary())); #line default #line hidden this.Write("\r\n\t\t/// \r\n\t\tpublic const "); - #line 54 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 67 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(constantItem.Type)); #line default #line hidden this.Write(" "); - #line 54 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 67 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(constantItem.Name)); #line default #line hidden this.Write(" = "); - #line 54 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 67 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(constantItem.Value)); #line default #line hidden this.Write(";\r\n"); - #line 55 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 68 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\t\t#endregion\r\n\r\n\t\t#region Properties\r\n"); - #line 59 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 72 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var propertyItem in model.Properties) { #line default #line hidden this.Write("\t\t/// \r\n\t\t/// "); - #line 61 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 74 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(propertyItem.Description.ToSummary())); #line default #line hidden this.Write("\r\n\t\t/// \r\n\t\tpublic virtual "); - #line 63 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 76 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(propertyItem.Type)); #line default #line hidden this.Write(" "); - #line 63 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 76 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(propertyItem.Name)); #line default #line hidden this.Write(" { get; set; }\r\n"); - #line 64 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 77 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\t\t#endregion\r\n\t}\t\r\n"); - #line 67 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 80 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\r\n"); - #line 69 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 82 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var model in Configuration.Metadata.Models.Where(m => m.Type.Equals("enum"))) { #line default #line hidden this.Write("\t\r\n\t/// \r\n\t/// "); - #line 71 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 84 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(model.Description.ToSummary())); #line default #line hidden this.Write("\r\n\t/// \r\n\tpublic enum "); - #line 73 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 86 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(model.Name)); #line default #line hidden this.Write("\r\n\t{\r\n"); - #line 75 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 88 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var constantItem in model.Constants) { #line default #line hidden this.Write("\r\n\t\t/// \r\n\t\t/// "); - #line 78 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 91 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(constantItem.Description.ToSummary())); #line default #line hidden this.Write("\r\n\t\t/// \r\n\t\t"); - #line 80 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 93 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(constantItem.Name)); #line default #line hidden this.Write(" = "); - #line 80 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 93 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(constantItem.Value)); #line default #line hidden this.Write(",\r\n"); - #line 81 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 94 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\t\t\r\n\t}\r\n"); - #line 83 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 96 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\t\r\n}\r\n#endregion\r\n\r\n#region Interfaces\r\nnamespace "); - #line 89 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 102 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Configuration.Namespace)); #line default @@ -257,27 +273,27 @@ public virtual string TransformText() this.Write(".Interfaces\r\n{\r\n\tpublic interface IClientBase : IDisposable\r\n\t{\r\n\t\tHttpClient Htt" + "pClient { get; }\r\n\t}\r\n\r\n"); - #line 96 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 109 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var definition in Configuration.Metadata.Definitions) { #line default #line hidden this.Write("\t\r\n\tpublic partial interface I"); - #line 97 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 110 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(definition.Name)); #line default #line hidden - #line 97 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 110 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Configuration.ClientSuffix)); #line default #line hidden this.Write(" : IClientBase\r\n\t{\t\r\n"); - #line 99 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 112 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var method in definition.ActionMethods) { var allParameters = method.UrlParameters.AsEnumerable().Where(m => m != null); @@ -304,119 +320,119 @@ public virtual string TransformText() #line hidden this.Write("\r\n\t\t/// \r\n\t\t/// "); - #line 122 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 135 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Description)); #line default #line hidden this.Write("\r\n\t\t/// \r\n"); - #line 124 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 137 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var p in method.UrlParameters) { #line default #line hidden this.Write("\t\t/// "); - #line 125 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 138 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(p.Description)); #line default #line hidden this.Write("\r\n"); - #line 126 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 139 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\t\tTask "); - #line 127 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 140 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Name)); #line default #line hidden this.Write("Async("); - #line 127 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 140 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(parameterList)); #line default #line hidden this.Write(");\r\n\r\n"); - #line 129 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 142 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var p in method.UrlParameters) { #line default #line hidden this.Write("\t\t/// "); - #line 130 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 143 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(p.Description)); #line default #line hidden this.Write("\r\n"); - #line 131 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 144 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\t\t"); - #line 132 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 145 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(String.IsNullOrEmpty(method.ReturnType) ? "void" : method.ReturnType)); #line default #line hidden this.Write(" "); - #line 132 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 145 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Name)); #line default #line hidden this.Write("("); - #line 132 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 145 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(parameterList)); #line default #line hidden this.Write(");\r\n"); - #line 133 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 146 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\t\t\t\t\r\n\t}\r\n"); - #line 135 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 148 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\r\n}\r\n#endregion\r\n\r\n#region Clients\r\nnamespace "); - #line 141 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 154 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Configuration.Namespace)); #line default @@ -442,7 +458,7 @@ protected ClientBase() { BaseAddress = new Uri(Configuration."); - #line 160 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 173 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Configuration.Name)); #line default @@ -456,7 +472,7 @@ public virtual void EnsureSuccess(HttpResponseMessage response) if (response.IsSuccessStatusCode) return; - throw new HttpResponseException(response); + throw new WebApiProxyResponseException(response); } /// @@ -470,7 +486,7 @@ protected ClientBase(HttpMessageHandler handler, bool disposeHandler = true) { BaseAddress = new Uri(Configuration."); - #line 181 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 194 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Configuration.Name)); #line default @@ -479,66 +495,66 @@ protected ClientBase(HttpMessageHandler handler, bool disposeHandler = true) "es and disposes of the managed resources. \r\n\t\t/// \r\n\t\tpublic voi" + "d Dispose()\r\n\t\t{\r\n\t\t\tHttpClient.Dispose();\r\n\t\t}\r\n\t}\r\n\r\n"); - #line 194 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 207 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var definition in Configuration.Metadata.Definitions) { #line default #line hidden this.Write("\t/// \r\n\t/// "); - #line 196 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 209 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(definition.Description.ToSummary())); #line default #line hidden this.Write("\r\n\t/// \r\n\tpublic partial class "); - #line 198 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 211 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(definition.Name)); #line default #line hidden - #line 198 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 211 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Configuration.ClientSuffix)); #line default #line hidden this.Write(" : ClientBase, Interfaces.I"); - #line 198 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 211 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(definition.Name)); #line default #line hidden - #line 198 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 211 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Configuration.ClientSuffix)); #line default #line hidden this.Write("\r\n\t{\t\t\r\n\t\tpublic "); - #line 200 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 213 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(definition.Name)); #line default #line hidden - #line 200 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 213 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Configuration.ClientSuffix)); #line default #line hidden this.Write("() : base()\r\n\t\t{\r\n\t\t}\r\n\r\n\t\tpublic "); - #line 204 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 217 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(definition.Name)); #line default #line hidden - #line 204 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 217 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Configuration.ClientSuffix)); #line default @@ -546,7 +562,7 @@ protected ClientBase(HttpMessageHandler handler, bool disposeHandler = true) this.Write("(HttpMessageHandler handler, bool disposeHandler = true) : base(handler, disposeH" + "andler)\r\n\t\t{\r\n\t\t}\r\n\r\n\t\t#region Methods\r\n"); - #line 209 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 222 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var method in definition.ActionMethods) { var allParameters = method.UrlParameters.AsEnumerable(); @@ -628,112 +644,112 @@ protected ClientBase(HttpMessageHandler handler, bool disposeHandler = true) #line hidden this.Write("\r\n\t\t/// \r\n\t\t/// "); - #line 287 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 300 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Description)); #line default #line hidden this.Write("\r\n\t\t/// \r\n"); - #line 289 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 302 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var p in method.UrlParameters) { #line default #line hidden this.Write("\t\t/// "); - #line 290 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 303 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(p.Description)); #line default #line hidden this.Write("\r\n"); - #line 291 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 304 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\t\tpublic virtual async Task "); - #line 292 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 305 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Name)); #line default #line hidden this.Write("Async("); - #line 292 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 305 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(parameterList)); #line default #line hidden this.Write(")\r\n\t\t{\r\n\t\t\tvar requestUrl = \""); - #line 294 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 307 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(requestUrl)); #line default #line hidden this.Write("\";\r\n\t\t\t"); - #line 295 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 308 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" if(hasQueryString){ #line default #line hidden this.Write("\r\n\t\t\t\tvar queryHasParamUrl = \""); - #line 297 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 310 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(queryHasParamUrl)); #line default #line hidden this.Write("\";\r\n\r\n\r\n\t\t\t\t"); - #line 300 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 313 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" if(!string.IsNullOrEmpty(queryNoParamUrlTpl)){ #line default #line hidden this.Write("\t\t\t\t\tvar queryNoParamUrlTpl = \""); - #line 301 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 314 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(queryNoParamUrlTpl)); #line default #line hidden this.Write("\";\r\n\t\t\t\t\tvar queryNoParamUrl = Generate"); - #line 302 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 315 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Name)); #line default #line hidden this.Write("QueryString(queryNoParamUrlTpl, "); - #line 302 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 315 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(parameterNameList)); #line default #line hidden this.Write(");\r\n\t\t\t\t"); - #line 303 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 316 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" }else{ #line default #line hidden this.Write("\t\t\t\t\tvar queryNoParamUrl = string.Empty;\r\n\t\t\t\t"); - #line 305 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 318 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default @@ -742,167 +758,167 @@ protected ClientBase(HttpMessageHandler handler, bool disposeHandler = true) "questUrl + \"?\" + queryNoParamUrl;\r\n\t\t\t\t}\r\n\t\t\t\telse\r\n\t\t\t\t{\r\n\t\t\t\t\trequestUrl = req" + "uestUrl + \"?\" + queryHasParamUrl + \"&\" + queryNoParamUrl;\r\n\t\t\t\t}\r\n\r\n\t\t\t"); - #line 316 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 329 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\r\n\t\t\t\treturn await HttpClient."); - #line 318 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 331 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Type.ToTitle())); #line default #line hidden - #line 318 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 331 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(postOrPut ? "AsJson" : "")); #line default #line hidden this.Write("Async"); - #line 318 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 331 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(postOrPut && method.BodyParameter != null ? "<" + method.BodyParameter.Type + ">" : "")); #line default #line hidden this.Write("(requestUrl "); - #line 318 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 331 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(postOrPut ? bodyParameterString:"")); #line default #line hidden this.Write(").ConfigureAwait(false);\r\n\t\t}\r\n\r\n\t\t"); - #line 321 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 334 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" if(hasQueryString && !string.IsNullOrEmpty(queryNoParamUrlTpl)){ #line default #line hidden this.Write("\t\t\t\t\r\n\t\t\tpublic virtual string Generate"); - #line 323 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 336 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Name)); #line default #line hidden this.Write("QueryString(string urlQueryString, "); - #line 323 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 336 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(parameterList)); #line default #line hidden this.Write(")\r\n\t\t\t{\r\n\t\t\t\tthrow new NotImplementedException();\r\n\t\t\t}\r\n\r\n\t\t"); - #line 328 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 341 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\r\n\r\n\t\t/// \r\n\t\t/// "); - #line 332 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 345 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Description)); #line default #line hidden this.Write("\r\n\t\t/// \r\n"); - #line 334 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 347 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var p in method.UrlParameters) { #line default #line hidden this.Write("\t\t/// "); - #line 335 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 348 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(p.Description)); #line default #line hidden this.Write("\r\n"); - #line 336 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 349 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\t\tpublic virtual "); - #line 337 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 350 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(String.IsNullOrEmpty(method.ReturnType) ? "void" : method.ReturnType)); #line default #line hidden this.Write(" "); - #line 337 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 350 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Name)); #line default #line hidden this.Write("("); - #line 337 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 350 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(parameterList)); #line default #line hidden this.Write(")\r\n\t\t{\r\n\t\t\tvar result = "); - #line 339 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 352 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Name)); #line default #line hidden this.Write("Async("); - #line 339 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 352 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(parameterNameList)); #line default #line hidden this.Write(").Result;\t\t \r\n\t\t\t \r\n\t\t\tEnsureSuccess(result);\r\n\t\t\t\t \r\n\t\t\t"); - #line 343 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" - if(!String.IsNullOrEmpty(method.ReturnType)) { + #line 356 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + if(!String.IsNullOrEmpty(method.ReturnType) && method.ReturnType != "void" ) { #line default #line hidden this.Write("\t\t\t \t\t\t \r\n\t\t\treturn result.Content.ReadAsAsync<"); - #line 344 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 357 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.ReturnType)); #line default #line hidden this.Write(">().Result;\r\n\t\t\t"); - #line 345 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 358 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\t\t}\r\n\r\n"); - #line 348 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 361 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\t\t#endregion\r\n\t}\r\n"); - #line 351 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 364 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default diff --git a/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.tt b/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.tt index b9982c1..c8f2ca2 100644 --- a/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.tt +++ b/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.tt @@ -40,6 +40,19 @@ namespace <#= Configuration.Namespace#> namespace <#= Configuration.Namespace#>.Models { + public class WebApiProxyResponseException : Exception + { + + public HttpResponseMessage Response { get; private set; } + + + public WebApiProxyResponseException(HttpResponseMessage response): base("A " + response.StatusCode + " (" + (int)response.StatusCode + ") http exception occured. See response.") + { + Response = response; + } + } + + <# foreach(var model in Configuration.Metadata.Models.Where(m => m.Type.Equals("class"))) { #> /// /// <#= model.Description.ToSummary() #> @@ -166,7 +179,7 @@ namespace <#= Configuration.Namespace#>.Clients if (response.IsSuccessStatusCode) return; - throw new HttpResponseException(response); + throw new WebApiProxyResponseException(response); } /// @@ -340,7 +353,7 @@ namespace <#= Configuration.Namespace#>.Clients EnsureSuccess(result); - <# if(!String.IsNullOrEmpty(method.ReturnType)) { #> + <# if(!String.IsNullOrEmpty(method.ReturnType) && method.ReturnType != "void" ) { #> return result.Content.ReadAsAsync<<#= method.ReturnType #>>().Result; <# } #> } From 83c484d5be0de8b3e065274e022f0084f243b17c Mon Sep 17 00:00:00 2001 From: $+j Date: Thu, 6 Aug 2015 11:05:06 +0800 Subject: [PATCH 06/45] nuget pkg info --- WebApiProxy.Tasks/Properties/AssemblyInfo.cs | 8 ++++---- WebApiProxy.Tasks/WebApiProxy.CSharp.nuspec | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/WebApiProxy.Tasks/Properties/AssemblyInfo.cs b/WebApiProxy.Tasks/Properties/AssemblyInfo.cs index 3db7037..22bc1b2 100644 --- a/WebApiProxy.Tasks/Properties/AssemblyInfo.cs +++ b/WebApiProxy.Tasks/Properties/AssemblyInfo.cs @@ -8,7 +8,7 @@ [assembly: AssemblyTitle("WebApiProxy C# Proxy Client Generator")] [assembly: AssemblyDescription("Generates a C# proxy for communicating to a RESTful Web Api that implements the WebApiProxy provider")] [assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("WebApiProxy")] +[assembly: AssemblyCompany("UOKO.COM")] [assembly: AssemblyCopyright("Copyright © 2015")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -31,6 +31,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyInformationalVersion("1.0.4.*")] -[assembly: AssemblyVersion("1.0.4.*")] -[assembly: AssemblyFileVersion("1.0.4.*")] +[assembly: AssemblyInformationalVersion("1.5.*")] +[assembly: AssemblyVersion("1.5.*")] +[assembly: AssemblyFileVersion("1.5.*")] diff --git a/WebApiProxy.Tasks/WebApiProxy.CSharp.nuspec b/WebApiProxy.Tasks/WebApiProxy.CSharp.nuspec index 436aa60..7ed50d0 100644 --- a/WebApiProxy.Tasks/WebApiProxy.CSharp.nuspec +++ b/WebApiProxy.Tasks/WebApiProxy.CSharp.nuspec @@ -1,7 +1,7 @@ - WebApiProxy.CSharp + UOKO.ApiProxy.CSharp $title$ https://github.com/faniereynders/WebApiProxy $version$ From 3c8085ae1bd463fc6994eecfad596b1f9a24ff2b Mon Sep 17 00:00:00 2001 From: $+j Date: Thu, 6 Aug 2015 14:32:00 +0800 Subject: [PATCH 07/45] use uoko nuget pkg --- ...p.targets => UOKO.ApiProxy.CSharp.targets} | 38 +++++++++---------- WebApiProxy.Tasks/WebApiProxy.Tasks.csproj | 2 +- 2 files changed, 20 insertions(+), 20 deletions(-) rename WebApiProxy.Tasks/{WebApiProxy.CSharp.targets => UOKO.ApiProxy.CSharp.targets} (97%) diff --git a/WebApiProxy.Tasks/WebApiProxy.CSharp.targets b/WebApiProxy.Tasks/UOKO.ApiProxy.CSharp.targets similarity index 97% rename from WebApiProxy.Tasks/WebApiProxy.CSharp.targets rename to WebApiProxy.Tasks/UOKO.ApiProxy.CSharp.targets index 154d0e5..21eb234 100644 --- a/WebApiProxy.Tasks/WebApiProxy.CSharp.targets +++ b/WebApiProxy.Tasks/UOKO.ApiProxy.CSharp.targets @@ -1,19 +1,19 @@ - - - - - . - - - - - - - - - - - - - - + + + + + . + + + + + + + + + + + + + + diff --git a/WebApiProxy.Tasks/WebApiProxy.Tasks.csproj b/WebApiProxy.Tasks/WebApiProxy.Tasks.csproj index 53bb24a..b09c733 100644 --- a/WebApiProxy.Tasks/WebApiProxy.Tasks.csproj +++ b/WebApiProxy.Tasks/WebApiProxy.Tasks.csproj @@ -88,7 +88,7 @@ Designer - + Designer Always From 3b690592ae757d2126ddb59ed03ac5c481a1d69e Mon Sep 17 00:00:00 2001 From: $+j Date: Thu, 6 Aug 2015 15:39:03 +0800 Subject: [PATCH 08/45] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E5=B8=A6=E5=8F=82?= =?UTF-8?q?=E6=9E=84=E9=80=A0=E5=87=BD=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 为了方便 simple injector 注入构造,移除带参构造函数. 如果需要用 带 messagehandler 的 httpclient . 可以集成 client 重写 HttpClient. --- .../Templates/CSharpProxyTemplate.cs | 143 ++++++++---------- .../Templates/CSharpProxyTemplate.tt | 17 --- 2 files changed, 60 insertions(+), 100 deletions(-) diff --git a/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.cs b/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.cs index d3d1a3c..7434f58 100644 --- a/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.cs +++ b/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.cs @@ -1,10 +1,10 @@ // ------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version: 12.0.0.0 +// 此代码由工具生成。 +// 运行时版本: 12.0.0.0 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// 对此文件的更改可能会导致不正确的行为。此外，如果 +// 重新生成代码，这些更改将会丢失。 // // ------------------------------------------------------------------------------ namespace WebApiProxy.Tasks.Templates @@ -476,93 +476,70 @@ public virtual void EnsureSuccess(HttpResponseMessage response) } /// - /// Initializes a new instance of the class. + /// Releases the unmanaged resources and disposes of the managed resources. /// - /// The handler. - /// if set to true [dispose handler]. - protected ClientBase(HttpMessageHandler handler, bool disposeHandler = true) + public void Dispose() { - HttpClient = new HttpClient(handler, disposeHandler) - { - BaseAddress = new Uri(Configuration."); + HttpClient.Dispose(); + } + } + +"); #line 194 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" - this.Write(this.ToStringHelper.ToStringWithCulture(Configuration.Name)); - - #line default - #line hidden - this.Write("BaseAddress)\r\n\t\t\t};\r\n\t\t}\r\n\r\n\t\t/// \r\n\t\t/// Releases the unmanaged resourc" + - "es and disposes of the managed resources. \r\n\t\t/// \r\n\t\tpublic voi" + - "d Dispose()\r\n\t\t{\r\n\t\t\tHttpClient.Dispose();\r\n\t\t}\r\n\t}\r\n\r\n"); - - #line 207 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var definition in Configuration.Metadata.Definitions) { #line default #line hidden this.Write("\t/// \r\n\t/// "); - #line 209 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 196 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(definition.Description.ToSummary())); #line default #line hidden this.Write("\r\n\t/// \r\n\tpublic partial class "); - #line 211 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 198 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(definition.Name)); #line default #line hidden - #line 211 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 198 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Configuration.ClientSuffix)); #line default #line hidden this.Write(" : ClientBase, Interfaces.I"); - #line 211 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 198 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(definition.Name)); #line default #line hidden - #line 211 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 198 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Configuration.ClientSuffix)); #line default #line hidden this.Write("\r\n\t{\t\t\r\n\t\tpublic "); - #line 213 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 200 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(definition.Name)); #line default #line hidden - #line 213 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 200 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Configuration.ClientSuffix)); #line default #line hidden - this.Write("() : base()\r\n\t\t{\r\n\t\t}\r\n\r\n\t\tpublic "); - - #line 217 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" - this.Write(this.ToStringHelper.ToStringWithCulture(definition.Name)); - - #line default - #line hidden - - #line 217 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" - this.Write(this.ToStringHelper.ToStringWithCulture(Configuration.ClientSuffix)); + this.Write("() : base()\r\n\t\t{\r\n\t\t}\r\n\r\n\t\t#region Methods\r\n"); - #line default - #line hidden - this.Write("(HttpMessageHandler handler, bool disposeHandler = true) : base(handler, disposeH" + - "andler)\r\n\t\t{\r\n\t\t}\r\n\r\n\t\t#region Methods\r\n"); - - #line 222 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 205 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var method in definition.ActionMethods) { var allParameters = method.UrlParameters.AsEnumerable(); @@ -644,112 +621,112 @@ protected ClientBase(HttpMessageHandler handler, bool disposeHandler = true) #line hidden this.Write("\r\n\t\t/// \r\n\t\t/// "); - #line 300 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 283 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Description)); #line default #line hidden this.Write("\r\n\t\t/// \r\n"); - #line 302 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 285 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var p in method.UrlParameters) { #line default #line hidden this.Write("\t\t/// "); - #line 303 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 286 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(p.Description)); #line default #line hidden this.Write("\r\n"); - #line 304 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 287 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\t\tpublic virtual async Task "); - #line 305 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 288 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Name)); #line default #line hidden this.Write("Async("); - #line 305 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 288 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(parameterList)); #line default #line hidden this.Write(")\r\n\t\t{\r\n\t\t\tvar requestUrl = \""); - #line 307 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 290 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(requestUrl)); #line default #line hidden this.Write("\";\r\n\t\t\t"); - #line 308 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 291 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" if(hasQueryString){ #line default #line hidden this.Write("\r\n\t\t\t\tvar queryHasParamUrl = \""); - #line 310 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 293 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(queryHasParamUrl)); #line default #line hidden this.Write("\";\r\n\r\n\r\n\t\t\t\t"); - #line 313 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 296 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" if(!string.IsNullOrEmpty(queryNoParamUrlTpl)){ #line default #line hidden this.Write("\t\t\t\t\tvar queryNoParamUrlTpl = \""); - #line 314 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 297 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(queryNoParamUrlTpl)); #line default #line hidden this.Write("\";\r\n\t\t\t\t\tvar queryNoParamUrl = Generate"); - #line 315 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 298 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Name)); #line default #line hidden this.Write("QueryString(queryNoParamUrlTpl, "); - #line 315 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 298 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(parameterNameList)); #line default #line hidden this.Write(");\r\n\t\t\t\t"); - #line 316 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 299 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" }else{ #line default #line hidden this.Write("\t\t\t\t\tvar queryNoParamUrl = string.Empty;\r\n\t\t\t\t"); - #line 318 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 301 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default @@ -758,167 +735,167 @@ protected ClientBase(HttpMessageHandler handler, bool disposeHandler = true) "questUrl + \"?\" + queryNoParamUrl;\r\n\t\t\t\t}\r\n\t\t\t\telse\r\n\t\t\t\t{\r\n\t\t\t\t\trequestUrl = req" + "uestUrl + \"?\" + queryHasParamUrl + \"&\" + queryNoParamUrl;\r\n\t\t\t\t}\r\n\r\n\t\t\t"); - #line 329 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 312 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\r\n\t\t\t\treturn await HttpClient."); - #line 331 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 314 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Type.ToTitle())); #line default #line hidden - #line 331 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 314 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(postOrPut ? "AsJson" : "")); #line default #line hidden this.Write("Async"); - #line 331 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 314 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(postOrPut && method.BodyParameter != null ? "<" + method.BodyParameter.Type + ">" : "")); #line default #line hidden this.Write("(requestUrl "); - #line 331 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 314 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(postOrPut ? bodyParameterString:"")); #line default #line hidden this.Write(").ConfigureAwait(false);\r\n\t\t}\r\n\r\n\t\t"); - #line 334 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 317 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" if(hasQueryString && !string.IsNullOrEmpty(queryNoParamUrlTpl)){ #line default #line hidden this.Write("\t\t\t\t\r\n\t\t\tpublic virtual string Generate"); - #line 336 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 319 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Name)); #line default #line hidden this.Write("QueryString(string urlQueryString, "); - #line 336 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 319 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(parameterList)); #line default #line hidden this.Write(")\r\n\t\t\t{\r\n\t\t\t\tthrow new NotImplementedException();\r\n\t\t\t}\r\n\r\n\t\t"); - #line 341 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 324 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\r\n\r\n\t\t/// \r\n\t\t/// "); - #line 345 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 328 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Description)); #line default #line hidden this.Write("\r\n\t\t/// \r\n"); - #line 347 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 330 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var p in method.UrlParameters) { #line default #line hidden this.Write("\t\t/// "); - #line 348 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 331 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(p.Description)); #line default #line hidden this.Write("\r\n"); - #line 349 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 332 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\t\tpublic virtual "); - #line 350 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 333 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(String.IsNullOrEmpty(method.ReturnType) ? "void" : method.ReturnType)); #line default #line hidden this.Write(" "); - #line 350 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 333 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Name)); #line default #line hidden this.Write("("); - #line 350 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 333 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(parameterList)); #line default #line hidden this.Write(")\r\n\t\t{\r\n\t\t\tvar result = "); - #line 352 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 335 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Name)); #line default #line hidden this.Write("Async("); - #line 352 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 335 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(parameterNameList)); #line default #line hidden this.Write(").Result;\t\t \r\n\t\t\t \r\n\t\t\tEnsureSuccess(result);\r\n\t\t\t\t \r\n\t\t\t"); - #line 356 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 339 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" if(!String.IsNullOrEmpty(method.ReturnType) && method.ReturnType != "void" ) { #line default #line hidden this.Write("\t\t\t \t\t\t \r\n\t\t\treturn result.Content.ReadAsAsync<"); - #line 357 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 340 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.ReturnType)); #line default #line hidden this.Write(">().Result;\r\n\t\t\t"); - #line 358 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 341 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\t\t}\r\n\r\n"); - #line 361 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 344 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\t\t#endregion\r\n\t}\r\n"); - #line 364 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 347 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default diff --git a/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.tt b/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.tt index c8f2ca2..7d7231c 100644 --- a/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.tt +++ b/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.tt @@ -182,19 +182,6 @@ namespace <#= Configuration.Namespace#>.Clients throw new WebApiProxyResponseException(response); } - /// - /// Initializes a new instance of the class. - /// - /// The handler. - /// if set to true [dispose handler]. - protected ClientBase(HttpMessageHandler handler, bool disposeHandler = true) - { - HttpClient = new HttpClient(handler, disposeHandler) - { - BaseAddress = new Uri(Configuration.<#= Configuration.Name #>BaseAddress) - }; - } - /// /// Releases the unmanaged resources and disposes of the managed resources. /// @@ -214,10 +201,6 @@ namespace <#= Configuration.Namespace#>.Clients { } - public <#=definition.Name#><#= Configuration.ClientSuffix#>(HttpMessageHandler handler, bool disposeHandler = true) : base(handler, disposeHandler) - { - } - #region Methods <# foreach(var method in definition.ActionMethods) { var allParameters = method.UrlParameters.AsEnumerable(); From 5a61e7d27e50dc973c0c244898c218af32298735 Mon Sep 17 00:00:00 2001 From: $+j Date: Thu, 6 Aug 2015 16:30:16 +0800 Subject: [PATCH 09/45] add summary to interface --- .../Templates/CSharpProxyTemplate.cs | 129 +++++++++--------- .../Templates/CSharpProxyTemplate.tt | 3 + 2 files changed, 71 insertions(+), 61 deletions(-) diff --git a/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.cs b/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.cs index 7434f58..a325509 100644 --- a/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.cs +++ b/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.cs @@ -367,72 +367,79 @@ public WebApiProxyResponseException(HttpResponseMessage response): base(""A "" + #line default #line hidden - this.Write(");\r\n\r\n"); + this.Write(");\r\n\r\n\t\t/// \r\n\t\t/// "); - #line 142 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 143 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + this.Write(this.ToStringHelper.ToStringWithCulture(method.Description)); + + #line default + #line hidden + this.Write("\r\n\t\t/// \r\n"); + + #line 145 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var p in method.UrlParameters) { #line default #line hidden this.Write("\t\t/// "); - #line 143 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 146 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(p.Description)); #line default #line hidden this.Write("\r\n"); - #line 144 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 147 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\t\t"); - #line 145 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 148 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(String.IsNullOrEmpty(method.ReturnType) ? "void" : method.ReturnType)); #line default #line hidden this.Write(" "); - #line 145 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 148 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Name)); #line default #line hidden this.Write("("); - #line 145 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 148 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(parameterList)); #line default #line hidden this.Write(");\r\n"); - #line 146 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 149 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\t\t\t\t\r\n\t}\r\n"); - #line 148 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 151 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\r\n}\r\n#endregion\r\n\r\n#region Clients\r\nnamespace "); - #line 154 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 157 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Configuration.Namespace)); #line default @@ -458,7 +465,7 @@ protected ClientBase() { BaseAddress = new Uri(Configuration."); - #line 173 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 176 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Configuration.Name)); #line default @@ -486,60 +493,60 @@ public void Dispose() "); - #line 194 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 197 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var definition in Configuration.Metadata.Definitions) { #line default #line hidden this.Write("\t/// \r\n\t/// "); - #line 196 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 199 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(definition.Description.ToSummary())); #line default #line hidden this.Write("\r\n\t/// \r\n\tpublic partial class "); - #line 198 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 201 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(definition.Name)); #line default #line hidden - #line 198 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 201 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Configuration.ClientSuffix)); #line default #line hidden this.Write(" : ClientBase, Interfaces.I"); - #line 198 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 201 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(definition.Name)); #line default #line hidden - #line 198 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 201 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Configuration.ClientSuffix)); #line default #line hidden this.Write("\r\n\t{\t\t\r\n\t\tpublic "); - #line 200 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 203 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(definition.Name)); #line default #line hidden - #line 200 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 203 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Configuration.ClientSuffix)); #line default #line hidden this.Write("() : base()\r\n\t\t{\r\n\t\t}\r\n\r\n\t\t#region Methods\r\n"); - #line 205 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 208 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var method in definition.ActionMethods) { var allParameters = method.UrlParameters.AsEnumerable(); @@ -621,112 +628,112 @@ public void Dispose() #line hidden this.Write("\r\n\t\t/// \r\n\t\t/// "); - #line 283 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 286 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Description)); #line default #line hidden this.Write("\r\n\t\t/// \r\n"); - #line 285 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 288 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var p in method.UrlParameters) { #line default #line hidden this.Write("\t\t/// "); - #line 286 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 289 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(p.Description)); #line default #line hidden this.Write("\r\n"); - #line 287 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 290 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\t\tpublic virtual async Task "); - #line 288 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 291 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Name)); #line default #line hidden this.Write("Async("); - #line 288 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 291 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(parameterList)); #line default #line hidden this.Write(")\r\n\t\t{\r\n\t\t\tvar requestUrl = \""); - #line 290 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 293 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(requestUrl)); #line default #line hidden this.Write("\";\r\n\t\t\t"); - #line 291 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 294 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" if(hasQueryString){ #line default #line hidden this.Write("\r\n\t\t\t\tvar queryHasParamUrl = \""); - #line 293 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 296 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(queryHasParamUrl)); #line default #line hidden this.Write("\";\r\n\r\n\r\n\t\t\t\t"); - #line 296 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 299 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" if(!string.IsNullOrEmpty(queryNoParamUrlTpl)){ #line default #line hidden this.Write("\t\t\t\t\tvar queryNoParamUrlTpl = \""); - #line 297 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 300 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(queryNoParamUrlTpl)); #line default #line hidden this.Write("\";\r\n\t\t\t\t\tvar queryNoParamUrl = Generate"); - #line 298 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 301 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Name)); #line default #line hidden this.Write("QueryString(queryNoParamUrlTpl, "); - #line 298 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 301 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(parameterNameList)); #line default #line hidden this.Write(");\r\n\t\t\t\t"); - #line 299 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 302 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" }else{ #line default #line hidden this.Write("\t\t\t\t\tvar queryNoParamUrl = string.Empty;\r\n\t\t\t\t"); - #line 301 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 304 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default @@ -735,167 +742,167 @@ public void Dispose() "questUrl + \"?\" + queryNoParamUrl;\r\n\t\t\t\t}\r\n\t\t\t\telse\r\n\t\t\t\t{\r\n\t\t\t\t\trequestUrl = req" + "uestUrl + \"?\" + queryHasParamUrl + \"&\" + queryNoParamUrl;\r\n\t\t\t\t}\r\n\r\n\t\t\t"); - #line 312 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 315 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\r\n\t\t\t\treturn await HttpClient."); - #line 314 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 317 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Type.ToTitle())); #line default #line hidden - #line 314 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 317 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(postOrPut ? "AsJson" : "")); #line default #line hidden this.Write("Async"); - #line 314 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 317 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(postOrPut && method.BodyParameter != null ? "<" + method.BodyParameter.Type + ">" : "")); #line default #line hidden this.Write("(requestUrl "); - #line 314 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 317 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(postOrPut ? bodyParameterString:"")); #line default #line hidden this.Write(").ConfigureAwait(false);\r\n\t\t}\r\n\r\n\t\t"); - #line 317 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 320 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" if(hasQueryString && !string.IsNullOrEmpty(queryNoParamUrlTpl)){ #line default #line hidden this.Write("\t\t\t\t\r\n\t\t\tpublic virtual string Generate"); - #line 319 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 322 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Name)); #line default #line hidden this.Write("QueryString(string urlQueryString, "); - #line 319 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 322 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(parameterList)); #line default #line hidden this.Write(")\r\n\t\t\t{\r\n\t\t\t\tthrow new NotImplementedException();\r\n\t\t\t}\r\n\r\n\t\t"); - #line 324 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 327 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\r\n\r\n\t\t/// \r\n\t\t/// "); - #line 328 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 331 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Description)); #line default #line hidden this.Write("\r\n\t\t/// \r\n"); - #line 330 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 333 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var p in method.UrlParameters) { #line default #line hidden this.Write("\t\t/// "); - #line 331 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 334 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(p.Description)); #line default #line hidden this.Write("\r\n"); - #line 332 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 335 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\t\tpublic virtual "); - #line 333 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 336 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(String.IsNullOrEmpty(method.ReturnType) ? "void" : method.ReturnType)); #line default #line hidden this.Write(" "); - #line 333 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 336 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Name)); #line default #line hidden this.Write("("); - #line 333 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 336 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(parameterList)); #line default #line hidden this.Write(")\r\n\t\t{\r\n\t\t\tvar result = "); - #line 335 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 338 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Name)); #line default #line hidden this.Write("Async("); - #line 335 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 338 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(parameterNameList)); #line default #line hidden this.Write(").Result;\t\t \r\n\t\t\t \r\n\t\t\tEnsureSuccess(result);\r\n\t\t\t\t \r\n\t\t\t"); - #line 339 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 342 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" if(!String.IsNullOrEmpty(method.ReturnType) && method.ReturnType != "void" ) { #line default #line hidden this.Write("\t\t\t \t\t\t \r\n\t\t\treturn result.Content.ReadAsAsync<"); - #line 340 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 343 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.ReturnType)); #line default #line hidden this.Write(">().Result;\r\n\t\t\t"); - #line 341 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 344 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\t\t}\r\n\r\n"); - #line 344 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 347 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\t\t#endregion\r\n\t}\r\n"); - #line 347 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 350 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default diff --git a/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.tt b/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.tt index 7d7231c..0d895fc 100644 --- a/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.tt +++ b/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.tt @@ -139,6 +139,9 @@ namespace <#= Configuration.Namespace#>.Interfaces <# } #> Task <#= method.Name #>Async(<#= parameterList#>); + /// + /// <#= method.Description #> + /// <# foreach(var p in method.UrlParameters) {#> /// <#= p.Description #> <# } #> From 901286653f68228c1110f13abced7eee5c7295b2 Mon Sep 17 00:00:00 2001 From: $+j Date: Thu, 6 Aug 2015 19:31:13 +0800 Subject: [PATCH 10/45] add generate url easy --- .../Templates/CSharpProxyTemplate.cs | 249 ++++++++++-------- .../Templates/CSharpProxyTemplate.tt | 18 ++ 2 files changed, 164 insertions(+), 103 deletions(-) diff --git a/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.cs b/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.cs index a325509..4fecca2 100644 --- a/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.cs +++ b/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.cs @@ -42,16 +42,17 @@ public virtual string TransformText() using System.Linq; using System.Net; using System.Web; +using Newtonsoft.Json; using "); - #line 20 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 21 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Configuration.Namespace)); #line default #line hidden this.Write(".Models;\r\n\r\n#region Proxies\r\nnamespace "); - #line 23 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 24 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Configuration.Namespace)); #line default @@ -60,21 +61,21 @@ public virtual string TransformText() " class Configuration\r\n\t{\r\n\t\t/// \r\n\t\t/// Web Api Base Address.\r\n\t\t/// \r\n\t\tpublic static string "); - #line 33 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 34 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Configuration.Name)); #line default #line hidden this.Write("BaseAddress = \""); - #line 33 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 34 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Configuration.Metadata.Host)); #line default #line hidden this.Write("\";\r\n\t\t\r\n\t}\r\n}\r\n#endregion\r\n\r\n#region Models\r\nnamespace "); - #line 40 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 41 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Configuration.Namespace)); #line default @@ -97,175 +98,175 @@ public WebApiProxyResponseException(HttpResponseMessage response): base(""A "" + "); - #line 56 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 57 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var model in Configuration.Metadata.Models.Where(m => m.Type.Equals("class"))) { #line default #line hidden this.Write("\t\r\n\t/// \r\n\t/// "); - #line 58 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 59 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(model.Description.ToSummary())); #line default #line hidden this.Write("\r\n\t/// \r\n\tpublic partial class "); - #line 60 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 61 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(model.Name)); #line default #line hidden this.Write("\r\n\t{\r\n\t\t#region Constants\r\n"); - #line 63 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 64 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var constantItem in model.Constants) { #line default #line hidden this.Write("\t\t/// \r\n\t\t/// "); - #line 65 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 66 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(constantItem.Description.ToSummary())); #line default #line hidden this.Write("\r\n\t\t/// \r\n\t\tpublic const "); - #line 67 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 68 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(constantItem.Type)); #line default #line hidden this.Write(" "); - #line 67 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 68 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(constantItem.Name)); #line default #line hidden this.Write(" = "); - #line 67 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 68 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(constantItem.Value)); #line default #line hidden this.Write(";\r\n"); - #line 68 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 69 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\t\t#endregion\r\n\r\n\t\t#region Properties\r\n"); - #line 72 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 73 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var propertyItem in model.Properties) { #line default #line hidden this.Write("\t\t/// \r\n\t\t/// "); - #line 74 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 75 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(propertyItem.Description.ToSummary())); #line default #line hidden this.Write("\r\n\t\t/// \r\n\t\tpublic virtual "); - #line 76 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 77 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(propertyItem.Type)); #line default #line hidden this.Write(" "); - #line 76 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 77 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(propertyItem.Name)); #line default #line hidden this.Write(" { get; set; }\r\n"); - #line 77 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 78 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\t\t#endregion\r\n\t}\t\r\n"); - #line 80 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 81 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\r\n"); - #line 82 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 83 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var model in Configuration.Metadata.Models.Where(m => m.Type.Equals("enum"))) { #line default #line hidden this.Write("\t\r\n\t/// \r\n\t/// "); - #line 84 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 85 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(model.Description.ToSummary())); #line default #line hidden this.Write("\r\n\t/// \r\n\tpublic enum "); - #line 86 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 87 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(model.Name)); #line default #line hidden this.Write("\r\n\t{\r\n"); - #line 88 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 89 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var constantItem in model.Constants) { #line default #line hidden this.Write("\r\n\t\t/// \r\n\t\t/// "); - #line 91 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 92 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(constantItem.Description.ToSummary())); #line default #line hidden this.Write("\r\n\t\t/// \r\n\t\t"); - #line 93 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 94 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(constantItem.Name)); #line default #line hidden this.Write(" = "); - #line 93 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 94 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(constantItem.Value)); #line default #line hidden this.Write(",\r\n"); - #line 94 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 95 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\t\t\r\n\t}\r\n"); - #line 96 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 97 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\t\r\n}\r\n#endregion\r\n\r\n#region Interfaces\r\nnamespace "); - #line 102 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 103 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Configuration.Namespace)); #line default @@ -273,27 +274,27 @@ public WebApiProxyResponseException(HttpResponseMessage response): base(""A "" + this.Write(".Interfaces\r\n{\r\n\tpublic interface IClientBase : IDisposable\r\n\t{\r\n\t\tHttpClient Htt" + "pClient { get; }\r\n\t}\r\n\r\n"); - #line 109 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 110 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var definition in Configuration.Metadata.Definitions) { #line default #line hidden this.Write("\t\r\n\tpublic partial interface I"); - #line 110 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 111 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(definition.Name)); #line default #line hidden - #line 110 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 111 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Configuration.ClientSuffix)); #line default #line hidden this.Write(" : IClientBase\r\n\t{\t\r\n"); - #line 112 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 113 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var method in definition.ActionMethods) { var allParameters = method.UrlParameters.AsEnumerable().Where(m => m != null); @@ -320,126 +321,126 @@ public WebApiProxyResponseException(HttpResponseMessage response): base(""A "" + #line hidden this.Write("\r\n\t\t/// \r\n\t\t/// "); - #line 135 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 136 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Description)); #line default #line hidden this.Write("\r\n\t\t/// \r\n"); - #line 137 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 138 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var p in method.UrlParameters) { #line default #line hidden this.Write("\t\t/// "); - #line 138 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 139 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(p.Description)); #line default #line hidden this.Write("\r\n"); - #line 139 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 140 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\t\tTask "); - #line 140 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 141 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Name)); #line default #line hidden this.Write("Async("); - #line 140 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 141 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(parameterList)); #line default #line hidden this.Write(");\r\n\r\n\t\t/// \r\n\t\t/// "); - #line 143 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 144 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Description)); #line default #line hidden this.Write("\r\n\t\t/// \r\n"); - #line 145 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 146 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var p in method.UrlParameters) { #line default #line hidden this.Write("\t\t/// "); - #line 146 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 147 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(p.Description)); #line default #line hidden this.Write("\r\n"); - #line 147 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 148 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\t\t"); - #line 148 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 149 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(String.IsNullOrEmpty(method.ReturnType) ? "void" : method.ReturnType)); #line default #line hidden this.Write(" "); - #line 148 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 149 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Name)); #line default #line hidden this.Write("("); - #line 148 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 149 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(parameterList)); #line default #line hidden this.Write(");\r\n"); - #line 149 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 150 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\t\t\t\t\r\n\t}\r\n"); - #line 151 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 152 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\r\n}\r\n#endregion\r\n\r\n#region Clients\r\nnamespace "); - #line 157 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 158 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Configuration.Namespace)); #line default @@ -465,7 +466,7 @@ protected ClientBase() { BaseAddress = new Uri(Configuration."); - #line 176 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 177 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Configuration.Name)); #line default @@ -493,60 +494,60 @@ public void Dispose() "); - #line 197 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 198 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var definition in Configuration.Metadata.Definitions) { #line default #line hidden this.Write("\t/// \r\n\t/// "); - #line 199 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 200 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(definition.Description.ToSummary())); #line default #line hidden this.Write("\r\n\t/// \r\n\tpublic partial class "); - #line 201 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 202 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(definition.Name)); #line default #line hidden - #line 201 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 202 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Configuration.ClientSuffix)); #line default #line hidden this.Write(" : ClientBase, Interfaces.I"); - #line 201 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 202 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(definition.Name)); #line default #line hidden - #line 201 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 202 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Configuration.ClientSuffix)); #line default #line hidden this.Write("\r\n\t{\t\t\r\n\t\tpublic "); - #line 203 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 204 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(definition.Name)); #line default #line hidden - #line 203 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 204 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Configuration.ClientSuffix)); #line default #line hidden this.Write("() : base()\r\n\t\t{\r\n\t\t}\r\n\r\n\t\t#region Methods\r\n"); - #line 208 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 209 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var method in definition.ActionMethods) { var allParameters = method.UrlParameters.AsEnumerable(); @@ -628,112 +629,112 @@ public void Dispose() #line hidden this.Write("\r\n\t\t/// \r\n\t\t/// "); - #line 286 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 287 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Description)); #line default #line hidden this.Write("\r\n\t\t/// \r\n"); - #line 288 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 289 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var p in method.UrlParameters) { #line default #line hidden this.Write("\t\t/// "); - #line 289 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 290 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(p.Description)); #line default #line hidden this.Write("\r\n"); - #line 290 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 291 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\t\tpublic virtual async Task "); - #line 291 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 292 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Name)); #line default #line hidden this.Write("Async("); - #line 291 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 292 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(parameterList)); #line default #line hidden this.Write(")\r\n\t\t{\r\n\t\t\tvar requestUrl = \""); - #line 293 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 294 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(requestUrl)); #line default #line hidden this.Write("\";\r\n\t\t\t"); - #line 294 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 295 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" if(hasQueryString){ #line default #line hidden this.Write("\r\n\t\t\t\tvar queryHasParamUrl = \""); - #line 296 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 297 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(queryHasParamUrl)); #line default #line hidden this.Write("\";\r\n\r\n\r\n\t\t\t\t"); - #line 299 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 300 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" if(!string.IsNullOrEmpty(queryNoParamUrlTpl)){ #line default #line hidden this.Write("\t\t\t\t\tvar queryNoParamUrlTpl = \""); - #line 300 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 301 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(queryNoParamUrlTpl)); #line default #line hidden this.Write("\";\r\n\t\t\t\t\tvar queryNoParamUrl = Generate"); - #line 301 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 302 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Name)); #line default #line hidden this.Write("QueryString(queryNoParamUrlTpl, "); - #line 301 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 302 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(parameterNameList)); #line default #line hidden this.Write(");\r\n\t\t\t\t"); - #line 302 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 303 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" }else{ #line default #line hidden this.Write("\t\t\t\t\tvar queryNoParamUrl = string.Empty;\r\n\t\t\t\t"); - #line 304 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 305 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default @@ -742,167 +743,209 @@ public void Dispose() "questUrl + \"?\" + queryNoParamUrl;\r\n\t\t\t\t}\r\n\t\t\t\telse\r\n\t\t\t\t{\r\n\t\t\t\t\trequestUrl = req" + "uestUrl + \"?\" + queryHasParamUrl + \"&\" + queryNoParamUrl;\r\n\t\t\t\t}\r\n\r\n\t\t\t"); - #line 315 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 316 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\r\n\t\t\t\treturn await HttpClient."); - #line 317 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 318 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Type.ToTitle())); #line default #line hidden - #line 317 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 318 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(postOrPut ? "AsJson" : "")); #line default #line hidden this.Write("Async"); - #line 317 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 318 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(postOrPut && method.BodyParameter != null ? "<" + method.BodyParameter.Type + ">" : "")); #line default #line hidden this.Write("(requestUrl "); - #line 317 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 318 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(postOrPut ? bodyParameterString:"")); #line default #line hidden this.Write(").ConfigureAwait(false);\r\n\t\t}\r\n\r\n\t\t"); - #line 320 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 321 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" if(hasQueryString && !string.IsNullOrEmpty(queryNoParamUrlTpl)){ #line default #line hidden this.Write("\t\t\t\t\r\n\t\t\tpublic virtual string Generate"); - #line 322 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 323 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Name)); #line default #line hidden this.Write("QueryString(string urlQueryString, "); - #line 322 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 323 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + this.Write(this.ToStringHelper.ToStringWithCulture(parameterList)); + + #line default + #line hidden + this.Write(")\r\n\t\t\t{\r\n\t\t\t\tvar kvList = Generate"); + + #line 325 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + this.Write(this.ToStringHelper.ToStringWithCulture(method.Name)); + + #line default + #line hidden + this.Write("KeyValueList( "); + + #line 325 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + this.Write(this.ToStringHelper.ToStringWithCulture(parameterNameList)); + + #line default + #line hidden + this.Write(@" ); + var urlTpl = string.Join(""&"", + kvList.Select(item => + { + var queryKey = Uri.EscapeDataString(item.Key); + + var queryValueJson = JsonConvert.SerializeObject(item.Value); + var queryValue = Uri.EscapeDataString(queryValueJson); + return queryKey + ""="" + queryValue; + })); + + return urlTpl; + } + + public virtual List> Generate"); + + #line 339 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + this.Write(this.ToStringHelper.ToStringWithCulture(method.Name)); + + #line default + #line hidden + this.Write("KeyValueList("); + + #line 339 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(parameterList)); #line default #line hidden - this.Write(")\r\n\t\t\t{\r\n\t\t\t\tthrow new NotImplementedException();\r\n\t\t\t}\r\n\r\n\t\t"); + this.Write(")\r\n\t\t\t{\r\n\t\t\t\tthrow new NotImplementedException();\r\n\t\t\t}\r\n\r\n\r\n\t\t"); - #line 327 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 345 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\r\n\r\n\t\t/// \r\n\t\t/// "); - #line 331 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 349 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Description)); #line default #line hidden this.Write("\r\n\t\t/// \r\n"); - #line 333 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 351 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var p in method.UrlParameters) { #line default #line hidden this.Write("\t\t/// "); - #line 334 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 352 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(p.Description)); #line default #line hidden this.Write("\r\n"); - #line 335 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 353 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\t\tpublic virtual "); - #line 336 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 354 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(String.IsNullOrEmpty(method.ReturnType) ? "void" : method.ReturnType)); #line default #line hidden this.Write(" "); - #line 336 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 354 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Name)); #line default #line hidden this.Write("("); - #line 336 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 354 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(parameterList)); #line default #line hidden this.Write(")\r\n\t\t{\r\n\t\t\tvar result = "); - #line 338 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 356 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Name)); #line default #line hidden this.Write("Async("); - #line 338 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 356 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(parameterNameList)); #line default #line hidden this.Write(").Result;\t\t \r\n\t\t\t \r\n\t\t\tEnsureSuccess(result);\r\n\t\t\t\t \r\n\t\t\t"); - #line 342 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 360 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" if(!String.IsNullOrEmpty(method.ReturnType) && method.ReturnType != "void" ) { #line default #line hidden this.Write("\t\t\t \t\t\t \r\n\t\t\treturn result.Content.ReadAsAsync<"); - #line 343 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 361 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.ReturnType)); #line default #line hidden this.Write(">().Result;\r\n\t\t\t"); - #line 344 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 362 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\t\t}\r\n\r\n"); - #line 347 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 365 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\t\t#endregion\r\n\t}\r\n"); - #line 350 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 368 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default diff --git a/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.tt b/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.tt index 0d895fc..d647f41 100644 --- a/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.tt +++ b/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.tt @@ -17,6 +17,7 @@ using System.Net.Http.Formatting; using System.Linq; using System.Net; using System.Web; +using Newtonsoft.Json; using <#= Configuration.Namespace#>.Models; #region Proxies @@ -320,10 +321,27 @@ namespace <#= Configuration.Namespace#>.Clients <# if(hasQueryString && !string.IsNullOrEmpty(queryNoParamUrlTpl)){ #> public virtual string Generate<#= method.Name #>QueryString(string urlQueryString, <#= parameterList#>) + { + var kvList = Generate<#= method.Name #>KeyValueList( <#=parameterNameList#> ); + var urlTpl = string.Join("&", + kvList.Select(item => + { + var queryKey = Uri.EscapeDataString(item.Key); + + var queryValueJson = JsonConvert.SerializeObject(item.Value); + var queryValue = Uri.EscapeDataString(queryValueJson); + return queryKey + "=" + queryValue; + })); + + return urlTpl; + } + + public virtual List> Generate<#= method.Name #>KeyValueList(<#= parameterList#>) { throw new NotImplementedException(); } + <#}#> From c51d2c8674c321f6c4b108c028f5154d3a6bb898 Mon Sep 17 00:00:00 2001 From: $+j Date: Thu, 6 Aug 2015 20:01:52 +0800 Subject: [PATCH 11/45] genereate url from kv --- .../Templates/CSharpProxyTemplate.cs | 141 +++++++++--------- .../Templates/CSharpProxyTemplate.tt | 27 ++-- 2 files changed, 91 insertions(+), 77 deletions(-) diff --git a/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.cs b/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.cs index 4fecca2..3bb1e20 100644 --- a/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.cs +++ b/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.cs @@ -483,6 +483,23 @@ public virtual void EnsureSuccess(HttpResponseMessage response) throw new WebApiProxyResponseException(response); } + public virtual string GenerateQueryStrFromKvList(List> kvList) + { + var urlTpl = string.Join(""&"", + kvList.Select(item => + { + var queryKey = Uri.EscapeDataString(item.Key); + var queryValue = string.Empty; + if (item.Value != null) + { + var queryValueJson = JsonConvert.SerializeObject(item.Value); + queryValue = Uri.EscapeDataString(queryValueJson); + } + return queryKey + ""="" + queryValue; + })); + return urlTpl; + } + /// /// Releases the unmanaged resources and disposes of the managed resources. /// @@ -494,60 +511,60 @@ public void Dispose() "); - #line 198 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 215 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var definition in Configuration.Metadata.Definitions) { #line default #line hidden this.Write("\t/// \r\n\t/// "); - #line 200 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 217 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(definition.Description.ToSummary())); #line default #line hidden this.Write("\r\n\t/// \r\n\tpublic partial class "); - #line 202 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 219 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(definition.Name)); #line default #line hidden - #line 202 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 219 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Configuration.ClientSuffix)); #line default #line hidden this.Write(" : ClientBase, Interfaces.I"); - #line 202 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 219 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(definition.Name)); #line default #line hidden - #line 202 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 219 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Configuration.ClientSuffix)); #line default #line hidden this.Write("\r\n\t{\t\t\r\n\t\tpublic "); - #line 204 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 221 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(definition.Name)); #line default #line hidden - #line 204 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 221 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Configuration.ClientSuffix)); #line default #line hidden this.Write("() : base()\r\n\t\t{\r\n\t\t}\r\n\r\n\t\t#region Methods\r\n"); - #line 209 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 226 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var method in definition.ActionMethods) { var allParameters = method.UrlParameters.AsEnumerable(); @@ -629,112 +646,112 @@ public void Dispose() #line hidden this.Write("\r\n\t\t/// \r\n\t\t/// "); - #line 287 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 304 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Description)); #line default #line hidden this.Write("\r\n\t\t/// \r\n"); - #line 289 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 306 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var p in method.UrlParameters) { #line default #line hidden this.Write("\t\t/// "); - #line 290 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 307 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(p.Description)); #line default #line hidden this.Write("\r\n"); - #line 291 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 308 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\t\tpublic virtual async Task "); - #line 292 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 309 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Name)); #line default #line hidden this.Write("Async("); - #line 292 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 309 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(parameterList)); #line default #line hidden this.Write(")\r\n\t\t{\r\n\t\t\tvar requestUrl = \""); - #line 294 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 311 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(requestUrl)); #line default #line hidden this.Write("\";\r\n\t\t\t"); - #line 295 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 312 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" if(hasQueryString){ #line default #line hidden this.Write("\r\n\t\t\t\tvar queryHasParamUrl = \""); - #line 297 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 314 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(queryHasParamUrl)); #line default #line hidden this.Write("\";\r\n\r\n\r\n\t\t\t\t"); - #line 300 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 317 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" if(!string.IsNullOrEmpty(queryNoParamUrlTpl)){ #line default #line hidden this.Write("\t\t\t\t\tvar queryNoParamUrlTpl = \""); - #line 301 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 318 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(queryNoParamUrlTpl)); #line default #line hidden this.Write("\";\r\n\t\t\t\t\tvar queryNoParamUrl = Generate"); - #line 302 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 319 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Name)); #line default #line hidden this.Write("QueryString(queryNoParamUrlTpl, "); - #line 302 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 319 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(parameterNameList)); #line default #line hidden this.Write(");\r\n\t\t\t\t"); - #line 303 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 320 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" }else{ #line default #line hidden this.Write("\t\t\t\t\tvar queryNoParamUrl = string.Empty;\r\n\t\t\t\t"); - #line 305 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 322 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default @@ -743,209 +760,197 @@ public void Dispose() "questUrl + \"?\" + queryNoParamUrl;\r\n\t\t\t\t}\r\n\t\t\t\telse\r\n\t\t\t\t{\r\n\t\t\t\t\trequestUrl = req" + "uestUrl + \"?\" + queryHasParamUrl + \"&\" + queryNoParamUrl;\r\n\t\t\t\t}\r\n\r\n\t\t\t"); - #line 316 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 333 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\r\n\t\t\t\treturn await HttpClient."); - #line 318 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 335 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Type.ToTitle())); #line default #line hidden - #line 318 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 335 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(postOrPut ? "AsJson" : "")); #line default #line hidden this.Write("Async"); - #line 318 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 335 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(postOrPut && method.BodyParameter != null ? "<" + method.BodyParameter.Type + ">" : "")); #line default #line hidden this.Write("(requestUrl "); - #line 318 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 335 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(postOrPut ? bodyParameterString:"")); #line default #line hidden this.Write(").ConfigureAwait(false);\r\n\t\t}\r\n\r\n\t\t"); - #line 321 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 338 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" if(hasQueryString && !string.IsNullOrEmpty(queryNoParamUrlTpl)){ #line default #line hidden this.Write("\t\t\t\t\r\n\t\t\tpublic virtual string Generate"); - #line 323 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 340 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Name)); #line default #line hidden this.Write("QueryString(string urlQueryString, "); - #line 323 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 340 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(parameterList)); #line default #line hidden this.Write(")\r\n\t\t\t{\r\n\t\t\t\tvar kvList = Generate"); - #line 325 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 342 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Name)); #line default #line hidden this.Write("KeyValueList( "); - #line 325 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 342 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(parameterNameList)); #line default #line hidden - this.Write(@" ); - var urlTpl = string.Join(""&"", - kvList.Select(item => - { - var queryKey = Uri.EscapeDataString(item.Key); - - var queryValueJson = JsonConvert.SerializeObject(item.Value); - var queryValue = Uri.EscapeDataString(queryValueJson); - return queryKey + ""="" + queryValue; - })); - - return urlTpl; - } - - public virtual List> Generate"); + this.Write(" );\r\n var urlTpl = GenerateQueryStrFromKvList(kvList);\r\n\r\n " + + "\t return urlTpl;\r\n\t\t\t}\r\n\r\n\t\t\tpublic virtual List" + + "> Generate"); - #line 339 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 348 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Name)); #line default #line hidden this.Write("KeyValueList("); - #line 339 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 348 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(parameterList)); #line default #line hidden this.Write(")\r\n\t\t\t{\r\n\t\t\t\tthrow new NotImplementedException();\r\n\t\t\t}\r\n\r\n\r\n\t\t"); - #line 345 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 354 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\r\n\r\n\t\t/// \r\n\t\t/// "); - #line 349 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 358 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Description)); #line default #line hidden this.Write("\r\n\t\t/// \r\n"); - #line 351 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 360 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var p in method.UrlParameters) { #line default #line hidden this.Write("\t\t/// "); - #line 352 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 361 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(p.Description)); #line default #line hidden this.Write("\r\n"); - #line 353 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 362 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\t\tpublic virtual "); - #line 354 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 363 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(String.IsNullOrEmpty(method.ReturnType) ? "void" : method.ReturnType)); #line default #line hidden this.Write(" "); - #line 354 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 363 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Name)); #line default #line hidden this.Write("("); - #line 354 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 363 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(parameterList)); #line default #line hidden this.Write(")\r\n\t\t{\r\n\t\t\tvar result = "); - #line 356 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 365 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Name)); #line default #line hidden this.Write("Async("); - #line 356 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 365 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(parameterNameList)); #line default #line hidden this.Write(").Result;\t\t \r\n\t\t\t \r\n\t\t\tEnsureSuccess(result);\r\n\t\t\t\t \r\n\t\t\t"); - #line 360 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 369 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" if(!String.IsNullOrEmpty(method.ReturnType) && method.ReturnType != "void" ) { #line default #line hidden this.Write("\t\t\t \t\t\t \r\n\t\t\treturn result.Content.ReadAsAsync<"); - #line 361 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 370 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.ReturnType)); #line default #line hidden this.Write(">().Result;\r\n\t\t\t"); - #line 362 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 371 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\t\t}\r\n\r\n"); - #line 365 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 374 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\t\t#endregion\r\n\t}\r\n"); - #line 368 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 377 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default diff --git a/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.tt b/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.tt index d647f41..17b77b3 100644 --- a/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.tt +++ b/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.tt @@ -186,6 +186,23 @@ namespace <#= Configuration.Namespace#>.Clients throw new WebApiProxyResponseException(response); } + public virtual string GenerateQueryStrFromKvList(List> kvList) + { + var urlTpl = string.Join("&", + kvList.Select(item => + { + var queryKey = Uri.EscapeDataString(item.Key); + var queryValue = string.Empty; + if (item.Value != null) + { + var queryValueJson = JsonConvert.SerializeObject(item.Value); + queryValue = Uri.EscapeDataString(queryValueJson); + } + return queryKey + "=" + queryValue; + })); + return urlTpl; + } + /// /// Releases the unmanaged resources and disposes of the managed resources. /// @@ -323,15 +340,7 @@ namespace <#= Configuration.Namespace#>.Clients public virtual string Generate<#= method.Name #>QueryString(string urlQueryString, <#= parameterList#>) { var kvList = Generate<#= method.Name #>KeyValueList( <#=parameterNameList#> ); - var urlTpl = string.Join("&", - kvList.Select(item => - { - var queryKey = Uri.EscapeDataString(item.Key); - - var queryValueJson = JsonConvert.SerializeObject(item.Value); - var queryValue = Uri.EscapeDataString(queryValueJson); - return queryKey + "=" + queryValue; - })); + var urlTpl = GenerateQueryStrFromKvList(kvList); return urlTpl; } From 2b046ad404382bc2c760d3a7ddb63118f9934ae3 Mon Sep 17 00:00:00 2001 From: $+j Date: Fri, 7 Aug 2015 15:33:26 +0800 Subject: [PATCH 12/45] remove json convert --- .../Templates/CSharpProxyTemplate.cs | 216 +++++++++--------- .../Templates/CSharpProxyTemplate.tt | 4 +- 2 files changed, 108 insertions(+), 112 deletions(-) diff --git a/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.cs b/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.cs index 3bb1e20..2fb4255 100644 --- a/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.cs +++ b/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.cs @@ -42,17 +42,16 @@ public virtual string TransformText() using System.Linq; using System.Net; using System.Web; -using Newtonsoft.Json; using "); - #line 21 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 20 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Configuration.Namespace)); #line default #line hidden this.Write(".Models;\r\n\r\n#region Proxies\r\nnamespace "); - #line 24 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 23 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Configuration.Namespace)); #line default @@ -61,21 +60,21 @@ public virtual string TransformText() " class Configuration\r\n\t{\r\n\t\t/// \r\n\t\t/// Web Api Base Address.\r\n\t\t/// \r\n\t\tpublic static string "); - #line 34 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 33 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Configuration.Name)); #line default #line hidden this.Write("BaseAddress = \""); - #line 34 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 33 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Configuration.Metadata.Host)); #line default #line hidden this.Write("\";\r\n\t\t\r\n\t}\r\n}\r\n#endregion\r\n\r\n#region Models\r\nnamespace "); - #line 41 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 40 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Configuration.Namespace)); #line default @@ -98,175 +97,175 @@ public WebApiProxyResponseException(HttpResponseMessage response): base(""A "" + "); - #line 57 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 56 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var model in Configuration.Metadata.Models.Where(m => m.Type.Equals("class"))) { #line default #line hidden this.Write("\t\r\n\t/// \r\n\t/// "); - #line 59 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 58 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(model.Description.ToSummary())); #line default #line hidden this.Write("\r\n\t/// \r\n\tpublic partial class "); - #line 61 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 60 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(model.Name)); #line default #line hidden this.Write("\r\n\t{\r\n\t\t#region Constants\r\n"); - #line 64 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 63 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var constantItem in model.Constants) { #line default #line hidden this.Write("\t\t/// \r\n\t\t/// "); - #line 66 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 65 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(constantItem.Description.ToSummary())); #line default #line hidden this.Write("\r\n\t\t/// \r\n\t\tpublic const "); - #line 68 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 67 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(constantItem.Type)); #line default #line hidden this.Write(" "); - #line 68 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 67 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(constantItem.Name)); #line default #line hidden this.Write(" = "); - #line 68 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 67 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(constantItem.Value)); #line default #line hidden this.Write(";\r\n"); - #line 69 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 68 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\t\t#endregion\r\n\r\n\t\t#region Properties\r\n"); - #line 73 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 72 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var propertyItem in model.Properties) { #line default #line hidden this.Write("\t\t/// \r\n\t\t/// "); - #line 75 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 74 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(propertyItem.Description.ToSummary())); #line default #line hidden this.Write("\r\n\t\t/// \r\n\t\tpublic virtual "); - #line 77 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 76 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(propertyItem.Type)); #line default #line hidden this.Write(" "); - #line 77 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 76 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(propertyItem.Name)); #line default #line hidden this.Write(" { get; set; }\r\n"); - #line 78 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 77 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\t\t#endregion\r\n\t}\t\r\n"); - #line 81 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 80 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\r\n"); - #line 83 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 82 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var model in Configuration.Metadata.Models.Where(m => m.Type.Equals("enum"))) { #line default #line hidden this.Write("\t\r\n\t/// \r\n\t/// "); - #line 85 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 84 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(model.Description.ToSummary())); #line default #line hidden this.Write("\r\n\t/// \r\n\tpublic enum "); - #line 87 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 86 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(model.Name)); #line default #line hidden this.Write("\r\n\t{\r\n"); - #line 89 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 88 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var constantItem in model.Constants) { #line default #line hidden this.Write("\r\n\t\t/// \r\n\t\t/// "); - #line 92 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 91 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(constantItem.Description.ToSummary())); #line default #line hidden this.Write("\r\n\t\t/// \r\n\t\t"); - #line 94 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 93 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(constantItem.Name)); #line default #line hidden this.Write(" = "); - #line 94 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 93 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(constantItem.Value)); #line default #line hidden this.Write(",\r\n"); - #line 95 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 94 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\t\t\r\n\t}\r\n"); - #line 97 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 96 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\t\r\n}\r\n#endregion\r\n\r\n#region Interfaces\r\nnamespace "); - #line 103 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 102 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Configuration.Namespace)); #line default @@ -274,27 +273,27 @@ public WebApiProxyResponseException(HttpResponseMessage response): base(""A "" + this.Write(".Interfaces\r\n{\r\n\tpublic interface IClientBase : IDisposable\r\n\t{\r\n\t\tHttpClient Htt" + "pClient { get; }\r\n\t}\r\n\r\n"); - #line 110 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 109 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var definition in Configuration.Metadata.Definitions) { #line default #line hidden this.Write("\t\r\n\tpublic partial interface I"); - #line 111 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 110 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(definition.Name)); #line default #line hidden - #line 111 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 110 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Configuration.ClientSuffix)); #line default #line hidden this.Write(" : IClientBase\r\n\t{\t\r\n"); - #line 113 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 112 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var method in definition.ActionMethods) { var allParameters = method.UrlParameters.AsEnumerable().Where(m => m != null); @@ -321,126 +320,126 @@ public WebApiProxyResponseException(HttpResponseMessage response): base(""A "" + #line hidden this.Write("\r\n\t\t/// \r\n\t\t/// "); - #line 136 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 135 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Description)); #line default #line hidden this.Write("\r\n\t\t/// \r\n"); - #line 138 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 137 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var p in method.UrlParameters) { #line default #line hidden this.Write("\t\t/// "); - #line 139 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 138 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(p.Description)); #line default #line hidden this.Write("\r\n"); - #line 140 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 139 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\t\tTask "); - #line 141 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 140 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Name)); #line default #line hidden this.Write("Async("); - #line 141 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 140 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(parameterList)); #line default #line hidden this.Write(");\r\n\r\n\t\t/// \r\n\t\t/// "); - #line 144 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 143 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Description)); #line default #line hidden this.Write("\r\n\t\t/// \r\n"); - #line 146 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 145 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var p in method.UrlParameters) { #line default #line hidden this.Write("\t\t/// "); - #line 147 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 146 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(p.Description)); #line default #line hidden this.Write("\r\n"); - #line 148 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 147 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\t\t"); - #line 149 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 148 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(String.IsNullOrEmpty(method.ReturnType) ? "void" : method.ReturnType)); #line default #line hidden this.Write(" "); - #line 149 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 148 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Name)); #line default #line hidden this.Write("("); - #line 149 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 148 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(parameterList)); #line default #line hidden this.Write(");\r\n"); - #line 150 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 149 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\t\t\t\t\r\n\t}\r\n"); - #line 152 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 151 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\r\n}\r\n#endregion\r\n\r\n#region Clients\r\nnamespace "); - #line 158 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 157 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Configuration.Namespace)); #line default @@ -466,7 +465,7 @@ protected ClientBase() { BaseAddress = new Uri(Configuration."); - #line 177 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 176 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Configuration.Name)); #line default @@ -492,8 +491,7 @@ public virtual string GenerateQueryStrFromKvList(List\r\n\tpublic partial class "); - #line 219 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 217 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(definition.Name)); #line default #line hidden - #line 219 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 217 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Configuration.ClientSuffix)); #line default #line hidden this.Write(" : ClientBase, Interfaces.I"); - #line 219 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 217 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(definition.Name)); #line default #line hidden - #line 219 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 217 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Configuration.ClientSuffix)); #line default #line hidden this.Write("\r\n\t{\t\t\r\n\t\tpublic "); - #line 221 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 219 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(definition.Name)); #line default #line hidden - #line 221 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 219 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Configuration.ClientSuffix)); #line default #line hidden this.Write("() : base()\r\n\t\t{\r\n\t\t}\r\n\r\n\t\t#region Methods\r\n"); - #line 226 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 224 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var method in definition.ActionMethods) { var allParameters = method.UrlParameters.AsEnumerable(); @@ -646,112 +644,112 @@ public void Dispose() #line hidden this.Write("\r\n\t\t/// \r\n\t\t/// "); - #line 304 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 302 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Description)); #line default #line hidden this.Write("\r\n\t\t/// \r\n"); - #line 306 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 304 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var p in method.UrlParameters) { #line default #line hidden this.Write("\t\t/// "); - #line 307 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 305 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(p.Description)); #line default #line hidden this.Write("\r\n"); - #line 308 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 306 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\t\tpublic virtual async Task "); - #line 309 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 307 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Name)); #line default #line hidden this.Write("Async("); - #line 309 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 307 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(parameterList)); #line default #line hidden this.Write(")\r\n\t\t{\r\n\t\t\tvar requestUrl = \""); - #line 311 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 309 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(requestUrl)); #line default #line hidden this.Write("\";\r\n\t\t\t"); - #line 312 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 310 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" if(hasQueryString){ #line default #line hidden this.Write("\r\n\t\t\t\tvar queryHasParamUrl = \""); - #line 314 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 312 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(queryHasParamUrl)); #line default #line hidden this.Write("\";\r\n\r\n\r\n\t\t\t\t"); - #line 317 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 315 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" if(!string.IsNullOrEmpty(queryNoParamUrlTpl)){ #line default #line hidden this.Write("\t\t\t\t\tvar queryNoParamUrlTpl = \""); - #line 318 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 316 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(queryNoParamUrlTpl)); #line default #line hidden this.Write("\";\r\n\t\t\t\t\tvar queryNoParamUrl = Generate"); - #line 319 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 317 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Name)); #line default #line hidden this.Write("QueryString(queryNoParamUrlTpl, "); - #line 319 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 317 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(parameterNameList)); #line default #line hidden this.Write(");\r\n\t\t\t\t"); - #line 320 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 318 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" }else{ #line default #line hidden this.Write("\t\t\t\t\tvar queryNoParamUrl = string.Empty;\r\n\t\t\t\t"); - #line 322 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 320 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default @@ -760,69 +758,69 @@ public void Dispose() "questUrl + \"?\" + queryNoParamUrl;\r\n\t\t\t\t}\r\n\t\t\t\telse\r\n\t\t\t\t{\r\n\t\t\t\t\trequestUrl = req" + "uestUrl + \"?\" + queryHasParamUrl + \"&\" + queryNoParamUrl;\r\n\t\t\t\t}\r\n\r\n\t\t\t"); - #line 333 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 331 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\r\n\t\t\t\treturn await HttpClient."); - #line 335 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 333 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Type.ToTitle())); #line default #line hidden - #line 335 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 333 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(postOrPut ? "AsJson" : "")); #line default #line hidden this.Write("Async"); - #line 335 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 333 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(postOrPut && method.BodyParameter != null ? "<" + method.BodyParameter.Type + ">" : "")); #line default #line hidden this.Write("(requestUrl "); - #line 335 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 333 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(postOrPut ? bodyParameterString:"")); #line default #line hidden this.Write(").ConfigureAwait(false);\r\n\t\t}\r\n\r\n\t\t"); - #line 338 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 336 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" if(hasQueryString && !string.IsNullOrEmpty(queryNoParamUrlTpl)){ #line default #line hidden this.Write("\t\t\t\t\r\n\t\t\tpublic virtual string Generate"); - #line 340 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 338 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Name)); #line default #line hidden this.Write("QueryString(string urlQueryString, "); - #line 340 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 338 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(parameterList)); #line default #line hidden this.Write(")\r\n\t\t\t{\r\n\t\t\t\tvar kvList = Generate"); - #line 342 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 340 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Name)); #line default #line hidden this.Write("KeyValueList( "); - #line 342 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 340 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(parameterNameList)); #line default @@ -831,126 +829,126 @@ public void Dispose() "\t return urlTpl;\r\n\t\t\t}\r\n\r\n\t\t\tpublic virtual List" + "> Generate"); - #line 348 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 346 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Name)); #line default #line hidden this.Write("KeyValueList("); - #line 348 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 346 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(parameterList)); #line default #line hidden this.Write(")\r\n\t\t\t{\r\n\t\t\t\tthrow new NotImplementedException();\r\n\t\t\t}\r\n\r\n\r\n\t\t"); - #line 354 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 352 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\r\n\r\n\t\t/// \r\n\t\t/// "); - #line 358 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 356 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Description)); #line default #line hidden this.Write("\r\n\t\t/// \r\n"); - #line 360 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 358 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var p in method.UrlParameters) { #line default #line hidden this.Write("\t\t/// "); - #line 361 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 359 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(p.Description)); #line default #line hidden this.Write("\r\n"); - #line 362 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 360 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\t\tpublic virtual "); - #line 363 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 361 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(String.IsNullOrEmpty(method.ReturnType) ? "void" : method.ReturnType)); #line default #line hidden this.Write(" "); - #line 363 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 361 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Name)); #line default #line hidden this.Write("("); - #line 363 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 361 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(parameterList)); #line default #line hidden this.Write(")\r\n\t\t{\r\n\t\t\tvar result = "); - #line 365 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 363 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Name)); #line default #line hidden this.Write("Async("); - #line 365 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 363 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(parameterNameList)); #line default #line hidden this.Write(").Result;\t\t \r\n\t\t\t \r\n\t\t\tEnsureSuccess(result);\r\n\t\t\t\t \r\n\t\t\t"); - #line 369 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 367 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" if(!String.IsNullOrEmpty(method.ReturnType) && method.ReturnType != "void" ) { #line default #line hidden this.Write("\t\t\t \t\t\t \r\n\t\t\treturn result.Content.ReadAsAsync<"); - #line 370 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 368 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.ReturnType)); #line default #line hidden this.Write(">().Result;\r\n\t\t\t"); - #line 371 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 369 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\t\t}\r\n\r\n"); - #line 374 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 372 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\t\t#endregion\r\n\t}\r\n"); - #line 377 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 375 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default diff --git a/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.tt b/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.tt index 17b77b3..eb5925c 100644 --- a/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.tt +++ b/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.tt @@ -17,7 +17,6 @@ using System.Net.Http.Formatting; using System.Linq; using System.Net; using System.Web; -using Newtonsoft.Json; using <#= Configuration.Namespace#>.Models; #region Proxies @@ -195,8 +194,7 @@ namespace <#= Configuration.Namespace#>.Clients var queryValue = string.Empty; if (item.Value != null) { - var queryValueJson = JsonConvert.SerializeObject(item.Value); - queryValue = Uri.EscapeDataString(queryValueJson); + queryValue = Uri.EscapeDataString(item.Value); } return queryKey + "=" + queryValue; })); From 0423560c4dd9e4afc99220df651c8a7ab26d97d9 Mon Sep 17 00:00:00 2001 From: $+j Date: Fri, 7 Aug 2015 15:42:55 +0800 Subject: [PATCH 13/45] tostring --- WebApiProxy.Tasks/Templates/CSharpProxyTemplate.cs | 2 +- WebApiProxy.Tasks/Templates/CSharpProxyTemplate.tt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.cs b/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.cs index 2fb4255..2f6c614 100644 --- a/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.cs +++ b/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.cs @@ -491,7 +491,7 @@ public virtual string GenerateQueryStrFromKvList(List.Clients var queryValue = string.Empty; if (item.Value != null) { - queryValue = Uri.EscapeDataString(item.Value); + queryValue = Uri.EscapeDataString(item.Value.ToString()); } return queryKey + "=" + queryValue; })); From 753ff1bfaaba6a57318d6a35f0d9cda4ac36e83e Mon Sep 17 00:00:00 2001 From: $+j Date: Fri, 7 Aug 2015 16:27:44 +0800 Subject: [PATCH 14/45] update json and convert --- .../Templates/CSharpProxyTemplate.cs | 167 ++++++++---------- .../Templates/CSharpProxyTemplate.tt | 24 ++- 2 files changed, 95 insertions(+), 96 deletions(-) diff --git a/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.cs b/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.cs index 2f6c614..2deaa74 100644 --- a/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.cs +++ b/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.cs @@ -42,6 +42,7 @@ public virtual string TransformText() using System.Linq; using System.Net; using System.Web; +using Newtonsoft.Json; using "); #line 20 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" @@ -470,99 +471,81 @@ protected ClientBase() #line default #line hidden - this.Write(@"BaseAddress) - }; - } - - public virtual void EnsureSuccess(HttpResponseMessage response) - { - if (response.IsSuccessStatusCode) - return; - - throw new WebApiProxyResponseException(response); - } - - public virtual string GenerateQueryStrFromKvList(List> kvList) - { - var urlTpl = string.Join(""&"", - kvList.Select(item => - { - var queryKey = Uri.EscapeDataString(item.Key); - var queryValue = string.Empty; - if (item.Value != null) - { - queryValue = Uri.EscapeDataString(item.Value.ToString()); - } - return queryKey + ""="" + queryValue; - })); - return urlTpl; - } - - /// - /// Releases the unmanaged resources and disposes of the managed resources. - /// - public void Dispose() - { - HttpClient.Dispose(); - } - } - -"); - - #line 213 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + this.Write("BaseAddress)\r\n\t\t\t};\r\n\r\n\t\t\tSerializationSettings = new JsonSerializerSettings\r\n " + + " {\r\n NullValueHandling = NullValueHandling.Ignore,\r\n " + + " ReferenceLoopHandling = ReferenceLoopHandling.Serialize,\r\n " + + " };\r\n\t\t}\r\n\r\n public JsonSerializerSettings SerializationSettings;\n\r\n\t\tpub" + + "lic virtual void EnsureSuccess(HttpResponseMessage response)\r\n\t\t{\t\t\t\r\n\t\t\tif (res" + + "ponse.IsSuccessStatusCode)\t\t\t\t\r\n\t\t\t\treturn;\r\n\t\t\t\t\t\t\t\t\t\t\t\t\t\r\n throw ne" + + "w WebApiProxyResponseException(response);\r\n\t\t}\r\n\r\n\t\tpublic virtual string Genera" + + "teQueryStrFromKvList(List> kvList)\r\n\t {\r\n " + + " var urlTpl = string.Join(\"&\",\r\n kvList.Select(i" + + "tem =>\r\n {\r\n var que" + + "ryKey = Uri.EscapeDataString(item.Key);\r\n var qu" + + "eryValue = string.Empty;\r\n\r\n\t\t\t\t\t\t\t\tif (item.Value is string)\n\t\t\t\t\t\t\t\t{\n " + + " queryValue = Uri.EscapeDataString(item.Value);\r\n\t\t\t\t" + + "\t\t\t\t}\n\t\t\t\t\t\t\t\telse\n\t\t\t\t\t\t\t\t{\n\t\t\t\t\t\t\t\t\tvar queryValueJson = JsonConvert.Serialize" + + "Object(item.Value).Trim(\'\"\');\r\n queryValue = " + + "Uri.EscapeDataString(queryValueJson);\r\n\t\t\t\t\t\t\t\t}\r\n\r\n " + + " return queryKey + \"=\" + queryValue;\r\n }));\r\n\t " + + " return urlTpl;\r\n\t }\r\n\r\n\t\t/// \r\n\t\t/// Releases the unmanaged re" + + "sources and disposes of the managed resources. \r\n\t\t/// \r\n\t\tpubli" + + "c void Dispose()\r\n\t\t{\r\n\t\t\tHttpClient.Dispose();\r\n\t\t}\r\n\t}\r\n\r\n"); + + #line 222 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var definition in Configuration.Metadata.Definitions) { #line default #line hidden this.Write("\t/// \r\n\t/// "); - #line 215 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 224 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(definition.Description.ToSummary())); #line default #line hidden this.Write("\r\n\t/// \r\n\tpublic partial class "); - #line 217 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 226 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(definition.Name)); #line default #line hidden - #line 217 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 226 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Configuration.ClientSuffix)); #line default #line hidden this.Write(" : ClientBase, Interfaces.I"); - #line 217 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 226 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(definition.Name)); #line default #line hidden - #line 217 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 226 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Configuration.ClientSuffix)); #line default #line hidden this.Write("\r\n\t{\t\t\r\n\t\tpublic "); - #line 219 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 228 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(definition.Name)); #line default #line hidden - #line 219 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 228 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Configuration.ClientSuffix)); #line default #line hidden this.Write("() : base()\r\n\t\t{\r\n\t\t}\r\n\r\n\t\t#region Methods\r\n"); - #line 224 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 233 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var method in definition.ActionMethods) { var allParameters = method.UrlParameters.AsEnumerable(); @@ -644,112 +627,112 @@ public void Dispose() #line hidden this.Write("\r\n\t\t/// \r\n\t\t/// "); - #line 302 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 311 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Description)); #line default #line hidden this.Write("\r\n\t\t/// \r\n"); - #line 304 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 313 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var p in method.UrlParameters) { #line default #line hidden this.Write("\t\t/// "); - #line 305 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 314 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(p.Description)); #line default #line hidden this.Write("\r\n"); - #line 306 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 315 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\t\tpublic virtual async Task "); - #line 307 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 316 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Name)); #line default #line hidden this.Write("Async("); - #line 307 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 316 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(parameterList)); #line default #line hidden this.Write(")\r\n\t\t{\r\n\t\t\tvar requestUrl = \""); - #line 309 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 318 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(requestUrl)); #line default #line hidden this.Write("\";\r\n\t\t\t"); - #line 310 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 319 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" if(hasQueryString){ #line default #line hidden this.Write("\r\n\t\t\t\tvar queryHasParamUrl = \""); - #line 312 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 321 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(queryHasParamUrl)); #line default #line hidden this.Write("\";\r\n\r\n\r\n\t\t\t\t"); - #line 315 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 324 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" if(!string.IsNullOrEmpty(queryNoParamUrlTpl)){ #line default #line hidden this.Write("\t\t\t\t\tvar queryNoParamUrlTpl = \""); - #line 316 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 325 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(queryNoParamUrlTpl)); #line default #line hidden this.Write("\";\r\n\t\t\t\t\tvar queryNoParamUrl = Generate"); - #line 317 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 326 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Name)); #line default #line hidden this.Write("QueryString(queryNoParamUrlTpl, "); - #line 317 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 326 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(parameterNameList)); #line default #line hidden this.Write(");\r\n\t\t\t\t"); - #line 318 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 327 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" }else{ #line default #line hidden this.Write("\t\t\t\t\tvar queryNoParamUrl = string.Empty;\r\n\t\t\t\t"); - #line 320 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 329 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default @@ -758,69 +741,69 @@ public void Dispose() "questUrl + \"?\" + queryNoParamUrl;\r\n\t\t\t\t}\r\n\t\t\t\telse\r\n\t\t\t\t{\r\n\t\t\t\t\trequestUrl = req" + "uestUrl + \"?\" + queryHasParamUrl + \"&\" + queryNoParamUrl;\r\n\t\t\t\t}\r\n\r\n\t\t\t"); - #line 331 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 340 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\r\n\t\t\t\treturn await HttpClient."); - #line 333 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 342 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Type.ToTitle())); #line default #line hidden - #line 333 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 342 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(postOrPut ? "AsJson" : "")); #line default #line hidden this.Write("Async"); - #line 333 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 342 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(postOrPut && method.BodyParameter != null ? "<" + method.BodyParameter.Type + ">" : "")); #line default #line hidden this.Write("(requestUrl "); - #line 333 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 342 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(postOrPut ? bodyParameterString:"")); #line default #line hidden this.Write(").ConfigureAwait(false);\r\n\t\t}\r\n\r\n\t\t"); - #line 336 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 345 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" if(hasQueryString && !string.IsNullOrEmpty(queryNoParamUrlTpl)){ #line default #line hidden this.Write("\t\t\t\t\r\n\t\t\tpublic virtual string Generate"); - #line 338 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 347 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Name)); #line default #line hidden this.Write("QueryString(string urlQueryString, "); - #line 338 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 347 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(parameterList)); #line default #line hidden this.Write(")\r\n\t\t\t{\r\n\t\t\t\tvar kvList = Generate"); - #line 340 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 349 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Name)); #line default #line hidden this.Write("KeyValueList( "); - #line 340 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 349 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(parameterNameList)); #line default @@ -829,126 +812,126 @@ public void Dispose() "\t return urlTpl;\r\n\t\t\t}\r\n\r\n\t\t\tpublic virtual List" + "> Generate"); - #line 346 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 355 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Name)); #line default #line hidden this.Write("KeyValueList("); - #line 346 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 355 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(parameterList)); #line default #line hidden this.Write(")\r\n\t\t\t{\r\n\t\t\t\tthrow new NotImplementedException();\r\n\t\t\t}\r\n\r\n\r\n\t\t"); - #line 352 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 361 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\r\n\r\n\t\t/// \r\n\t\t/// "); - #line 356 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 365 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Description)); #line default #line hidden this.Write("\r\n\t\t/// \r\n"); - #line 358 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 367 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var p in method.UrlParameters) { #line default #line hidden this.Write("\t\t/// "); - #line 359 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 368 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(p.Description)); #line default #line hidden this.Write("\r\n"); - #line 360 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 369 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\t\tpublic virtual "); - #line 361 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 370 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(String.IsNullOrEmpty(method.ReturnType) ? "void" : method.ReturnType)); #line default #line hidden this.Write(" "); - #line 361 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 370 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Name)); #line default #line hidden this.Write("("); - #line 361 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 370 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(parameterList)); #line default #line hidden this.Write(")\r\n\t\t{\r\n\t\t\tvar result = "); - #line 363 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 372 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Name)); #line default #line hidden this.Write("Async("); - #line 363 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 372 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(parameterNameList)); #line default #line hidden this.Write(").Result;\t\t \r\n\t\t\t \r\n\t\t\tEnsureSuccess(result);\r\n\t\t\t\t \r\n\t\t\t"); - #line 367 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 376 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" if(!String.IsNullOrEmpty(method.ReturnType) && method.ReturnType != "void" ) { #line default #line hidden this.Write("\t\t\t \t\t\t \r\n\t\t\treturn result.Content.ReadAsAsync<"); - #line 368 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 377 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.ReturnType)); #line default #line hidden this.Write(">().Result;\r\n\t\t\t"); - #line 369 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 378 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\t\t}\r\n\r\n"); - #line 372 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 381 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\t\t#endregion\r\n\t}\r\n"); - #line 375 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 384 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default diff --git a/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.tt b/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.tt index f02f74c..5143460 100644 --- a/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.tt +++ b/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.tt @@ -17,6 +17,7 @@ using System.Net.Http.Formatting; using System.Linq; using System.Net; using System.Web; +using Newtonsoft.Json; using <#= Configuration.Namespace#>.Models; #region Proxies @@ -175,8 +176,16 @@ namespace <#= Configuration.Namespace#>.Clients { BaseAddress = new Uri(Configuration.<#= Configuration.Name #>BaseAddress) }; + + SerializationSettings = new JsonSerializerSettings + { + NullValueHandling = NullValueHandling.Ignore, + ReferenceLoopHandling = ReferenceLoopHandling.Serialize, + }; } + public JsonSerializerSettings SerializationSettings; + public virtual void EnsureSuccess(HttpResponseMessage response) { if (response.IsSuccessStatusCode) @@ -192,10 +201,17 @@ namespace <#= Configuration.Namespace#>.Clients { var queryKey = Uri.EscapeDataString(item.Key); var queryValue = string.Empty; - if (item.Value != null) - { - queryValue = Uri.EscapeDataString(item.Value.ToString()); - } + + if (item.Value is string) + { + queryValue = Uri.EscapeDataString(item.Value); + } + else + { + var queryValueJson = JsonConvert.SerializeObject(item.Value).Trim('"'); + queryValue = Uri.EscapeDataString(queryValueJson); + } + return queryKey + "=" + queryValue; })); return urlTpl; From 5d6023ef69f96410530fb29fc5d6ff8c65de038b Mon Sep 17 00:00:00 2001 From: $+j Date: Fri, 7 Aug 2015 16:32:33 +0800 Subject: [PATCH 15/45] type convert --- .../Templates/CSharpProxyTemplate.cs | 250 +++++++++--------- .../Templates/CSharpProxyTemplate.tt | 16 +- 2 files changed, 133 insertions(+), 133 deletions(-) diff --git a/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.cs b/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.cs index 2deaa74..36ac950 100644 --- a/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.cs +++ b/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.cs @@ -42,17 +42,17 @@ public virtual string TransformText() using System.Linq; using System.Net; using System.Web; -using Newtonsoft.Json; +using Newtonsoft.Json; using "); - #line 20 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 21 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Configuration.Namespace)); #line default #line hidden this.Write(".Models;\r\n\r\n#region Proxies\r\nnamespace "); - #line 23 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 24 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Configuration.Namespace)); #line default @@ -61,21 +61,21 @@ public virtual string TransformText() " class Configuration\r\n\t{\r\n\t\t/// \r\n\t\t/// Web Api Base Address.\r\n\t\t/// \r\n\t\tpublic static string "); - #line 33 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 34 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Configuration.Name)); #line default #line hidden this.Write("BaseAddress = \""); - #line 33 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 34 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Configuration.Metadata.Host)); #line default #line hidden this.Write("\";\r\n\t\t\r\n\t}\r\n}\r\n#endregion\r\n\r\n#region Models\r\nnamespace "); - #line 40 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 41 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Configuration.Namespace)); #line default @@ -98,175 +98,175 @@ public WebApiProxyResponseException(HttpResponseMessage response): base(""A "" + "); - #line 56 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 57 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var model in Configuration.Metadata.Models.Where(m => m.Type.Equals("class"))) { #line default #line hidden this.Write("\t\r\n\t/// \r\n\t/// "); - #line 58 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 59 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(model.Description.ToSummary())); #line default #line hidden this.Write("\r\n\t/// \r\n\tpublic partial class "); - #line 60 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 61 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(model.Name)); #line default #line hidden this.Write("\r\n\t{\r\n\t\t#region Constants\r\n"); - #line 63 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 64 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var constantItem in model.Constants) { #line default #line hidden this.Write("\t\t/// \r\n\t\t/// "); - #line 65 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 66 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(constantItem.Description.ToSummary())); #line default #line hidden this.Write("\r\n\t\t/// \r\n\t\tpublic const "); - #line 67 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 68 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(constantItem.Type)); #line default #line hidden this.Write(" "); - #line 67 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 68 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(constantItem.Name)); #line default #line hidden this.Write(" = "); - #line 67 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 68 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(constantItem.Value)); #line default #line hidden this.Write(";\r\n"); - #line 68 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 69 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\t\t#endregion\r\n\r\n\t\t#region Properties\r\n"); - #line 72 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 73 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var propertyItem in model.Properties) { #line default #line hidden this.Write("\t\t/// \r\n\t\t/// "); - #line 74 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 75 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(propertyItem.Description.ToSummary())); #line default #line hidden this.Write("\r\n\t\t/// \r\n\t\tpublic virtual "); - #line 76 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 77 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(propertyItem.Type)); #line default #line hidden this.Write(" "); - #line 76 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 77 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(propertyItem.Name)); #line default #line hidden this.Write(" { get; set; }\r\n"); - #line 77 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 78 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\t\t#endregion\r\n\t}\t\r\n"); - #line 80 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 81 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\r\n"); - #line 82 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 83 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var model in Configuration.Metadata.Models.Where(m => m.Type.Equals("enum"))) { #line default #line hidden this.Write("\t\r\n\t/// \r\n\t/// "); - #line 84 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 85 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(model.Description.ToSummary())); #line default #line hidden this.Write("\r\n\t/// \r\n\tpublic enum "); - #line 86 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 87 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(model.Name)); #line default #line hidden this.Write("\r\n\t{\r\n"); - #line 88 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 89 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var constantItem in model.Constants) { #line default #line hidden this.Write("\r\n\t\t/// \r\n\t\t/// "); - #line 91 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 92 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(constantItem.Description.ToSummary())); #line default #line hidden this.Write("\r\n\t\t/// \r\n\t\t"); - #line 93 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 94 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(constantItem.Name)); #line default #line hidden this.Write(" = "); - #line 93 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 94 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(constantItem.Value)); #line default #line hidden this.Write(",\r\n"); - #line 94 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 95 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\t\t\r\n\t}\r\n"); - #line 96 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 97 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\t\r\n}\r\n#endregion\r\n\r\n#region Interfaces\r\nnamespace "); - #line 102 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 103 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Configuration.Namespace)); #line default @@ -274,27 +274,27 @@ public WebApiProxyResponseException(HttpResponseMessage response): base(""A "" + this.Write(".Interfaces\r\n{\r\n\tpublic interface IClientBase : IDisposable\r\n\t{\r\n\t\tHttpClient Htt" + "pClient { get; }\r\n\t}\r\n\r\n"); - #line 109 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 110 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var definition in Configuration.Metadata.Definitions) { #line default #line hidden this.Write("\t\r\n\tpublic partial interface I"); - #line 110 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 111 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(definition.Name)); #line default #line hidden - #line 110 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 111 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Configuration.ClientSuffix)); #line default #line hidden this.Write(" : IClientBase\r\n\t{\t\r\n"); - #line 112 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 113 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var method in definition.ActionMethods) { var allParameters = method.UrlParameters.AsEnumerable().Where(m => m != null); @@ -321,126 +321,126 @@ public WebApiProxyResponseException(HttpResponseMessage response): base(""A "" + #line hidden this.Write("\r\n\t\t/// \r\n\t\t/// "); - #line 135 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 136 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Description)); #line default #line hidden this.Write("\r\n\t\t/// \r\n"); - #line 137 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 138 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var p in method.UrlParameters) { #line default #line hidden this.Write("\t\t/// "); - #line 138 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 139 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(p.Description)); #line default #line hidden this.Write("\r\n"); - #line 139 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 140 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\t\tTask "); - #line 140 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 141 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Name)); #line default #line hidden this.Write("Async("); - #line 140 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 141 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(parameterList)); #line default #line hidden this.Write(");\r\n\r\n\t\t/// \r\n\t\t/// "); - #line 143 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 144 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Description)); #line default #line hidden this.Write("\r\n\t\t/// \r\n"); - #line 145 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 146 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var p in method.UrlParameters) { #line default #line hidden this.Write("\t\t/// "); - #line 146 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 147 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(p.Description)); #line default #line hidden this.Write("\r\n"); - #line 147 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 148 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\t\t"); - #line 148 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 149 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(String.IsNullOrEmpty(method.ReturnType) ? "void" : method.ReturnType)); #line default #line hidden this.Write(" "); - #line 148 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 149 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Name)); #line default #line hidden this.Write("("); - #line 148 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 149 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(parameterList)); #line default #line hidden this.Write(");\r\n"); - #line 149 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 150 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\t\t\t\t\r\n\t}\r\n"); - #line 151 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 152 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\r\n}\r\n#endregion\r\n\r\n#region Clients\r\nnamespace "); - #line 157 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 158 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Configuration.Namespace)); #line default @@ -466,7 +466,7 @@ protected ClientBase() { BaseAddress = new Uri(Configuration."); - #line 176 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 177 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Configuration.Name)); #line default @@ -474,78 +474,78 @@ protected ClientBase() this.Write("BaseAddress)\r\n\t\t\t};\r\n\r\n\t\t\tSerializationSettings = new JsonSerializerSettings\r\n " + " {\r\n NullValueHandling = NullValueHandling.Ignore,\r\n " + " ReferenceLoopHandling = ReferenceLoopHandling.Serialize,\r\n " + - " };\r\n\t\t}\r\n\r\n public JsonSerializerSettings SerializationSettings;\n\r\n\t\tpub" + - "lic virtual void EnsureSuccess(HttpResponseMessage response)\r\n\t\t{\t\t\t\r\n\t\t\tif (res" + - "ponse.IsSuccessStatusCode)\t\t\t\t\r\n\t\t\t\treturn;\r\n\t\t\t\t\t\t\t\t\t\t\t\t\t\r\n throw ne" + - "w WebApiProxyResponseException(response);\r\n\t\t}\r\n\r\n\t\tpublic virtual string Genera" + - "teQueryStrFromKvList(List> kvList)\r\n\t {\r\n " + - " var urlTpl = string.Join(\"&\",\r\n kvList.Select(i" + - "tem =>\r\n {\r\n var que" + - "ryKey = Uri.EscapeDataString(item.Key);\r\n var qu" + - "eryValue = string.Empty;\r\n\r\n\t\t\t\t\t\t\t\tif (item.Value is string)\n\t\t\t\t\t\t\t\t{\n " + - " queryValue = Uri.EscapeDataString(item.Value);\r\n\t\t\t\t" + - "\t\t\t\t}\n\t\t\t\t\t\t\t\telse\n\t\t\t\t\t\t\t\t{\n\t\t\t\t\t\t\t\t\tvar queryValueJson = JsonConvert.Serialize" + - "Object(item.Value).Trim(\'\"\');\r\n queryValue = " + - "Uri.EscapeDataString(queryValueJson);\r\n\t\t\t\t\t\t\t\t}\r\n\r\n " + - " return queryKey + \"=\" + queryValue;\r\n }));\r\n\t " + - " return urlTpl;\r\n\t }\r\n\r\n\t\t/// \r\n\t\t/// Releases the unmanaged re" + - "sources and disposes of the managed resources. \r\n\t\t/// \r\n\t\tpubli" + - "c void Dispose()\r\n\t\t{\r\n\t\t\tHttpClient.Dispose();\r\n\t\t}\r\n\t}\r\n\r\n"); - - #line 222 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + " };\r\n\t\t}\r\n\r\n public JsonSerializerSettings SerializationSettings;\r\n\r\n\t\tpu" + + "blic virtual void EnsureSuccess(HttpResponseMessage response)\r\n\t\t{\t\t\t\r\n\t\t\tif (re" + + "sponse.IsSuccessStatusCode)\t\t\t\t\r\n\t\t\t\treturn;\r\n\t\t\t\t\t\t\t\t\t\t\t\t\t\r\n throw n" + + "ew WebApiProxyResponseException(response);\r\n\t\t}\r\n\r\n\t\tpublic virtual string Gener" + + "ateQueryStrFromKvList(List> kvList)\r\n\t {\r\n " + + " var urlTpl = string.Join(\"&\",\r\n kvList.Select(" + + "item =>\r\n {\r\n var qu" + + "eryKey = Uri.EscapeDataString(item.Key);\r\n var q" + + "ueryValue = string.Empty;\r\n\r\n\t\t\t\t\t\t\t\tif (item.Value is string)\r\n\t\t\t\t\t\t\t\t{\r\n " + + " queryValue = Uri.EscapeDataString((string)item.Va" + + "lue);\r\n\t\t\t\t\t\t\t\t}\r\n\t\t\t\t\t\t\t\telse\r\n\t\t\t\t\t\t\t\t{\r\n\t\t\t\t\t\t\t\t\tvar queryValueJson = JsonCon" + + "vert.SerializeObject(item.Value).Trim(\'\"\');\r\n " + + " queryValue = Uri.EscapeDataString(queryValueJson);\r\n\t\t\t\t\t\t\t\t}\r\n\r\n " + + " return queryKey + \"=\" + queryValue;\r\n " + + " }));\r\n\t return urlTpl;\r\n\t }\r\n\r\n\t\t/// \r\n\t\t/// Releases th" + + "e unmanaged resources and disposes of the managed resources. \r\n\t\t/// \r\n\t\tpublic void Dispose()\r\n\t\t{\r\n\t\t\tHttpClient.Dispose();\r\n\t\t}\r\n\t}\r\n\r\n"); + + #line 229 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var definition in Configuration.Metadata.Definitions) { #line default #line hidden this.Write("\t/// \r\n\t/// "); - #line 224 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 231 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(definition.Description.ToSummary())); #line default #line hidden this.Write("\r\n\t/// \r\n\tpublic partial class "); - #line 226 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 233 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(definition.Name)); #line default #line hidden - #line 226 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 233 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Configuration.ClientSuffix)); #line default #line hidden this.Write(" : ClientBase, Interfaces.I"); - #line 226 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 233 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(definition.Name)); #line default #line hidden - #line 226 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 233 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Configuration.ClientSuffix)); #line default #line hidden this.Write("\r\n\t{\t\t\r\n\t\tpublic "); - #line 228 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 235 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(definition.Name)); #line default #line hidden - #line 228 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 235 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Configuration.ClientSuffix)); #line default #line hidden this.Write("() : base()\r\n\t\t{\r\n\t\t}\r\n\r\n\t\t#region Methods\r\n"); - #line 233 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 240 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var method in definition.ActionMethods) { var allParameters = method.UrlParameters.AsEnumerable(); @@ -627,112 +627,112 @@ protected ClientBase() #line hidden this.Write("\r\n\t\t/// \r\n\t\t/// "); - #line 311 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 318 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Description)); #line default #line hidden this.Write("\r\n\t\t/// \r\n"); - #line 313 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 320 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var p in method.UrlParameters) { #line default #line hidden this.Write("\t\t/// "); - #line 314 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 321 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(p.Description)); #line default #line hidden this.Write("\r\n"); - #line 315 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 322 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\t\tpublic virtual async Task "); - #line 316 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 323 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Name)); #line default #line hidden this.Write("Async("); - #line 316 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 323 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(parameterList)); #line default #line hidden this.Write(")\r\n\t\t{\r\n\t\t\tvar requestUrl = \""); - #line 318 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 325 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(requestUrl)); #line default #line hidden this.Write("\";\r\n\t\t\t"); - #line 319 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 326 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" if(hasQueryString){ #line default #line hidden this.Write("\r\n\t\t\t\tvar queryHasParamUrl = \""); - #line 321 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 328 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(queryHasParamUrl)); #line default #line hidden this.Write("\";\r\n\r\n\r\n\t\t\t\t"); - #line 324 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 331 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" if(!string.IsNullOrEmpty(queryNoParamUrlTpl)){ #line default #line hidden this.Write("\t\t\t\t\tvar queryNoParamUrlTpl = \""); - #line 325 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 332 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(queryNoParamUrlTpl)); #line default #line hidden this.Write("\";\r\n\t\t\t\t\tvar queryNoParamUrl = Generate"); - #line 326 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 333 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Name)); #line default #line hidden this.Write("QueryString(queryNoParamUrlTpl, "); - #line 326 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 333 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(parameterNameList)); #line default #line hidden this.Write(");\r\n\t\t\t\t"); - #line 327 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 334 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" }else{ #line default #line hidden this.Write("\t\t\t\t\tvar queryNoParamUrl = string.Empty;\r\n\t\t\t\t"); - #line 329 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 336 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default @@ -741,69 +741,69 @@ protected ClientBase() "questUrl + \"?\" + queryNoParamUrl;\r\n\t\t\t\t}\r\n\t\t\t\telse\r\n\t\t\t\t{\r\n\t\t\t\t\trequestUrl = req" + "uestUrl + \"?\" + queryHasParamUrl + \"&\" + queryNoParamUrl;\r\n\t\t\t\t}\r\n\r\n\t\t\t"); - #line 340 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 347 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\r\n\t\t\t\treturn await HttpClient."); - #line 342 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 349 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Type.ToTitle())); #line default #line hidden - #line 342 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 349 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(postOrPut ? "AsJson" : "")); #line default #line hidden this.Write("Async"); - #line 342 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 349 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(postOrPut && method.BodyParameter != null ? "<" + method.BodyParameter.Type + ">" : "")); #line default #line hidden this.Write("(requestUrl "); - #line 342 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 349 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(postOrPut ? bodyParameterString:"")); #line default #line hidden this.Write(").ConfigureAwait(false);\r\n\t\t}\r\n\r\n\t\t"); - #line 345 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 352 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" if(hasQueryString && !string.IsNullOrEmpty(queryNoParamUrlTpl)){ #line default #line hidden this.Write("\t\t\t\t\r\n\t\t\tpublic virtual string Generate"); - #line 347 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 354 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Name)); #line default #line hidden this.Write("QueryString(string urlQueryString, "); - #line 347 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 354 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(parameterList)); #line default #line hidden this.Write(")\r\n\t\t\t{\r\n\t\t\t\tvar kvList = Generate"); - #line 349 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 356 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Name)); #line default #line hidden this.Write("KeyValueList( "); - #line 349 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 356 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(parameterNameList)); #line default @@ -812,126 +812,126 @@ protected ClientBase() "\t return urlTpl;\r\n\t\t\t}\r\n\r\n\t\t\tpublic virtual List" + "> Generate"); - #line 355 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 362 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Name)); #line default #line hidden this.Write("KeyValueList("); - #line 355 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 362 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(parameterList)); #line default #line hidden this.Write(")\r\n\t\t\t{\r\n\t\t\t\tthrow new NotImplementedException();\r\n\t\t\t}\r\n\r\n\r\n\t\t"); - #line 361 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 368 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\r\n\r\n\t\t/// \r\n\t\t/// "); - #line 365 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 372 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Description)); #line default #line hidden this.Write("\r\n\t\t/// \r\n"); - #line 367 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 374 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var p in method.UrlParameters) { #line default #line hidden this.Write("\t\t/// "); - #line 368 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 375 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(p.Description)); #line default #line hidden this.Write("\r\n"); - #line 369 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 376 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\t\tpublic virtual "); - #line 370 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 377 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(String.IsNullOrEmpty(method.ReturnType) ? "void" : method.ReturnType)); #line default #line hidden this.Write(" "); - #line 370 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 377 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Name)); #line default #line hidden this.Write("("); - #line 370 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 377 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(parameterList)); #line default #line hidden this.Write(")\r\n\t\t{\r\n\t\t\tvar result = "); - #line 372 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 379 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Name)); #line default #line hidden this.Write("Async("); - #line 372 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 379 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(parameterNameList)); #line default #line hidden this.Write(").Result;\t\t \r\n\t\t\t \r\n\t\t\tEnsureSuccess(result);\r\n\t\t\t\t \r\n\t\t\t"); - #line 376 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 383 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" if(!String.IsNullOrEmpty(method.ReturnType) && method.ReturnType != "void" ) { #line default #line hidden this.Write("\t\t\t \t\t\t \r\n\t\t\treturn result.Content.ReadAsAsync<"); - #line 377 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 384 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.ReturnType)); #line default #line hidden this.Write(">().Result;\r\n\t\t\t"); - #line 378 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 385 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\t\t}\r\n\r\n"); - #line 381 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 388 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\t\t#endregion\r\n\t}\r\n"); - #line 384 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 391 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default diff --git a/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.tt b/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.tt index 5143460..9acc5a9 100644 --- a/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.tt +++ b/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.tt @@ -17,7 +17,7 @@ using System.Net.Http.Formatting; using System.Linq; using System.Net; using System.Web; -using Newtonsoft.Json; +using Newtonsoft.Json; using <#= Configuration.Namespace#>.Models; #region Proxies @@ -184,7 +184,7 @@ namespace <#= Configuration.Namespace#>.Clients }; } - public JsonSerializerSettings SerializationSettings; + public JsonSerializerSettings SerializationSettings; public virtual void EnsureSuccess(HttpResponseMessage response) { @@ -202,12 +202,12 @@ namespace <#= Configuration.Namespace#>.Clients var queryKey = Uri.EscapeDataString(item.Key); var queryValue = string.Empty; - if (item.Value is string) - { - queryValue = Uri.EscapeDataString(item.Value); - } - else - { + if (item.Value is string) + { + queryValue = Uri.EscapeDataString((string)item.Value); + } + else + { var queryValueJson = JsonConvert.SerializeObject(item.Value).Trim('"'); queryValue = Uri.EscapeDataString(queryValueJson); } From 20ae02055fac9287c7179d64734bab562b678193 Mon Sep 17 00:00:00 2001 From: $+j Date: Fri, 7 Aug 2015 16:45:25 +0800 Subject: [PATCH 16/45] add serialize setting --- WebApiProxy.Tasks/Templates/CSharpProxyTemplate.cs | 13 +++++++------ WebApiProxy.Tasks/Templates/CSharpProxyTemplate.tt | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.cs b/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.cs index 36ac950..a88967c 100644 --- a/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.cs +++ b/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.cs @@ -485,12 +485,13 @@ protected ClientBase() "ueryValue = string.Empty;\r\n\r\n\t\t\t\t\t\t\t\tif (item.Value is string)\r\n\t\t\t\t\t\t\t\t{\r\n " + " queryValue = Uri.EscapeDataString((string)item.Va" + "lue);\r\n\t\t\t\t\t\t\t\t}\r\n\t\t\t\t\t\t\t\telse\r\n\t\t\t\t\t\t\t\t{\r\n\t\t\t\t\t\t\t\t\tvar queryValueJson = JsonCon" + - "vert.SerializeObject(item.Value).Trim(\'\"\');\r\n " + - " queryValue = Uri.EscapeDataString(queryValueJson);\r\n\t\t\t\t\t\t\t\t}\r\n\r\n " + - " return queryKey + \"=\" + queryValue;\r\n " + - " }));\r\n\t return urlTpl;\r\n\t }\r\n\r\n\t\t/// \r\n\t\t/// Releases th" + - "e unmanaged resources and disposes of the managed resources. \r\n\t\t/// \r\n\t\tpublic void Dispose()\r\n\t\t{\r\n\t\t\tHttpClient.Dispose();\r\n\t\t}\r\n\t}\r\n\r\n"); + "vert.SerializeObject(item.Value,SerializationSettings).Trim(\'\"\');\r\n " + + " queryValue = Uri.EscapeDataString(queryValueJson);\r\n\t\t\t\t\t" + + "\t\t\t}\r\n\r\n return queryKey + \"=\" + queryValue;\r\n " + + " }));\r\n\t return urlTpl;\r\n\t }\r\n\r\n\t\t/// \r\n\t\t/// Releases the unmanaged resources and disposes of the managed resource" + + "s. \r\n\t\t/// \r\n\t\tpublic void Dispose()\r\n\t\t{\r\n\t\t\tHttpClient.Dispose" + + "();\r\n\t\t}\r\n\t}\r\n\r\n"); #line 229 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var definition in Configuration.Metadata.Definitions) { diff --git a/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.tt b/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.tt index 9acc5a9..d26ace3 100644 --- a/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.tt +++ b/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.tt @@ -208,7 +208,7 @@ namespace <#= Configuration.Namespace#>.Clients } else { - var queryValueJson = JsonConvert.SerializeObject(item.Value).Trim('"'); + var queryValueJson = JsonConvert.SerializeObject(item.Value,SerializationSettings).Trim('"'); queryValue = Uri.EscapeDataString(queryValueJson); } From 6fde9c9e5eca89c55eb6f16eec860bb96c071a67 Mon Sep 17 00:00:00 2001 From: $+j Date: Fri, 7 Aug 2015 16:59:26 +0800 Subject: [PATCH 17/45] null check --- .../Templates/CSharpProxyTemplate.cs | 128 +++++++++--------- .../Templates/CSharpProxyTemplate.tt | 22 +-- 2 files changed, 76 insertions(+), 74 deletions(-) diff --git a/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.cs b/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.cs index a88967c..77e891d 100644 --- a/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.cs +++ b/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.cs @@ -482,71 +482,71 @@ protected ClientBase() " var urlTpl = string.Join(\"&\",\r\n kvList.Select(" + "item =>\r\n {\r\n var qu" + "eryKey = Uri.EscapeDataString(item.Key);\r\n var q" + - "ueryValue = string.Empty;\r\n\r\n\t\t\t\t\t\t\t\tif (item.Value is string)\r\n\t\t\t\t\t\t\t\t{\r\n " + - " queryValue = Uri.EscapeDataString((string)item.Va" + - "lue);\r\n\t\t\t\t\t\t\t\t}\r\n\t\t\t\t\t\t\t\telse\r\n\t\t\t\t\t\t\t\t{\r\n\t\t\t\t\t\t\t\t\tvar queryValueJson = JsonCon" + - "vert.SerializeObject(item.Value,SerializationSettings).Trim(\'\"\');\r\n " + - " queryValue = Uri.EscapeDataString(queryValueJson);\r\n\t\t\t\t\t" + - "\t\t\t}\r\n\r\n return queryKey + \"=\" + queryValue;\r\n " + - " }));\r\n\t return urlTpl;\r\n\t }\r\n\r\n\t\t/// \r\n\t\t/// Releases the unmanaged resources and disposes of the managed resource" + - "s. \r\n\t\t/// \r\n\t\tpublic void Dispose()\r\n\t\t{\r\n\t\t\tHttpClient.Dispose" + - "();\r\n\t\t}\r\n\t}\r\n\r\n"); - - #line 229 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + "ueryValue = string.Empty;\r\n\r\n\t\t\t\t\t\t\t\t if (item.Value != null)\r\n " + + " {\r\n\t\t\t\t\t\t\t\t\t\tif (item.Value is string)\r\n\t\t\t\t\t\t\t\t\t\t{\r\n\t\t\t\t\t\t\t\t\t\t" + + "\tqueryValue = Uri.EscapeDataString((string)item.Value);\r\n\t\t\t\t\t\t\t\t\t\t}\r\n\t\t\t\t\t\t\t\t\t\t" + + "else\r\n\t\t\t\t\t\t\t\t\t\t{\r\n\t\t\t\t\t\t\t\t\t\t\tvar queryValueJson = JsonConvert.SerializeObject(i" + + "tem.Value,SerializationSettings).Trim(\'\"\');\r\n\t\t\t\t\t\t\t\t\t\t\tqueryValue = Uri.EscapeD" + + "ataString(queryValueJson);\r\n\t\t\t\t\t\t\t\t\t\t}\r\n\t\t\t\t\t\t\t }\r\n " + + " return queryKey + \"=\" + queryValue;\r\n }));" + + "\r\n\t return urlTpl;\r\n\t }\r\n\r\n\t\t/// \r\n\t\t/// Releases the unmanag" + + "ed resources and disposes of the managed resources. \r\n\t\t/// \r\n\t\t" + + "public void Dispose()\r\n\t\t{\r\n\t\t\tHttpClient.Dispose();\r\n\t\t}\r\n\t}\r\n\r\n"); + + #line 231 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var definition in Configuration.Metadata.Definitions) { #line default #line hidden this.Write("\t/// \r\n\t/// "); - #line 231 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 233 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(definition.Description.ToSummary())); #line default #line hidden this.Write("\r\n\t/// \r\n\tpublic partial class "); - #line 233 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 235 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(definition.Name)); #line default #line hidden - #line 233 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 235 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Configuration.ClientSuffix)); #line default #line hidden this.Write(" : ClientBase, Interfaces.I"); - #line 233 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 235 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(definition.Name)); #line default #line hidden - #line 233 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 235 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Configuration.ClientSuffix)); #line default #line hidden this.Write("\r\n\t{\t\t\r\n\t\tpublic "); - #line 235 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 237 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(definition.Name)); #line default #line hidden - #line 235 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 237 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Configuration.ClientSuffix)); #line default #line hidden this.Write("() : base()\r\n\t\t{\r\n\t\t}\r\n\r\n\t\t#region Methods\r\n"); - #line 240 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 242 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var method in definition.ActionMethods) { var allParameters = method.UrlParameters.AsEnumerable(); @@ -628,112 +628,112 @@ protected ClientBase() #line hidden this.Write("\r\n\t\t/// \r\n\t\t/// "); - #line 318 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 320 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Description)); #line default #line hidden this.Write("\r\n\t\t/// \r\n"); - #line 320 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 322 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var p in method.UrlParameters) { #line default #line hidden this.Write("\t\t/// "); - #line 321 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 323 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(p.Description)); #line default #line hidden this.Write("\r\n"); - #line 322 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 324 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\t\tpublic virtual async Task "); - #line 323 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 325 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Name)); #line default #line hidden this.Write("Async("); - #line 323 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 325 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(parameterList)); #line default #line hidden this.Write(")\r\n\t\t{\r\n\t\t\tvar requestUrl = \""); - #line 325 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 327 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(requestUrl)); #line default #line hidden this.Write("\";\r\n\t\t\t"); - #line 326 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 328 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" if(hasQueryString){ #line default #line hidden this.Write("\r\n\t\t\t\tvar queryHasParamUrl = \""); - #line 328 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 330 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(queryHasParamUrl)); #line default #line hidden this.Write("\";\r\n\r\n\r\n\t\t\t\t"); - #line 331 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 333 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" if(!string.IsNullOrEmpty(queryNoParamUrlTpl)){ #line default #line hidden this.Write("\t\t\t\t\tvar queryNoParamUrlTpl = \""); - #line 332 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 334 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(queryNoParamUrlTpl)); #line default #line hidden this.Write("\";\r\n\t\t\t\t\tvar queryNoParamUrl = Generate"); - #line 333 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 335 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Name)); #line default #line hidden this.Write("QueryString(queryNoParamUrlTpl, "); - #line 333 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 335 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(parameterNameList)); #line default #line hidden this.Write(");\r\n\t\t\t\t"); - #line 334 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 336 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" }else{ #line default #line hidden this.Write("\t\t\t\t\tvar queryNoParamUrl = string.Empty;\r\n\t\t\t\t"); - #line 336 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 338 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default @@ -742,69 +742,69 @@ protected ClientBase() "questUrl + \"?\" + queryNoParamUrl;\r\n\t\t\t\t}\r\n\t\t\t\telse\r\n\t\t\t\t{\r\n\t\t\t\t\trequestUrl = req" + "uestUrl + \"?\" + queryHasParamUrl + \"&\" + queryNoParamUrl;\r\n\t\t\t\t}\r\n\r\n\t\t\t"); - #line 347 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 349 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\r\n\t\t\t\treturn await HttpClient."); - #line 349 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 351 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Type.ToTitle())); #line default #line hidden - #line 349 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 351 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(postOrPut ? "AsJson" : "")); #line default #line hidden this.Write("Async"); - #line 349 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 351 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(postOrPut && method.BodyParameter != null ? "<" + method.BodyParameter.Type + ">" : "")); #line default #line hidden this.Write("(requestUrl "); - #line 349 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 351 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(postOrPut ? bodyParameterString:"")); #line default #line hidden this.Write(").ConfigureAwait(false);\r\n\t\t}\r\n\r\n\t\t"); - #line 352 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 354 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" if(hasQueryString && !string.IsNullOrEmpty(queryNoParamUrlTpl)){ #line default #line hidden this.Write("\t\t\t\t\r\n\t\t\tpublic virtual string Generate"); - #line 354 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 356 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Name)); #line default #line hidden this.Write("QueryString(string urlQueryString, "); - #line 354 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 356 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(parameterList)); #line default #line hidden this.Write(")\r\n\t\t\t{\r\n\t\t\t\tvar kvList = Generate"); - #line 356 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 358 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Name)); #line default #line hidden this.Write("KeyValueList( "); - #line 356 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 358 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(parameterNameList)); #line default @@ -813,126 +813,126 @@ protected ClientBase() "\t return urlTpl;\r\n\t\t\t}\r\n\r\n\t\t\tpublic virtual List" + "> Generate"); - #line 362 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 364 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Name)); #line default #line hidden this.Write("KeyValueList("); - #line 362 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 364 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(parameterList)); #line default #line hidden this.Write(")\r\n\t\t\t{\r\n\t\t\t\tthrow new NotImplementedException();\r\n\t\t\t}\r\n\r\n\r\n\t\t"); - #line 368 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 370 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\r\n\r\n\t\t/// \r\n\t\t/// "); - #line 372 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 374 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Description)); #line default #line hidden this.Write("\r\n\t\t/// \r\n"); - #line 374 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 376 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" foreach(var p in method.UrlParameters) { #line default #line hidden this.Write("\t\t/// "); - #line 375 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 377 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(p.Description)); #line default #line hidden this.Write("\r\n"); - #line 376 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 378 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\t\tpublic virtual "); - #line 377 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 379 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(String.IsNullOrEmpty(method.ReturnType) ? "void" : method.ReturnType)); #line default #line hidden this.Write(" "); - #line 377 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 379 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Name)); #line default #line hidden this.Write("("); - #line 377 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 379 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(parameterList)); #line default #line hidden this.Write(")\r\n\t\t{\r\n\t\t\tvar result = "); - #line 379 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 381 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.Name)); #line default #line hidden this.Write("Async("); - #line 379 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 381 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(parameterNameList)); #line default #line hidden this.Write(").Result;\t\t \r\n\t\t\t \r\n\t\t\tEnsureSuccess(result);\r\n\t\t\t\t \r\n\t\t\t"); - #line 383 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 385 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" if(!String.IsNullOrEmpty(method.ReturnType) && method.ReturnType != "void" ) { #line default #line hidden this.Write("\t\t\t \t\t\t \r\n\t\t\treturn result.Content.ReadAsAsync<"); - #line 384 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 386 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" this.Write(this.ToStringHelper.ToStringWithCulture(method.ReturnType)); #line default #line hidden this.Write(">().Result;\r\n\t\t\t"); - #line 385 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 387 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\t\t}\r\n\r\n"); - #line 388 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 390 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default #line hidden this.Write("\t\t#endregion\r\n\t}\r\n"); - #line 391 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" + #line 393 "E:\git\github\WebApiProxy\WebApiProxy.Tasks\Templates\CSharpProxyTemplate.tt" } #line default diff --git a/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.tt b/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.tt index d26ace3..5150075 100644 --- a/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.tt +++ b/WebApiProxy.Tasks/Templates/CSharpProxyTemplate.tt @@ -202,16 +202,18 @@ namespace <#= Configuration.Namespace#>.Clients var queryKey = Uri.EscapeDataString(item.Key); var queryValue = string.Empty; - if (item.Value is string) - { - queryValue = Uri.EscapeDataString((string)item.Value); - } - else - { - var queryValueJson = JsonConvert.SerializeObject(item.Value,SerializationSettings).Trim('"'); - queryValue = Uri.EscapeDataString(queryValueJson); - } - + if (item.Value != null) + { + if (item.Value is string) + { + queryValue = Uri.EscapeDataString((string)item.Value); + } + else + { + var queryValueJson = JsonConvert.SerializeObject(item.Value,SerializationSettings).Trim('"'); + queryValue = Uri.EscapeDataString(queryValueJson); + } + } return queryKey + "=" + queryValue; })); return urlTpl; From d98d006d10ac2881a593a00ea8a75dd24e1c197d Mon Sep 17 00:00:00 2001 From: $+j Date: Tue, 11 Aug 2015 10:53:55 +0800 Subject: [PATCH 18/45] add readme --- README.org | 183 ++++++++++++++++++ .../api-key-in-uoko-nuget-site.jpg | Bin 0 -> 30039 bytes .../install-pkg-from-uoko.jpg | Bin 0 -> 53865 bytes .../nuget-package-source-in-vs.jpg | Bin 0 -> 70730 bytes img/web-api-uoko/api-client-usage-di.jpg | Bin 0 -> 53017 bytes img/web-api-uoko/api-client-usage.jpg | Bin 0 -> 61865 bytes img/web-api-uoko/api-response-type-assign.jpg | Bin 0 -> 70317 bytes 7 files changed, 183 insertions(+) create mode 100644 README.org create mode 100644 img/nuget-package-uoko/api-key-in-uoko-nuget-site.jpg create mode 100644 img/nuget-package-uoko/install-pkg-from-uoko.jpg create mode 100644 img/nuget-package-uoko/nuget-package-source-in-vs.jpg create mode 100644 img/web-api-uoko/api-client-usage-di.jpg create mode 100644 img/web-api-uoko/api-client-usage.jpg create mode 100644 img/web-api-uoko/api-response-type-assign.jpg diff --git a/README.org b/README.org new file mode 100644 index 0000000..89fa0be --- /dev/null +++ b/README.org @@ -0,0 +1,183 @@ +#+TITLE: web-api-uoko +#+DATE: <2015-08-07 Fri> +#+AUTHOR: $+j +#+EMAIL: lust4life.jun@gmail.com +#+OPTIONS: ':nil *:t -:t ::t <:t H:3 \n:nil ^:t arch:headline +#+OPTIONS: author:t c:nil creator:comment d:(not "LOGBOOK") date:t +#+OPTIONS: e:t email:nil f:t inline:t num:t p:nil pri:nil stat:t +#+OPTIONS: tags:t tasks:t tex:t timestamp:t toc:t todo:t |:t +#+CREATOR: Emacs 24.5.1 (Org mode 8.2.10) +#+DESCRIPTION: +#+EXCLUDE_TAGS: noexport +#+KEYWORDS: +#+LANGUAGE: zh +#+SELECT_TAGS: export + +* 使用 api proxy + +** 服务端配置 + +*** 从 nuget 安装包 + + 在api的站点层,引用包 : WebApiProxy(WebApi Proxy Provider) ,创建者为 Fanie Reynders 的这个. + +*** 注册 Endpoint + + 在 web api 配置类中注册 + + #+BEGIN_SRC csharp + config.RegisterProxyRoutes(); + #+END_SRC + +** 客户端配置 + +*** 安装包 + + 在需要用到 client 的地方,建立一个类库项目,作为这个 client 的寄宿.对这个类库项目引用 uoko nuget 上的 UOKO.ApiProxy.CSharp (WebApiProxy c# Proxy Client Generator). + + #+BEGIN_QUOTE + 为什么要单独建立一个类库项目? + + 因为目前这个 proxy client 的代码生成不支持多个 endpoint ,所以在需要调用 api 的项目中直接使用的话,没法做到多个 api 一起用.后期可以改改源码,支持多个 endpoint 的代码生成. + #+END_QUOTE + +*** config 和 使用 + + 安装成功以后,在项目中会出现一个 WebApiProxy 的文件夹.分别有一个代码生成类文件 以及 一个配置文件. + + #+BEGIN_SRC xml + + #+END_SRC + + 我们主要配置三个东西: + + - endpoint : 这个是你需要使用的 api 服务端地址 + - namespace : proxy 代码生成类的命名空间 + - generateOnBuild : 是否在 build 的时候,生成代码. 建议是按需调整.需要生成的时候置为 1 , 生成完成后修改为 0 + + 然后 build 这个解决方案, 相应的 proxy 代码即可生成了. + +** 细节处理 + + +*** 服务端相关 + + 大家都知道 web api Action 的返回类型支持就 4 种. + + + 1. void + 2. HttpResponseMessage + 3. IHttpActionResult + 4. Some other type + + 见: http://www.asp.net/web-api/overview/getting-started-with-aspnet-web-api/action-results + + 如果你的返回类型是 1, 4 那么不用修改什么. 如果你的返回类型是 2,3 两种的话,那么你需要告诉 Proxy 你请求成功时候真正的返回类型是什么类型.这样代码生成的时候才能生成相应的类.这时候在 Action 使用 [ResponseType(xxxType)] 即可.如下: + + [[./img/web-api-uoko/api-response-type-assign.jpg]] + +*** 客户端相关 + + 客户端生成的代码中有一类情况需要完善修改的.就是大家需要搜索生成代码中 =throw new NotImplementedException();= 的地方.需要对这些类进行继承以后重写实现这个方法. + + #+BEGIN_QUOTE + 什么时候回出现这类情况? + + 如果大家在服务端 Action 的参数中使用了复杂类型参数,并且请求是 Get 请求, 并且这个参数的绑定方式是 FromUri 的时候,那么生成的 Proxy 代码就会出现这类情况. + #+END_QUOTE + + 见如下代码: + + #+BEGIN_SRC csharp + /// + /// 获取部门分页列表 + /// + /// 查询实体类 + public virtual async Task GetAsync(DepartmentQuery query) + { + var requestUrl = "api/Department"; + + var queryHasParamUrl = ""; + + + var queryNoParamUrlTpl = "CompanyId={CompanyId}&DepLevel={DepLevel}&offset={offset}&pageSize={pageSize}&sortBy={sortBy}&sortType={sortType}"; + var queryNoParamUrl = GenerateGetQueryString(queryNoParamUrlTpl, query); + + if (string.IsNullOrEmpty(queryHasParamUrl)) + { + requestUrl = requestUrl + "?" + queryNoParamUrl; + } + else + { + requestUrl = requestUrl + "?" + queryHasParamUrl + "&" + queryNoParamUrl; + } + + + return await HttpClient.GetAsync(requestUrl ).ConfigureAwait(false); + } + + + public virtual string GenerateGetQueryString(string urlQueryString, DepartmentQuery query) + { + var kvList = GenerateGetKeyValueList( query ); + var urlTpl = GenerateQueryStrFromKvList(kvList); + + return urlTpl; + } + + public virtual List> GenerateGetKeyValueList(DepartmentQuery query) + { + throw new NotImplementedException(); + } + #+END_SRC + + 这类情况我们需要做的就是: + + #+BEGIN_SRC csharp + public class DepartmentClientIndeed : DepartmentClient + { + public override List> GenerateGetKeyValueList(DepartmentQuery query) + { + var kvList = new List>() + { + new KeyValuePair("CompanyId", query.CompanyId), + new KeyValuePair("DepLevel", query.DepLevel), + + new KeyValuePair("offset", query.offset), + new KeyValuePair("pageSize", query.pageSize), + new KeyValuePair("sortBy", query.sortBy), + new KeyValuePair("sortType", query.sortType), + }; + return kvList; + } + } + #+END_SRC + + 这里做的就是, 指定上面 url 中查询串的参数,都如何从 复杂对象 中获取. + + 因为 Proxy 代码是生成的, 所以这个新建的子类,应该是独立的类文件, 不会被生成覆盖的. + + +*** 使用 + + 到此,基本上就可以正常使用了. 因为会有子类的存在,所以我们最好不要直接在需要用 api 的地方, 创建具体的实体类. 这样不利于后期维护和修改调整.因为生成代码中已经生成了接口代码.所以最好是对接口进行依赖.然后通过大家喜欢的 DI 框架,注入到接口中进行使用.比如: + + [[./img/web-api-uoko/api-client-usage.jpg]] + + 如下是 DI 框架注入的, 箭头都是被重写过的类. + + [[./img/web-api-uoko/api-client-usage-di.jpg]] + + +* 关于 proxy + + 使用的是 https://github.com/faniereynders/WebApiProxy + + 该项目分两大部分,服务端 api 描述信息生成. 客户端代码根据描述信息,生成本地代理.我们只是把生成代理的代码做了一些定制化修改,方便我们自己使用.更多有意思的东西,可以直接看官方使用 wiki: https://github.com/faniereynders/WebApiProxy/wiki 或者源码进行了解. + + 有兴趣还可了解下来由: [[file:user-permission-refactor.org::*web%20api%20proxy/help%20page(api%20lifecycle)][web api proxy/help page(api lifecycle)]] diff --git a/img/nuget-package-uoko/api-key-in-uoko-nuget-site.jpg b/img/nuget-package-uoko/api-key-in-uoko-nuget-site.jpg new file mode 100644 index 0000000000000000000000000000000000000000..b064a17c93a12b95e601793ca68774b09f97317a GIT binary patch literal 30039 zcmeFZbyOVD_AXd>@Zjzc65L%w@DKvQ-8GF%;{gIma0w7RxI>VpaS09~1Z$vix8Tea|8aE?IzP6KV}uQ@(9DmA*Z0EqGo%>{`>`pkg$lTn7D+( zD@7$`6;-u&I=XuL28Kq~Hnw*54vtQqUfw>wU_bxxj}eidK7WZyO8%OXn)WR{Bfp@q zsJNuGth}zi0n!L{a3%>03I3&^5vls0kXhl z4PMA#NkPa=48skVUX?A_`aw~e=Aq5v5%`1Q^an+e^zHv_!_<$I-FP?Nx!+HC59s6j zt}VLu$WrEwUsR0qeu9AGXK`PBW=xJxa|3de#MzIyePyT~fy8&pk3bEj>^X`F#lV3C ze1Eket*+RGtC|ID;%)kiG(HdOoQ(SvZVqd~=W(vtZ(7Dg?7y864k1FMy_>eGKL%w* zE{(Fi(zQbmygg|;i4&YYfw#mGuGxpTDVJ8~7VRgD`Yd~}$FA}IZJlzF`Po)6AYtNf z-#vzQEpq4uE{5jZzqOZ~akslkb?uF6KjGCIm(r*Pb4>n(>ZQRm%sKPwEcz)UCnGtp z1Dh?^pd|iOfL`Z(Ozjlm9V^?@*|J^_Ewc={%*T^E?rW>$m8x^<+}Oa75U0MXLsw#lZ)F&XIobq-rOd_jr)IHt zM^;5e_xfw`S|?ahLYlaSRZGy)K6~8kQggPf8;%dEcNlud%W+boYwH3#{+0T!Pkw!= zP3*dWuh0gpH9Z2+^v~MIz0L6r<{EP?X6joW0q3QzI$YTnY|{l)`Hh?&sL{p)!|%yE z|0&ZpMS_m)*A_P)$#-#7O(h~D)A>q8d+}zw3 zgE?D=p00Q=sYHc7gocUS6|jf75n3x%oG5hrKP!jZ<<-cO!9`{iV;7jt?R1$mYo+wF z?g)-AQ$mWJTMBPLl{a4{lDXT?l<4v~(0CT^CzG>cs5jb3KwL}oGhRWOYZ&pL=nie- z9s$jc9}!C?G33iEnCzup8$>zhKIfgwuKR~HdakhL^z(!EUQwTu1!J{jd5%wUDzgH0 zIUk9p^aU#dRgWV-1q9faIcv=?%#o7xj;k0@P?=Z;yNF+V#vw`qB_K;Lvsb+{ zdjvSn?yxl%wt~&G<8`4YcAva!l=FH58MKmSO$%k-#q|1%`~@9NiWi3W-H`Q{l{?m& zN48ER|7wpPcHiU?%u0;B!>$pUay>u74<6S$+Y?kMnH?(loR_N2^4VI9N($vP@mf#w zBScceexQ^10+&i^-thd&p|G2#pFc5YfQ-QGV8&6lzN|Z-V*O0A^wuaqOu;BjL^QykHkrC1ipYACF4c{XJ4SC zz4If0*Iub{32qz0i#z&Zn{I=mDpLT_KcRK>UU>vQx|=YM&?fcA#R*V(Qg&mN4v>KY z7CPMTLI%H{Z=I&C1So}`VEyc1pR)Ne4*BNdQh*U-OoxqDX4>U)Cum?sI>q(gyOU~h zbX~IDh(YMRfK{an?rh82ln@?fI5d30tR)O8A-jkwyYU|1>0A z{X#mor<3T8eXU)!;hseIR(GP`mj6CS=UN`fstaAvW9XM9-p`>rhUJQcf*YZ}qPs3O z4&w-p0R}Nf4=l0Dqwx4*Q&U8^ZhS9wa6$Q=C)btUrIwV|PfT}+4Nk9Z%letrq>RiX zFj$}W2+W%C-ec^z!#G>bqp8z+Z`l#drX*{aB^7}Tu!|SZo+9E^!W^nKQ=1Ln(p5FY zc<#p7P%r+Ga<_M0amCw{VVm+X-K!m-9@D`R^$e03eTX@7U39&P@y6Q6ezkGrb+yI&Sw1m)PdQ2sR}$mHGWbjgENQe$*O z#%;3sMnGiVS`dR8?EIek@@%+sN`Twybm98j{vbMGZ`5i{o9UW4Ib!J%=%FXbnb(9& z$`~K$fj|DL$pXESqL-(=p;r>$4%A=+bpEHn)L275R#z5YJWKlX+*V^|@9)gKsgwijRjm>YDC5@IVXeKUC?_52{ zh3FXiZ|v%+rrX{*RyoF0vg!XYc6__O$yv{MHX~hjGt)bUi3oTn;ZjnqfDb=DsdRnT zv(rZ!Au~X>Nl#IGyp(yXU}OwdJeYq?&f^L4u-AAnw%_8KJ6Ni1W59q(X%+1SOVu7v z|AKmOUld(@6rlOwf$N$WDvh9%xGM2E*jZlqOAbMH<<lK`PKW*ATq;&94V?RA=z_-wS7 z;Ty^aajG$hup|=h+WI?77 z*evNjrY*PDN{A0fM5{wvHHr82GO`>L~Io9muCV4f*12M(?&6g_J_(m=y``zq! zakRKkv{Q@yyd9mntFC7p!x}!5H)qX%eR9d92!kqk(p=YQ>|5+-zZaAX`eSi6+z>MyiDgB7lWJ15Y0yxh)ctpZ>De4v|R`!RjtaKKXlrQoLN z-@dY0c`DZ}{y;Pa0qf@Emh3+Q1P!ek>T5aK&ek{u)#>+XgxRi)>uAo{lp8tjXZF(j z<*;*OI^)ae@k(KJ@KM!_D&CO9rfG@|I9G7(m}=U16|iBqagK zdH}_Y`;8A1MQ-$ah6y69g_TuLg2SsF1otz1z9&02-rmg(OT3>In8QO^@tlBwK-`re zmWGC~=iFf;p@>r?F_MccA0=)rXY)+0Pr(Mho&zu|FdL z*OXRkcA1SEyY%B^wLd~C+bMVIMSDx^)7Tk*=a&XJ2`Y8v#KneKuVlJ(IXxxc*IYdU zU2M?dnpWt7Z!kBk==kU(M8oQd)HR43t`l?4>NN)SJTMbqkhmBRz|MiW{#(L> zbAWxaO>*@Jd#8iv_!0PGnb}utlk)fLt1ij=&8MMX=O-s8OMClnX95B`qRQ>HyDM5WQ%Aj!k;Uq0i=nO0D%yyXAih8GsW8`Bwo85WZ1Ut05S)~97v za*1N15c6B9SbbQJpu-B(6JGut=)A&90`_1acJ_h8vMbfNH&I6!MJ9*~HaV|8EQm|X zN#UFse-_TH2{W=Q@!_$rn}pQ;kxJ*{Zu~%a+j@!xYaRRS56fK7B}Fi(A0Pas{+NGm zss>sRi{#TuLhQI0UU^4f2M65^r^fnsj?^;zd<4i46-Fl|U(R!hm*hDeH+3zc zU-ZQ0-O*okS&2O`JJG541+&d`JabwipOjK`T&)NaAz~ikF4tfif@6z$egMSRe~d}j zK2Yz&rOYX$KtdUiD8&Fbj0(swinxFXD(&5(^6QJr1Alzn0R}SfeO?-;1c$~OlVFX{ zzubfhZbw<-GwU&sGmE%uVJG_d8)P3vBko`G=iK#U2iNqS@#;u3Bph$j$Q06I`ZH5| zRgQs=PV#cVg=4I@hS~(7pi&?II!yc`NNpALe!{$k^1^yQCiH^2DL&#s$dwR*X5KUf zS8vBsXns0pDi7$T<5~l5glwAZh-+cFRJwUxtL=1xBW63L{Fc{Brh#^1&_pFDDPG+ALBfzKY-Kt~n+S^GM4miD~|9 zlIGPvX$zqQwQ(%*KFl^WMjuc|huHN1iv2!;-?L7$!ep)>j(4Ib7>8euRh)wv{S3La z4VeT<+Sjl)sH9H8^s~i*PbYY6#xHm&_N;yKsuzS>;~l!i2EKC{AEQ>oO79@Im*zEt z(Mz~vnyn%Gzb>4f=NEp@k9rRLi=lD$$ewaIJOUT%gbyD$HZOB+%Z-GK^Xy%H-*1pd zuCXN&5Gd({NlY`~Ad}VH{E(TC3^&})W*?Yt>7cWHxpS+x&oy}mXGPxkiyZ96_>}wm zerhnKS58(RKfk4-wS>dwn7O2fLo+7wK*ZZ7G=ECT<$A|#gs~nwch#YQMlW029#t&$Ii-8r90#W5rWTYIWU4R9O zuGK`tjxZI3@;$e8NBYYVkA%`xIsOm7FjZE(&nvv%V$dloPC!B_r-ep1SBZXE?O~)@ zUeJX05$(WD1Q#^PGwqU1l$diALlx9MSa8yM0PC1FT5_Z;f6l*o6;G^9{7rsipI2m^eLkBAGQB z2>>|pM}AhZT3q1t+IUM#JBgiZJR|Y9n)sWrY=2-2`V&+jK9)W(Hgz%fPJib+4w}M* zQu2M0P%BgMI)nACgrBtM6+g5_T4IK9%@x(TYMqX=w}Z50B0orG=5H;sQSpTdZ`g_u zh>3Nfm6%QMoNK{WCkAp6l3gv0x$F4qeGe?{b!mF-pA|M7PwKj<@7gw-txw}R?gMgKDK+Q&bb8ZO-ZYW{BR-7ZT$l}? zCQe48zcW{xES$v5xFoN#c*+QI(CH=hqT!DTu&NrDqe?({Dm32mCKfo32PH-uzlSKE zs_wl*+hp(H7=1{$ET6y6)v9f53l~2Z@rFNxSQxI2azzB1g-yT{zFK^(s09Vp9c-*!9F0R37ZHq{Z$ta?9KQs#`ohU4_@4#& zT8md`6giHTRTsm^OWx|7!ghXkIG7)P>USSnm)=_>1@wYo;RQ>3L{1d`8nJzU#ZIej zp~{JT9wN0=lu{=~q;D~OO1?Y5CzasUiI&0Rs4Sv-LoZ%m^sl)8(Gj61J3dVDf%^M| z7tJk{GTA}v<3xdDw_%hj|L3zfsYZI)C0rxcmd;M>o~%Eg=t}iV8~zZN*(x^%8~4C` z^Dk%QCstaq+;TX@rn@f|FrAH%kGFIACI%4h2cFv*4nHKRnF?@>Cn$g4Ge~LQ( zQ-g+?P3AjfzcXh|sodPCN~K(D;cle!7Ts=%94fL!`3u8`GAg#!--blN+nPSnpbecb?5<7kx)_jnKN3ST4dl#6JC zCByjzBR-Vx8EoJ|+7CK0?xEMZ8P87%1#uWKz}idTt?(XdF75vAiB~_q7#esyVFC-g zY9C*IsT@pl%8nLbl!@AkUltLV-;w!`X#cv~ zi1miry{=J&NvamK$(shfZFNTmAu^uhGV>iJ1SA~&ZBwF}N1~0rK8wycP?grSiRbP4 zI{TJ7z`YlT0dnVPoy2|#%g@gmkS!nD0*WiLf%#tQUFlWDbW5r2xDQ^d43KfRw~?og z&(AB+^1aGqi4w*sE%*+&VW=wtq+0(+vjOWryt*fOXk&Z?#+{8W5?9TyNrg0Tj>8`T z#VY6jf8g875g{9I$7T0_65f+T(zcy~8Bgdd9Gxo`9DR(8S*ajV&ypMs$%d>s#Bk7_ z1AxaHO||J`=v@>w?>$)l5y*#?nSgz@pffxd8n`;pdgo1ZNVm703yZH-g!eo%8K{k3 zMT{0tdykI5S7+K=npf+DJ-hNvtbMWL(Y6BMt?$T2FofIq#~7dw5*H(z68*9cate}| ze?7$mgX=_Y?V&4>60AHe;h|j-NQM{yegk5ooyV_QV*G#P>iec?)k7eDW{VzpJikmL z80qG30RFfOA6`Nya-+@7rR)ktSL-0RG*OW;$1Ry-GUJhCFb*a2Hpk*1iVX>wk4e-@;_fTp4iyQa@@7*;3bELMu>G*IQi^H5KA={I~iu|iuWIgVCk&+lS8|f9ODVbpNont_2qnvR|$<| zH|s2vViex&kopsi>H_`_yQtqPuY7L2Cd&x+Jljb>DE-d%8-tadpWhP&*&>2A!uv#$ z<_%PxoqfHfPwN$(iAxjES4Uhd3LIDN7B#6#$D*qYW(QoYL)_i{wmw2*pGpY5!X_Kx z(`C#xaqr%+PfJsq$eHNISsatj{H=eGL(`l=VQ5l|DNvB$9!BXU11Yk(398yk^I&d? z{>%S6l17$bQJ&;F;?2tgNq6Y7_8yJe%KsJ74*l8{2f=SOE1eY1k{v zedTv27^&$6iWN<%&M&B$wtjw(P^AR6Spy5)SZ{nPqvLU$ii1?9lXOFL`MU+qA@$laOOvkur)O|JTc+jB3VcSO>iHGa~7jn~2QrnqaikyNB@eU7n*NX+ob@x1tkJ?C$6 ztbGGtGpt*syvl{@d~5ZMXG^^7%rNU84Ij3*MignR&my7nf{{!@*&RLD|Yg?p9|jpwxJsA zf4O3x9HkyYC3mJwwv}AAJ1X3|Fi%q$Pg2gag>T>?XRVXI#I z&1`jbUnVUhDXus9H-cb^Ls%t)l6upf5f`}8nTFm6R-CJjXg#R&Ml^wGrZI==9b5BV z{eJ|&yP=B}HTy_54)8ZO-*-i@?MP|by5E1Q;|#s8$JKC6G5`AHZY(#4fbjj9a^#&V z!8v1jb;PCMe0bvCb59UdO5v`hv>aDwlIFTj@mT&K zFx$*TcoH>)A6qX+&#X zn{(zWL87Zo6GF<9LI-B*Du?flVCUTgV-l~Q)|cX+stAVpE$|UCK26(2ARFBG^Uks3 zht7ApZ6HSweZIG}sMe&-k4EE?s8tr9BoQ`wP3{GfCTsNYBo1E0n}f9g#8HE(Uca&M z=Wkn2>(x#hXA{vqL=5B6zEg@bH&?yu!Y>5-8fPpm4g2wOtwRDdIN#iIkQoY?JJq*l zkt7goq2cHxI11I^ceLA9ILz?1&JF)C;VJSgS$s7rA)_Z6cc|?57Q;+{0zD3UFyJ3O zg61iO;(dtuq(oVptG&IWFWY5yh@&rvl^^nTNk3!DZk|fd5D#oOIOHB%B389elkRdr z?)cY*tB`dIH!`N>Y@z>G+b#80WgvraWLk(Lx(s|)NCNM{8`e1l zPO#|JihJVuH;v&2x{YCeMa|H-KU^La8$oUBGA|X|VGUQ02TUilFbU%?jH-bU_n<>zLD=qqe^Oz07_(745;yF*_2b!6j7wm}8wTgHQ zhnCLELh{5%ppa&_s^G(zfYQ94!P>VE!|sD-o|AOX{X@(djdI56E()P_bIRUmi$BXJ zy6RAO2w#p&q0I|hwTbpo#~#)b#wuo?^Y`3`I(pd~Kj}@*dueE}?uI9=I-m1`J5ayU z*fEFV&&tVGrmd@|)#Ol>ItW{bgA~^S_x-~6l_ZbgHWDO6Hqm+gwDaOBB>m7!KMD?> z?}NhqRPY>eFxN5gLx032yn9681uXtd`KwM4_?P( z5NZgIY%W4XuPuKvR_ugM5zlC}`7O=$MpJsD_!4!AAIy|gJ-a&Xd`Mc}q3f(J3oZ$; zT#F~%gPPk;LKX#1*U_)_uG|L^bYN`_Ge}2$2XUrkDG#~;Wg*`ngLPcF`=7Y=s=&pS zARdG2I}G1)BS#;9ud5{Cs{60#CZhuNps3X$T9Qes6_oRHUKB*Q=49oaxt({Az`Tyc z^m&53uScmW8dFqqb{lQ3oKptmAtc;<``$!iel)mq!@r$un*m=+xqM&HDZ>X^G2~e` zKR_eFCGucm3=JF~BI4KsuSP0K&iGzR#@}F@JOax^kH873u;nw8{IdJF^@lKh*{j}= zJ4FU-q@?0|%Gmu0!y`bXVmr){J9{X*!{+%21R@96Uafzx0L3G!^ARn3k{{zu=nhH6kLN|B~BE2RHCefVk(!(Ef%wPDbeYe0A8v(FarZb+S zF^AwFeD)@mVC(V|Ta8e3dAwBjx>tm(&slI0dasuW&nt3~qpb5nx4m@KZka{K`&6fK zM*Rg!`_Q-#pmkUa{P`Ini_GoI@e6e@=mMXk|By0dTG`zti7Tk%tvuRs@glPk<{~x)JVKAyYzM^j=wh;jV-*T{h)#fASR zaP0mqaN2Hrme{9O|Fp^4ljThvU9k9mad8>OINgv9imL4=5JQh4;Gg{CjHY=U8<_!r zryx8+$M=S5Y1r3qfV&mgEKetLvI^`Nj0>lGS5d1MLR4y)Q=R>|;qUWDX-JV; z!~-_}gWrU2rnk@bB@WAuZ+_qEHbPTvXShGgyt;PuSvr8rztZjhgEBPsF6umpT?IOx z*BrIDY1`D2x_kE%n~;Uvf)9&IO7FD{c70@brECN5(l2wibG~}z&!%=~jb(F9WiG8> z#C8;g+wWzCL#F6qW+BPy=P#DPyA1*OhLB9$0Ov*N6-^$_(c{i6cN!`~605`CYx*Cs zx2h5PeaGOWt%pA%IWy!|BKDIt5es-VSypltXSN1pjMm}5oq`m8O86AHmuX6+p&D;~ zAXf%{{z)2dp>^wy^BY`oj|mTXJ$YD(9=2`RF$GFEIJ$vh6%tC-9+il={8oXZ$3pwAq}onLD2h^6Jzi<>CfA73&wziof`* zDWL_rfh51W91g#Mty4aO)Pz0jY@c}qAUsETlSdFOuf!O62w&-Q(oIG+{ z4M$Rhw!VITyqA%A80~*g78Z$Pn(tUR&qOPkL9@6=cacC){>Lwir>4o74SS8U0@iXiF*hBjrsBi7HxQP zhC3KdIT9x6mGqYpngO$71r~Z#H-)^8qxgX^IKTKojg}y z*6|>uRc$KunCxAo(zU+z`Fetf-&!_%e2v#?Sx0@r+8r8MQLEBUAqR>S zan=<#KPo0TH0)XY%PIV#gQc=kkt`VBfd5H3<(GFqo=j87zUY?rjAXSYMbh}3VHuIh zp2Z7uI~06`0-WC}zkeNTvRuEV1OP0yI1dUsd>JG@RrAZN6V|^RDP>Ri*_$(4s`1;^ z)1UR9CWVRoh_qF@Ey{I6>7MM!qn|~!48*y54PEqyD;Q@=ldD8b6(6&-w6JUm&3bh4 z4_Xz3hIz>CG>i%yY1)fYZ{?Ln0vwBl0DIHvy2ABV*%CtS=MBCOm0dG#6{#qOp+~FM z+xOStRb`ViW!-z9dmdbn8m!}aJH^bUQEEael>GAL4O`TS4Y86so*V80#?yD2Kos-pcD&q}3aQQx^eXBE7!#2gOJ>gj75dLI3J&atIRunb!l%;?udcgccGrYq@cL%XU= zUh*%iyw{l&mU!ZWE3{{(m^G{1lEyh(#{F6M`Q4Rtx*zBbE#_#0{)QeL7??30oA&Iq zWX>-v?%hNzyp?BcbBNq2NDC&?)t2rOv=AMBBWgqP^@(vV{gR{BK7J*VOxk`UauQBZ zXrs#d?L%mKzFd^x8UK!W_c~YnnvO=%UK%#YI>^(K?FavEM%02L$0(!XJkN9wS}TVf zveaO7&jU$w((ogo)>_~4W88Q+bM_(_#ao zPKB14_p#QhQQL-6;knSFZ1xtQm;RPtFXm_u>|A;1{1EN2Cwgf{-#o?Juqo>H>NHcG z%E;qZo=NAcHd1HlTT|r;Iw25~;>WCY6SCr|PJ%7W@6E3ej5J->H8^jspd~`$-w3#y zX8+QZZb(#iXKQUqsDDLT$Dq|jHa10Ma&*T;9#4BDQ&g&1s_semXNt17UYXSyf)gQ^ z#iN8n8!0}@Qy`9%9x*uS-!PBmRezh|bArKq2{FI3ho&mOMo)Or*} z=jtrEq@O$8X)c4)Z*aoTUKDqJTuZuK+l6Q-1TAL3&3F&p-N+0TpogbbXUV4^I z&pnj`%n-08E-hUV36sL*ZY;8=YfK3UvbQejakZCj^AQ-P!(~_sDz)@4!xW|(`t8=_ z>Fcr-QgeqQZ^(HaoLlufjsdBrt#-V5H|uygX)@m z`A4+{*yRz>ubZ6jrG|{CQid64a#}ux`V}zM5vFZfyJ1B#q>+{6J6@&on+e~qFKBpr zv#!35m>^@vrMAz)Ks$Ms34vb_&rvE2ICOAB$62E_WP(QKITXqY)3oX;M0Oc*Ps`wb zODe+~sBZihK>=@Ptd2LgFVz%^G^@HmhceSG+GMk+CkH4B)+~4f#c~JZMquXOzYk%r zri3vY8(Nc2;iDO{94{Dx4?k0dp3xlf4>;Kbqt!*JD^lkazyDj^w^)^y5k_gk{~qtz zmPr!dFE>KUb!@NBi}HU0cH4K#HOu=(ppPfJFX$8C2bEeTnU%w8rp$*9Q6I|HexM7| zr=zjcVZ~g4Jk`?_OzAoGDU8D8MRUdD-IzXWUbud6A0be}L>YVXfL7;6B-?NyTpM@c zn*YP_tpaVn{4?dDrm(KN%3k~d;OUc@880#Kc?0I8tu2^(z{lpW0ISyZM1P`YLrwIU zr^-TJW}TZzpq~B_V88A}VA0$|%64*CPvY{(Q}BO@41wIi8p~-AJ-|Tul)Z+&O1lpw}cfs^9O|3fl`ibHUyf1!h{K7-Ch+=VA= zpYMr_NnIEaKQg@PMj*bU6kr`?(?P1(c59Yhu_s}3fbRAh)}fA_g8B4EswfqZn1WU# z-t`j(duTyw(g9}=M*G9ksD%PAdHCi8n-_vIWIZ1NAL2B;_ z^BrU;CMKM5y)*WfIG359z+d)h3ou=Oi(uV+ix>CCxnQ~h>|KSquG*GiP1b8>l9cy$ zd%0L}pjf&*wP4kzZOWz-GVM(#um&c_jjTsXM*^d>o0nq4L`A6F{PrjD4-f7g4iI5; z<~Q@_VwyxwKb+n6GqPJ$5*ESIg*pkAX*_pCdlLEvfvROL%?;xXVAsxi?ltG)jI%+u zbkUD7=%7(3))t41<(P>{CRG89Abcq&?VXLQ!eVQuY!Ex)1u~*MswgX0E z2CWUTV?}6xpdYKnVG^=Fx#*-_GFaGCFWwcIadYgSV^3N`bp4tnf?9oEc0)-^QhFnY z9yQl;Tot=OeW$JNMq%<6DrxAE+e&no<=#c-IqFUgjS&8LB9d1+>-bLi67f4bfL4!} z_#jq?DkJb$6XV7!pldj`H$xq%@42{t|88#_hWNd=H={VY5or%ixlpHE=wYJL%SPi- z5_rPOpru~EXrjEnOgPVaT1gByYe?iwsMa5btL&%@4HRoQ?Pa{CUP`#6{vc_C)0gK_ zM5kgg>>oynDwCqGdAw%iBnubyk3B5$XXYCaUQWeRQQ;!9er2XY#Y)n(O`5Uj|DX|U z^$767wsQ~++NpaXIMLDy`biI9n=~Ej*uL&4gRqNOJ4u62FTyG0v$CiUrEtC7eOIBW zTYh%Q2UlM@^tpVhdP9{oEdaDXI7#!}H$g>_pPcb#SZ>LBjMbZc6C29(B;9nwX;%mq z`IX{Vea6|J&6`ZYe~ofI0#=EjU&e)YJ{zwXXuc($1*hmgbT}g+zE9ZBH5W6;oyg}J zRr?8nuQE0H4IcsPz7p;c@+PLQu8c$R&o`U;7iYVEd$_AxuH)Xu|IHk!BI7=S@5%UAX$~53?jyDoTf;-VU`vC!AMPY6Xut+-azFp5l_UJ%Fv52&bL{VI@uU^9 zg-qBxSH*>Jk*_mtX5T z$3K}h+0AGVAN63Kc9EHs#55hAm5;avGcfMwoO8?82>*lIoN@gpRn1cOv#2L=1>X7P!{A$@q94BAVmf-p_ z$4;jNb$5&(5d}$dz~UDc4{QLfA#|WdI6!ZL`{FaGpvg}cbeP|w$rYL!3k5s~sc8Q+ z>Yvi=yZl-oi2nV>+M6-9h}hXzq<>v!3dguRCO1Qi>U5IDshZHluEuCTm?d*yw?w)l z`#uZ)-j|?uNf5*~$WtNe>fFE zQGV}v=-3!cSU2hFHJ>eWcslb}B-(bffQ9S0Y*2rp@M4=o=hPuy{Shz<`6ko&06{i- zQ)81>D2%%yh~p>C$hD<&+O6VH*z+}Q3bruuAu9kS0J&^p9dclH)O)ZRZJlq3RLo`l zF`G4Cpo?@UNPF&1gC(c)7|#-tVh=U;sY+vO?mG_)K9Qr%dklO z_!47DbHZNR&aep$E#`Egt#liQyRtWbn63v0X?csZCm|J&0O2mhjG&0noG@yJCn5|1 z|F$}dea8A#D61(b?`tD}7J;&5nIrj4Aw00YtsF-2a*z8XV8Y2mgIvBN%@6+$Yj}c; zEf>Yj>6FFf`fhj7W~%A1ZX~Oc_7j=(^|0sq(6PJDLCFx)Uy=-T8Wpp{qRJv_lH0 zzW1UNc$pI#NMess_0=aMuE5#TUg%5#92fii>{~;WZvp2E_Lkfh@xf7v{ca=BiCufn z>6%i#x&l{H?7H)jp#n-Gql-Kx8XBNAExT{=&`JF1vy{&geMi*N9zGYt!u5~F$_kJ9 zSyao<#Wq^WBc$w(>&3=p;N`c_&X%YiB}fw#GQ~7$leBjCbIVY~;vnucFWqY z(n0>rb^-%7(>6&#FZ&hxt!rG|IwcjsBmggO>=oNd%L1IKrwo)P! za<;5^Hs>PTcl?($*X)xQ*-F3R#^Ii9F;?Ue*>UDa{lC#@lh6oCC@bK_>Cf_+9E8;m zBn-YVt1D@KBO0_#G$eFU+prE3@Mz)L^bU&i=;g16LzyjT z)&9oZrlh|`EzH?&UOaxNgHLB23FkGmG&Th|f5tt+WnPywM)OFJ$3hDqq~jDrrkRun z)MIa_xOopYQZ=Ey;|&uHZ9{Dm0#AFgoq4HH1c6R12+B zeHc-a{{pngb;r8IimUP0r01?TC;!wf8OA>-h%#IpQ9MMj=^YQ;Mfr=~gS(MRpuT@S z!<6LR~9om8EVC-2_&w2pqLbIW}U_3w12CD9XZ=%>PCL^`iUl7i5L-!HP@JA z#a)DIFxA&g?X{t>t+3U62-k4hXTh`AA_*!QmDnuFIS%SKw~xTc;Z)`UGUsadk{FUw zlU)`2)Wc`wS9STUt-0xpkI{7gtu<|`_#q#bzfdP}tZ^Up??jBeQ=!fmtgUBaekLx@ zDHwk8C+FOAemxE@z;VpsKtu#3;{UBv#g;wW2RJ?isaPYTy4s_4|HwR{)8=gc3#rn( z;k^B_W>sAyH0*v3*CCpOum#DO2j=8@(Cptkq;>{K=SQ8;$sxjDnlm`~WIRAhX-q|M zTOCWX+D=+&JNiwY@)4pz2cG9(!7!OHlQ*!a>8(r1y+JSLNaSiDO0uuAaVYyjX~G*nA%po>EB-ZWif3_1h*c z+n`8V;@?cn`aY({R&e&=;~8>!?Ss$7pEAb~UWDxCl~ceX*;#w%7bNN&Z6&3= zhIx|dw4?(k@4sc1Zwo&K%|q=7{yqY+zK_7uHY2;^scrcwm%OM+U3G4&y$Oml5cBpg z&crGAGrWuZhrN&)%^veMpR0_2Ox#kl$5it>0z;neC4zbTJ$GbSW`yy{XN_p^-&`!b zW)paxs5_{~LQ53CJ(|nF)1J3S?GjM{Dyb}*W%AagEvy6!JHKwuxl(UvX>PpbI(wO< zig~|e{1n?{#hy+A=S*5@cuZBJ$cbM7G=c-VgPv%9Xco_uemO zND=%Kv9_%?6DS>0?L@I}UxqM}4iie8Fz&bTAVQ%zS*Gjr&|hLa;XaCNdjX zRDh80yBHTmwP3$QX*`COa|E@Z#e~kafL8vI(7Z2MwDkC`ozCyw@ z+OyG83I^gfy7GN9wyC)bZUGj$(M%QQrf(9Vlr$(rO(^Lqv`KFSH8@-S=8*xyBx)PN z`GBOQ4X%ct=O_I9&t2^QgI~N(eAEu|36wpqJgf%^*MQb|63J%zUOzS>n{y?S# z&_!^QnxNKu-xG}WX3#Cgm-^+}wrJFBcED)Ep2)sMQgPHx>>#Znu=VO?=4z0(sfI9} zv35riL;aTv&KmI~scolYJ^_^K#;6xds}}iDF90n?(tnyh(^|+Uf8Q?`Uem18!m$#6 zgJFe!BHHU9hIuauaF8Krig!e#{c@f|9keSf~k=jBmIB= znMTMtiXO`&kT5!MAJF#*z9lWmK{ zzuQr$jL0&veOj&9|E|}4RGBbZ$T(KTK+&5;ZK462eQx7vTNHto9p`2}9>Z6DDWcgw zYQFj+rPaQ@GThMP%ZkD|4SQeN`Ar*MjE1^v3l%~HF4 zg_#=pvbF&u^Yk23Z2src#BsL|ts=OIIezP*&iDQy-^(OCRYYGnNGZkoUunmr2Ne zjk*$lW)%=B$L7Db^u@Z?99Ht|7f=LTwM-VF@lv9GT>RZ3EL3*4G8&b`wIfZXaWCHy zHM5|Yqn`}?Z|!|&P*YvoZV&{Kru1F}3`&;{0YRiouM(Ql3=xnX5J8F{Rq09zz4sb= zkuCz#0)(DWrG+Xro;>e2?>Eo$&7AMdoH>8a%$Gm=PiF5md#`(~dtLW+UH82VA50~s znZ@u;Bwia0q(2(?sj;TS)khTXJo9y+>m|XiA{!lD6a+oYe26+k%YD83`rFs>w~!Zc zgyh9DzZmy+-@C(@B$&@el`e0t?I0?hDH7xQJx)s@HZZNvH14utfISXL(P=mZemG{I z&k!of-!FC+G>A+dGOt>K2MPP~?AYS@UQ)dz0R|;JN0~+v<28mmf{tlB`jAq7@Tk*I z_4u#12A|Ve*tSD2Sv*Yz;N0|!52j5n zF2u(L>Mp^FFBzN|9_=}I+HE*3d+Z|1fidFugZE6E;Z!yE20=cO9?JK)SxII#87pA( z#3Z1f#Mg9bQXj=z-llE)x=h(sAsD1MOJ7Q3bv&ZkiQmX<{d)K*0%YpC@&`a6R3}&= zl=HcNE$_`>JZmiYwkFnNfOXmH-h0{G{I~b}m?h%7H{|!uUx=MQD4YisGfK}Nl+Z^z zf~uIhjwP}#+Tp4E+Z;|Yb*t~^(>~(7M1vZu`aJsc*Y zwpvt2nx&NX{m4?!rmsfdieP`=gsz+26jsC}BrytRTS=y`VpHkK~)_bXRw=Z^x zGwAxDII$0{EbmG-rx`@fiHRAc=nYhu)Z&!vA7z=ccnpj@qRRJVw(2N^J{qMAjR zaeL6jZWbtn(xAS#LHe&)I-OT@H6Oz6M<87l<_ubve1%GVouSOV$%mNFL7ziD=)X5R z7#JMPb|QJM@^Ti2Q0Zv9Lo43q>&7v}XSEg5{dKM!>YhiNGz{7P0W0%B|-5hEkWKIW^eFa3YJ@VVC}BY|X=X`OaQ|RZf#Ou)o~nHxGUm6x{Gr$&N#Yhf2V{MzLR_Iv*CIjkJfe$T-lh=bLtRv*5u@Zuj_S7IJ=lSq8etsoik)s~co^;1$qTwLey^A`LJ zuq|qf{%t^NYo}o;xC+a5>>J}L$>#=ghjAC3&=Sfuq@Q2pmtgY3o7*S&UN zN7zbYg}#+`frM=zU9658YxMDSYDUFZTehj=MWfdTy)BT}Emg*hge`aY%u7Qip6t>k zy+dmQb&?PHOWWd~_tPeDM$80p(?tUa=FN%;Oo8%Eboy7y8&0whQ8nGpZw1B%*>>}= zBbRroX3BEe9%%t?Z4CpC@li^mbC4WTvHxv>pz8r>z34dBlbE z6Q{XiEN|}{h3Mc7#FBkiVJmjk>AhUa;d4U6p@frRohMoB;YunV&6QE*$Cb2O&8*2j z@e(@*8XGFk;z5#00RJMT5llj63ZcA;Bh05Sc|zCMzQjs>n%ktQHUjq@XF$L&;8qve zLRUphc&DGcLRF<=3E4oBJv(Mr3#(N@Os0O*Dh5p@+4#~gs)ot1FsdaACzrV^7<68B zPa2nlEhg&tY*O?a4^4cZioTR|KfI%^M@y}7`;A;W!Qc(Nl2x3q4CZf`J8G8#b>C*O z6ok(@uf`x9IEn1+$@5md2!p9Ky*45|qlnwVX>BpKYowE^J4y+AHv#rT-ed`>0AxF!n;!Te$ zPv7PdP#-xy9O4Ibe&D1Z=<`ryv!~PCHmRu|=P+*hGB=y|(!|%+-iAuiC}ysS&_xU` znwsTrohumE>|3Gd`;CA+*-&7Yi|KY%;t?YTPKzboqyV_+n?1&U-6YfjueU!Sv$#%x zcHJAOwaFCB{?yjKKrv#CP+@fH>o>T@c`on<*p%CkQ@9NoJV(;i%wB?NW2ywzVN z(N^)e2#;x%&tJ4aEn3&Pn>X_g(jV4<_iq~w{L0tYSqXbdVg-{<9qLWxJ!=tJq@#}` zT@(9;MRTXC<4wPm>sC@YFMbkF(FMcBex@QX*7gbzTDOqkq~^L*k{A|g=h&dgbausl z;-ZBsO>9!=H~t0f-Sn96z`9iV?b#H(OJ7$vc}OgUc*V~98SL~`WV70}uQHzEdAs^= zI7#J7moxioM?&}Xzsol&vA{LM9C+2Z zi3pziNd>tam(IcNH^iQPNA1k3yt!CI(VY(!UkXjouK_t=gwY4-rdeZ8ell-*;CRRD zS+?8g{{WtWp93dcP#zRN%Bcs+Y5G)8OgLlCFAMV>tj=`xo5uXX5LV=nWVOczIDR*j z-ALnzt(7%<3qCbF_GIGX_z!@G%6fbHYIXya5>&BFSRKc(>Ojsgkuy%Y87NGie^q(WU+f9~&uA{XuZ8k-}jhl3b1c)HF5 zPH7J&^$K2-duqicj_)*HssnHan9+7Pn zdafQfSY%;&{*u&3@^sti%%?dYvg89Rh`I6L92C^G#GMyd`z%= z75(ZyMD^fPvxfd>jqP6WcwM=3D_F9rq$2aSd?YHrt!(sx0c(R+jgUvejBTMjv>@k0 z;mNfRN#)5FPK~K((~8^D(Yk5;51?j|!s=Ew@jB%0^1}~4%iJWF{cGQkFXxf3m#8Yr zDt?<$Ay9+%H_PG%%Pb+Qz8Y0DtHjjAY+uN2gFX6l#x$3vmvAreDh;=9OEC6d8<)?( z^5r#J_Alu2-YzP!CXbBJ9TM$< zj0}W>001i)85vAjPTF+fcHq&?f+c*}^plJN(X^1~oJvb;wN$P8izzmy(;+ASe0%GZ zWd7UOH^l23(`5$^pWG^7FZXq7VY!X(V(zAJNpY6~-jD)z`xK=|mBB`O3*VOhDlNL} z7MvwdgBy`$&YoX|gv&6&>x*w^>0ZEwlI+~>3gyWRJZzIa(*M=0c1rb4-tgH`E5}+wawg(4N+g4^u8N}K}qM$a9!oa zF=L?j(#iDIpyr@3e!pk;YbQr$KAk*XyJU+g`vY*i6b!Z=_M+wGncrdiNlOH{!H1GO z9rhB1NIk%4W!MaI%-T<&>u-@RwAsZ)a5MI?`ka)fJ_xk_5Pls{n4#rdVGS$nOO`c& ztn=pwGx0Vjjb$$YSSBA!A} zSs_fY7Q5KbppeaDy*k8au@uC(R~vs1b2Q3t>&WbvVXvD&3U%`kA(7FWqC4R?_3kEH zQ2QZWVwT%dlG(m*TrfTkhJ*v7Ecexh?zueXI|sWBj!^g*>EpfPNWN5t zo($buGMaLb5`+{isEF~N^zNhxZ7O(%X&19=W-e5+2DL=?V%O@-ud}gN&57orDXILk z%0A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 RLyo_P@caKyM)7C%e*q~d>X85d literal 0 HcmV?d00001 diff --git a/img/nuget-package-uoko/install-pkg-from-uoko.jpg b/img/nuget-package-uoko/install-pkg-from-uoko.jpg new file mode 100644 index 0000000000000000000000000000000000000000..266049c80bc1586db76ad7f11eeb70a5780cbf33 GIT binary patch literal 53865 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�%w8AslS(y<(*; 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 literal 0 HcmV?d00001 diff --git a/img/nuget-package-uoko/nuget-package-source-in-vs.jpg b/img/nuget-package-uoko/nuget-package-source-in-vs.jpg new file mode 100644 index 0000000000000000000000000000000000000000..425895f71f87699f7def48a04250239b4708c8f7 GIT binary patch literal 70730 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 z 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