loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

update code style for apiclient, configuration and apiexception

Browse Source
This commit is contained in:
wing328 2015-07-03 10:36:21 +08:00
parent 422da698f6
commit 57b54d8ad7
10 changed files with 270 additions and 258 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
modules/swagger-codegen/src/main/resources/csharp/ApiClient.mustache
View File

@ -36,47 +36,47 @@ namespace {{packageName}}.Client {
/// <value>The RestClient.</value> /// <value>The RestClient.</value>
public RestClient RestClient { get; set; } public RestClient RestClient { get; set; }
private Dictionary<String, String> defaultHeaderMap = new Dictionary<String, String>(); private Dictionary<String, String> DefaultHeaderMap = new Dictionary<String, String>();
public Object CallApi(String Path, RestSharp.Method Method, Dictionary<String, String> QueryParams, String PostBody, public Object CallApi(String path, RestSharp.Method method, Dictionary<String, String> queryParams, String postBody,
Dictionary<String, String> HeaderParams, Dictionary<String, String> FormParams, Dictionary<String, FileParameter> FileParams, String[] AuthSettings) { Dictionary<String, String> headerParams, Dictionary<String, String> formParams, Dictionary<String, FileParameter> fileParams, String[] authSettings) {
var response = Task.Run(async () => { var response = Task.Run(async () => {
var resp = await CallApiAsync(Path, Method, QueryParams, PostBody, HeaderParams, FormParams, FileParams, AuthSettings); var resp = await CallApiAsync(path, method, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
return resp; return resp;
}); });
return response.Result; return response.Result;
} }
public async Task<Object> CallApiAsync(String Path, RestSharp.Method Method, Dictionary<String, String> QueryParams, String PostBody, public async Task<Object> CallApiAsync(String path, RestSharp.Method method, Dictionary<String, String> queryParams, String postBody,
Dictionary<String, String> HeaderParams, Dictionary<String, String> FormParams, Dictionary<String, FileParameter> FileParams, String[] AuthSettings) { Dictionary<String, String> headerParams, Dictionary<String, String> formParams, Dictionary<String, FileParameter> fileParams, String[] authSettings) {
var request = new RestRequest(Path, Method); var request = new RestRequest(path, method);
UpdateParamsForAuth(QueryParams, HeaderParams, AuthSettings); UpdateParamsForAuth(queryParams, headerParams, authSettings);
// add default header, if any // add default header, if any
foreach(KeyValuePair<string, string> defaultHeader in this.defaultHeaderMap) foreach(KeyValuePair<string, string> defaultHeader in this.DefaultHeaderMap)
request.AddHeader(defaultHeader.Key, defaultHeader.Value); request.AddHeader(defaultHeader.Key, defaultHeader.Value);
// add header parameter, if any // add header parameter, if any
foreach(KeyValuePair<string, string> param in HeaderParams) foreach(KeyValuePair<string, string> param in headerParams)
request.AddHeader(param.Key, param.Value); request.AddHeader(param.Key, param.Value);
// add query parameter, if any // add query parameter, if any
foreach(KeyValuePair<string, string> param in QueryParams) foreach(KeyValuePair<string, string> param in queryParams)
request.AddQueryParameter(param.Key, param.Value); request.AddQueryParameter(param.Key, param.Value);
// add form parameter, if any // add form parameter, if any
foreach(KeyValuePair<string, string> param in FormParams) foreach(KeyValuePair<string, string> param in formParams)
request.AddParameter(param.Key, param.Value); request.AddParameter(param.Key, param.Value);
// add file parameter, if any // add file parameter, if any
foreach(KeyValuePair<string, FileParameter> param in FileParams) foreach(KeyValuePair<string, FileParameter> param in fileParams)
request.AddFile(param.Value.Name, param.Value.Writer, param.Value.FileName, param.Value.ContentType); request.AddFile(param.Value.Name, param.Value.Writer, param.Value.FileName, param.Value.ContentType);
if (PostBody != null) { if (postBody != null) {
request.AddParameter("application/json", PostBody, ParameterType.RequestBody); // http body (model) parameter request.AddParameter("application/json", postBody, ParameterType.RequestBody); // http body (model) parameter
} }
return (Object) await RestClient.ExecuteTaskAsync(request); return (Object) await RestClient.ExecuteTaskAsync(request);
@ -90,7 +90,7 @@ namespace {{packageName}}.Client {
/// <param name="value"> Header field value /// <param name="value"> Header field value
/// <returns></returns> /// <returns></returns>
public void AddDefaultHeader(string key, string value) { public void AddDefaultHeader(string key, string value) {
defaultHeaderMap.Add(key, value); DefaultHeaderMap.Add(key, value);
} }
/// <summary> /// <summary>
@ -98,7 +98,7 @@ namespace {{packageName}}.Client {
/// </summary> /// </summary>
/// <returns>Dictionary of default header</returns> /// <returns>Dictionary of default header</returns>
public Dictionary<String, String> GetDefaultHeader() { public Dictionary<String, String> GetDefaultHeader() {
return defaultHeaderMap; return DefaultHeaderMap;
} }
/// <summary> /// <summary>
@ -224,16 +224,16 @@ namespace {{packageName}}.Client {
/// <param name="QueryParams">Query parameters</param> /// <param name="QueryParams">Query parameters</param>
/// <param name="HeaderParams">Header parameters</param> /// <param name="HeaderParams">Header parameters</param>
/// <param name="AuthSettings">Authentication settings</param> /// <param name="AuthSettings">Authentication settings</param>
public void UpdateParamsForAuth(Dictionary<String, String> QueryParams, Dictionary<String, String> HeaderParams, string[] AuthSettings) { public void UpdateParamsForAuth(Dictionary<String, String> queryParams, Dictionary<String, String> headerParams, string[] authSettings) {
if (AuthSettings == null || AuthSettings.Length == 0) if (authSettings == null || authSettings.Length == 0)
return; return;
foreach (string auth in AuthSettings) { foreach (string auth in authSettings) {
// determine which one to use // determine which one to use
switch(auth) { switch(auth) {
{{#authMethods}} {{#authMethods}}
case "{{name}}": case "{{name}}":
{{#isApiKey}}{{#isKeyInHeader}}HeaderParams["{{keyParamName}}"] = GetApiKeyWithPrefix("{{keyParamName}}");{{/isKeyInHeader}}{{#isKeyInQuery}}QueryParams["{{keyParamName}}"] = GetApiKeyWithPrefix("{{keyParamName}}");{{/isKeyInQuery}}{{/isApiKey}}{{#isBasic}}HeaderParams["Authorization"] = "Basic " + Base64Encode(Configuration.Username + ":" + Configuration.Password);{{/isBasic}} {{#isApiKey}}{{#isKeyInHeader}}headerParams["{{keyParamName}}"] = GetApiKeyWithPrefix("{{keyParamName}}");{{/isKeyInHeader}}{{#isKeyInQuery}}queryParams["{{keyParamName}}"] = GetApiKeyWithPrefix("{{keyParamName}}");{{/isKeyInQuery}}{{/isApiKey}}{{#isBasic}}headerParams["Authorization"] = "Basic " + Base64Encode(Configuration.Username + ":" + Configuration.Password);{{/isBasic}}
{{#isOAuth}}//TODO support oauth{{/isOAuth}} {{#isOAuth}}//TODO support oauth{{/isOAuth}}
break; break;
{{/authMethods}} {{/authMethods}}

6
modules/swagger-codegen/src/main/resources/csharp/ApiException.mustache
View File

@ -32,6 +32,12 @@ namespace {{packageName}}.Client {
this.ErrorCode = errorCode; this.ErrorCode = errorCode;
} }
/// <summary>
/// Initializes a new instance of the <see cref="ApiException"/> class.
/// </summary>
/// <param name="errorCode">HTTP status code.</param>
/// <param name="message">Error message.</param>
/// <param name="errorContent">Error content.</param>
public ApiException(int errorCode, string message, dynamic errorContent = null) : base(message) { public ApiException(int errorCode, string message, dynamic errorContent = null) : base(message) {
this.ErrorCode = errorCode; this.ErrorCode = errorCode;
this.ErrorContent = errorContent; this.ErrorContent = errorContent;

42
samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Client/ApiClient.cs
View File

@ -36,47 +36,47 @@ namespace IO.Swagger.Client {
/// <value>The RestClient.</value> /// <value>The RestClient.</value>
public RestClient RestClient { get; set; } public RestClient RestClient { get; set; }
private Dictionary<String, String> defaultHeaderMap = new Dictionary<String, String>(); private Dictionary<String, String> DefaultHeaderMap = new Dictionary<String, String>();
public Object CallApi(String Path, RestSharp.Method Method, Dictionary<String, String> QueryParams, String PostBody, public Object CallApi(String path, RestSharp.Method method, Dictionary<String, String> queryParams, String postBody,
Dictionary<String, String> HeaderParams, Dictionary<String, String> FormParams, Dictionary<String, FileParameter> FileParams, String[] AuthSettings) { Dictionary<String, String> headerParams, Dictionary<String, String> formParams, Dictionary<String, FileParameter> fileParams, String[] authSettings) {
var response = Task.Run(async () => { var response = Task.Run(async () => {
var resp = await CallApiAsync(Path, Method, QueryParams, PostBody, HeaderParams, FormParams, FileParams, AuthSettings); var resp = await CallApiAsync(path, method, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
return resp; return resp;
}); });
return response.Result; return response.Result;
} }
public async Task<Object> CallApiAsync(String Path, RestSharp.Method Method, Dictionary<String, String> QueryParams, String PostBody, public async Task<Object> CallApiAsync(String path, RestSharp.Method method, Dictionary<String, String> queryParams, String postBody,
Dictionary<String, String> HeaderParams, Dictionary<String, String> FormParams, Dictionary<String, FileParameter> FileParams, String[] AuthSettings) { Dictionary<String, String> headerParams, Dictionary<String, String> formParams, Dictionary<String, FileParameter> fileParams, String[] authSettings) {
var request = new RestRequest(Path, Method); var request = new RestRequest(path, method);
UpdateParamsForAuth(QueryParams, HeaderParams, AuthSettings); UpdateParamsForAuth(queryParams, headerParams, authSettings);
// add default header, if any // add default header, if any
foreach(KeyValuePair<string, string> defaultHeader in this.defaultHeaderMap) foreach(KeyValuePair<string, string> defaultHeader in this.DefaultHeaderMap)
request.AddHeader(defaultHeader.Key, defaultHeader.Value); request.AddHeader(defaultHeader.Key, defaultHeader.Value);
// add header parameter, if any // add header parameter, if any
foreach(KeyValuePair<string, string> param in HeaderParams) foreach(KeyValuePair<string, string> param in headerParams)
request.AddHeader(param.Key, param.Value); request.AddHeader(param.Key, param.Value);
// add query parameter, if any // add query parameter, if any
foreach(KeyValuePair<string, string> param in QueryParams) foreach(KeyValuePair<string, string> param in queryParams)
request.AddQueryParameter(param.Key, param.Value); request.AddQueryParameter(param.Key, param.Value);
// add form parameter, if any // add form parameter, if any
foreach(KeyValuePair<string, string> param in FormParams) foreach(KeyValuePair<string, string> param in formParams)
request.AddParameter(param.Key, param.Value); request.AddParameter(param.Key, param.Value);
// add file parameter, if any // add file parameter, if any
foreach(KeyValuePair<string, FileParameter> param in FileParams) foreach(KeyValuePair<string, FileParameter> param in fileParams)
request.AddFile(param.Value.Name, param.Value.Writer, param.Value.FileName, param.Value.ContentType); request.AddFile(param.Value.Name, param.Value.Writer, param.Value.FileName, param.Value.ContentType);
if (PostBody != null) { if (postBody != null) {
request.AddParameter("application/json", PostBody, ParameterType.RequestBody); // http body (model) parameter request.AddParameter("application/json", postBody, ParameterType.RequestBody); // http body (model) parameter
} }
return (Object) await RestClient.ExecuteTaskAsync(request); return (Object) await RestClient.ExecuteTaskAsync(request);
@ -90,7 +90,7 @@ namespace IO.Swagger.Client {
/// <param name="value"> Header field value /// <param name="value"> Header field value
/// <returns></returns> /// <returns></returns>
public void AddDefaultHeader(string key, string value) { public void AddDefaultHeader(string key, string value) {
defaultHeaderMap.Add(key, value); DefaultHeaderMap.Add(key, value);
} }
/// <summary> /// <summary>
@ -98,7 +98,7 @@ namespace IO.Swagger.Client {
/// </summary> /// </summary>
/// <returns>Dictionary of default header</returns> /// <returns>Dictionary of default header</returns>
public Dictionary<String, String> GetDefaultHeader() { public Dictionary<String, String> GetDefaultHeader() {
return defaultHeaderMap; return DefaultHeaderMap;
} }
/// <summary> /// <summary>
@ -224,16 +224,16 @@ namespace IO.Swagger.Client {
/// <param name="QueryParams">Query parameters</param> /// <param name="QueryParams">Query parameters</param>
/// <param name="HeaderParams">Header parameters</param> /// <param name="HeaderParams">Header parameters</param>
/// <param name="AuthSettings">Authentication settings</param> /// <param name="AuthSettings">Authentication settings</param>
public void UpdateParamsForAuth(Dictionary<String, String> QueryParams, Dictionary<String, String> HeaderParams, string[] AuthSettings) { public void UpdateParamsForAuth(Dictionary<String, String> queryParams, Dictionary<String, String> headerParams, string[] authSettings) {
if (AuthSettings == null || AuthSettings.Length == 0) if (authSettings == null || authSettings.Length == 0)
return; return;
foreach (string auth in AuthSettings) { foreach (string auth in authSettings) {
// determine which one to use // determine which one to use
switch(auth) { switch(auth) {
case "api_key": case "api_key":
HeaderParams["api_key"] = GetApiKeyWithPrefix("api_key"); headerParams["api_key"] = GetApiKeyWithPrefix("api_key");
break; break;

6
samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Client/ApiException.cs
View File

@ -32,6 +32,12 @@ namespace IO.Swagger.Client {
this.ErrorCode = errorCode; this.ErrorCode = errorCode;
} }
/// <summary>
/// Initializes a new instance of the <see cref="ApiException"/> class.
/// </summary>
/// <param name="errorCode">HTTP status code.</param>
/// <param name="message">Error message.</param>
/// <param name="errorContent">Error content.</param>
public ApiException(int errorCode, string message, dynamic errorContent = null) : base(message) { public ApiException(int errorCode, string message, dynamic errorContent = null) : base(message) {
this.ErrorCode = errorCode; this.ErrorCode = errorCode;
this.ErrorContent = errorContent; this.ErrorContent = errorContent;

BIN
samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/SwaggerClientTest.dll
View File

Binary file not shown.

BIN
samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/SwaggerClientTest.dll.mdb
View File

Binary file not shown.

BIN
samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/SwaggerClientTest.dll
View File

Binary file not shown.

BIN
samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/SwaggerClientTest.dll.mdb
View File

Binary file not shown.