diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 9c1ab341ce..77702d46ba 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -1,7 +1,7 @@ - 13.14.9 + 13.15.0 Rico Suter Copyright © Rico Suter, 2020 diff --git a/src/NSwag.AspNet.Owin/NSwag.AspNet.Owin.csproj b/src/NSwag.AspNet.Owin/NSwag.AspNet.Owin.csproj index 6ed8f863f8..9071b833a4 100644 --- a/src/NSwag.AspNet.Owin/NSwag.AspNet.Owin.csproj +++ b/src/NSwag.AspNet.Owin/NSwag.AspNet.Owin.csproj @@ -35,7 +35,7 @@ - + diff --git a/src/NSwag.AspNet.WebApi/NSwag.AspNet.WebApi.csproj b/src/NSwag.AspNet.WebApi/NSwag.AspNet.WebApi.csproj index dffd0c0491..e176ba5f27 100644 --- a/src/NSwag.AspNet.WebApi/NSwag.AspNet.WebApi.csproj +++ b/src/NSwag.AspNet.WebApi/NSwag.AspNet.WebApi.csproj @@ -11,7 +11,7 @@ - + diff --git a/src/NSwag.AspNetCore/NSwag.AspNetCore.csproj b/src/NSwag.AspNetCore/NSwag.AspNetCore.csproj index ca61681a61..a781558705 100644 --- a/src/NSwag.AspNetCore/NSwag.AspNetCore.csproj +++ b/src/NSwag.AspNetCore/NSwag.AspNetCore.csproj @@ -1,6 +1,6 @@  - net451;netstandard1.6;netstandard2.0;netcoreapp3.1;net5.0;net6.0 + net461;netstandard1.6;netstandard2.0;netcoreapp3.1;net5.0;net6.0 Swagger Documentation AspNetCore NetCore TypeScript CodeGen $(MSBuildProjectName).nuspec @@ -28,7 +28,7 @@ - + @@ -38,7 +38,7 @@ - + diff --git a/src/NSwag.AspNetCore/NSwag.AspNetCore.nuspec b/src/NSwag.AspNetCore/NSwag.AspNetCore.nuspec index f252c0505d..563fb5af3c 100644 --- a/src/NSwag.AspNetCore/NSwag.AspNetCore.nuspec +++ b/src/NSwag.AspNetCore/NSwag.AspNetCore.nuspec @@ -85,8 +85,8 @@ - - + + diff --git a/src/NSwag.AssemblyLoader/NSwag.AssemblyLoader.csproj b/src/NSwag.AssemblyLoader/NSwag.AssemblyLoader.csproj index 1c624a8ebe..793d2105f4 100644 --- a/src/NSwag.AssemblyLoader/NSwag.AssemblyLoader.csproj +++ b/src/NSwag.AssemblyLoader/NSwag.AssemblyLoader.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/NSwag.CodeGeneration.CSharp/NSwag.CodeGeneration.CSharp.csproj b/src/NSwag.CodeGeneration.CSharp/NSwag.CodeGeneration.CSharp.csproj index 4605b6fdd8..27c375b7a5 100644 --- a/src/NSwag.CodeGeneration.CSharp/NSwag.CodeGeneration.CSharp.csproj +++ b/src/NSwag.CodeGeneration.CSharp/NSwag.CodeGeneration.CSharp.csproj @@ -1,6 +1,6 @@  - netstandard1.3;net451;netstandard2.0 + net461;netstandard2.0 bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml @@ -46,7 +46,7 @@ - + @@ -56,6 +56,6 @@ - + \ No newline at end of file diff --git a/src/NSwag.CodeGeneration.CSharp/Templates/Client.Class.HeaderParameter.liquid b/src/NSwag.CodeGeneration.CSharp/Templates/Client.Class.HeaderParameter.liquid index 711df0a5ab..9d686c515d 100644 --- a/src/NSwag.CodeGeneration.CSharp/Templates/Client.Class.HeaderParameter.liquid +++ b/src/NSwag.CodeGeneration.CSharp/Templates/Client.Class.HeaderParameter.liquid @@ -1,7 +1,7 @@ {% if parameter.IsStringArray -%} request_.Headers.TryAddWithoutValidation("{{ parameter.Name }}", {{ parameter.VariableName }}); -{% elseif parameter.IsDateTime -%} -request_.Headers.TryAddWithoutValidation("{{ parameter.Name }}", ConvertToString({{ parameter.VariableName }}{{ if parameter.IsNullable }}?{{ endif }}.ToString("{{ ParameterDateTimeFormat }}"), System.Globalization.CultureInfo.InvariantCulture)); +{% elsif parameter.IsDateTime -%} +request_.Headers.TryAddWithoutValidation("{{ parameter.Name }}", ConvertToString({{ parameter.VariableName }}{% if parameter.IsNullable %}?{% endif %}.ToString("{{ ParameterDateTimeFormat }}"), System.Globalization.CultureInfo.InvariantCulture)); {% else -%} request_.Headers.TryAddWithoutValidation("{{ parameter.Name }}", ConvertToString({{ parameter.VariableName }}, System.Globalization.CultureInfo.InvariantCulture)); -{% endif -%} +{%- endif %} diff --git a/src/NSwag.CodeGeneration.CSharp/Templates/Client.Class.PathParameter.liquid b/src/NSwag.CodeGeneration.CSharp/Templates/Client.Class.PathParameter.liquid index 22453b89b7..38b36b5ece 100644 --- a/src/NSwag.CodeGeneration.CSharp/Templates/Client.Class.PathParameter.liquid +++ b/src/NSwag.CodeGeneration.CSharp/Templates/Client.Class.PathParameter.liquid @@ -1,13 +1,13 @@ {% if parameter.IsDateTimeArray -%} urlBuilder_.Replace("{{ "{" }}{{ parameter.Name }}}", System.Uri.EscapeDataString(string.Join(",", System.Linq.Enumerable.Select({{ parameter.VariableName }}, s_ => s_.ToString("{{ ParameterDateTimeFormat }}", System.Globalization.CultureInfo.InvariantCulture))))); -{% elseif parameter.IsDateArray -%} +{% elsif parameter.IsDateArray -%} urlBuilder_.Replace("{{ "{" }}{{ parameter.Name }}}", System.Uri.EscapeDataString(string.Join(",", System.Linq.Enumerable.Select({{ parameter.VariableName }}, s_ => s_.ToString("{{ ParameterDateFormat }}", System.Globalization.CultureInfo.InvariantCulture))))); -{% elseif parameter.IsDateTime -%} +{% elsif parameter.IsDateTime -%} urlBuilder_.Replace("{{ "{" }}{{ parameter.Name }}}", System.Uri.EscapeDataString({{ parameter.VariableName }}.ToString("{{ ParameterDateTimeFormat }}", System.Globalization.CultureInfo.InvariantCulture))); -{% elseif parameter.IsDate -%} +{% elsif parameter.IsDate -%} urlBuilder_.Replace("{{ "{" }}{{ parameter.Name }}}", System.Uri.EscapeDataString({{ parameter.VariableName }}.ToString("{{ ParameterDateFormat }}", System.Globalization.CultureInfo.InvariantCulture))); -{% elseif parameter.IsArray -%} +{% elsif parameter.IsArray -%} urlBuilder_.Replace("{{ "{" }}{{ parameter.Name }}}", System.Uri.EscapeDataString(string.Join(",", System.Linq.Enumerable.Select({{ parameter.VariableName }}, s_ => ConvertToString(s_, System.Globalization.CultureInfo.InvariantCulture))))); {% else -%} urlBuilder_.Replace("{{ "{" }}{{ parameter.Name }}}", System.Uri.EscapeDataString(ConvertToString({{ parameter.VariableName }}, System.Globalization.CultureInfo.InvariantCulture))); -{% endif -%} +{%- endif %} diff --git a/src/NSwag.CodeGeneration.CSharp/Templates/Client.Class.ProcessResponse.liquid b/src/NSwag.CodeGeneration.CSharp/Templates/Client.Class.ProcessResponse.liquid index b8a4e6a3e2..9201c58938 100644 --- a/src/NSwag.CodeGeneration.CSharp/Templates/Client.Class.ProcessResponse.liquid +++ b/src/NSwag.CodeGeneration.CSharp/Templates/Client.Class.ProcessResponse.liquid @@ -2,7 +2,7 @@ {% if response.IsFile -%} {% if response.IsSuccess -%} var responseStream_ = response_.Content == null ? System.IO.Stream.Null : await response_.Content.ReadAsStreamAsync().ConfigureAwait(false); -var fileResponse_ = new FileResponse(status_, headers_, responseStream_, {% if InjectHttpClient or DisposeHttpClient == false %}null{% else %}client_{% endif %}, response_); +var fileResponse_ = new FileResponse(status_, headers_, responseStream_, {% if InjectHttpClient or DisposeHttpClient == false %}null{% else %}client_{% endif %}, response_); disposeClient_ = false; disposeResponse_ = false; // response and client are disposed by FileResponse return fileResponse_; {% else -%} @@ -14,7 +14,7 @@ var responseData_ = response_.Content == null ? null : await response_.Content.R var result_ = ({{ response.Type }})System.Convert.ChangeType(responseData_, typeof({{ response.Type }})); {% if response.IsSuccess -%} {% if operation.WrapResponse -%} -return new {{ ResponseClass }}<{{ operation.UnwrappedResultType }}>(status_, headers_, result_); +return new {{ ResponseClass }}<{{ operation.UnwrappedResultType }}>(status_, headers_, result_); {% else -%} return result_; {% endif -%} @@ -31,9 +31,9 @@ if (objectResponse_.Object == null) {% endif -%} {% if response.IsSuccess -%} {% if operation.WrapResponse -%} -return new {{ ResponseClass }}<{{ operation.UnwrappedResultType }}>(status_, headers_, objectResponse_.Object); +return new {{ ResponseClass }}<{{ operation.UnwrappedResultType }}>(status_, headers_, objectResponse_.Object); {% else -%} -return objectResponse_.Object; +return objectResponse_.Object; {% endif -%} {% endif -%} {% if response.IsSuccess == false -%} @@ -52,7 +52,7 @@ throw new {{ ExceptionClass }}<{{ response.Type }}>("{{ response.ExceptionDescri {% endif -%} {% endif -%} {% endif -%} -{% elseif response.IsSuccess -%} +{% elsif response.IsSuccess -%} {% if operation.HasResultType -%} {% if operation.WrapResponse -%} return new {{ ResponseClass }}<{{ operation.UnwrappedResultType }}>(status_, headers_, {{ operation.UnwrappedResultDefaultValue }}); @@ -61,7 +61,7 @@ return {{ operation.UnwrappedResultDefaultValue }}; {% endif -%} {% else -%} {% if operation.WrapResponse -%} -return new {{ ResponseClass }}(status_, headers_); +return new {{ ResponseClass }}(status_, headers_); {% else -%} return; {% endif -%} @@ -69,4 +69,4 @@ return; {% else -%}{% comment %} implied: `if !response.HasType` so just read it as text {% endcomment %} string responseText_ = ( response_.Content == null ) ? string.Empty : await response_.Content.ReadAsStringAsync().ConfigureAwait(false); throw new {{ ExceptionClass }}("{{ response.ExceptionDescription }}", status_, responseText_, headers_, null); -{% endif -%} \ No newline at end of file +{% endif %} \ No newline at end of file diff --git a/src/NSwag.CodeGeneration.CSharp/Templates/Client.Class.QueryParameter.liquid b/src/NSwag.CodeGeneration.CSharp/Templates/Client.Class.QueryParameter.liquid index a7fd119ff0..6bf155757e 100644 --- a/src/NSwag.CodeGeneration.CSharp/Templates/Client.Class.QueryParameter.liquid +++ b/src/NSwag.CodeGeneration.CSharp/Templates/Client.Class.QueryParameter.liquid @@ -1,16 +1,16 @@ {% if parameter.IsDateTimeArray -%} foreach (var item_ in {{ parameter.VariableName }}) { urlBuilder_.Append(System.Uri.EscapeDataString("{{ parameter.Name }}") + "=").Append(System.Uri.EscapeDataString(item_.ToString("{{ ParameterDateTimeFormat }}", System.Globalization.CultureInfo.InvariantCulture))).Append("&"); } -{% elseif parameter.IsDateArray -%} +{% elsif parameter.IsDateArray -%} foreach (var item_ in {{ parameter.VariableName }}) { urlBuilder_.Append(System.Uri.EscapeDataString("{{ parameter.Name }}") + "=").Append(System.Uri.EscapeDataString(item_.ToString("{{ ParameterDateFormat }}", System.Globalization.CultureInfo.InvariantCulture))).Append("&"); } -{% elseif parameter.IsDateTime -%} +{% elsif parameter.IsDateTime -%} urlBuilder_.Append(System.Uri.EscapeDataString("{{ parameter.Name }}") + "=").Append(System.Uri.EscapeDataString({% if parameter.IsNullable and parameter.IsRequired %}{{ parameter.VariableName }} != null ? {% endif %}{{ parameter.VariableName }}{% if parameter.IsSystemNullable %}.Value{% endif %}.ToString("{{ ParameterDateTimeFormat }}", System.Globalization.CultureInfo.InvariantCulture){% if parameter.IsNullable and parameter.IsRequired %} : "{{ QueryNullValue }}"{% endif %})).Append("&"); -{% elseif parameter.IsDate -%} +{% elsif parameter.IsDate -%} urlBuilder_.Append(System.Uri.EscapeDataString("{{ parameter.Name }}") + "=").Append(System.Uri.EscapeDataString({% if parameter.IsNullable and parameter.IsRequired %}{{ parameter.VariableName }} != null ? {% endif %}{{ parameter.VariableName }}{% if parameter.IsSystemNullable %}.Value{% endif %}.ToString("{{ ParameterDateFormat }}", System.Globalization.CultureInfo.InvariantCulture){% if parameter.IsNullable and parameter.IsRequired %} : "{{ QueryNullValue }}"{% endif %})).Append("&"); -{% elseif parameter.IsArray -%} +{% elsif parameter.IsArray -%} foreach (var item_ in {{ parameter.VariableName }}) { urlBuilder_.Append(System.Uri.EscapeDataString("{{ parameter.Name }}") + "=").Append(System.Uri.EscapeDataString(ConvertToString(item_, System.Globalization.CultureInfo.InvariantCulture))).Append("&"); } -{% elseif parameter.IsDictionary -%} +{% elsif parameter.IsDictionary -%} foreach (var item_ in {{ parameter.VariableName }}) { urlBuilder_.Append(System.Uri.EscapeDataString(item_.Key) + "=").Append(System.Uri.EscapeDataString(ConvertToString(item_.Value, System.Globalization.CultureInfo.InvariantCulture))).Append("&"); } -{% elseif parameter.IsDeepObject -%} +{% elsif parameter.IsDeepObject -%} {% for property in parameter.PropertyNames -%} if ({{parameter.Name}}.{{property.Name}} != null) { @@ -29,14 +29,14 @@ if ({{parameter.Name}}.{{property.Name}} != null && {{parameter.Name}}.{{propert urlBuilder_.Append("&"); } {% endfor -%} -{% elseif parameter.Explode and parameter.IsForm and parameter.IsObject -%} +{% elsif parameter.Explode and parameter.IsForm and parameter.IsObject -%} {% for property in parameter.PropertyNames -%} if ({{parameter.Name}}.{{property.Name}} != null) { urlBuilder_.Append(System.Uri.EscapeDataString("{{property.Key}}") + "=").Append(System.Uri.EscapeDataString(ConvertToString({{parameter.Name}}.{{property.Name}}, System.Globalization.CultureInfo.InvariantCulture))).Append("&"); } {% endfor -%} -{% elseif parameter.HasAdditionalProperties == false -%} +{% elsif parameter.HasAdditionalProperties == false -%} urlBuilder_.Append(System.Uri.EscapeDataString("{{ parameter.Name }}") + "=").Append(System.Uri.EscapeDataString({% if parameter.IsNullable and parameter.IsRequired %}{{ parameter.VariableName }} != null ? {% endif %}ConvertToString({{ parameter.VariableName }}, System.Globalization.CultureInfo.InvariantCulture){% if parameter.IsNullable and parameter.IsRequired %} : "{{ QueryNullValue }}"{% endif %})).Append("&"); {% endif -%} {% if parameter.HasAdditionalProperties -%} diff --git a/src/NSwag.CodeGeneration.CSharp/Templates/Client.Class.ReadObjectResponse.liquid b/src/NSwag.CodeGeneration.CSharp/Templates/Client.Class.ReadObjectResponse.liquid index cac5df5107..8f5da03152 100644 --- a/src/NSwag.CodeGeneration.CSharp/Templates/Client.Class.ReadObjectResponse.liquid +++ b/src/NSwag.CodeGeneration.CSharp/Templates/Client.Class.ReadObjectResponse.liquid @@ -4,11 +4,11 @@ protected virtual async System.Threading.Tasks.Task> Rea { if (response == null || response.Content == null) { -{% if GenerateNullableReferenceTypes -%} +{%- if GenerateNullableReferenceTypes -%} return new ObjectResponseResult(default(T)!, string.Empty); -{% else -%} +{%- else -%} return new ObjectResponseResult(default(T), string.Empty); -{% endif -%} +{%- endif -%} } if (ReadResponseAsString) @@ -17,11 +17,11 @@ protected virtual async System.Threading.Tasks.Task> Rea try { var typedBody = {% if UseSystemTextJson %}System.Text.Json.JsonSerializer.Deserialize{% else %}Newtonsoft.Json.JsonConvert.DeserializeObject{% endif %}(responseText, {% if UseRequestAndResponseSerializationSettings %}Response{% endif %}JsonSerializerSettings); -{% if GenerateNullableReferenceTypes -%} +{%- if GenerateNullableReferenceTypes -%} return new ObjectResponseResult(typedBody!, responseText); -{% else -%} +{%- else -%} return new ObjectResponseResult(typedBody, responseText); -{% endif -%} +{%- endif -%} } catch ({% if UseSystemTextJson %}System.Text.Json.JsonException{% else %}Newtonsoft.Json.JsonException{% endif %} exception) { @@ -34,21 +34,21 @@ protected virtual async System.Threading.Tasks.Task> Rea try { using (var responseStream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false)) -{% if UseSystemTextJson -%} +{%- if UseSystemTextJson -%} { var typedBody = await System.Text.Json.JsonSerializer.DeserializeAsync(responseStream, {% if UseRequestAndResponseSerializationSettings %}Response{% endif %}JsonSerializerSettings, cancellationToken).ConfigureAwait(false); -{% else -%} +{%- else -%} using (var streamReader = new System.IO.StreamReader(responseStream)) using (var jsonTextReader = new Newtonsoft.Json.JsonTextReader(streamReader)) { var serializer = Newtonsoft.Json.JsonSerializer.Create({% if UseRequestAndResponseSerializationSettings %}Response{% endif %}JsonSerializerSettings); var typedBody = serializer.Deserialize(jsonTextReader); -{% endif -%} -{% if GenerateNullableReferenceTypes -%} +{%- endif -%} +{%- if GenerateNullableReferenceTypes -%} return new ObjectResponseResult(typedBody!, string.Empty); -{% else -%} +{%- else -%} return new ObjectResponseResult(typedBody, string.Empty); -{% endif -%} +{%- endif -%} } } catch ({% if UseSystemTextJson %}System.Text.Json.JsonException{% else %}Newtonsoft.Json.JsonException{% endif %} exception) diff --git a/src/NSwag.CodeGeneration.CSharp/Templates/Client.Class.liquid b/src/NSwag.CodeGeneration.CSharp/Templates/Client.Class.liquid index 32fced3463..715ae14d86 100644 --- a/src/NSwag.CodeGeneration.CSharp/Templates/Client.Class.liquid +++ b/src/NSwag.CodeGeneration.CSharp/Templates/Client.Class.liquid @@ -21,14 +21,14 @@ {% if InjectHttpClient -%} _httpClient = httpClient; {% endif -%} -{% elseif UseBaseUrl and HasBaseUrl == false -%} - public {{ Class }}(string baseUrl{% if InjectHttpClient -%}, {{ HttpClientType }} httpClient{% endif %}) +{% elsif UseBaseUrl and HasBaseUrl == false %} + public {{ Class }}(string baseUrl{% if InjectHttpClient %}, {{ HttpClientType }} httpClient{% endif %}) { BaseUrl = baseUrl; {% if InjectHttpClient -%} _httpClient = httpClient; {% endif -%} -{% elseif InjectHttpClient -%} +{% elsif InjectHttpClient %} public {{ Class }}({{ HttpClientType }} httpClient) { _httpClient = httpClient; @@ -68,10 +68,10 @@ } {% endif -%} -{% if ExposeJsonSerializerSettings %} -{% assign serializerSettingsAccessModifier = "public" -%} +{% if ExposeJsonSerializerSettings -%} +{% assign serializerSettingsAccessModifier = "public" %} {% else -%} -{% assign serializerSettingsAccessModifier = "protected" -%} +{% assign serializerSettingsAccessModifier = "protected" %} {% endif -%} {% if UseRequestAndResponseSerializationSettings -%} {{ serializerSettingsAccessModifier }} {{ JsonSerializerSettingsType }} RequestJsonSerializerSettings { get { return _requestSettings.Value; } } @@ -94,7 +94,7 @@ partial void PrepareRequest({{ HttpClientType }} client, System.Net.Http.HttpRequestMessage request, System.Text.StringBuilder urlBuilder); partial void ProcessResponse({{ HttpClientType }} client, System.Net.Http.HttpResponseMessage response); {% endif -%} -{% for operation in Operations -%} +{% for operation in Operations %} {% if GenerateOptionalParameters == false -%} {% template Client.Method.Documentation %} {% template Client.Method.Annotations %} @@ -165,7 +165,7 @@ {% if InjectHttpClient -%} var client_ = _httpClient; -{% elseif UseHttpClientCreationMethod -%} +{% elsif UseHttpClientCreationMethod -%} var client_ = await CreateHttpClientAsync(cancellationToken).ConfigureAwait(false); {% else -%} var client_ = new {{ HttpClientType }}(); @@ -183,7 +183,7 @@ using (var request_ = new System.Net.Http.HttpRequestMessage()) {% endif -%} { -{% for parameter in operation.HeaderParameters -%} +{% for parameter in operation.HeaderParameters %} {% if parameter.IsRequired -%} if ({{ parameter.VariableName }} == null) throw new System.ArgumentNullException("{{ parameter.VariableName }}"); @@ -202,10 +202,10 @@ var content_ = new System.Net.Http.StreamContent({{ operation.ContentParameter.VariableName }}); content_.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("{{ operation.Consumes }}"); {% endif -%} -{% elseif operation.HasXmlBodyParameter -%} +{% elsif operation.HasXmlBodyParameter -%} var content_ = new System.Net.Http.StringContent({{ operation.ContentParameter.VariableName }}); content_.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("{{ operation.Consumes }}"); -{% elseif operation.ConsumesFormUrlEncoded -%} +{% elsif operation.ConsumesFormUrlEncoded -%} var json_ = Newtonsoft.Json.JsonConvert.SerializeObject({{ operation.ContentParameter.VariableName }}, _settings.Value); var dictionary_ = Newtonsoft.Json.JsonConvert.DeserializeObject>(json_, _settings.Value); var content_ = new System.Net.Http.FormUrlEncodedContent(dictionary_); @@ -235,7 +235,7 @@ var content_ = new System.Net.Http.MultipartFormDataContent(boundary_); content_.Headers.Remove("Content-Type"); content_.Headers.TryAddWithoutValidation("Content-Type", "multipart/form-data; boundary=" + boundary_); -{% for parameter in operation.FormParameters -%} +{% for parameter in operation.FormParameters %} {% if parameter.IsNullable -%} if ({{ parameter.VariableName }} != null) {% else -%} @@ -259,12 +259,12 @@ content_{{ parameter.VariableName }}_.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse({{ parameter.VariableName }}.ContentType); content_.Add(content_{{ parameter.VariableName }}_, "{{ parameter.Name }}", {{ parameter.VariableName }}.FileName ?? "{{ parameter.Name }}"); {% endif -%} -{% elseif parameter.IsArray -%} +{% elsif parameter.IsArray -%} foreach (var item_ in {{ parameter.VariableName }}) { content_.Add(new System.Net.Http.StringContent(ConvertToString(item_, System.Globalization.CultureInfo.InvariantCulture)), "{{ parameter.Name }}"); } -{% elseif parameter.IsObject -%} +{% elsif parameter.IsObject -%} content_.Add(new System.Net.Http.StringContent({% if UseSystemTextJson %}System.Text.Json.JsonSerializer.Serialize{% else %}Newtonsoft.Json.JsonConvert.SerializeObject{% endif %}({{ parameter.VariableName }}, {% if UseRequestAndResponseSerializationSettings %}_requestSettings{% else %}_settings{% endif %}.Value)), "{{ parameter.Name }}"); {% else -%} content_.Add(new System.Net.Http.StringContent(ConvertToString({{ parameter.VariableName }}, System.Globalization.CultureInfo.InvariantCulture)), "{{ parameter.Name }}"); @@ -273,7 +273,7 @@ {% endfor -%} request_.Content = content_; {% endif -%} -{% elseif operation.IsGetOrDeleteOrHead == false -%} +{% elsif operation.IsGetOrDeleteOrHead == false -%} request_.Content = new System.Net.Http.StringContent(string.Empty, System.Text.Encoding.UTF8, "{{ operation.Produces }}"); {% endif -%} {% endif -%} @@ -282,7 +282,7 @@ request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("{{ operation.Produces }}")); {% endif -%} -{% if GeneratePrepareRequestAndProcessResponseAsAsyncMethods -%} +{% if GeneratePrepareRequestAndProcessResponseAsAsyncMethods %} await PrepareRequestAsync(client_, request_, urlBuilder_).ConfigureAwait(false); {% else -%} PrepareRequest(client_, request_, urlBuilder_); @@ -296,8 +296,8 @@ {% else -%} PrepareRequest(client_, request_, url_); {% endif -%} - {% template Client.Class.BeforeSend %} + var response_ = await client_.SendAsync(request_, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false); var disposeResponse_ = true; try @@ -309,11 +309,11 @@ headers_[item_.Key] = item_.Value; } -{% if GeneratePrepareRequestAndProcessResponseAsAsyncMethods -%} +{% if GeneratePrepareRequestAndProcessResponseAsAsyncMethods %} await ProcessResponseAsync(client_, response_, cancellationToken).ConfigureAwait(false); -{% else -%} +{% else %} ProcessResponse(client_, response_); -{% endif -%} +{% endif %} var status_ = (int)response_.StatusCode; {% for response in operation.Responses -%} @@ -329,38 +329,38 @@ {% assign response = operation.DefaultResponse -%} {% template Client.Class.ProcessResponse %} } -{% elseif operation.HasSuccessResponse -%} +{% elsif operation.HasSuccessResponse -%} { var responseData_ = response_.Content == null ? null : await response_.Content.ReadAsStringAsync().ConfigureAwait(false); throw new {{ ExceptionClass }}("{{ operation.DefaultResponse.ExceptionDescription }}", status_, responseData_, headers_, null); } -{% elseif operation.HasResultType -%} -{% if operation.WrapResponse and operation.UnwrappedResultType != "FileResponse" -%} +{% elsif operation.HasResultType -%} +{% if operation.WrapResponse and operation.UnwrappedResultType != "FileResponse" %} return new {{ ResponseClass }}<{{ operation.UnwrappedResultType }}>(status_, headers_, {{ operation.UnwrappedResultDefaultValue }}); {% else -%} return {{ operation.UnwrappedResultDefaultValue }}; {% endif -%} -{% elseif operation.WrapResponse -%} +{% elsif operation.WrapResponse -%} return new {{ ResponseClass }}(status_, headers_); {% endif -%} {% else -%} {% if operation.HasSuccessResponse == false -%} -{% comment %} +{% comment -%} If the success response has already been explicitely declared, there is no need for this default code (because handled above). Otherwise, return default values on success because we don't want to throw on "unknown status code". Success is always expected -{% endcomment -%} +{%- endcomment %} if (status_ == 200 || status_ == 204) { {% if operation.HasResultType -%} -{% if operation.WrapResponse and operation.UnwrappedResultType != "FileResponse" -%} +{% if operation.WrapResponse and operation.UnwrappedResultType != "FileResponse" %} return new {{ ResponseClass }}<{{ operation.UnwrappedResultType }}>(status_, headers_, {{ operation.UnwrappedResultDefaultValue }}); {% else -%} return {{ operation.UnwrappedResultDefaultValue }}; {% endif -%} -{% elseif operation.WrapResponse -%} +{% elsif operation.WrapResponse -%} return new {{ ResponseClass }}(status_, headers_); -{% else -%}{% comment %} This method isn't expected to return a value. Just return. {% endcomment -%} +{% else -%}{% comment %} This method isn't expected to return a value. Just return. {% endcomment %} return; {% endif -%} } @@ -386,7 +386,7 @@ } } -{% endfor -%} +{% endfor %} protected struct ObjectResponseResult { public ObjectResponseResult(T responseObject, string responseText) diff --git a/src/NSwag.CodeGeneration.CSharp/Templates/Client.Interface.liquid b/src/NSwag.CodeGeneration.CSharp/Templates/Client.Interface.liquid index c392a6ec1b..8fbb51e451 100644 --- a/src/NSwag.CodeGeneration.CSharp/Templates/Client.Interface.liquid +++ b/src/NSwag.CodeGeneration.CSharp/Templates/Client.Interface.liquid @@ -15,7 +15,7 @@ public partial interface I{{ Class }}{% if HasClientBaseInterface %} : {{ Client {% template Client.Method.Annotations %} {{ operation.SyncResultType }} {{ operation.ActualOperationName }}({% for parameter in operation.Parameters %}{{ parameter.Type }} {{ parameter.VariableName }}{% if GenerateOptionalParameters and parameter.IsOptional %} = null{% endif %}{% if parameter.IsLast == false %}, {% endif %}{% endfor %}); -{% endif -%} +{%- endif %} /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. {% template Client.Method.Documentation %} {% template Client.Method.Annotations %} diff --git a/src/NSwag.CodeGeneration.CSharp/Templates/Controller.liquid b/src/NSwag.CodeGeneration.CSharp/Templates/Controller.liquid index e5e9c813fb..1fa20de5f8 100644 --- a/src/NSwag.CodeGeneration.CSharp/Templates/Controller.liquid +++ b/src/NSwag.CodeGeneration.CSharp/Templates/Controller.liquid @@ -2,36 +2,36 @@ [System.CodeDom.Compiler.GeneratedCode("NSwag", "{{ ToolchainVersion }}")] public interface I{{ Class }}Controller { -{% for operation in Operations -%} -{% if operation.HasSummary -%} +{%- for operation in Operations %} +{%- if operation.HasSummary %} /// {{ operation.Summary | csharpdocs }} -{% endif -%} -{% for parameter in operation.Parameters -%} -{% if parameter.HasDescription -%} +{%- endif %} +{%- for parameter in operation.Parameters %} +{%- if parameter.HasDescription %} /// {{ parameter.Description | csharpdocs }} -{% endif -%} -{% endfor -%} -{% if operation.HasResultDescription -%} +{%- endif %} +{%- endfor %} +{%- if operation.HasResultDescription %} /// {{ operation.ResultDescription | csharpdocs }} {% endif -%} -{% if operation.IsDeprecated -%} +{%- if operation.IsDeprecated %} [System.Obsolete] -{% endif -%} - {{ operation.ResultType }} {{ operation.ActualOperationName }}Async({% for parameter in operation.Parameters %}{{ parameter.TypeInControllerInterface }} {{ parameter.VariableName }}{% if GenerateOptionalParameters and parameter.IsOptional and parameter.HasDefault == false %} = null{% endif %}{% if parameter.IsLast == false or UseCancellationToken %}, {% endif %}{% endfor %}{% if UseCancellationToken %}System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken){% endif %}); +{%- endif %} + {{ operation.ResultType }} {{ operation.ActualOperationName }}Async({% for parameter in operation.Parameters %}{% assign parameterOptional = GenerateOptionalParameters and parameter.IsOptional %}{{ parameter.TypeInControllerInterface }} {{ parameter.VariableName }}{% if parameterOptional and parameter.HasDefault == false %} = null{% endif %}{% if parameter.IsLast == false or UseCancellationToken %}, {% endif %}{% endfor %}{% if UseCancellationToken %}System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken){% endif %}); -{% endfor -%} +{%- endfor %} } +{%- endif %} -{% endif -%} [System.CodeDom.Compiler.GeneratedCode("NSwag", "{{ ToolchainVersion }}")] -{% if HasBasePath -%} -{% if IsAspNetCore -%} +{%- if HasBasePath -%} +{%- if IsAspNetCore -%} [{{ AspNetNamespace }}.Route("{{ BasePath }}")] -{% else -%} +{%- else -%} [{{ AspNetNamespace }}.RoutePrefix("{{ BasePath }}")] -{% endif -%} -{% endif -%} -{% if GeneratePartialControllers -%} +{%- endif -%} +{%- endif -%} +{%- if GeneratePartialControllers -%} {% template Controller.Class.Annotations %} public partial class {{ Class }}Controller : {% if HasBaseClass %}{{ BaseClass }}{% else %}{{ AspNetNamespace }}.{% if IsAspNetCore %}ControllerBase{% else %}ApiController{% endif %}{% endif %} { @@ -59,9 +59,9 @@ public partial class {{ Class }}Controller : {% if HasBaseClass %}{{ BaseClass } {% endif -%} {% template Controller.Method.Annotations %} [{{ AspNetNamespace }}.Http{{ operation.HttpMethodUpper }}, {{ AspNetNamespace }}.Route("{{ operation.Path }}"{% if operation.HasRouteName %}, Name = "{{ operation.RouteName }}"{% endif %})] - public {% if IsAspNetCore and operation.WrapResponse %}async System.Threading.Tasks.Task{% elsif operation.WrapResponse %}async System.Threading.Tasks.Task{% else %}{{ operation.ResultType }}{% endif %} {{ operation.ActualOperationName }}({% for parameter in operation.Parameters %}{% if parameter.IsQuery %}[{{ AspNetNamespace }}.{% if IsAspNetCore -%}FromQuery{% else -%}FromUri{% endif -%}{% if parameter.IsValidIdentifier == false %}(Name = "{{ parameter.Name }}"){% endif %}] {% endif %}{% if parameter.IsHeader %}[{% if IsAspNetCore -%}{{ AspNetNamespace }}.{% endif -%}FromHeader{% if parameter.IsValidIdentifier == false %}(Name = "{{ parameter.Name }}"){% endif %}] {% endif %}{% if parameter.IsBody and parameter.IsBinaryBody == false %}[{{ AspNetNamespace }}.FromBody] {% endif %}{% if GenerateModelValidationAttributes and parameter.IsRequired %}[{{ RequiredAttributeType }}] {% endif %}{{ parameter.Type }} {{ parameter.VariableName }}{% if GenerateOptionalParameters and parameter.IsOptional %} = null{% endif %}{% if parameter.IsLast == false or UseCancellationToken %}, {% endif %}{% endfor %}{% if UseCancellationToken %}System.Threading.CancellationToken cancellationToken{% endif %}) + public {% if IsAspNetCore and operation.WrapResponse %}async System.Threading.Tasks.Task{% elsif operation.WrapResponse %}async System.Threading.Tasks.Task{% else %}{{ operation.ResultType }}{% endif %} {{ operation.ActualOperationName }}({% for parameter in operation.Parameters %}{% if parameter.IsQuery %}[{{ AspNetNamespace }}.{% if IsAspNetCore -%}FromQuery{% else -%}FromUri{%- endif %}{% if parameter.IsValidIdentifier == false %}(Name = "{{ parameter.Name }}"){% endif %}] {% endif %}{% if parameter.IsHeader %}[{% if IsAspNetCore -%}{{ AspNetNamespace }}.{%- endif %}FromHeader{% if parameter.IsValidIdentifier == false %}(Name = "{{ parameter.Name }}"){% endif %}] {% endif %}{% if parameter.IsBody and parameter.IsBinaryBody == false %}[{{ AspNetNamespace }}.FromBody] {% endif %}{% if GenerateModelValidationAttributes and parameter.IsRequired %}[{{ RequiredAttributeType }}] {% endif %}{{ parameter.Type }} {{ parameter.VariableName }}{% if GenerateOptionalParameters and parameter.IsOptional %} = null{% endif %}{% if parameter.IsLast == false or UseCancellationToken %}, {% endif %}{% endfor %}{% if UseCancellationToken %}System.Threading.CancellationToken cancellationToken{% endif %}) { -{% if IsAspNetCore and operation.WrapResponse -%} +{%- if IsAspNetCore and operation.WrapResponse %} var result = await _implementation.{{ operation.ActualOperationName }}Async({% for parameter in operation.Parameters %}{{ parameter.VariableName }}{% if parameter.HasDefault %} ?? {{parameter.Default}}{% endif %}{% if parameter.IsLast == false or UseCancellationToken %}, {% endif %}{% endfor %}{% if UseCancellationToken %}cancellationToken{% endif %}).ConfigureAwait(false); var status = result.StatusCode; @@ -71,7 +71,7 @@ public partial class {{ Class }}Controller : {% if HasBaseClass %}{{ BaseClass } Request.HttpContext.Response.Headers.Add(header.Key, new Microsoft.Extensions.Primitives.StringValues(header.Value.ToArray())); return response; -{% elsif operation.WrapResponse -%} +{%- elsif operation.WrapResponse %} var result = await _implementation.{{ operation.ActualOperationName }}Async({% for parameter in operation.Parameters %}{{ parameter.VariableName }}{% if parameter.HasDefault %} ?? {{parameter.Default}}{% endif %}{% if parameter.IsLast == false or UseCancellationToken %}, {% endif %}{% endfor %}{% if UseCancellationToken %}cancellationToken{% endif %}).ConfigureAwait(false); var status = (System.Net.HttpStatusCode)result.StatusCode; @@ -81,14 +81,14 @@ public partial class {{ Class }}Controller : {% if HasBaseClass %}{{ BaseClass } response.Headers.Add(header.Key, header.Value); return response; -{% else -%} +{%- else %} return _implementation.{{ operation.ActualOperationName }}Async({% for parameter in operation.Parameters %}{{ parameter.VariableName }}{% if parameter.HasDefault %} ?? {{parameter.Default}}{% endif %}{% if parameter.IsLast == false or UseCancellationToken %}, {% endif %}{% endfor %}{% if UseCancellationToken %}cancellationToken{% endif %}); {% endif -%} } {% endfor -%} } -{% elseif GenerateAbstractControllers -%} +{% elsif GenerateAbstractControllers -%} {% template Controller.Class.Annotations %} public abstract class {{ Class }}ControllerBase : {% if HasBaseClass %}{{ BaseClass }}{% else %}{{ AspNetNamespace }}.{% if IsAspNetCore %}ControllerBase{% else %}ApiController{% endif %}{% endif %} { @@ -109,8 +109,8 @@ public abstract class {{ Class }}ControllerBase : {% if HasBaseClass %}{{ BaseCl {% endif -%} {% template Controller.Method.Annotations %} [{{ AspNetNamespace }}.Http{{ operation.HttpMethodUpper }}, {{ AspNetNamespace }}.Route("{{ operation.Path }}"{% if operation.HasRouteName %}, Name = "{{ operation.RouteName }}"{% endif %})] - public abstract {% if operation.WrapResponse %}System.Threading.Tasks.Task{% else %}{{ operation.ResultType }}{% endif %} {{ operation.ActualOperationName }}({% for parameter in operation.Parameters %}{% if parameter.IsQuery %}[{{ AspNetNamespace }}.{% if IsAspNetCore -%}FromQuery{% else -%}FromUri{% endif -%}{% if parameter.IsValidIdentifier == false %}(Name = "{{ parameter.Name }}"){% endif %}] {% endif %}{% if parameter.IsHeader %}[{% if IsAspNetCore -%}{{ AspNetNamespace }}.{% endif -%}FromHeader{% if parameter.IsValidIdentifier == false %}(Name = "{{ parameter.Name }}"){% endif %}] {% endif %}{% if parameter.IsBody and parameter.IsBinaryBody == false %}[{{ AspNetNamespace }}.FromBody] {% endif %}{% if GenerateModelValidationAttributes and parameter.IsRequired %}[{{ RequiredAttributeType }}] {% endif %}{{ parameter.Type }} {{ parameter.VariableName }}{% if parameter.HasDefault %} = {{parameter.Default}}{% endif %}{% if GenerateOptionalParameters and parameter.IsOptional and parameter.HasDefault == false %} = null{% endif %}{% if parameter.IsLast == false or UseCancellationToken %}, {% endif %}{% endfor %}{% if UseCancellationToken %}System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken){% endif %}); + public abstract {% if operation.WrapResponse %}System.Threading.Tasks.Task{% else %}{{ operation.ResultType }}{% endif %} {{ operation.ActualOperationName }}({% for parameter in operation.Parameters %}{% if parameter.IsQuery %}[{{ AspNetNamespace }}.{% if IsAspNetCore -%}FromQuery{% else -%}FromUri{%- endif %}{% if parameter.IsValidIdentifier == false %}(Name = "{{ parameter.Name }}"){% endif %}] {% endif %}{% if parameter.IsHeader %}[{% if IsAspNetCore -%}{{ AspNetNamespace }}.{%- endif %}FromHeader{% if parameter.IsValidIdentifier == false %}(Name = "{{ parameter.Name }}"){% endif %}] {% endif %}{% if parameter.IsBody and parameter.IsBinaryBody == false %}[{{ AspNetNamespace }}.FromBody] {% endif %}{% if GenerateModelValidationAttributes and parameter.IsRequired %}[{{ RequiredAttributeType }}] {% endif %}{{ parameter.Type }} {{ parameter.VariableName }}{% if parameter.HasDefault %} = {{parameter.Default}}{% endif %}{% if GenerateOptionalParameters and parameter.IsOptional and parameter.HasDefault == false %} = null{% endif %}{% if parameter.IsLast == false or UseCancellationToken %}, {% endif %}{% endfor %}{% if UseCancellationToken %}System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken){% endif %}); {% endfor -%} } -{% endif -%} +{%- endif %} diff --git a/src/NSwag.CodeGeneration.CSharp/Templates/File.liquid b/src/NSwag.CodeGeneration.CSharp/Templates/File.liquid index 2a6bbc2d29..def547218e 100644 --- a/src/NSwag.CodeGeneration.CSharp/Templates/File.liquid +++ b/src/NSwag.CodeGeneration.CSharp/Templates/File.liquid @@ -10,7 +10,7 @@ {% if GenerateNullableReferenceTypes -%} #nullable enable -{% endif -%} +{%- endif %} {% for usage in NamespaceUsages -%} using {{ usage }}; {% endfor -%} @@ -32,7 +32,7 @@ namespace {{ Namespace }} {% if GenerateContracts -%} {{ Classes | tab }} -{% if RequiresFileParameterType -%} +{%- if RequiresFileParameterType -%} [System.CodeDom.Compiler.GeneratedCode("NSwag", "{{ ToolchainVersion }}")] public partial class FileParameter { @@ -41,20 +41,20 @@ namespace {{ Namespace }} { } -{% if GenerateNullableReferenceTypes -%} +{%- if GenerateNullableReferenceTypes -%} public FileParameter(System.IO.Stream data, string? fileName) -{% else -%} +{%- else -%} public FileParameter(System.IO.Stream data, string fileName) -{% endif -%} +{%- endif -%} : this (data, fileName, null) { } -{% if GenerateNullableReferenceTypes -%} +{%- if GenerateNullableReferenceTypes -%} public FileParameter(System.IO.Stream data, string? fileName, string? contentType) -{% else -%} +{%- else -%} public FileParameter(System.IO.Stream data, string fileName, string contentType) -{% endif -%} +{%- endif -%} { Data = data; FileName = fileName; @@ -63,29 +63,29 @@ namespace {{ Namespace }} public System.IO.Stream Data { get; private set; } -{% if GenerateNullableReferenceTypes -%} +{%- if GenerateNullableReferenceTypes -%} public string? FileName { get; private set; } public string? ContentType { get; private set; } -{% else -%} +{%- else -%} public string FileName { get; private set; } public string ContentType { get; private set; } -{% endif -%} +{%- endif -%} } -{% endif -%} -{% if GenerateFileResponseClass -%} +{%- endif %} +{%- if GenerateFileResponseClass %} [System.CodeDom.Compiler.GeneratedCode("NSwag", "{{ ToolchainVersion }}")] public partial class FileResponse : System.IDisposable { -{% if GenerateNullableReferenceTypes -%} +{%- if GenerateNullableReferenceTypes -%} private System.IDisposable? _client; private System.IDisposable? _response; -{% else -%} +{%- else -%} private System.IDisposable _client; private System.IDisposable _response; -{% endif -%} +{%- endif -%} public int StatusCode { get; private set; } @@ -98,11 +98,11 @@ namespace {{ Namespace }} get { return StatusCode == 206; } } -{% if GenerateNullableReferenceTypes -%} +{%- if GenerateNullableReferenceTypes -%} public FileResponse(int statusCode, System.Collections.Generic.IReadOnlyDictionary> headers, System.IO.Stream stream, System.IDisposable? client, System.IDisposable? response) -{% else -%} +{%- else -%} public FileResponse(int statusCode, System.Collections.Generic.IReadOnlyDictionary> headers, System.IO.Stream stream, System.IDisposable client, System.IDisposable response) -{% endif -%} +{%- endif -%} { StatusCode = statusCode; Headers = headers; @@ -121,9 +121,9 @@ namespace {{ Namespace }} } } -{% endif -%} -{% if WrapResponses and GenerateResponseClasses -%} -{% for responseClassName in ResponseClassNames -%} +{%- endif %} +{%- if WrapResponses and GenerateResponseClasses %} +{%- for responseClassName in ResponseClassNames %} [System.CodeDom.Compiler.GeneratedCode("NSwag", "{{ ToolchainVersion }}")] public partial class {{ responseClassName }} { @@ -150,28 +150,28 @@ namespace {{ Namespace }} } } -{% endfor %} -{% endif -%} -{% if GenerateExceptionClasses -%} -{% for exceptionClassName in ExceptionClassNames -%} +{%- endfor %} +{%- endif %} +{%- if GenerateExceptionClasses %} +{%- for exceptionClassName in ExceptionClassNames %} [System.CodeDom.Compiler.GeneratedCode("NSwag", "{{ ToolchainVersion }}")] public partial class {{ exceptionClassName }} : System.Exception { public int StatusCode { get; private set; } -{% if GenerateNullableReferenceTypes -%} +{%- if GenerateNullableReferenceTypes -%} public string? Response { get; private set; } -{% else -%} +{%- else -%} public string Response { get; private set; } -{% endif -%} +{%- endif -%} public System.Collections.Generic.IReadOnlyDictionary> Headers { get; private set; } -{% if GenerateNullableReferenceTypes -%} +{%- if GenerateNullableReferenceTypes -%} public {{ exceptionClassName }}(string message, int statusCode, string? response, System.Collections.Generic.IReadOnlyDictionary> headers, System.Exception? innerException) -{% else -%} +{%- else -%} public {{ exceptionClassName }}(string message, int statusCode, string response, System.Collections.Generic.IReadOnlyDictionary> headers, System.Exception innerException) -{% endif -%} +{%- endif -%} : base(message + "\n\nStatus: " + statusCode + "\nResponse: \n" + ((response == null) ? "(null)" : response.Substring(0, response.Length >= 512 ? 512 : response.Length)), innerException) { StatusCode = statusCode; @@ -190,11 +190,11 @@ namespace {{ Namespace }} { public TResult Result { get; private set; } -{% if GenerateNullableReferenceTypes -%} +{%- if GenerateNullableReferenceTypes -%} public {{ exceptionClassName }}(string message, int statusCode, string? response, System.Collections.Generic.IReadOnlyDictionary> headers, TResult result, System.Exception? innerException) -{% else -%} +{%- else -%} public {{ exceptionClassName }}(string message, int statusCode, string response, System.Collections.Generic.IReadOnlyDictionary> headers, TResult result, System.Exception innerException) -{% endif -%} +{%- endif -%} : base(message, statusCode, response, headers, innerException) { Result = result; @@ -203,12 +203,12 @@ namespace {{ Namespace }} {% endfor -%} {% endif -%} -{% endif -%} +{%- endif %} {% if GenerateImplementation -%} {% if RequiresJsonExceptionConverter -%} {% template JsonExceptionConverter %} {% endif -%} -{% endif -%} +{%- endif %} } diff --git a/src/NSwag.CodeGeneration.TypeScript/NSwag.CodeGeneration.TypeScript.csproj b/src/NSwag.CodeGeneration.TypeScript/NSwag.CodeGeneration.TypeScript.csproj index f786eb0563..26f1334d45 100644 --- a/src/NSwag.CodeGeneration.TypeScript/NSwag.CodeGeneration.TypeScript.csproj +++ b/src/NSwag.CodeGeneration.TypeScript/NSwag.CodeGeneration.TypeScript.csproj @@ -1,6 +1,6 @@  - netstandard1.3;net451;netstandard2.0 + net461;netstandard2.0 bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml @@ -8,7 +8,7 @@ - + @@ -18,6 +18,6 @@ - + \ No newline at end of file diff --git a/src/NSwag.CodeGeneration.TypeScript/Templates/AngularClient.liquid b/src/NSwag.CodeGeneration.TypeScript/Templates/AngularClient.liquid index 684b1a7c47..aced4792d0 100644 --- a/src/NSwag.CodeGeneration.TypeScript/Templates/AngularClient.liquid +++ b/src/NSwag.CodeGeneration.TypeScript/Templates/AngularClient.liquid @@ -5,7 +5,7 @@ {% template Client.Method.Documentation %} {{ operation.MethodAccessModifier }}{{ operation.ActualOperationName }}({% for parameter in operation.Parameters %}{{ parameter.VariableName }}{% if GenerateOptionalParameters and parameter.IsOptional %}?{% endif %}: {{ parameter.Type }}{{ parameter.TypePostfix }}{% if parameter.IsLast == false%}, {% endif %}{% endfor %}): Observable<{{ operation.ResultType }}>; {% endfor -%}} -{% endif -%} +{%- endif -%} {% if Framework.Angular.UseSingletonProvider -%} @Injectable({ @@ -13,91 +13,91 @@ }) {% else -%} @Injectable() -{% endif -%} +{%- endif -%} {% if ExportTypes %}export {% endif %}class {{ Class }} {% if HasBaseClass %}extends {{ BaseClass }} {% endif %}{% if GenerateClientInterfaces %}implements I{{ Class }} {% endif %}{ private http: {{ Framework.Angular.HttpClass }}; private baseUrl: string; protected jsonParseReviver: {% if SupportsStrictNullChecks %}((key: string, value: any) => any) | undefined{% else %}(key: string, value: any) => any{% endif %} = undefined; -{% if HasExtendedConstructor == false -%} +{%- if HasExtendedConstructor == false -%} constructor({% if HasConfigurationClass %}@Inject({{ ConfigurationClass }}) configuration: {{ ConfigurationClass }}, {% endif %}@Inject({{ Framework.Angular.HttpClass }}) http: {{ Framework.Angular.HttpClass }}, @Optional() @Inject({{ Framework.Angular.BaseUrlTokenName }}) baseUrl?: string) { -{% if HasBaseClass -%} +{%- if HasBaseClass -%} super({% if HasConfigurationClass %}configuration{% endif %}); -{% endif -%} +{%- endif -%} this.http = http; -{% if UseGetBaseUrlMethod -%} +{%- if UseGetBaseUrlMethod -%} this.baseUrl = baseUrl !== undefined && baseUrl !== null ? baseUrl : this.getBaseUrl("{{ BaseUrl }}"); -{% else -%} +{%- else -%} this.baseUrl = baseUrl !== undefined && baseUrl !== null ? baseUrl : "{{ BaseUrl }}"; -{% endif -%} +{%- endif -%} } -{% endif -%} +{%- endif -%} {% if HasExtensionCode -%} {{ ExtensionCode }} -{% endif -%} -{% for operation in Operations -%} +{%- endif -%} +{% for operation in Operations %} {% template Client.Method.Documentation %} - {{ operation.MethodAccessModifier }}{{ operation.ActualOperationName }}({% for parameter in operation.Parameters %}{{ parameter.VariableName }}{% if GenerateOptionalParameters and parameter.IsOptional %}?{% endif %}: {{ parameter.Type }}{{ parameter.TypePostfix }}{% if parameter.IsLast == false or IncludeHttpContext == true%}, {% endif %}{% endfor %}{% if IncludeHttpContext%}httpContext?: HttpContext{% endif %}) : Observable<{{ operation.ResultType }}> { + {{ operation.MethodAccessModifier }}{{ operation.ActualOperationName }}({% for parameter in operation.Parameters %}{{ parameter.VariableName }}{% if GenerateOptionalParameters and parameter.IsOptional %}?{% endif %}: {{ parameter.Type }}{{ parameter.TypePostfix }}{% if parameter.IsLast == false or IncludeHttpContext == true%}, {% endif %}{% endfor %}{% if IncludeHttpContext%}httpContext?: HttpContext{% endif %}): Observable<{{ operation.ResultType }}> { {% template Client.RequestUrl %} -{% if operation.HasBody -%} +{%- if operation.HasBody -%} {% template Client.RequestBody %} -{% endif -%} +{%- endif -%} let options_ : any = { -{% if operation.HasBody -%} +{%- if operation.HasBody -%} body: content_, -{% endif -%} -{% if Framework.Angular.UseHttpClient -%} +{%- endif -%} +{%- if Framework.Angular.UseHttpClient -%} observe: "response", responseType: "blob", -{% if Framework.Angular.WithCredentials -%} +{%- if Framework.Angular.WithCredentials -%} withCredentials: true, -{% endif -%} -{% else -%} +{%- endif -%} +{%- else -%} method: "{{ operation.HttpMethodLower }}", -{% endif -%} -{% if operation.IsFile and Framework.Angular.UseHttpClient == false -%} +{%- endif -%} +{%- if operation.IsFile and Framework.Angular.UseHttpClient == false -%} responseType: ResponseContentType.Blob, -{% endif -%} -{% if IncludeHttpContext -%} +{%- endif -%} +{%- if IncludeHttpContext -%} context: httpContext, -{% endif -%} +{%- endif -%} headers: new {% if Framework.Angular.UseHttpClient %}HttpHeaders{% else %}Headers{% endif %}({ -{% for parameter in operation.HeaderParameters -%} +{%- for parameter in operation.HeaderParameters -%} "{{ parameter.Name }}": {{ parameter.VariableName }} !== undefined && {{ parameter.VariableName }} !== null ? "" + {{ parameter.VariableName }} : "", -{% endfor -%} -{% if operation.HasContent or operation.ConsumesFormUrlEncoded -%} +{%- endfor -%} +{%- if operation.HasContent or operation.ConsumesFormUrlEncoded -%} "Content-Type": "{{ operation.Consumes }}", -{% endif -%} -{% if operation.HasResultType and operation.HasAcceptHeaderParameterParameter == false -%} +{%- endif -%} +{%- if operation.HasResultType and operation.HasAcceptHeaderParameterParameter == false -%} "Accept": "{{ operation.Produces }}" -{% endif -%} +{%- endif -%} }) }; -{% if UseTransformOptionsMethod -%} +{% if UseTransformOptionsMethod -%} return {{ Framework.RxJs.ObservableFromMethod }}(this.transformOptions(options_)).{% if Framework.UseRxJs6 %}pipe({% endif %}{{ Framework.RxJs.ObservableMergeMapMethod }}(transformedOptions_ => { return this.http.request({% if Framework.Angular.UseHttpClient %}"{{ operation.HttpMethodLower }}", {% endif %}url_, transformedOptions_); }){% if Framework.UseRxJs6 %}){% endif %}.{% if Framework.UseRxJs6 %}pipe({% endif %}{{ Framework.RxJs.ObservableMergeMapMethod }}((response_: any) => { -{% else -%} +{%- else -%} return this.http.request({% if Framework.Angular.UseHttpClient %}"{{ operation.HttpMethodLower }}", {% endif %}url_, options_).{% if Framework.UseRxJs6 %}pipe({% endif %}{{ Framework.RxJs.ObservableMergeMapMethod }}((response_ : any) => { -{% endif -%} -{% if UseTransformResultMethod -%} +{%- endif -%} +{%- if UseTransformResultMethod -%} return this.transformResult(url_, response_, (r) => this.process{{ operation.ActualOperationNameUpper }}(r)); -{% else -%} +{%- else -%} return this.process{{ operation.ActualOperationNameUpper }}(response_); -{% endif -%} +{%- endif -%} }){% if Framework.UseRxJs6 %}){% endif %}.{% if Framework.UseRxJs6 %}pipe({% endif %}{{ Framework.RxJs.ObservableCatchMethod }}((response_: any) => { if (response_ instanceof {% if Framework.Angular.UseHttpClient %}HttpResponseBase{% else %}Response{% endif %}) { try { -{% if UseTransformResultMethod -%} +{%- if UseTransformResultMethod -%} return this.transformResult(url_, response_, (r) => this.process{{ operation.ActualOperationNameUpper }}(r)); -{% else -%} +{%- else -%} return this.process{{ operation.ActualOperationNameUpper }}(response_); -{% endif -%} +{%- endif -%} } catch (e) { return >{{ Framework.RxJs.ObservableThrowMethod }}(e); } @@ -108,14 +108,14 @@ protected process{{ operation.ActualOperationNameUpper }}(response: {% if Framework.Angular.UseHttpClient %}HttpResponseBase{% else %}Response{% endif %}): Observable<{{ operation.ResultType }}> { const status = response.status; -{% if Framework.Angular.UseHttpClient -%} +{%- if Framework.Angular.UseHttpClient -%} const responseBlob = response instanceof HttpResponse ? response.body : (response).error instanceof Blob ? (response).error : undefined; -{% endif -%} +{%- endif -%} {% template Client.ProcessResponse %} } {% endfor -%} } -{% endif -%} \ No newline at end of file +{%- endif -%} diff --git a/src/NSwag.CodeGeneration.TypeScript/Templates/AngularJSClient.liquid b/src/NSwag.CodeGeneration.TypeScript/Templates/AngularJSClient.liquid index 28690543fc..7636aa519c 100644 --- a/src/NSwag.CodeGeneration.TypeScript/Templates/AngularJSClient.liquid +++ b/src/NSwag.CodeGeneration.TypeScript/Templates/AngularJSClient.liquid @@ -5,7 +5,7 @@ {% template Client.Method.Documentation %} {{ operation.MethodAccessModifier }}{{ operation.ActualOperationName }}({% for parameter in operation.Parameters %}{{ parameter.VariableName }}{% if GenerateOptionalParameters and parameter.IsOptional %}?{% endif %}: {{ parameter.Type }}{{ parameter.TypePostfix }}{% if parameter.IsLast == false %}, {% endif %}{% endfor %}): ng.IPromise<{{ operation.ResultType }}>; {% endfor -%}} -{% endif -%} +{%- endif -%} {% if ExportTypes %}export {% endif %}class {{ Class }} {% if HasBaseClass %}extends {{ BaseClass }} {% endif %}{% if GenerateClientInterfaces %}implements I{{ Class }} {% endif %}{ private baseUrl: string{% if SupportsStrictNullChecks %} | undefined{% endif %} = undefined; @@ -13,25 +13,25 @@ private q: ng.IQService; protected jsonParseReviver: {% if SupportsStrictNullChecks %}((key: string, value: any) => any) | undefined{% else %}(key: string, value: any) => any{% endif %} = undefined; -{% if HasExtendedConstructor == false %} +{%- if HasExtendedConstructor == false -%} constructor({% if HasConfigurationClass %}configuration: {{ ConfigurationClass }}, {% endif %}$http: ng.IHttpService, $q: ng.IQService, baseUrl?: string) { -{% if HasBaseClass -%} +{%- if HasBaseClass -%} super({% if HasConfigurationClass %}configuration{% endif %}); -{% endif -%} +{%- endif -%} this.http = $http; this.q = $q; -{% if UseGetBaseUrlMethod -%} +{%- if UseGetBaseUrlMethod -%} this.baseUrl = baseUrl !== undefined && baseUrl !== null ? baseUrl : this.getBaseUrl("{{ BaseUrl }}"); -{% else -%} +{%- else -%} this.baseUrl = baseUrl !== undefined && baseUrl !== null ? baseUrl : "{{ BaseUrl }}"; -{% endif -%} +{%- endif -%} } -{% endif -%} +{%- endif -%} {% if HasExtensionCode -%} {{ ExtensionCode }} -{% endif -%} -{% for operation in Operations -%} +{%- endif -%} +{% for operation in Operations %} {% template Client.Method.Documentation %} {{ operation.MethodAccessModifier }}{{ operation.ActualOperationName }}({% for parameter in operation.Parameters %}{{ parameter.VariableName }}{% if GenerateOptionalParameters and parameter.IsOptional %}?{% endif %}: {{ parameter.Type }}{{ parameter.TypePostfix }}{% if parameter.IsLast == false %}, {% endif %}{% endfor %}): ng.IPromise<{{ operation.ResultType }}> { @@ -52,7 +52,7 @@ {% endif -%} transformResponse: [], headers: { -{% for parameter in operation.HeaderParameters -%} +{%- for parameter in operation.HeaderParameters -%} "{{ parameter.Name }}": {{ parameter.VariableName }} !== undefined && {{ parameter.VariableName }} !== null ? "" + {{ parameter.VariableName }} : "", {% endfor -%} {% if operation.HasContent or operation.ConsumesFormUrlEncoded -%} @@ -94,4 +94,4 @@ } {% endfor -%} } -{% endif -%} +{%- endif -%} diff --git a/src/NSwag.CodeGeneration.TypeScript/Templates/AxiosClient.liquid b/src/NSwag.CodeGeneration.TypeScript/Templates/AxiosClient.liquid index a72ea046bb..3b3396337a 100644 --- a/src/NSwag.CodeGeneration.TypeScript/Templates/AxiosClient.liquid +++ b/src/NSwag.CodeGeneration.TypeScript/Templates/AxiosClient.liquid @@ -5,31 +5,31 @@ {% template Client.Method.Documentation %} {{ operation.MethodAccessModifier }}{{ operation.ActualOperationName }}({% for parameter in operation.Parameters %}{{ parameter.VariableName }}{% if GenerateOptionalParameters and parameter.IsOptional %}?{% endif %}: {{ parameter.Type }}{{ parameter.TypePostfix }}{% if parameter.IsLast == false %}, {% endif %}{% endfor %}): Promise<{{ operation.ResultType }}>; {% endfor -%}} -{% endif -%} +{%- endif %} {% if ExportTypes %}export {% endif %}class {{ Class }} {% if HasBaseClass %}extends {{ BaseClass }} {% endif %}{% if GenerateClientInterfaces %}implements I{{ Class }} {% endif %}{ private instance: AxiosInstance; private baseUrl: string; protected jsonParseReviver: {% if SupportsStrictNullChecks %}((key: string, value: any) => any) | undefined{% else %}(key: string, value: any) => any{% endif %} = undefined; -{% if HasExtendedConstructor == false -%} +{%- if HasExtendedConstructor == false %} constructor({% if HasConfigurationClass %}configuration: {{ ConfigurationClass }}, {% endif %}baseUrl?: string, instance?: AxiosInstance) { -{% if HasBaseClass -%} +{%- if HasBaseClass %} super({% if HasConfigurationClass %}configuration{% endif %}); -{% endif -%} +{%- endif %} this.instance = instance ? instance : axios.create(); -{% if UseGetBaseUrlMethod -%} +{%- if UseGetBaseUrlMethod %} this.baseUrl = baseUrl !== undefined && baseUrl !== null ? baseUrl : this.getBaseUrl("{{ BaseUrl }}"); -{% else -%} +{%- else %} this.baseUrl = baseUrl !== undefined && baseUrl !== null ? baseUrl : "{{ BaseUrl }}"; -{% endif -%} +{%- endif %} } -{% endif -%} +{%- endif %} {% if HasExtensionCode -%} {{ ExtensionCode }} -{% endif -%} -{% for operation in Operations -%} +{%- endif %} +{% for operation in Operations %} {% template Client.Method.Documentation %} {{ operation.MethodAccessModifier }}{{ operation.ActualOperationName }}({% for parameter in operation.Parameters %}{{ parameter.VariableName }}{% if GenerateOptionalParameters and parameter.IsOptional %}?{% endif %}: {{ parameter.Type }}{{ parameter.TypePostfix }}{% if parameter.IsLast == false %}, {% endif %}{% endfor %} {% if operation.Parameters.size > 0 %},{%endif%} cancelToken?: CancelToken | undefined): Promise<{{ operation.ResultType }}> { @@ -89,4 +89,4 @@ } {% endfor -%} } -{% endif -%} +{%- endif %} diff --git a/src/NSwag.CodeGeneration.TypeScript/Templates/Client.Method.Documentation.liquid b/src/NSwag.CodeGeneration.TypeScript/Templates/Client.Method.Documentation.liquid index 4c25851e79..2756d01c1f 100644 --- a/src/NSwag.CodeGeneration.TypeScript/Templates/Client.Method.Documentation.liquid +++ b/src/NSwag.CodeGeneration.TypeScript/Templates/Client.Method.Documentation.liquid @@ -15,4 +15,4 @@ * @deprecated {% endif -%} */ -{% endif -%} \ No newline at end of file +{%- endif %} \ No newline at end of file diff --git a/src/NSwag.CodeGeneration.TypeScript/Templates/Client.ProcessResponse.HandleStatusCode.liquid b/src/NSwag.CodeGeneration.TypeScript/Templates/Client.ProcessResponse.HandleStatusCode.liquid index 86546ffac2..d9841c9dc1 100644 --- a/src/NSwag.CodeGeneration.TypeScript/Templates/Client.ProcessResponse.HandleStatusCode.liquid +++ b/src/NSwag.CodeGeneration.TypeScript/Templates/Client.ProcessResponse.HandleStatusCode.liquid @@ -1,7 +1,7 @@ {% if operation.CanRequestBlobs and response.IsFile -%} {% if Framework.IsAngularJS -%} const contentDisposition = response.headers ? response.headers("content-disposition") : undefined; -{% elseif Framework.IsAxios -%} +{% elsif Framework.IsAxios -%} const contentDisposition = response.headers ? response.headers["content-disposition"] : undefined; {% else -%} const contentDisposition = response.headers ? response.headers.get("content-disposition") : undefined; @@ -11,9 +11,9 @@ const fileName = fileNameMatch && fileNameMatch.length > 1 ? fileNameMatch[1] : {% if operation.WrapResponse -%} {% if Framework.IsAngular -%} return {{ Framework.RxJs.ObservableOfMethod }}(new {{ operation.ResponseClass }}(status, _headers, { fileName: fileName, data: {% if Framework.Angular.UseHttpClient %}responseBlob{% else %}response.blob(){% endif %}, status: status, headers: _headers })); -{% elseif Framework.IsAngularJS -%} +{% elsif Framework.IsAngularJS -%} return this.q.resolve(new {{ operation.ResponseClass }}(status, _headers, { fileName: fileName, status: status, data: new Blob([response.data]), headers: _headers })); -{% elseif Framework.IsAxios -%} +{% elsif Framework.IsAxios -%} return Promise.resolve<{{ operation.ResultType }}>(new {{ operation.ResponseClass }}(status, _headers, { fileName: fileName, status: status, data: new Blob([response.data]), headers: _headers })); {% else -%} return response.blob().then(blob => { return new {{ operation.ResponseClass }}(status, _headers, { fileName: fileName, data: blob, status: status, headers: _headers }); }); @@ -21,9 +21,9 @@ return response.blob().then(blob => { return new {{ operation.ResponseClass }}(s {% else -%} {% if Framework.IsAngular -%} return {{ Framework.RxJs.ObservableOfMethod }}({ fileName: fileName, data: {% if Framework.Angular.UseHttpClient %}responseBlob{% else %}response.blob(){% endif %}, status: status, headers: _headers }); -{% elseif Framework.IsAngularJS -%} +{% elsif Framework.IsAngularJS -%} return this.q.resolve({ fileName: fileName, status: status, data: new Blob([response.data]), headers: _headers }); -{% elseif Framework.IsAxios -%} +{% elsif Framework.IsAxios -%} return Promise.resolve({ fileName: fileName, status: status, data: new Blob([response.data]), headers: _headers }); {% else -%} return response.blob().then(blob => { return { fileName: fileName, data: blob, status: status, headers: _headers }; }); @@ -52,9 +52,9 @@ result{{ response.StatusCode }} = _responseText === "" ? null : <{{ response.Typ {% if operation.WrapResponse -%} {% if Framework.IsAngular -%} return {{ Framework.RxJs.ObservableOfMethod }}(new {{ operation.ResponseClass }}(status, _headers, result{{ response.StatusCode }})); -{% elseif Framework.IsAngularJS -%} +{% elsif Framework.IsAngularJS -%} return this.q.resolve(new {{ operation.ResponseClass }}(status, _headers, result{{ response.StatusCode }})); -{% elseif Framework.IsAxios -%} +{% elsif Framework.IsAxios -%} return Promise.resolve<{{ operation.ResultType }}>(new {{ operation.ResultType }}(status, _headers, result{{ response.StatusCode }})); {% else -%} return new {{ operation.ResponseClass }}(status, _headers, result{{ response.StatusCode }}); @@ -62,9 +62,9 @@ return new {{ operation.ResponseClass }}(status, _headers, result{{ response.Sta {% else -%} {% if Framework.IsAngular -%} return {{ Framework.RxJs.ObservableOfMethod }}(result{{ response.StatusCode }}); -{% elseif Framework.IsAngularJS -%} +{% elsif Framework.IsAngularJS -%} return this.q.resolve(result{{ response.StatusCode }}); -{% elseif Framework.IsAxios -%} +{% elsif Framework.IsAxios -%} return Promise.resolve<{{ operation.ResultType }}>(result{{ response.StatusCode }}); {% else -%} return result{{ response.StatusCode }}; @@ -73,13 +73,13 @@ return result{{ response.StatusCode }}; {% else -%} return throwException({% if Framework.IsAngularJS %}this.q, {% endif %}"{{ response.ExceptionDescription }}", status, _responseText, _headers, result{{ response.StatusCode }}); {% endif -%} -{% elseif response.IsSuccess -%} +{% elsif response.IsSuccess -%} {% if operation.WrapResponse -%} {% if Framework.IsAngular -%} return {{ Framework.RxJs.ObservableOfMethod }}<{{ operation.ResultType }}>(new {{ operation.ResponseClass }}(status, _headers, null)); -{% elseif Framework.IsAngularJS -%} +{% elsif Framework.IsAngularJS -%} return this.q.resolve<{{ operation.ResultType }}>(new {{ operation.ResponseClass }}(status, _headers, null)); -{% elseif Framework.IsAxios -%} +{% elsif Framework.IsAxios -%} return Promise.resolve<{{ operation.ResultType }}>(new {{ operation.ResultType }}(status, _headers, null)); {% else -%} return new {{ operation.ResponseClass }}(status, _headers, null); @@ -87,9 +87,9 @@ return new {{ operation.ResponseClass }}(status, _headers, null); {% else -%} {% if Framework.IsAngular -%} return {{ Framework.RxJs.ObservableOfMethod }}<{{ operation.ResultType }}>(null); -{% elseif Framework.IsAngularJS -%} +{% elsif Framework.IsAngularJS -%} return this.q.resolve<{{ operation.ResultType }}>(null); -{% elseif Framework.IsAxios -%} +{% elsif Framework.IsAxios -%} return Promise.resolve<{{ operation.ResultType }}>(null); {% else -%} return{% if operation.HasResultType %} null{% endif %}; diff --git a/src/NSwag.CodeGeneration.TypeScript/Templates/Client.ProcessResponse.ReadBodyEnd.liquid b/src/NSwag.CodeGeneration.TypeScript/Templates/Client.ProcessResponse.ReadBodyEnd.liquid index 6c743c8e42..ef0d8793f0 100644 --- a/src/NSwag.CodeGeneration.TypeScript/Templates/Client.ProcessResponse.ReadBodyEnd.liquid +++ b/src/NSwag.CodeGeneration.TypeScript/Templates/Client.ProcessResponse.ReadBodyEnd.liquid @@ -1,7 +1,8 @@ {% if Framework.IsFetchOrAurelia or operation.RequestAngularBlobs or Framework.Angular.UseHttpClient or operation.RequestAngularJSBlobs -%} -{% if Framework.IsAngular and Framework.UseRxJs6 and (Framework.Angular.UseHttpClient or operation.RequestAngularBlobs) -%} +{%- assign condition_temp = Framework.Angular.UseHttpClient or operation.RequestAngularBlobs %} +{% if Framework.IsAngular and Framework.UseRxJs6 and condition_temp -%} })); {% else -%} }); {% endif -%} -{% endif -%} +{%- endif %} diff --git a/src/NSwag.CodeGeneration.TypeScript/Templates/Client.ProcessResponse.ReadBodyStart.liquid b/src/NSwag.CodeGeneration.TypeScript/Templates/Client.ProcessResponse.ReadBodyStart.liquid index e48951a63f..c72374c0c2 100644 --- a/src/NSwag.CodeGeneration.TypeScript/Templates/Client.ProcessResponse.ReadBodyStart.liquid +++ b/src/NSwag.CodeGeneration.TypeScript/Templates/Client.ProcessResponse.ReadBodyStart.liquid @@ -1,24 +1,24 @@ {% if Framework.IsFetchOrAurelia -%} return response.text().then((_responseText) => { -{% elseif Framework.Angular.UseHttpClient -%} +{% elsif Framework.Angular.UseHttpClient -%} {% if Framework.UseRxJs6 -%} return blobToText(responseBlob).pipe({{ Framework.RxJs.ObservableMergeMapMethod }}({{ Framework.RxJs.ResponseTextProperty }} => { {% else -%} return blobToText(responseBlob).flatMap({{ Framework.RxJs.ResponseTextProperty }} => { {% endif -%} -{% elseif operation.RequestAngularBlobs -%} +{% elsif operation.RequestAngularBlobs -%} {% if Framework.UseRxJs6 -%} return blobToText(response.blob()).pipe({{ Framework.RxJs.ObservableMergeMapMethod }}({{ Framework.RxJs.ResponseTextProperty }} => { {% else -%} return blobToText(response.blob()).flatMap({{ Framework.RxJs.ResponseTextProperty }} => { {% endif -%} -{% elseif operation.RequestAngularJSBlobs -%} +{% elsif operation.RequestAngularJSBlobs -%} return blobToText(new Blob([response.data]), this.q).then({{ Framework.RxJs.ResponseTextProperty }} => { -{% elseif Framework.IsAngular -%} +{% elsif Framework.IsAngular -%} const _responseText = response.text(); -{% elseif Framework.IsAngularJS -%} +{% elsif Framework.IsAngularJS -%} const _responseText = response.data; -{% elseif Framework.IsAxios -%} +{% elsif Framework.IsAxios -%} const _responseText = response.data; {% else -%} const _responseText = xhr.responseText; diff --git a/src/NSwag.CodeGeneration.TypeScript/Templates/Client.ProcessResponse.ReadHeaders.liquid b/src/NSwag.CodeGeneration.TypeScript/Templates/Client.ProcessResponse.ReadHeaders.liquid index 523545f12d..eb40f398f3 100644 --- a/src/NSwag.CodeGeneration.TypeScript/Templates/Client.ProcessResponse.ReadHeaders.liquid +++ b/src/NSwag.CodeGeneration.TypeScript/Templates/Client.ProcessResponse.ReadHeaders.liquid @@ -4,9 +4,9 @@ let _headers: any = {}; if (response.headers) { for (let key of response.headers {% else -%} let _headers: any = response.headers ? response.headers.toJSON() : {}; {% endif -%} -{% elseif Framework.IsFetchOrAurelia -%} +{% elsif Framework.IsFetchOrAurelia -%} let _headers: any = {}; if (response.headers && response.headers.forEach) { response.headers.forEach((v: any, k: any) => _headers[k] = v); }; -{% elseif Framework.IsAxios -%} +{% elsif Framework.IsAxios -%} let _headers: any = {}; if (response.headers && typeof response.headers === "object") { for (let k in response.headers) { @@ -15,6 +15,6 @@ if (response.headers && typeof response.headers === "object") { } } } -{% else -%} +{%- else -%} let _headers: any = {}; -{% endif -%} \ No newline at end of file +{%- endif -%} \ No newline at end of file diff --git a/src/NSwag.CodeGeneration.TypeScript/Templates/Client.ProcessResponse.Return.liquid b/src/NSwag.CodeGeneration.TypeScript/Templates/Client.ProcessResponse.Return.liquid index 6199f4ba37..661dbc6310 100644 --- a/src/NSwag.CodeGeneration.TypeScript/Templates/Client.ProcessResponse.Return.liquid +++ b/src/NSwag.CodeGeneration.TypeScript/Templates/Client.ProcessResponse.Return.liquid @@ -4,19 +4,19 @@ return Promise.resolve<{{ operation.ResultType }}>(new {{ operation.ResponseClas {% else -%} return Promise.resolve<{{ operation.ResultType }}>(null); {% endif -%} -{% elseif Framework.IsAxios -%} +{% elsif Framework.IsAxios -%} {% if operation.WrapResponse -%} return Promise.resolve<{{ operation.ResultType }}>(new {{ operation.ResponseClass }}(status, _headers, null)); {% else -%} return Promise.resolve<{{ operation.ResultType }}>(null); {% endif -%} -{% elseif Framework.IsAngular -%} +{% elsif Framework.IsAngular -%} {% if operation.WrapResponse -%} return {{ Framework.RxJs.ObservableOfMethod }}<{{ operation.ResultType }}>(new {{ operation.ResponseClass }}(status, _headers, null)); {% else -%} return {{ Framework.RxJs.ObservableOfMethod }}<{{ operation.ResultType }}>(null); {% endif -%} -{% elseif Framework.IsAngularJS -%} +{% elsif Framework.IsAngularJS -%} {% if operation.WrapResponse -%} return this.q.resolve<{{ operation.ResultType }}>(new {{ operation.ResponseClass }}(status, _headers, null)); {% else -%} @@ -28,4 +28,4 @@ return new {{ operation.ResponseClass }}(status, _headers, null); {% else -%} return{% if operation.HasResultType %} null{% endif %}; {% endif -%} -{% endif -%} +{%- endif -%} \ No newline at end of file diff --git a/src/NSwag.CodeGeneration.TypeScript/Templates/Client.ProcessResponse.liquid b/src/NSwag.CodeGeneration.TypeScript/Templates/Client.ProcessResponse.liquid index 0862627a79..cd0c82b2fd 100644 --- a/src/NSwag.CodeGeneration.TypeScript/Templates/Client.ProcessResponse.liquid +++ b/src/NSwag.CodeGeneration.TypeScript/Templates/Client.ProcessResponse.liquid @@ -8,14 +8,13 @@ if (status === {{ response.StatusCode }}{% if response.CheckChunkedStatusCode %} } else {% endfor -%} {% if operation.HasDefaultResponse -%} { -{% assign response = operation.DefaultResponse -%} +{%- assign response = operation.DefaultResponse -%} {% template Client.ProcessResponse.HandleStatusCode %} } -{% else -%} -if (status !== 200 && status !== 204) { +{%- else %}if (status !== 200 && status !== 204) { {% template Client.ProcessResponse.ReadBodyStart %} return throwException({% if Framework.IsAngularJS %}this.q, {% endif %}"An unexpected server error occurred.", status, _responseText, _headers); {% template Client.ProcessResponse.ReadBodyEnd %} } -{% template Client.ProcessResponse.Return %} +{% template Client.ProcessResponse.Return -%} {% endif -%} \ No newline at end of file diff --git a/src/NSwag.CodeGeneration.TypeScript/Templates/Client.RequestBody.liquid b/src/NSwag.CodeGeneration.TypeScript/Templates/Client.RequestBody.liquid index 82fcece8bc..be64a59c97 100644 --- a/src/NSwag.CodeGeneration.TypeScript/Templates/Client.RequestBody.liquid +++ b/src/NSwag.CodeGeneration.TypeScript/Templates/Client.RequestBody.liquid @@ -1,29 +1,29 @@ -{% if operation.HasFormParameters -%} -{% if operation.ConsumesFormUrlEncoded -%} +{%- if operation.HasFormParameters -%} +{%- if operation.ConsumesFormUrlEncoded -%} let content_ = ""; -{% for parameter in operation.FormParameters -%} -{% if parameter.IsRequired -%} -{% if parameter.IsNullable -%} +{%- for parameter in operation.FormParameters -%} +{%- if parameter.IsRequired -%} +{%- if parameter.IsNullable -%} if ({{ parameter.VariableName }} === undefined) throw new Error("The parameter '{{ parameter.VariableName }}' must be defined."); else -{% else -%} +{%- else -%} if ({{ parameter.VariableName }} === undefined || {{ parameter.VariableName }} === null) throw new Error("The parameter '{{ parameter.VariableName }}' must be defined and cannot be null."); else -{% endif -%} -{% else -%} -{% if parameter.IsNullable -%} +{%- endif -%} +{%- else -%} +{%- if parameter.IsNullable -%} if ({{ parameter.VariableName }} !== undefined) -{% else -%} +{%- else -%} if ({{ parameter.VariableName }} === null) throw new Error("The parameter '{{ parameter.VariableName }}' cannot be null."); else if ({{ parameter.VariableName }} !== undefined) -{% endif -%} -{% endif -%} -{% if parameter.IsDateOrDateTimeArray -%} +{%- endif -%} +{%- endif -%} +{%- if parameter.IsDateOrDateTimeArray -%} {{ parameter.VariableName }} && {{ parameter.VariableName }}.forEach(item_ => { content_ += encodeURIComponent("{{ parameter.Name }}") + "=" + encodeURIComponent(item_ ? "" + item_.toJSON() : "null") + "&"; }); -{% elseif parameter.IsObjectArray -%} +{%- elsif parameter.IsObjectArray -%} {{ parameter.VariableName }} && {{ parameter.VariableName }}.forEach((item_, index_) => { for (let attr_ in item_) { if (item_.hasOwnProperty(attr_)) { @@ -31,57 +31,57 @@ else if ({{ parameter.VariableName }} !== undefined) } } }); -{% elseif parameter.IsDateOrDateTime -%} +{%- elsif parameter.IsDateOrDateTime -%} content_ += encodeURIComponent("{{ parameter.Name }}") + "=" + encodeURIComponent({{ parameter.VariableName }} ? "" + {{ parameter.VariableName }}.toJSON() : "{{ QueryNullValue }}") + "&"; -{% elseif parameter.IsArray -%} +{%- elsif parameter.IsArray -%} {{ parameter.VariableName }} && {{ parameter.VariableName }}.forEach(item => { content_ += encodeURIComponent("{{ parameter.Name }}") + "=" + encodeURIComponent("" + item) + "&"; }); -{% else -%} +{%- else -%} content_ += encodeURIComponent("{{ parameter.Name }}") + "=" + encodeURIComponent("" + {{ parameter.VariableName }}) + "&"; -{% endif -%} -{% endfor -%} +{%- endif -%} +{%- endfor -%} content_ = content_.replace(/&$/, ""); -{% else -%} +{%- else -%} const content_ = new FormData(); {% for parameter in operation.FormParameters -%} -{% if parameter.IsNullable -%} +{%- if parameter.IsNullable -%} if ({{ parameter.VariableName }} !== null && {{ parameter.VariableName }} !== undefined) -{% else -%} +{%- else -%} if ({{ parameter.VariableName }} === null || {{ parameter.VariableName }} === undefined) throw new Error("The parameter '{{ parameter.VariableName }}' cannot be null."); else -{% endif -%} -{% if parameter.IsFile -%} -{% if parameter.IsArray -%} +{%- endif -%} +{%- if parameter.IsFile -%} +{%- if parameter.IsArray -%} {{ parameter.VariableName }}.forEach(item_ => content_.append("{{ parameter.Name }}", item_.data, item_.fileName ? item_.fileName : "{{ parameter.Name }}") ); -{% else -%} +{%- else -%} content_.append("{{ parameter.Name }}", {{ parameter.VariableName }}.data, {{ parameter.VariableName }}.fileName ? {{ parameter.VariableName }}.fileName : "{{ parameter.Name }}"); -{% endif -%} -{% elseif parameter.IsDateOrDateTime -%} +{%- endif -%} +{%- elsif parameter.IsDateOrDateTime -%} content_.append("{{ parameter.Name }}", {{ parameter.VariableName }}.toJSON()); -{% elseif parameter.IsObject -%} +{%- elsif parameter.IsObject -%} content_.append("{{ parameter.Name }}", JSON.stringify({{ parameter.VariableName }})); -{% elseif parameter.IsArray -%} +{%- elsif parameter.IsArray -%} {{ parameter.VariableName }}.forEach(item_ => content_.append("{{ parameter.Name }}", item_.toString())); -{% else -%} +{%- else -%} content_.append("{{ parameter.Name }}", {{ parameter.VariableName }}.toString()); -{% endif -%} -{% endfor -%} -{% endif -%} -{% else -%} -{% if operation.HasContent -%} -{% if operation.HasBinaryBodyParameter -%} +{%- endif -%} +{%- endfor -%} +{%- endif -%} +{%- else -%} +{%- if operation.HasContent -%} +{%- if operation.HasBinaryBodyParameter -%} const content_ = {{ operation.ContentParameter.VariableName }}; -{% elseif operation.HasXmlBodyParameter -%} +{%- elsif operation.HasXmlBodyParameter -%} const content_ = {{ operation.ContentParameter.VariableName }}; -{% elseif operation.Consumes == "application/x-www-form-urlencoded" -%} +{% elsif operation.Consumes == "application/x-www-form-urlencoded" -%} const content_ = Object.keys({{ operation.ContentParameter.VariableName }} as any).map((key) => { return encodeURIComponent(key) + '=' + encodeURIComponent(({{ operation.ContentParameter.VariableName }} as any)[key]); }).join('&') -{% else -%} +{%- else -%} const content_ = JSON.stringify({{ operation.ContentParameter.VariableName }}); -{% endif -%} -{% else -%} +{%- endif -%} +{%- else -%} const content_ = undefined; -{% endif -%} -{% endif -%} \ No newline at end of file +{%- endif -%} +{%- endif -%} diff --git a/src/NSwag.CodeGeneration.TypeScript/Templates/Client.RequestUrl.liquid b/src/NSwag.CodeGeneration.TypeScript/Templates/Client.RequestUrl.liquid index 7fbe7135b8..5363775df2 100644 --- a/src/NSwag.CodeGeneration.TypeScript/Templates/Client.RequestUrl.liquid +++ b/src/NSwag.CodeGeneration.TypeScript/Templates/Client.RequestUrl.liquid @@ -1,60 +1,60 @@ let url_ = this.baseUrl + "/{{ operation.Path }}{% if operation.HasQueryParameters %}?{% endif %}"; {% for parameter in operation.PathParameters -%} -{% if parameter.IsRequired -%} +{% if parameter.IsRequired -%} if ({{ parameter.VariableName }} === undefined || {{ parameter.VariableName }} === null) throw new Error("The parameter '{{ parameter.VariableName }}' must be defined."); -{% else -%} +{% else -%} if ({{ parameter.VariableName }} !== null && {{ parameter.VariableName }} !== undefined) -{% endif -%} -{% if parameter.IsDateOrDateTimeArray -%} +{% endif -%} +{% if parameter.IsDateOrDateTimeArray -%} url_ = url_.replace("{{ "{" }}{{ parameter.Name }}}", encodeURIComponent({{ parameter.VariableName }}.map(s_ => s_ ? s_.{{ parameter.GetDateTimeToString }} : "null").join())); -{% elseif parameter.IsDateOrDateTime -%} +{% elsif parameter.IsDateOrDateTime -%} url_ = url_.replace("{{ "{" }}{{ parameter.Name }}}", encodeURIComponent({{ parameter.VariableName }} ? "" + {{ parameter.VariableName }}.{{ parameter.GetDateTimeToString }} : "null")); -{% elseif parameter.IsArray -%} +{% elsif parameter.IsArray -%} url_ = url_.replace("{{ "{" }}{{ parameter.Name }}}", encodeURIComponent({{ parameter.VariableName }}.join())); -{% else -%} +{% else -%} url_ = url_.replace("{{ "{" }}{{ parameter.Name }}}", encodeURIComponent("" + {{ parameter.VariableName }})); -{% endif -%} -{% if parameter.IsOptional -%} +{% endif -%} +{% if parameter.IsOptional -%} else url_ = url_.replace("/{{ "{" }}{{ parameter.Name }}}", ""); -{% endif -%} +{% endif -%} {% endfor -%} {% for parameter in operation.QueryParameters -%} -{% if parameter.IsRequired -%} -{% if parameter.IsNullable -%} +{% if parameter.IsRequired -%} +{% if parameter.IsNullable -%} if ({{ parameter.VariableName }} === undefined) throw new Error("The parameter '{{ parameter.VariableName }}' must be defined."); else if({{ parameter.VariableName }} !== null) -{% else -%} +{% else -%} if ({{ parameter.VariableName }} === undefined || {{ parameter.VariableName }} === null) throw new Error("The parameter '{{ parameter.VariableName }}' must be defined and cannot be null."); else -{% endif -%} -{% else -%} -{% if parameter.IsNullable -%} +{% endif -%} +{% else -%} +{% if parameter.IsNullable -%} if ({{ parameter.VariableName }} !== undefined && {{ parameter.VariableName }} !== null) -{% else -%} +{% else -%} if ({{ parameter.VariableName }} === null) throw new Error("The parameter '{{ parameter.VariableName }}' cannot be null."); else if ({{ parameter.VariableName }} !== undefined) -{% endif -%} -{% endif -%} -{% if parameter.IsDateOrDateTimeArray -%} +{% endif -%} +{% endif -%} +{% if parameter.IsDateOrDateTimeArray -%} {{ parameter.VariableName }} && {{ parameter.VariableName }}.forEach(item_ => { url_ += "{{ parameter.Name }}=" + encodeURIComponent(item_ ? "" + item_.toJSON() : "null") + "&"; }); -{% elseif parameter.IsObjectArray -%} +{% elsif parameter.IsObjectArray -%} {{ parameter.VariableName }} && {{ parameter.VariableName }}.forEach((item, index) => { for (let attr in item) if (item.hasOwnProperty(attr)) { url_ += "{{ parameter.Name }}[" + index + "]." + attr + "=" + encodeURIComponent("" + (item)[attr]) + "&"; } }); -{% elseif parameter.IsDateOrDateTime -%} - url_ += "{{ parameter.Name }}=" + encodeURIComponent({{ parameter.VariableName }} ? "" + {{ parameter.VariableName }}.{{ parameter.GetDateTimeToString }} : "{{ QueryNullValue }}") + "&"; -{% elseif parameter.IsArray -%} +{% elsif parameter.IsDateOrDateTime -%} + url_ += "{{ parameter.Name }}=" + encodeURIComponent({{ parameter.VariableName }} ? "" + {{ parameter.VariableName }}.toJSON() : "{{ QueryNullValue }}") + "&"; +{% elsif parameter.IsArray -%} {{ parameter.VariableName }} && {{ parameter.VariableName }}.forEach(item => { url_ += "{{ parameter.Name }}=" + encodeURIComponent("" + item) + "&"; }); -{% else -%} +{% else -%} url_ += "{{ parameter.Name }}=" + encodeURIComponent("" + {{ parameter.VariableName }}) + "&"; -{% endif -%} +{% endif -%} {% endfor -%} -url_ = url_.replace(/[?&]$/, ""); +url_ = url_.replace(/[?&]$/, ""); \ No newline at end of file diff --git a/src/NSwag.CodeGeneration.TypeScript/Templates/FetchClient.liquid b/src/NSwag.CodeGeneration.TypeScript/Templates/FetchClient.liquid index 3f9a8fe638..7c4fb757b3 100644 --- a/src/NSwag.CodeGeneration.TypeScript/Templates/FetchClient.liquid +++ b/src/NSwag.CodeGeneration.TypeScript/Templates/FetchClient.liquid @@ -1,80 +1,81 @@ {% if HasOperations -%} {% if GenerateClientInterfaces -%} {% if ExportTypes %}export {% endif %}interface I{{ Class }} { -{% for operation in Operations -%} +{% for operation in Operations %} + {% template Client.Method.Documentation %} {{ operation.MethodAccessModifier }}{{ operation.ActualOperationName }}({% for parameter in operation.Parameters %}{{ parameter.VariableName }}{% if GenerateOptionalParameters and parameter.IsOptional %}?{% endif %}: {{ parameter.Type }}{{ parameter.TypePostfix }}{% if parameter.IsLast == false %}, {% endif %}{% endfor %}): Promise<{{ operation.ResultType }}>; -{% endfor -%}} -{% endif -%} +{%- endfor %}} +{%- endif -%} {% if UseAureliaHttpInjection -%} @inject({% if HasConfigurationClass %}{{ ConfigurationClass }}, {% endif %}String, HttpClient) -{% endif -%} +{%- endif -%} {% if ExportTypes %}export {% endif %}class {{ Class }} {% if HasBaseClass %}extends {{ BaseClass }} {% endif %}{% if GenerateClientInterfaces %}implements I{{ Class }} {% endif %}{ private http: { fetch(url: RequestInfo, init?: RequestInit): Promise }; private baseUrl: string; protected jsonParseReviver: {% if SupportsStrictNullChecks %}((key: string, value: any) => any) | undefined{% else %}(key: string, value: any) => any{% endif %} = undefined; - -{% if HasExtendedConstructor == false -%} +{{ '' }} +{%- if HasExtendedConstructor == false -%} constructor({% if HasConfigurationClass %}configuration: {{ ConfigurationClass }}, {% endif %}baseUrl?: string, http?: { fetch(url: RequestInfo, init?: RequestInit): Promise }) { -{% if HasBaseClass -%} +{%- if HasBaseClass -%} super({% if HasConfigurationClass %}configuration{% endif %}); -{% endif -%} +{%- endif -%} this.http = http ? http : window; -{% if UseGetBaseUrlMethod -%} +{%- if UseGetBaseUrlMethod -%} this.baseUrl = this.getBaseUrl("{{ BaseUrl }}", baseUrl); -{% else -%} +{%- else -%} this.baseUrl = baseUrl !== undefined && baseUrl !== null ? baseUrl : "{{ BaseUrl }}"; -{% endif -%} +{%- endif -%} } -{% endif -%} -{% if HasExtensionCode -%} +{%- endif -%} +{%- if HasExtensionCode -%} {{ ExtensionCode }} -{% endif -%} -{% for operation in Operations -%} +{%- endif -%} +{% for operation in Operations %} {% template Client.Method.Documentation %} {{ operation.MethodAccessModifier }}{{ operation.ActualOperationName }}({% for parameter in operation.Parameters %}{{ parameter.VariableName }}{% if GenerateOptionalParameters and parameter.IsOptional %}?{% endif %}: {{ parameter.Type }}{{ parameter.TypePostfix }}{% if parameter.IsLast == false %}, {% endif %}{% endfor %}{% if UseAbortSignal %}{% if operation.Parameters.size > 0 %}, {% endif %}signal?: AbortSignal | undefined{% endif %}): Promise<{{ operation.ResultType }}> { {% template Client.RequestUrl %} -{% if operation.HasBody -%} +{%- if operation.HasBody -%} {% template Client.RequestBody %} -{% endif -%} +{%- endif -%} let options_ = { -{% if operation.HasBody -%} +{%- if operation.HasBody -%} body: content_, -{% endif -%} +{%- endif -%} method: "{{ operation.HttpMethodUpper | upcase }}", -{% if UseAbortSignal -%} +{%- if UseAbortSignal -%} signal, -{% endif -%} +{%- endif -%} headers: { -{% for parameter in operation.HeaderParameters -%} +{%- for parameter in operation.HeaderParameters -%} "{{ parameter.Name }}": {{ parameter.VariableName }} !== undefined && {{ parameter.VariableName }} !== null ? "" + {{ parameter.VariableName }} : "", -{% endfor -%} -{% if operation.HasContent or operation.ConsumesFormUrlEncoded -%} +{%- endfor -%} +{%- if operation.HasContent or operation.ConsumesFormUrlEncoded -%} "Content-Type": "{{ operation.Consumes }}", -{% endif -%} -{% if operation.HasResultType and operation.HasAcceptHeaderParameterParameter == false -%} +{%- endif -%} +{%- if operation.HasResultType and operation.HasAcceptHeaderParameterParameter == false -%} "Accept": "{{ operation.Produces }}" -{% endif -%} +{%- endif -%} } }; -{% if UseTransformOptionsMethod -%} +{%- if UseTransformOptionsMethod -%} return this.transformOptions(options_).then(transformedOptions_ => { return this.http.fetch(url_, transformedOptions_); }).then((_response: Response) => { -{% else -%} +{%- else -%} return this.http.fetch(url_, options_).then((_response: Response) => { -{% endif -%} -{% if UseTransformResultMethod -%} +{%- endif -%} +{%- if UseTransformResultMethod -%} return this.transformResult(url_, _response, (_response: Response) => this.process{{ operation.ActualOperationNameUpper }}(_response)); -{% else -%} +{%- else -%} return this.process{{ operation.ActualOperationNameUpper }}(_response); -{% endif -%} +{%- endif -%} }); } @@ -84,4 +85,4 @@ } {% endfor -%} } -{% endif -%} +{%- endif -%} diff --git a/src/NSwag.CodeGeneration.TypeScript/Templates/File.Utilities.liquid b/src/NSwag.CodeGeneration.TypeScript/Templates/File.Utilities.liquid index f8e8bc8727..14f8a8377d 100644 --- a/src/NSwag.CodeGeneration.TypeScript/Templates/File.Utilities.liquid +++ b/src/NSwag.CodeGeneration.TypeScript/Templates/File.Utilities.liquid @@ -3,7 +3,7 @@ function throwException(message: string, status: number, response: string, headers: { [key: string]: any; }, result?: any): Observable { {% if WrapDtoExceptions -%} return {{ Framework.RxJs.ObservableThrowMethod }}(new {{ ExceptionClassName }}(message, status, response, headers, result)); -{% else -%} +{%- else -%} if (result !== null && result !== undefined) return {{ Framework.RxJs.ObservableThrowMethod }}(result); else @@ -11,11 +11,11 @@ function throwException(message: string, status: number, response: string, heade {% endif -%} } -{% elseif Framework.IsAngularJS -%} +{% elsif Framework.IsAngularJS -%} function throwException(q: ng.IQService, message: string, status: number, response: string, headers: { [key: string]: any; }, result?: any): ng.IPromise { {% if WrapDtoExceptions -%} return q.reject(new {{ ExceptionClassName }}(message, status, response, headers, result)); -{% else -%} +{%- else -%} if (result !== null && result !== undefined) return q.reject(result); else @@ -27,7 +27,7 @@ function throwException(q: ng.IQService, message: string, status: number, respon function throwException(message: string, status: number, response: string, headers: { [key: string]: any; }, result?: any): any { {% if WrapDtoExceptions -%} throw new {{ ExceptionClassName }}(message, status, response, headers, result); -{% else -%} +{%- else -%} if (result !== null && result !== undefined) throw result; else @@ -35,7 +35,7 @@ function throwException(message: string, status: number, response: string, heade {% endif -%} } -{% endif -%} +{%- endif -%} {% if Framework.IsAngular -%} function blobToText(blob: any): Observable { return new Observable((observer: any) => { @@ -53,7 +53,7 @@ function blobToText(blob: any): Observable { }); } -{% elseif Framework.IsAngularJS -%} +{% elsif Framework.IsAngularJS -%} function blobToText(blob: Blob, q: ng.IQService): ng.IPromise { return new q((resolve) => { let reader = new FileReader(); @@ -62,7 +62,7 @@ function blobToText(blob: Blob, q: ng.IQService): ng.IPromise { }); } -{% elseif Framework.IsAxios -%} +{% elsif Framework.IsAxios -%} function isAxiosError(obj: any | undefined): obj is AxiosError { return obj && obj.isAxiosError === true; } diff --git a/src/NSwag.CodeGeneration.TypeScript/Templates/File.liquid b/src/NSwag.CodeGeneration.TypeScript/Templates/File.liquid index 19bc7ab946..51a199dc8d 100644 --- a/src/NSwag.CodeGeneration.TypeScript/Templates/File.liquid +++ b/src/NSwag.CodeGeneration.TypeScript/Templates/File.liquid @@ -12,10 +12,10 @@ {{ ExtensionCodeImport -}} {% if ImportRequiredTypes -%} -{% if GenerateClientClasses -%} -{% if Framework.IsAngular -%} +{%- if GenerateClientClasses -%} +{%- if Framework.IsAngular -%} -{% if Framework.UseRxJs5 -%} +{%- if Framework.UseRxJs5 -%} import 'rxjs/add/observable/fromPromise'; import 'rxjs/add/observable/of'; import 'rxjs/add/observable/throw'; @@ -25,66 +25,66 @@ import 'rxjs/add/operator/mergeMap'; import 'rxjs/add/operator/catch'; import { Observable } from 'rxjs/Observable'; -{% else -%} +{%- else -%} import { mergeMap as {{ Framework.RxJs.ObservableMergeMapMethod }}, catchError as {{ Framework.RxJs.ObservableCatchMethod }} } from 'rxjs/operators'; import { Observable, {% if UseTransformOptionsMethod %}from as {{ Framework.RxJs.ObservableFromMethod }}, {% endif %}throwError as {{ Framework.RxJs.ObservableThrowMethod }}, of as {{ Framework.RxJs.ObservableOfMethod }} } from 'rxjs'; -{% endif -%} +{%- endif -%} import { Injectable, Inject, Optional, {{ Framework.Angular.InjectionTokenType }} } from '@angular/core'; -{% if Framework.Angular.UseHttpClient -%} +{%- if Framework.Angular.UseHttpClient -%} import { HttpClient, HttpHeaders, HttpResponse, HttpResponseBase{% if IncludeHttpContext %}, HttpContext{% endif %} } from '@angular/common/http'; -{% else -%} +{%- else -%} import { Http, Headers, ResponseContentType, Response{% if UseTransformOptionsMethod %}, RequestOptionsArgs{% endif %} } from '@angular/http'; -{% endif -%} -{% endif -%} -{% if Framework.IsAurelia -%} +{%- endif -%} +{%- endif -%} +{%- if Framework.IsAurelia -%} import { inject } from 'aurelia-framework'; import { HttpClient, RequestInit } from 'aurelia-fetch-client'; -{% endif -%} -{% if Framework.IsAngularJS -%} +{%- endif -%} +{%- if Framework.IsAngularJS -%} import * as ng from 'angular'; -{% endif -%} -{% if Framework.IsAxios -%} +{%- endif -%} +{%- if Framework.IsAxios -%} import axios, { AxiosError, AxiosInstance, AxiosRequestConfig, AxiosResponse, CancelToken } from 'axios'; -{% endif -%} -{% if Framework.IsKnockout -%} +{%- endif -%} +{%- if Framework.IsKnockout -%} import * as ko from 'knockout'; -{% endif -%} -{% if Framework.IsJQuery -%} +{%- endif -%} +{%- if Framework.IsJQuery -%} import * as jQuery from 'jquery'; -{% endif -%} -{% endif -%} -{% if Framework.UseMomentJS -%} +{%- endif -%} +{%- endif -%} +{%- if Framework.UseMomentJS -%} import * as moment from 'moment'; -{% if RequiresMomentJSDuration -%} +{%- if RequiresMomentJSDuration -%} import 'moment-duration-format'; -{% endif -%} -{% endif -%} -{% if Framework.UseDayJS -%} +{%- endif -%} +{%- endif -%} +{%- if Framework.UseDayJS -%} import * as dayjs from 'dayjs'; -{% endif -%} -{% if Framework.UseLuxon -%} +{%- endif -%} +{%- if Framework.UseLuxon -%} import { DateTime, Duration } from "luxon"; -{% endif -%} -{% endif -%} +{%- endif -%} +{%- endif -%} {% if HasModuleName -%} {% if ExportTypes %}export {% endif %}module {{ ModuleName }} { -{% endif -%} +{%- endif -%} {% if HasNamespace -%} namespace {{ Namespace }} { -{% endif -%} +{%- endif -%} {% if GenerateClientClasses and Framework.IsAngular -%} {% if ExportTypes %}export {% endif %}const {{ Framework.Angular.BaseUrlTokenName }} = new {{ Framework.Angular.InjectionTokenType }}{% if Framework.Angular.InjectionTokenType == "InjectionToken" %}{% endif %}('{{ Framework.Angular.BaseUrlTokenName }}'); -{% endif -%} +{%- endif -%} {{ ExtensionCodeTop }} {{ Clients }} @@ -92,7 +92,7 @@ namespace {{ Namespace }} { {{ Types }} {% if WrapResponses and GenerateResponseClasses -%} -{% for responseClassName in ResponseClassNames -%} +{%- for responseClassName in ResponseClassNames -%} {% if ExportTypes %}export {% endif %}class {{ responseClassName }} { status: number; headers: { [key: string]: any; }; @@ -106,15 +106,15 @@ namespace {{ Namespace }} { } } -{% endfor -%} -{% endif -%} +{%- endfor -%} +{%- endif -%} {% if RequiresFileParameterInterface -%} {% if ExportTypes %}export {% endif %}interface FileParameter { data: any; fileName: string; } -{% endif -%} +{%- endif -%} {% if RequiresFileResponseInterface -%} {% if ExportTypes %}export {% endif %}interface FileResponse { data: Blob; @@ -123,7 +123,7 @@ namespace {{ Namespace }} { headers?: { [name: string]: any }; } -{% endif -%} +{%- endif -%} {% if RequiresExceptionClass -%} {% if ExportTypes %}export {% endif %}class {{ ExceptionClassName }} extends Error { message: string; @@ -149,15 +149,15 @@ namespace {{ Namespace }} { } } -{% endif -%} +{%- endif -%} {% if GenerateClientClasses -%} {% template File.Utilities %} -{% endif -%} +{%- endif -%} {{ ExtensionCodeBottom }} {% if HasNamespace -%} } -{% endif -%} +{%- endif -%} {% if HasModuleName -%} } -{% endif -%} \ No newline at end of file +{%- endif -%} diff --git a/src/NSwag.CodeGeneration.TypeScript/Templates/JQueryCallbacksClient.liquid b/src/NSwag.CodeGeneration.TypeScript/Templates/JQueryCallbacksClient.liquid index 4f9a871d0d..46d484da89 100644 --- a/src/NSwag.CodeGeneration.TypeScript/Templates/JQueryCallbacksClient.liquid +++ b/src/NSwag.CodeGeneration.TypeScript/Templates/JQueryCallbacksClient.liquid @@ -28,7 +28,7 @@ {{ ExtensionCode }} {% endif -%} -{% for operation in Operations -%} +{% for operation in Operations %} {% template Client.Method.Documentation %} {{ operation.MethodAccessModifier }}{{ operation.ActualOperationName }}({% for parameter in operation.Parameters %}{{ parameter.VariableName }}{% if GenerateOptionalParameters and parameter.IsOptional %}?{% endif %}: {{ parameter.Type }}{{ parameter.TypePostfix }}, {% endfor %}onSuccess?: ({% if operation.HasResultType %}result: {{ operation.ResultType }}{% endif %}) => void, onFail?: (exception: {{ operation.ExceptionType }}, reason: string) => void): JQueryXHR { @@ -44,21 +44,21 @@ type: "{{ operation.HttpMethodLower }}", {% if operation.HasBody -%} data: content_, -{% endif -%} -{% if operation.HasFormParameters -%} +{% endif -%} +{% if operation.HasFormParameters -%} mimeType: "multipart/form-data", contentType: false, -{% else -%} +{% else -%} dataType: "text", -{% endif -%} +{% endif -%} headers: { -{% for parameter in operation.HeaderParameters -%} +{% for parameter in operation.HeaderParameters -%} "{{ parameter.Name }}": {{ parameter.VariableName }} !== undefined && {{ parameter.VariableName }} !== null ? "" + {{ parameter.VariableName }} : "", -{% endfor -%} -{% if operation.HasContent or operation.ConsumesFormUrlEncoded -%} +{% endfor -%} +{% if operation.HasContent or operation.ConsumesFormUrlEncoded -%} "Content-Type": "{{ operation.Consumes }}", -{% endif -%} -{% if operation.HasResultType and operation.HasAcceptHeaderParameterParameter == false -%} +{% endif -%} +{% if operation.HasResultType and operation.HasAcceptHeaderParameterParameter == false -%} "Accept": "{{ operation.Produces }}" {% endif -%} } @@ -77,9 +77,9 @@ try { {% if UseTransformResultMethod -%} let result = this.transformResult(_url, xhr, (xhr) => this.process{{ operation.ActualOperationNameUpper }}(xhr)); -{% else -%} +{% else -%} let result = this.process{{ operation.ActualOperationNameUpper }}(xhr); -{% endif -%} +{% endif -%} if (onSuccess !== undefined) onSuccess(result); } catch (e) { diff --git a/src/NSwag.CodeGeneration.TypeScript/Templates/JQueryPromisesClient.liquid b/src/NSwag.CodeGeneration.TypeScript/Templates/JQueryPromisesClient.liquid index a1e8e19dd6..7823585c78 100644 --- a/src/NSwag.CodeGeneration.TypeScript/Templates/JQueryPromisesClient.liquid +++ b/src/NSwag.CodeGeneration.TypeScript/Templates/JQueryPromisesClient.liquid @@ -6,30 +6,30 @@ {{ operation.MethodAccessModifier }}{{ operation.ActualOperationName }}({% for parameter in operation.Parameters %}{{ parameter.VariableName }}{% if GenerateOptionalParameters and parameter.IsOptional %}?{% endif %}: {{ parameter.Type }}{{ parameter.TypePostfix }}{% if parameter.IsLast == false %}, {% endif %}{% endfor %}): {{ PromiseType }}<{{ operation.ResultType }}>; {% endfor -%} } -{% endif -%} +{%- endif -%} {% if ExportTypes %}export {% endif %}class {{ Class }} {% if HasBaseClass %}extends {{ BaseClass }} {% endif %}{% if GenerateClientInterfaces %}implements I{{ Class }} {% endif %}{ baseUrl: string; beforeSend: any = undefined; protected jsonParseReviver: {% if SupportsStrictNullChecks %}((key: string, value: any) => any) | undefined{% else -%}(key: string, value: any) => any{% endif %} = undefined; -{% if HasExtendedConstructor == false -%} +{%- if HasExtendedConstructor == false -%} constructor({% if HasConfigurationClass %}configuration: {{ ConfigurationClass }}, {% endif %}baseUrl?: string) { -{% if HasBaseClass -%} +{%- if HasBaseClass -%} super({% if HasConfigurationClass %}configuration{% endif %}); -{% endif -%} -{% if UseGetBaseUrlMethod -%} +{%- endif -%} +{%- if UseGetBaseUrlMethod -%} this.baseUrl = baseUrl !== undefined && baseUrl !== null ? baseUrl : this.getBaseUrl("{{ BaseUrl }}"); -{% else -%} +{%- else -%} this.baseUrl = baseUrl !== undefined && baseUrl !== null ? baseUrl : "{{ BaseUrl }}"; -{% endif -%} +{%- endif -%} } -{% endif -%} +{%- endif -%} {% if HasExtensionCode -%} {{ ExtensionCode }} -{% endif -%} -{% for operation in Operations -%} +{%- endif -%} +{% for operation in Operations %} {% template Client.Method.Documentation %} {{ operation.MethodAccessModifier }}{{ operation.ActualOperationName }}({% for parameter in operation.Parameters %}{{ parameter.VariableName }}{% if GenerateOptionalParameters and parameter.IsOptional %}?{% endif %}: {{ parameter.Type }}{{ parameter.TypePostfix }}{% if parameter.IsLast == false %}, {% endif %}{% endfor %}) { @@ -41,35 +41,37 @@ private {{ operation.ActualOperationName }}WithCallbacks({% for parameter in operation.Parameters %}{{ parameter.VariableName }}: {{ parameter.Type }}{{ parameter.TypePostfix }}, {% endfor %}onSuccess?: (result: {{ operation.ResultType }}) => void, onFail?: (exception: {{ operation.ExceptionType }}, reason: string) => void) { {% template Client.RequestUrl %} -{% if operation.HasBody -%} +{%- if operation.HasBody -%} {% template Client.RequestBody %} -{% endif -%} +{%- endif -%} jQuery.ajax({% if UseTransformOptionsMethod %}this.transformOptions({% endif %}{ url: url_, beforeSend: this.beforeSend, type: "{{ operation.HttpMethodLower }}", -{% if operation.HasBody -%} +{%- if operation.HasBody -%} data: content_, -{% endif -%} -{% if operation.HasFormParameters -%} +{%- endif -%} +{%- if operation.HasFormParameters -%} mimeType: "multipart/form-data", contentType: false, -{% else -%} +{%- else -%} dataType: "text", -{% endif -%} +{%- endif -%} headers: { -{% for parameter in operation.HeaderParameters -%} +{%- for parameter in operation.HeaderParameters -%} "{{ parameter.Name }}": {{ parameter.VariableName }} !== undefined && {{ parameter.VariableName }} !== null ? "" + {{ parameter.VariableName }} : "", {% endfor -%} -{% if operation.HasContent or operation.ConsumesFormUrlEncoded -%} +{%- if operation.HasContent or operation.ConsumesFormUrlEncoded -%} "Content-Type": "{{ operation.Consumes }}", -{% endif -%} -{% if operation.HasResultType and operation.HasAcceptHeaderParameterParameter == false -%} +{%- endif -%} +{%- if operation.HasResultType and operation.HasAcceptHeaderParameterParameter == false -%} "Accept": "{{ operation.Produces }}" -{% endif -%} +{%- endif -%} } - }{% if UseTransformOptionsMethod %}){% endif %}).done((_data, _textStatus, xhr) => { + }{% if UseTransformOptionsMethod -%} +){% endif -%} +).done((_data, _textStatus, xhr) => { this.process{{ operation.ActualOperationNameUpper }}WithCallbacks(url_, xhr, onSuccess, onFail); }).fail((xhr) => { this.process{{ operation.ActualOperationNameUpper }}WithCallbacks(url_, xhr, onSuccess, onFail); @@ -78,11 +80,11 @@ private process{{ operation.ActualOperationNameUpper }}WithCallbacks(_url: string, xhr: any, onSuccess?: any, onFail?: any): void { try { -{% if UseTransformResultMethod -%} +{%- if UseTransformResultMethod -%} let result = this.transformResult(_url, xhr, (xhr) => this.process{{ operation.ActualOperationNameUpper }}(xhr)); -{% else -%} +{%- else -%} let result = this.process{{ operation.ActualOperationNameUpper }}(xhr); -{% endif -%} +{%- endif -%} if (onSuccess !== undefined) onSuccess(result); } catch (e) { @@ -98,4 +100,4 @@ } {% endfor -%} } -{% endif -%} +{%- endif -%} \ No newline at end of file diff --git a/src/NSwag.CodeGeneration/NSwag.CodeGeneration.csproj b/src/NSwag.CodeGeneration/NSwag.CodeGeneration.csproj index faea150e0d..77df51b524 100644 --- a/src/NSwag.CodeGeneration/NSwag.CodeGeneration.csproj +++ b/src/NSwag.CodeGeneration/NSwag.CodeGeneration.csproj @@ -1,16 +1,16 @@  - netstandard1.3;net451;netstandard2.0 + net461;netstandard2.0 bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml - - + + - + diff --git a/src/NSwag.CodeGeneration/OperationNameGenerators/MultipleClientsFromOperationIdOperationNameGenerator.cs b/src/NSwag.CodeGeneration/OperationNameGenerators/MultipleClientsFromOperationIdOperationNameGenerator.cs index a7d3df5ae7..b9eadf41d1 100644 --- a/src/NSwag.CodeGeneration/OperationNameGenerators/MultipleClientsFromOperationIdOperationNameGenerator.cs +++ b/src/NSwag.CodeGeneration/OperationNameGenerators/MultipleClientsFromOperationIdOperationNameGenerator.cs @@ -6,6 +6,8 @@ // Rico Suter, mail@rsuter.com //----------------------------------------------------------------------- +using System; +using System.Diagnostics; using System.Linq; using NJsonSchema; @@ -25,7 +27,7 @@ public class MultipleClientsFromOperationIdOperationNameGenerator : IOperationNa /// The client name. public virtual string GetClientName(OpenApiDocument document, string path, string httpMethod, OpenApiOperation operation) { - return GetClientName(operation); + return GetClientName(operation).ToString(); } /// Gets the operation name for a given operation. @@ -39,38 +41,50 @@ public virtual string GetOperationName(OpenApiDocument document, string path, st var clientName = GetClientName(operation); var operationName = GetOperationName(operation); - var hasOperationWithSameName = document.Operations - .Where(o => o.Operation != operation) - .Any(o => GetClientName(o.Operation) == clientName && GetOperationName(o.Operation) == operationName); + var hasOperationWithSameName = false; + foreach (var o in document.Operations) + { + if (o.Operation != operation) + { + if (GetClientName(o.Operation).SequenceEqual(clientName) && GetOperationName(o.Operation).SequenceEqual(operationName)) + { + hasOperationWithSameName = true; + break; + } + } + } if (hasOperationWithSameName) { - if (operationName.ToLowerInvariant().StartsWith("get")) + if (operationName.StartsWith("get".AsSpan(), StringComparison.InvariantCultureIgnoreCase)) { - var isArrayResponse = operation.ActualResponses.ContainsKey("200") && - operation.ActualResponses["200"].Schema?.ActualSchema - .Type.HasFlag(JsonObjectType.Array) == true; + var isArrayResponse = operation.ActualResponses.TryGetValue("200", out var response) && + response.Schema?.ActualSchema.Type.HasFlag(JsonObjectType.Array) == true; if (isArrayResponse) { - return "GetAll" + operationName.Substring(3); + return "GetAll" + operationName.Slice(3).ToString(); } } } - return operationName; + return operationName.ToString(); } - private string GetClientName(OpenApiOperation operation) + private static ReadOnlySpan GetClientName(OpenApiOperation operation) { - var segments = operation.OperationId.Split('_').Reverse().ToArray(); - return segments.Length >= 2 ? segments[1] : string.Empty; + var idx = operation.OperationId.IndexOf('_'); + return idx != -1 && idx < operation.OperationId.Length - 1 + ? operation.OperationId.AsSpan(0,idx) + : string.Empty.AsSpan(); } - private string GetOperationName(OpenApiOperation operation) + private static ReadOnlySpan GetOperationName(OpenApiOperation operation) { - var segments = operation.OperationId.Split('_').Reverse().ToArray(); - return segments.FirstOrDefault() ?? "Index"; + var idx = operation.OperationId.LastIndexOf('_'); + return idx != -1 && idx < operation.OperationId.Length - 1 + ? operation.OperationId.AsSpan(idx + 1) + : operation.OperationId.AsSpan(); } } } \ No newline at end of file diff --git a/src/NSwag.Commands/NSwag.Commands.csproj b/src/NSwag.Commands/NSwag.Commands.csproj index b855861c6d..9ed5377741 100644 --- a/src/NSwag.Commands/NSwag.Commands.csproj +++ b/src/NSwag.Commands/NSwag.Commands.csproj @@ -51,11 +51,6 @@ - - - - - diff --git a/src/NSwag.Console.x86/NSwag.Console.x86.csproj b/src/NSwag.Console.x86/NSwag.Console.x86.csproj index 94c757f986..50a0134a70 100644 --- a/src/NSwag.Console.x86/NSwag.Console.x86.csproj +++ b/src/NSwag.Console.x86/NSwag.Console.x86.csproj @@ -20,7 +20,7 @@ - + diff --git a/src/NSwag.Console/NSwag.Console.csproj b/src/NSwag.Console/NSwag.Console.csproj index 2636dfb273..e0e14afc5a 100644 --- a/src/NSwag.Console/NSwag.Console.csproj +++ b/src/NSwag.Console/NSwag.Console.csproj @@ -22,7 +22,7 @@ - + diff --git a/src/NSwag.Core.Yaml/NSwag.Core.Yaml.csproj b/src/NSwag.Core.Yaml/NSwag.Core.Yaml.csproj index 5f1e2bf57c..a11c281488 100644 --- a/src/NSwag.Core.Yaml/NSwag.Core.Yaml.csproj +++ b/src/NSwag.Core.Yaml/NSwag.Core.Yaml.csproj @@ -4,8 +4,8 @@ NSwag - - + + diff --git a/src/NSwag.Core/NSwag.Core.csproj b/src/NSwag.Core/NSwag.Core.csproj index cf13d010fb..b840606d0c 100644 --- a/src/NSwag.Core/NSwag.Core.csproj +++ b/src/NSwag.Core/NSwag.Core.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/NSwag.Demo.Web/NSwag.Demo.Web.csproj b/src/NSwag.Demo.Web/NSwag.Demo.Web.csproj index 29412477ac..3b44f32be8 100644 --- a/src/NSwag.Demo.Web/NSwag.Demo.Web.csproj +++ b/src/NSwag.Demo.Web/NSwag.Demo.Web.csproj @@ -14,7 +14,7 @@ Properties NSwag.Demo.Web NSwag.Demo.Web - v4.6 + v4.6.1 win true @@ -142,9 +142,9 @@ - + - + diff --git a/src/NSwag.Generation.AspNetCore.Tests/NSwag.Generation.AspNetCore.Tests.csproj b/src/NSwag.Generation.AspNetCore.Tests/NSwag.Generation.AspNetCore.Tests.csproj index 3a95b9fc7f..3fe3c3ae8f 100644 --- a/src/NSwag.Generation.AspNetCore.Tests/NSwag.Generation.AspNetCore.Tests.csproj +++ b/src/NSwag.Generation.AspNetCore.Tests/NSwag.Generation.AspNetCore.Tests.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/NSwag.Generation.AspNetCore/NSwag.Generation.AspNetCore.csproj b/src/NSwag.Generation.AspNetCore/NSwag.Generation.AspNetCore.csproj index a2c81f1b93..514c69f3c2 100644 --- a/src/NSwag.Generation.AspNetCore/NSwag.Generation.AspNetCore.csproj +++ b/src/NSwag.Generation.AspNetCore/NSwag.Generation.AspNetCore.csproj @@ -1,22 +1,22 @@  - netstandard1.6;net451;netstandard2.0;netcoreapp3.1;net5.0;net6.0 + netstandard1.6;net461;netstandard2.0;netcoreapp3.1;net5.0;net6.0 Swagger Documentation AspNetCore $(DefineConstants);ASPNETCORE bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml - + - + - + diff --git a/src/NSwag.Generation.WebApi.Tests/NSwag.Generation.WebApi.Tests.csproj b/src/NSwag.Generation.WebApi.Tests/NSwag.Generation.WebApi.Tests.csproj index 7e924d6320..985539a972 100644 --- a/src/NSwag.Generation.WebApi.Tests/NSwag.Generation.WebApi.Tests.csproj +++ b/src/NSwag.Generation.WebApi.Tests/NSwag.Generation.WebApi.Tests.csproj @@ -30,7 +30,6 @@ - @@ -43,9 +42,9 @@ - + - + diff --git a/src/NSwag.Generation.WebApi/NSwag.Generation.WebApi.csproj b/src/NSwag.Generation.WebApi/NSwag.Generation.WebApi.csproj index 73efa587f7..448884b18e 100644 --- a/src/NSwag.Generation.WebApi/NSwag.Generation.WebApi.csproj +++ b/src/NSwag.Generation.WebApi/NSwag.Generation.WebApi.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/NSwag.Generation/NSwag.Generation.csproj b/src/NSwag.Generation/NSwag.Generation.csproj index 70f62262d6..3d69b3024d 100644 --- a/src/NSwag.Generation/NSwag.Generation.csproj +++ b/src/NSwag.Generation/NSwag.Generation.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/NSwag.Integration.ClientPCL/PetStoreClient.cs b/src/NSwag.Integration.ClientPCL/PetStoreClient.cs index 25e5197e3c..827e8bd12f 100644 --- a/src/NSwag.Integration.ClientPCL/PetStoreClient.cs +++ b/src/NSwag.Integration.ClientPCL/PetStoreClient.cs @@ -1,6 +1,6 @@ //---------------------- // -// Generated using the NSwag toolchain v13.14.4.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0)) (http://NSwag.org) +// Generated using the NSwag toolchain v (http://NSwag.org) // //---------------------- @@ -16,7 +16,7 @@ namespace PetStore { using System = global::System; - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.4.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "")] public partial interface IPetStoreClient { /// uploads an image @@ -26,7 +26,7 @@ public partial interface IPetStoreClient /// successful operation /// A server side error occurred. System.Threading.Tasks.Task UploadFileAsync(long petId, string additionalMetadata, FileParameter file); - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// uploads an image /// ID of pet to update @@ -35,38 +35,38 @@ public partial interface IPetStoreClient /// successful operation /// A server side error occurred. System.Threading.Tasks.Task UploadFileAsync(long petId, string additionalMetadata, FileParameter file, System.Threading.CancellationToken cancellationToken); - + /// Update an existing pet /// Pet object that needs to be added to the store /// A server side error occurred. System.Threading.Tasks.Task UpdatePetAsync(Pet body); - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// Update an existing pet /// Pet object that needs to be added to the store /// A server side error occurred. System.Threading.Tasks.Task UpdatePetAsync(Pet body, System.Threading.CancellationToken cancellationToken); - + /// Finds Pets by status /// Status values that need to be considered for filter /// successful operation /// A server side error occurred. System.Threading.Tasks.Task> FindPetsByStatusAsync(System.Collections.Generic.IEnumerable status); - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// Finds Pets by status /// Status values that need to be considered for filter /// successful operation /// A server side error occurred. System.Threading.Tasks.Task> FindPetsByStatusAsync(System.Collections.Generic.IEnumerable status, System.Threading.CancellationToken cancellationToken); - + /// Finds Pets by tags /// Tags to filter by /// successful operation /// A server side error occurred. [System.Obsolete] System.Threading.Tasks.Task> FindPetsByTagsAsync(System.Collections.Generic.IEnumerable tags); - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// Finds Pets by tags /// Tags to filter by @@ -74,27 +74,27 @@ public partial interface IPetStoreClient /// A server side error occurred. [System.Obsolete] System.Threading.Tasks.Task> FindPetsByTagsAsync(System.Collections.Generic.IEnumerable tags, System.Threading.CancellationToken cancellationToken); - + /// Find pet by ID /// ID of pet to return /// successful operation /// A server side error occurred. System.Threading.Tasks.Task GetPetByIdAsync(long petId); - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// Find pet by ID /// ID of pet to return /// successful operation /// A server side error occurred. System.Threading.Tasks.Task GetPetByIdAsync(long petId, System.Threading.CancellationToken cancellationToken); - + /// Updates a pet in the store with form data /// ID of pet that needs to be updated /// Updated name of the pet /// Updated status of the pet /// A server side error occurred. System.Threading.Tasks.Task UpdatePetWithFormAsync(long petId, string name, string status); - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// Updates a pet in the store with form data /// ID of pet that needs to be updated @@ -102,123 +102,123 @@ public partial interface IPetStoreClient /// Updated status of the pet /// A server side error occurred. System.Threading.Tasks.Task UpdatePetWithFormAsync(long petId, string name, string status, System.Threading.CancellationToken cancellationToken); - + /// Deletes a pet /// Pet id to delete /// A server side error occurred. System.Threading.Tasks.Task DeletePetAsync(string api_key, long petId); - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// Deletes a pet /// Pet id to delete /// A server side error occurred. System.Threading.Tasks.Task DeletePetAsync(string api_key, long petId, System.Threading.CancellationToken cancellationToken); - + /// Returns pet inventories by status /// successful operation /// A server side error occurred. System.Threading.Tasks.Task> GetInventoryAsync(); - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// Returns pet inventories by status /// successful operation /// A server side error occurred. System.Threading.Tasks.Task> GetInventoryAsync(System.Threading.CancellationToken cancellationToken); - + /// Place an order for a pet /// order placed for purchasing the pet /// successful operation /// A server side error occurred. System.Threading.Tasks.Task PlaceOrderAsync(Order body); - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// Place an order for a pet /// order placed for purchasing the pet /// successful operation /// A server side error occurred. System.Threading.Tasks.Task PlaceOrderAsync(Order body, System.Threading.CancellationToken cancellationToken); - + /// Find purchase order by ID /// ID of pet that needs to be fetched /// successful operation /// A server side error occurred. System.Threading.Tasks.Task GetOrderByIdAsync(long orderId); - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// Find purchase order by ID /// ID of pet that needs to be fetched /// successful operation /// A server side error occurred. System.Threading.Tasks.Task GetOrderByIdAsync(long orderId, System.Threading.CancellationToken cancellationToken); - + /// Delete purchase order by ID /// ID of the order that needs to be deleted /// A server side error occurred. System.Threading.Tasks.Task DeleteOrderAsync(long orderId); - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// Delete purchase order by ID /// ID of the order that needs to be deleted /// A server side error occurred. System.Threading.Tasks.Task DeleteOrderAsync(long orderId, System.Threading.CancellationToken cancellationToken); - + /// Creates list of users with given input array /// List of user object /// successful operation /// A server side error occurred. System.Threading.Tasks.Task CreateUsersWithListInputAsync(System.Collections.Generic.IEnumerable body); - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// Creates list of users with given input array /// List of user object /// successful operation /// A server side error occurred. System.Threading.Tasks.Task CreateUsersWithListInputAsync(System.Collections.Generic.IEnumerable body, System.Threading.CancellationToken cancellationToken); - + /// Get user by user name /// The name that needs to be fetched. Use user1 for testing. /// successful operation /// A server side error occurred. System.Threading.Tasks.Task GetUserByNameAsync(string username); - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// Get user by user name /// The name that needs to be fetched. Use user1 for testing. /// successful operation /// A server side error occurred. System.Threading.Tasks.Task GetUserByNameAsync(string username, System.Threading.CancellationToken cancellationToken); - + /// Updated user /// name that need to be updated /// Updated user object /// A server side error occurred. System.Threading.Tasks.Task UpdateUserAsync(string username, User body); - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// Updated user /// name that need to be updated /// Updated user object /// A server side error occurred. System.Threading.Tasks.Task UpdateUserAsync(string username, User body, System.Threading.CancellationToken cancellationToken); - + /// Delete user /// The name that needs to be deleted /// A server side error occurred. System.Threading.Tasks.Task DeleteUserAsync(string username); - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// Delete user /// The name that needs to be deleted /// A server side error occurred. System.Threading.Tasks.Task DeleteUserAsync(string username, System.Threading.CancellationToken cancellationToken); - + /// Logs user into the system /// The user name for login /// The password for login in clear text /// successful operation /// A server side error occurred. System.Threading.Tasks.Task LoginUserAsync(string username, string password); - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// Logs user into the system /// The user name for login @@ -226,78 +226,78 @@ public partial interface IPetStoreClient /// successful operation /// A server side error occurred. System.Threading.Tasks.Task LoginUserAsync(string username, string password, System.Threading.CancellationToken cancellationToken); - + /// Logs out current logged in user session /// successful operation /// A server side error occurred. System.Threading.Tasks.Task LogoutUserAsync(); - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// Logs out current logged in user session /// successful operation /// A server side error occurred. System.Threading.Tasks.Task LogoutUserAsync(System.Threading.CancellationToken cancellationToken); - + /// Creates list of users with given input array /// List of user object /// successful operation /// A server side error occurred. System.Threading.Tasks.Task CreateUsersWithArrayInputAsync(System.Collections.Generic.IEnumerable body); - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// Creates list of users with given input array /// List of user object /// successful operation /// A server side error occurred. System.Threading.Tasks.Task CreateUsersWithArrayInputAsync(System.Collections.Generic.IEnumerable body, System.Threading.CancellationToken cancellationToken); - + /// Create user /// Created user object /// successful operation /// A server side error occurred. System.Threading.Tasks.Task CreateUserAsync(User body); - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// Create user /// Created user object /// successful operation /// A server side error occurred. System.Threading.Tasks.Task CreateUserAsync(User body, System.Threading.CancellationToken cancellationToken); - + } - - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.4.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] + + [System.CodeDom.Compiler.GeneratedCode("NSwag", "")] public partial class PetStoreClient : IPetStoreClient { private string _baseUrl = "https://petstore.swagger.io/v2"; private System.Lazy _settings; - + public PetStoreClient() { _settings = new System.Lazy(CreateSerializerSettings); } - + private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() { var settings = new Newtonsoft.Json.JsonSerializerSettings(); UpdateJsonSerializerSettings(settings); return settings; } - + public string BaseUrl { get { return _baseUrl; } set { _baseUrl = value; } } - + protected Newtonsoft.Json.JsonSerializerSettings JsonSerializerSettings { get { return _settings.Value; } } - + partial void UpdateJsonSerializerSettings(Newtonsoft.Json.JsonSerializerSettings settings); - - + partial void PrepareRequest(System.Net.Http.HttpClient client, System.Net.Http.HttpRequestMessage request, string url); partial void PrepareRequest(System.Net.Http.HttpClient client, System.Net.Http.HttpRequestMessage request, System.Text.StringBuilder urlBuilder); partial void ProcessResponse(System.Net.Http.HttpClient client, System.Net.Http.HttpResponseMessage response); + /// uploads an image /// ID of pet to update /// Additional data to pass to server @@ -308,7 +308,7 @@ public System.Threading.Tasks.Task UploadFileAsync(long petId, stri { return UploadFileAsync(petId, additionalMetadata, file, System.Threading.CancellationToken.None); } - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// uploads an image /// ID of pet to update @@ -320,11 +320,11 @@ public async System.Threading.Tasks.Task UploadFileAsync(long petId { if (petId == null) throw new System.ArgumentNullException("petId"); - + var urlBuilder_ = new System.Text.StringBuilder(); urlBuilder_.Append(BaseUrl != null ? BaseUrl.TrimEnd('/') : "").Append("/pet/{petId}/uploadImage"); urlBuilder_.Replace("{petId}", System.Uri.EscapeDataString(ConvertToString(petId, System.Globalization.CultureInfo.InvariantCulture))); - + var client_ = new System.Net.Http.HttpClient(); var disposeClient_ = true; try @@ -335,10 +335,12 @@ public async System.Threading.Tasks.Task UploadFileAsync(long petId var content_ = new System.Net.Http.MultipartFormDataContent(boundary_); content_.Headers.Remove("Content-Type"); content_.Headers.TryAddWithoutValidation("Content-Type", "multipart/form-data; boundary=" + boundary_); + if (additionalMetadata != null) { content_.Add(new System.Net.Http.StringContent(ConvertToString(additionalMetadata, System.Globalization.CultureInfo.InvariantCulture)), "additionalMetadata"); } + if (file != null) { var content_file_ = new System.Net.Http.StreamContent(file.Data); @@ -349,14 +351,14 @@ public async System.Threading.Tasks.Task UploadFileAsync(long petId request_.Content = content_; request_.Method = new System.Net.Http.HttpMethod("POST"); request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); - + PrepareRequest(client_, request_, urlBuilder_); - + var url_ = urlBuilder_.ToString(); request_.RequestUri = new System.Uri(url_, System.UriKind.RelativeOrAbsolute); - + PrepareRequest(client_, request_, url_); - + var response_ = await client_.SendAsync(request_, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false); var disposeResponse_ = true; try @@ -367,9 +369,9 @@ public async System.Threading.Tasks.Task UploadFileAsync(long petId foreach (var item_ in response_.Content.Headers) headers_[item_.Key] = item_.Value; } - + ProcessResponse(client_, response_); - + var status_ = (int)response_.StatusCode; if (status_ == 200) { @@ -399,7 +401,7 @@ public async System.Threading.Tasks.Task UploadFileAsync(long petId client_.Dispose(); } } - + /// Add a new pet to the store /// Pet object that needs to be added to the store /// A server side error occurred. @@ -407,7 +409,7 @@ protected System.Threading.Tasks.Task AddPetCoreAsync(Pet body) { return AddPetCoreAsync(body, System.Threading.CancellationToken.None); } - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// Add a new pet to the store /// Pet object that needs to be added to the store @@ -416,10 +418,10 @@ protected async System.Threading.Tasks.Task AddPetCoreAsync(Pet body, System.Thr { if (body == null) throw new System.ArgumentNullException("body"); - + var urlBuilder_ = new System.Text.StringBuilder(); urlBuilder_.Append(BaseUrl != null ? BaseUrl.TrimEnd('/') : "").Append("/pet"); - + var client_ = new System.Net.Http.HttpClient(); var disposeClient_ = true; try @@ -430,14 +432,14 @@ protected async System.Threading.Tasks.Task AddPetCoreAsync(Pet body, System.Thr content_.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json"); request_.Content = content_; request_.Method = new System.Net.Http.HttpMethod("POST"); - + PrepareRequest(client_, request_, urlBuilder_); - + var url_ = urlBuilder_.ToString(); request_.RequestUri = new System.Uri(url_, System.UriKind.RelativeOrAbsolute); - + PrepareRequest(client_, request_, url_); - + var response_ = await client_.SendAsync(request_, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false); var disposeResponse_ = true; try @@ -448,9 +450,9 @@ protected async System.Threading.Tasks.Task AddPetCoreAsync(Pet body, System.Thr foreach (var item_ in response_.Content.Headers) headers_[item_.Key] = item_.Value; } - + ProcessResponse(client_, response_); - + var status_ = (int)response_.StatusCode; if (status_ == 405) { @@ -458,8 +460,10 @@ protected async System.Threading.Tasks.Task AddPetCoreAsync(Pet body, System.Thr throw new SwaggerException("Invalid input", status_, responseText_, headers_, null); } else + if (status_ == 200 || status_ == 204) { + return; } else @@ -481,7 +485,7 @@ protected async System.Threading.Tasks.Task AddPetCoreAsync(Pet body, System.Thr client_.Dispose(); } } - + /// Update an existing pet /// Pet object that needs to be added to the store /// A server side error occurred. @@ -489,7 +493,7 @@ public System.Threading.Tasks.Task UpdatePetAsync(Pet body) { return UpdatePetAsync(body, System.Threading.CancellationToken.None); } - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// Update an existing pet /// Pet object that needs to be added to the store @@ -498,10 +502,10 @@ public async System.Threading.Tasks.Task UpdatePetAsync(Pet body, System.Threadi { if (body == null) throw new System.ArgumentNullException("body"); - + var urlBuilder_ = new System.Text.StringBuilder(); urlBuilder_.Append(BaseUrl != null ? BaseUrl.TrimEnd('/') : "").Append("/pet"); - + var client_ = new System.Net.Http.HttpClient(); var disposeClient_ = true; try @@ -512,14 +516,14 @@ public async System.Threading.Tasks.Task UpdatePetAsync(Pet body, System.Threadi content_.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json"); request_.Content = content_; request_.Method = new System.Net.Http.HttpMethod("PUT"); - + PrepareRequest(client_, request_, urlBuilder_); - + var url_ = urlBuilder_.ToString(); request_.RequestUri = new System.Uri(url_, System.UriKind.RelativeOrAbsolute); - + PrepareRequest(client_, request_, url_); - + var response_ = await client_.SendAsync(request_, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false); var disposeResponse_ = true; try @@ -530,9 +534,9 @@ public async System.Threading.Tasks.Task UpdatePetAsync(Pet body, System.Threadi foreach (var item_ in response_.Content.Headers) headers_[item_.Key] = item_.Value; } - + ProcessResponse(client_, response_); - + var status_ = (int)response_.StatusCode; if (status_ == 400) { @@ -552,8 +556,10 @@ public async System.Threading.Tasks.Task UpdatePetAsync(Pet body, System.Threadi throw new SwaggerException("Validation exception", status_, responseText_, headers_, null); } else + if (status_ == 200 || status_ == 204) { + return; } else @@ -575,7 +581,7 @@ public async System.Threading.Tasks.Task UpdatePetAsync(Pet body, System.Threadi client_.Dispose(); } } - + /// Finds Pets by status /// Status values that need to be considered for filter /// successful operation @@ -584,7 +590,7 @@ public async System.Threading.Tasks.Task UpdatePetAsync(Pet body, System.Threadi { return FindPetsByStatusAsync(status, System.Threading.CancellationToken.None); } - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// Finds Pets by status /// Status values that need to be considered for filter @@ -594,12 +600,12 @@ public async System.Threading.Tasks.Task UpdatePetAsync(Pet body, System.Threadi { if (status == null) throw new System.ArgumentNullException("status"); - + var urlBuilder_ = new System.Text.StringBuilder(); urlBuilder_.Append(BaseUrl != null ? BaseUrl.TrimEnd('/') : "").Append("/pet/findByStatus?"); foreach (var item_ in status) { urlBuilder_.Append(System.Uri.EscapeDataString("status") + "=").Append(System.Uri.EscapeDataString(ConvertToString(item_, System.Globalization.CultureInfo.InvariantCulture))).Append("&"); } urlBuilder_.Length--; - + var client_ = new System.Net.Http.HttpClient(); var disposeClient_ = true; try @@ -608,14 +614,14 @@ public async System.Threading.Tasks.Task UpdatePetAsync(Pet body, System.Threadi { request_.Method = new System.Net.Http.HttpMethod("GET"); request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); - + PrepareRequest(client_, request_, urlBuilder_); - + var url_ = urlBuilder_.ToString(); request_.RequestUri = new System.Uri(url_, System.UriKind.RelativeOrAbsolute); - + PrepareRequest(client_, request_, url_); - + var response_ = await client_.SendAsync(request_, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false); var disposeResponse_ = true; try @@ -626,9 +632,9 @@ public async System.Threading.Tasks.Task UpdatePetAsync(Pet body, System.Threadi foreach (var item_ in response_.Content.Headers) headers_[item_.Key] = item_.Value; } - + ProcessResponse(client_, response_); - + var status_ = (int)response_.StatusCode; if (status_ == 200) { @@ -664,7 +670,7 @@ public async System.Threading.Tasks.Task UpdatePetAsync(Pet body, System.Threadi client_.Dispose(); } } - + /// Finds Pets by tags /// Tags to filter by /// successful operation @@ -674,7 +680,7 @@ public async System.Threading.Tasks.Task UpdatePetAsync(Pet body, System.Threadi { return FindPetsByTagsAsync(tags, System.Threading.CancellationToken.None); } - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// Finds Pets by tags /// Tags to filter by @@ -685,12 +691,12 @@ public async System.Threading.Tasks.Task UpdatePetAsync(Pet body, System.Threadi { if (tags == null) throw new System.ArgumentNullException("tags"); - + var urlBuilder_ = new System.Text.StringBuilder(); urlBuilder_.Append(BaseUrl != null ? BaseUrl.TrimEnd('/') : "").Append("/pet/findByTags?"); foreach (var item_ in tags) { urlBuilder_.Append(System.Uri.EscapeDataString("tags") + "=").Append(System.Uri.EscapeDataString(ConvertToString(item_, System.Globalization.CultureInfo.InvariantCulture))).Append("&"); } urlBuilder_.Length--; - + var client_ = new System.Net.Http.HttpClient(); var disposeClient_ = true; try @@ -699,14 +705,14 @@ public async System.Threading.Tasks.Task UpdatePetAsync(Pet body, System.Threadi { request_.Method = new System.Net.Http.HttpMethod("GET"); request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); - + PrepareRequest(client_, request_, urlBuilder_); - + var url_ = urlBuilder_.ToString(); request_.RequestUri = new System.Uri(url_, System.UriKind.RelativeOrAbsolute); - + PrepareRequest(client_, request_, url_); - + var response_ = await client_.SendAsync(request_, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false); var disposeResponse_ = true; try @@ -717,9 +723,9 @@ public async System.Threading.Tasks.Task UpdatePetAsync(Pet body, System.Threadi foreach (var item_ in response_.Content.Headers) headers_[item_.Key] = item_.Value; } - + ProcessResponse(client_, response_); - + var status_ = (int)response_.StatusCode; if (status_ == 200) { @@ -755,7 +761,7 @@ public async System.Threading.Tasks.Task UpdatePetAsync(Pet body, System.Threadi client_.Dispose(); } } - + /// Find pet by ID /// ID of pet to return /// successful operation @@ -764,7 +770,7 @@ public System.Threading.Tasks.Task GetPetByIdAsync(long petId) { return GetPetByIdAsync(petId, System.Threading.CancellationToken.None); } - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// Find pet by ID /// ID of pet to return @@ -774,11 +780,11 @@ public async System.Threading.Tasks.Task GetPetByIdAsync(long petId, System { if (petId == null) throw new System.ArgumentNullException("petId"); - + var urlBuilder_ = new System.Text.StringBuilder(); urlBuilder_.Append(BaseUrl != null ? BaseUrl.TrimEnd('/') : "").Append("/pet/{petId}"); urlBuilder_.Replace("{petId}", System.Uri.EscapeDataString(ConvertToString(petId, System.Globalization.CultureInfo.InvariantCulture))); - + var client_ = new System.Net.Http.HttpClient(); var disposeClient_ = true; try @@ -787,14 +793,14 @@ public async System.Threading.Tasks.Task GetPetByIdAsync(long petId, System { request_.Method = new System.Net.Http.HttpMethod("GET"); request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); - + PrepareRequest(client_, request_, urlBuilder_); - + var url_ = urlBuilder_.ToString(); request_.RequestUri = new System.Uri(url_, System.UriKind.RelativeOrAbsolute); - + PrepareRequest(client_, request_, url_); - + var response_ = await client_.SendAsync(request_, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false); var disposeResponse_ = true; try @@ -805,9 +811,9 @@ public async System.Threading.Tasks.Task GetPetByIdAsync(long petId, System foreach (var item_ in response_.Content.Headers) headers_[item_.Key] = item_.Value; } - + ProcessResponse(client_, response_); - + var status_ = (int)response_.StatusCode; if (status_ == 200) { @@ -849,7 +855,7 @@ public async System.Threading.Tasks.Task GetPetByIdAsync(long petId, System client_.Dispose(); } } - + /// Updates a pet in the store with form data /// ID of pet that needs to be updated /// Updated name of the pet @@ -859,7 +865,7 @@ public System.Threading.Tasks.Task UpdatePetWithFormAsync(long petId, string nam { return UpdatePetWithFormAsync(petId, name, status, System.Threading.CancellationToken.None); } - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// Updates a pet in the store with form data /// ID of pet that needs to be updated @@ -870,11 +876,11 @@ public async System.Threading.Tasks.Task UpdatePetWithFormAsync(long petId, stri { if (petId == null) throw new System.ArgumentNullException("petId"); - + var urlBuilder_ = new System.Text.StringBuilder(); urlBuilder_.Append(BaseUrl != null ? BaseUrl.TrimEnd('/') : "").Append("/pet/{petId}"); urlBuilder_.Replace("{petId}", System.Uri.EscapeDataString(ConvertToString(petId, System.Globalization.CultureInfo.InvariantCulture))); - + var client_ = new System.Net.Http.HttpClient(); var disposeClient_ = true; try @@ -888,14 +894,14 @@ public async System.Threading.Tasks.Task UpdatePetWithFormAsync(long petId, stri keyValues_.Add(new System.Collections.Generic.KeyValuePair("status", ConvertToString(status, System.Globalization.CultureInfo.InvariantCulture))); request_.Content = new System.Net.Http.FormUrlEncodedContent(keyValues_); request_.Method = new System.Net.Http.HttpMethod("POST"); - + PrepareRequest(client_, request_, urlBuilder_); - + var url_ = urlBuilder_.ToString(); request_.RequestUri = new System.Uri(url_, System.UriKind.RelativeOrAbsolute); - + PrepareRequest(client_, request_, url_); - + var response_ = await client_.SendAsync(request_, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false); var disposeResponse_ = true; try @@ -906,9 +912,9 @@ public async System.Threading.Tasks.Task UpdatePetWithFormAsync(long petId, stri foreach (var item_ in response_.Content.Headers) headers_[item_.Key] = item_.Value; } - + ProcessResponse(client_, response_); - + var status_ = (int)response_.StatusCode; if (status_ == 405) { @@ -916,8 +922,10 @@ public async System.Threading.Tasks.Task UpdatePetWithFormAsync(long petId, stri throw new SwaggerException("Invalid input", status_, responseText_, headers_, null); } else + if (status_ == 200 || status_ == 204) { + return; } else @@ -939,7 +947,7 @@ public async System.Threading.Tasks.Task UpdatePetWithFormAsync(long petId, stri client_.Dispose(); } } - + /// Deletes a pet /// Pet id to delete /// A server side error occurred. @@ -947,7 +955,7 @@ public System.Threading.Tasks.Task DeletePetAsync(string api_key, long petId) { return DeletePetAsync(api_key, petId, System.Threading.CancellationToken.None); } - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// Deletes a pet /// Pet id to delete @@ -956,28 +964,29 @@ public async System.Threading.Tasks.Task DeletePetAsync(string api_key, long pet { if (petId == null) throw new System.ArgumentNullException("petId"); - + var urlBuilder_ = new System.Text.StringBuilder(); urlBuilder_.Append(BaseUrl != null ? BaseUrl.TrimEnd('/') : "").Append("/pet/{petId}"); urlBuilder_.Replace("{petId}", System.Uri.EscapeDataString(ConvertToString(petId, System.Globalization.CultureInfo.InvariantCulture))); - + var client_ = new System.Net.Http.HttpClient(); var disposeClient_ = true; try { using (var request_ = new System.Net.Http.HttpRequestMessage()) { + if (api_key != null) request_.Headers.TryAddWithoutValidation("api_key", ConvertToString(api_key, System.Globalization.CultureInfo.InvariantCulture)); request_.Method = new System.Net.Http.HttpMethod("DELETE"); - + PrepareRequest(client_, request_, urlBuilder_); - + var url_ = urlBuilder_.ToString(); request_.RequestUri = new System.Uri(url_, System.UriKind.RelativeOrAbsolute); - + PrepareRequest(client_, request_, url_); - + var response_ = await client_.SendAsync(request_, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false); var disposeResponse_ = true; try @@ -988,9 +997,9 @@ public async System.Threading.Tasks.Task DeletePetAsync(string api_key, long pet foreach (var item_ in response_.Content.Headers) headers_[item_.Key] = item_.Value; } - + ProcessResponse(client_, response_); - + var status_ = (int)response_.StatusCode; if (status_ == 400) { @@ -1004,8 +1013,10 @@ public async System.Threading.Tasks.Task DeletePetAsync(string api_key, long pet throw new SwaggerException("Pet not found", status_, responseText_, headers_, null); } else + if (status_ == 200 || status_ == 204) { + return; } else @@ -1027,7 +1038,7 @@ public async System.Threading.Tasks.Task DeletePetAsync(string api_key, long pet client_.Dispose(); } } - + /// Returns pet inventories by status /// successful operation /// A server side error occurred. @@ -1035,7 +1046,7 @@ public async System.Threading.Tasks.Task DeletePetAsync(string api_key, long pet { return GetInventoryAsync(System.Threading.CancellationToken.None); } - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// Returns pet inventories by status /// successful operation @@ -1044,7 +1055,7 @@ public async System.Threading.Tasks.Task DeletePetAsync(string api_key, long pet { var urlBuilder_ = new System.Text.StringBuilder(); urlBuilder_.Append(BaseUrl != null ? BaseUrl.TrimEnd('/') : "").Append("/store/inventory"); - + var client_ = new System.Net.Http.HttpClient(); var disposeClient_ = true; try @@ -1053,14 +1064,14 @@ public async System.Threading.Tasks.Task DeletePetAsync(string api_key, long pet { request_.Method = new System.Net.Http.HttpMethod("GET"); request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); - + PrepareRequest(client_, request_, urlBuilder_); - + var url_ = urlBuilder_.ToString(); request_.RequestUri = new System.Uri(url_, System.UriKind.RelativeOrAbsolute); - + PrepareRequest(client_, request_, url_); - + var response_ = await client_.SendAsync(request_, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false); var disposeResponse_ = true; try @@ -1071,9 +1082,9 @@ public async System.Threading.Tasks.Task DeletePetAsync(string api_key, long pet foreach (var item_ in response_.Content.Headers) headers_[item_.Key] = item_.Value; } - + ProcessResponse(client_, response_); - + var status_ = (int)response_.StatusCode; if (status_ == 200) { @@ -1103,7 +1114,7 @@ public async System.Threading.Tasks.Task DeletePetAsync(string api_key, long pet client_.Dispose(); } } - + /// Place an order for a pet /// order placed for purchasing the pet /// successful operation @@ -1112,7 +1123,7 @@ public System.Threading.Tasks.Task PlaceOrderAsync(Order body) { return PlaceOrderAsync(body, System.Threading.CancellationToken.None); } - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// Place an order for a pet /// order placed for purchasing the pet @@ -1122,10 +1133,10 @@ public async System.Threading.Tasks.Task PlaceOrderAsync(Order body, Syst { if (body == null) throw new System.ArgumentNullException("body"); - + var urlBuilder_ = new System.Text.StringBuilder(); urlBuilder_.Append(BaseUrl != null ? BaseUrl.TrimEnd('/') : "").Append("/store/order"); - + var client_ = new System.Net.Http.HttpClient(); var disposeClient_ = true; try @@ -1137,14 +1148,14 @@ public async System.Threading.Tasks.Task PlaceOrderAsync(Order body, Syst request_.Content = content_; request_.Method = new System.Net.Http.HttpMethod("POST"); request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); - + PrepareRequest(client_, request_, urlBuilder_); - + var url_ = urlBuilder_.ToString(); request_.RequestUri = new System.Uri(url_, System.UriKind.RelativeOrAbsolute); - + PrepareRequest(client_, request_, url_); - + var response_ = await client_.SendAsync(request_, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false); var disposeResponse_ = true; try @@ -1155,9 +1166,9 @@ public async System.Threading.Tasks.Task PlaceOrderAsync(Order body, Syst foreach (var item_ in response_.Content.Headers) headers_[item_.Key] = item_.Value; } - + ProcessResponse(client_, response_); - + var status_ = (int)response_.StatusCode; if (status_ == 200) { @@ -1193,7 +1204,7 @@ public async System.Threading.Tasks.Task PlaceOrderAsync(Order body, Syst client_.Dispose(); } } - + /// Find purchase order by ID /// ID of pet that needs to be fetched /// successful operation @@ -1202,7 +1213,7 @@ public System.Threading.Tasks.Task GetOrderByIdAsync(long orderId) { return GetOrderByIdAsync(orderId, System.Threading.CancellationToken.None); } - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// Find purchase order by ID /// ID of pet that needs to be fetched @@ -1212,11 +1223,11 @@ public async System.Threading.Tasks.Task GetOrderByIdAsync(long orderId, { if (orderId == null) throw new System.ArgumentNullException("orderId"); - + var urlBuilder_ = new System.Text.StringBuilder(); urlBuilder_.Append(BaseUrl != null ? BaseUrl.TrimEnd('/') : "").Append("/store/order/{orderId}"); urlBuilder_.Replace("{orderId}", System.Uri.EscapeDataString(ConvertToString(orderId, System.Globalization.CultureInfo.InvariantCulture))); - + var client_ = new System.Net.Http.HttpClient(); var disposeClient_ = true; try @@ -1225,14 +1236,14 @@ public async System.Threading.Tasks.Task GetOrderByIdAsync(long orderId, { request_.Method = new System.Net.Http.HttpMethod("GET"); request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); - + PrepareRequest(client_, request_, urlBuilder_); - + var url_ = urlBuilder_.ToString(); request_.RequestUri = new System.Uri(url_, System.UriKind.RelativeOrAbsolute); - + PrepareRequest(client_, request_, url_); - + var response_ = await client_.SendAsync(request_, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false); var disposeResponse_ = true; try @@ -1243,9 +1254,9 @@ public async System.Threading.Tasks.Task GetOrderByIdAsync(long orderId, foreach (var item_ in response_.Content.Headers) headers_[item_.Key] = item_.Value; } - + ProcessResponse(client_, response_); - + var status_ = (int)response_.StatusCode; if (status_ == 200) { @@ -1287,7 +1298,7 @@ public async System.Threading.Tasks.Task GetOrderByIdAsync(long orderId, client_.Dispose(); } } - + /// Delete purchase order by ID /// ID of the order that needs to be deleted /// A server side error occurred. @@ -1295,7 +1306,7 @@ public System.Threading.Tasks.Task DeleteOrderAsync(long orderId) { return DeleteOrderAsync(orderId, System.Threading.CancellationToken.None); } - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// Delete purchase order by ID /// ID of the order that needs to be deleted @@ -1304,11 +1315,11 @@ public async System.Threading.Tasks.Task DeleteOrderAsync(long orderId, System.T { if (orderId == null) throw new System.ArgumentNullException("orderId"); - + var urlBuilder_ = new System.Text.StringBuilder(); urlBuilder_.Append(BaseUrl != null ? BaseUrl.TrimEnd('/') : "").Append("/store/order/{orderId}"); urlBuilder_.Replace("{orderId}", System.Uri.EscapeDataString(ConvertToString(orderId, System.Globalization.CultureInfo.InvariantCulture))); - + var client_ = new System.Net.Http.HttpClient(); var disposeClient_ = true; try @@ -1316,14 +1327,14 @@ public async System.Threading.Tasks.Task DeleteOrderAsync(long orderId, System.T using (var request_ = new System.Net.Http.HttpRequestMessage()) { request_.Method = new System.Net.Http.HttpMethod("DELETE"); - + PrepareRequest(client_, request_, urlBuilder_); - + var url_ = urlBuilder_.ToString(); request_.RequestUri = new System.Uri(url_, System.UriKind.RelativeOrAbsolute); - + PrepareRequest(client_, request_, url_); - + var response_ = await client_.SendAsync(request_, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false); var disposeResponse_ = true; try @@ -1334,9 +1345,9 @@ public async System.Threading.Tasks.Task DeleteOrderAsync(long orderId, System.T foreach (var item_ in response_.Content.Headers) headers_[item_.Key] = item_.Value; } - + ProcessResponse(client_, response_); - + var status_ = (int)response_.StatusCode; if (status_ == 400) { @@ -1350,8 +1361,10 @@ public async System.Threading.Tasks.Task DeleteOrderAsync(long orderId, System.T throw new SwaggerException("Order not found", status_, responseText_, headers_, null); } else + if (status_ == 200 || status_ == 204) { + return; } else @@ -1373,7 +1386,7 @@ public async System.Threading.Tasks.Task DeleteOrderAsync(long orderId, System.T client_.Dispose(); } } - + /// Creates list of users with given input array /// List of user object /// successful operation @@ -1382,7 +1395,7 @@ public System.Threading.Tasks.Task CreateUsersWithListInputAsync(System.Collecti { return CreateUsersWithListInputAsync(body, System.Threading.CancellationToken.None); } - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// Creates list of users with given input array /// List of user object @@ -1392,10 +1405,10 @@ public async System.Threading.Tasks.Task CreateUsersWithListInputAsync(System.Co { if (body == null) throw new System.ArgumentNullException("body"); - + var urlBuilder_ = new System.Text.StringBuilder(); urlBuilder_.Append(BaseUrl != null ? BaseUrl.TrimEnd('/') : "").Append("/user/createWithList"); - + var client_ = new System.Net.Http.HttpClient(); var disposeClient_ = true; try @@ -1406,14 +1419,14 @@ public async System.Threading.Tasks.Task CreateUsersWithListInputAsync(System.Co content_.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json"); request_.Content = content_; request_.Method = new System.Net.Http.HttpMethod("POST"); - + PrepareRequest(client_, request_, urlBuilder_); - + var url_ = urlBuilder_.ToString(); request_.RequestUri = new System.Uri(url_, System.UriKind.RelativeOrAbsolute); - + PrepareRequest(client_, request_, url_); - + var response_ = await client_.SendAsync(request_, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false); var disposeResponse_ = true; try @@ -1424,9 +1437,9 @@ public async System.Threading.Tasks.Task CreateUsersWithListInputAsync(System.Co foreach (var item_ in response_.Content.Headers) headers_[item_.Key] = item_.Value; } - + ProcessResponse(client_, response_); - + var status_ = (int)response_.StatusCode; } finally @@ -1442,7 +1455,7 @@ public async System.Threading.Tasks.Task CreateUsersWithListInputAsync(System.Co client_.Dispose(); } } - + /// Get user by user name /// The name that needs to be fetched. Use user1 for testing. /// successful operation @@ -1451,7 +1464,7 @@ public System.Threading.Tasks.Task GetUserByNameAsync(string username) { return GetUserByNameAsync(username, System.Threading.CancellationToken.None); } - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// Get user by user name /// The name that needs to be fetched. Use user1 for testing. @@ -1461,11 +1474,11 @@ public async System.Threading.Tasks.Task GetUserByNameAsync(string usernam { if (username == null) throw new System.ArgumentNullException("username"); - + var urlBuilder_ = new System.Text.StringBuilder(); urlBuilder_.Append(BaseUrl != null ? BaseUrl.TrimEnd('/') : "").Append("/user/{username}"); urlBuilder_.Replace("{username}", System.Uri.EscapeDataString(ConvertToString(username, System.Globalization.CultureInfo.InvariantCulture))); - + var client_ = new System.Net.Http.HttpClient(); var disposeClient_ = true; try @@ -1474,14 +1487,14 @@ public async System.Threading.Tasks.Task GetUserByNameAsync(string usernam { request_.Method = new System.Net.Http.HttpMethod("GET"); request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); - + PrepareRequest(client_, request_, urlBuilder_); - + var url_ = urlBuilder_.ToString(); request_.RequestUri = new System.Uri(url_, System.UriKind.RelativeOrAbsolute); - + PrepareRequest(client_, request_, url_); - + var response_ = await client_.SendAsync(request_, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false); var disposeResponse_ = true; try @@ -1492,9 +1505,9 @@ public async System.Threading.Tasks.Task GetUserByNameAsync(string usernam foreach (var item_ in response_.Content.Headers) headers_[item_.Key] = item_.Value; } - + ProcessResponse(client_, response_); - + var status_ = (int)response_.StatusCode; if (status_ == 200) { @@ -1536,7 +1549,7 @@ public async System.Threading.Tasks.Task GetUserByNameAsync(string usernam client_.Dispose(); } } - + /// Updated user /// name that need to be updated /// Updated user object @@ -1545,7 +1558,7 @@ public System.Threading.Tasks.Task UpdateUserAsync(string username, User body) { return UpdateUserAsync(username, body, System.Threading.CancellationToken.None); } - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// Updated user /// name that need to be updated @@ -1555,14 +1568,14 @@ public async System.Threading.Tasks.Task UpdateUserAsync(string username, User b { if (username == null) throw new System.ArgumentNullException("username"); - + if (body == null) throw new System.ArgumentNullException("body"); - + var urlBuilder_ = new System.Text.StringBuilder(); urlBuilder_.Append(BaseUrl != null ? BaseUrl.TrimEnd('/') : "").Append("/user/{username}"); urlBuilder_.Replace("{username}", System.Uri.EscapeDataString(ConvertToString(username, System.Globalization.CultureInfo.InvariantCulture))); - + var client_ = new System.Net.Http.HttpClient(); var disposeClient_ = true; try @@ -1573,14 +1586,14 @@ public async System.Threading.Tasks.Task UpdateUserAsync(string username, User b content_.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json"); request_.Content = content_; request_.Method = new System.Net.Http.HttpMethod("PUT"); - + PrepareRequest(client_, request_, urlBuilder_); - + var url_ = urlBuilder_.ToString(); request_.RequestUri = new System.Uri(url_, System.UriKind.RelativeOrAbsolute); - + PrepareRequest(client_, request_, url_); - + var response_ = await client_.SendAsync(request_, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false); var disposeResponse_ = true; try @@ -1591,9 +1604,9 @@ public async System.Threading.Tasks.Task UpdateUserAsync(string username, User b foreach (var item_ in response_.Content.Headers) headers_[item_.Key] = item_.Value; } - + ProcessResponse(client_, response_); - + var status_ = (int)response_.StatusCode; if (status_ == 400) { @@ -1607,8 +1620,10 @@ public async System.Threading.Tasks.Task UpdateUserAsync(string username, User b throw new SwaggerException("User not found", status_, responseText_, headers_, null); } else + if (status_ == 200 || status_ == 204) { + return; } else @@ -1630,7 +1645,7 @@ public async System.Threading.Tasks.Task UpdateUserAsync(string username, User b client_.Dispose(); } } - + /// Delete user /// The name that needs to be deleted /// A server side error occurred. @@ -1638,7 +1653,7 @@ public System.Threading.Tasks.Task DeleteUserAsync(string username) { return DeleteUserAsync(username, System.Threading.CancellationToken.None); } - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// Delete user /// The name that needs to be deleted @@ -1647,11 +1662,11 @@ public async System.Threading.Tasks.Task DeleteUserAsync(string username, System { if (username == null) throw new System.ArgumentNullException("username"); - + var urlBuilder_ = new System.Text.StringBuilder(); urlBuilder_.Append(BaseUrl != null ? BaseUrl.TrimEnd('/') : "").Append("/user/{username}"); urlBuilder_.Replace("{username}", System.Uri.EscapeDataString(ConvertToString(username, System.Globalization.CultureInfo.InvariantCulture))); - + var client_ = new System.Net.Http.HttpClient(); var disposeClient_ = true; try @@ -1659,14 +1674,14 @@ public async System.Threading.Tasks.Task DeleteUserAsync(string username, System using (var request_ = new System.Net.Http.HttpRequestMessage()) { request_.Method = new System.Net.Http.HttpMethod("DELETE"); - + PrepareRequest(client_, request_, urlBuilder_); - + var url_ = urlBuilder_.ToString(); request_.RequestUri = new System.Uri(url_, System.UriKind.RelativeOrAbsolute); - + PrepareRequest(client_, request_, url_); - + var response_ = await client_.SendAsync(request_, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false); var disposeResponse_ = true; try @@ -1677,9 +1692,9 @@ public async System.Threading.Tasks.Task DeleteUserAsync(string username, System foreach (var item_ in response_.Content.Headers) headers_[item_.Key] = item_.Value; } - + ProcessResponse(client_, response_); - + var status_ = (int)response_.StatusCode; if (status_ == 400) { @@ -1693,8 +1708,10 @@ public async System.Threading.Tasks.Task DeleteUserAsync(string username, System throw new SwaggerException("User not found", status_, responseText_, headers_, null); } else + if (status_ == 200 || status_ == 204) { + return; } else @@ -1716,7 +1733,7 @@ public async System.Threading.Tasks.Task DeleteUserAsync(string username, System client_.Dispose(); } } - + /// Logs user into the system /// The user name for login /// The password for login in clear text @@ -1726,7 +1743,7 @@ public System.Threading.Tasks.Task LoginUserAsync(string username, strin { return LoginUserAsync(username, password, System.Threading.CancellationToken.None); } - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// Logs user into the system /// The user name for login @@ -1737,16 +1754,16 @@ public async System.Threading.Tasks.Task LoginUserAsync(string username, { if (username == null) throw new System.ArgumentNullException("username"); - + if (password == null) throw new System.ArgumentNullException("password"); - + var urlBuilder_ = new System.Text.StringBuilder(); urlBuilder_.Append(BaseUrl != null ? BaseUrl.TrimEnd('/') : "").Append("/user/login?"); urlBuilder_.Append(System.Uri.EscapeDataString("username") + "=").Append(System.Uri.EscapeDataString(ConvertToString(username, System.Globalization.CultureInfo.InvariantCulture))).Append("&"); urlBuilder_.Append(System.Uri.EscapeDataString("password") + "=").Append(System.Uri.EscapeDataString(ConvertToString(password, System.Globalization.CultureInfo.InvariantCulture))).Append("&"); urlBuilder_.Length--; - + var client_ = new System.Net.Http.HttpClient(); var disposeClient_ = true; try @@ -1755,14 +1772,14 @@ public async System.Threading.Tasks.Task LoginUserAsync(string username, { request_.Method = new System.Net.Http.HttpMethod("GET"); request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); - + PrepareRequest(client_, request_, urlBuilder_); - + var url_ = urlBuilder_.ToString(); request_.RequestUri = new System.Uri(url_, System.UriKind.RelativeOrAbsolute); - + PrepareRequest(client_, request_, url_); - + var response_ = await client_.SendAsync(request_, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false); var disposeResponse_ = true; try @@ -1773,9 +1790,9 @@ public async System.Threading.Tasks.Task LoginUserAsync(string username, foreach (var item_ in response_.Content.Headers) headers_[item_.Key] = item_.Value; } - + ProcessResponse(client_, response_); - + var status_ = (int)response_.StatusCode; if (status_ == 200) { @@ -1811,7 +1828,7 @@ public async System.Threading.Tasks.Task LoginUserAsync(string username, client_.Dispose(); } } - + /// Logs out current logged in user session /// successful operation /// A server side error occurred. @@ -1819,7 +1836,7 @@ public System.Threading.Tasks.Task LogoutUserAsync() { return LogoutUserAsync(System.Threading.CancellationToken.None); } - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// Logs out current logged in user session /// successful operation @@ -1828,7 +1845,7 @@ public async System.Threading.Tasks.Task LogoutUserAsync(System.Threading.Cancel { var urlBuilder_ = new System.Text.StringBuilder(); urlBuilder_.Append(BaseUrl != null ? BaseUrl.TrimEnd('/') : "").Append("/user/logout"); - + var client_ = new System.Net.Http.HttpClient(); var disposeClient_ = true; try @@ -1836,14 +1853,14 @@ public async System.Threading.Tasks.Task LogoutUserAsync(System.Threading.Cancel using (var request_ = new System.Net.Http.HttpRequestMessage()) { request_.Method = new System.Net.Http.HttpMethod("GET"); - + PrepareRequest(client_, request_, urlBuilder_); - + var url_ = urlBuilder_.ToString(); request_.RequestUri = new System.Uri(url_, System.UriKind.RelativeOrAbsolute); - + PrepareRequest(client_, request_, url_); - + var response_ = await client_.SendAsync(request_, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false); var disposeResponse_ = true; try @@ -1854,9 +1871,9 @@ public async System.Threading.Tasks.Task LogoutUserAsync(System.Threading.Cancel foreach (var item_ in response_.Content.Headers) headers_[item_.Key] = item_.Value; } - + ProcessResponse(client_, response_); - + var status_ = (int)response_.StatusCode; } finally @@ -1872,7 +1889,7 @@ public async System.Threading.Tasks.Task LogoutUserAsync(System.Threading.Cancel client_.Dispose(); } } - + /// Creates list of users with given input array /// List of user object /// successful operation @@ -1881,7 +1898,7 @@ public System.Threading.Tasks.Task CreateUsersWithArrayInputAsync(System.Collect { return CreateUsersWithArrayInputAsync(body, System.Threading.CancellationToken.None); } - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// Creates list of users with given input array /// List of user object @@ -1891,10 +1908,10 @@ public async System.Threading.Tasks.Task CreateUsersWithArrayInputAsync(System.C { if (body == null) throw new System.ArgumentNullException("body"); - + var urlBuilder_ = new System.Text.StringBuilder(); urlBuilder_.Append(BaseUrl != null ? BaseUrl.TrimEnd('/') : "").Append("/user/createWithArray"); - + var client_ = new System.Net.Http.HttpClient(); var disposeClient_ = true; try @@ -1905,14 +1922,14 @@ public async System.Threading.Tasks.Task CreateUsersWithArrayInputAsync(System.C content_.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json"); request_.Content = content_; request_.Method = new System.Net.Http.HttpMethod("POST"); - + PrepareRequest(client_, request_, urlBuilder_); - + var url_ = urlBuilder_.ToString(); request_.RequestUri = new System.Uri(url_, System.UriKind.RelativeOrAbsolute); - + PrepareRequest(client_, request_, url_); - + var response_ = await client_.SendAsync(request_, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false); var disposeResponse_ = true; try @@ -1923,9 +1940,9 @@ public async System.Threading.Tasks.Task CreateUsersWithArrayInputAsync(System.C foreach (var item_ in response_.Content.Headers) headers_[item_.Key] = item_.Value; } - + ProcessResponse(client_, response_); - + var status_ = (int)response_.StatusCode; } finally @@ -1941,7 +1958,7 @@ public async System.Threading.Tasks.Task CreateUsersWithArrayInputAsync(System.C client_.Dispose(); } } - + /// Create user /// Created user object /// successful operation @@ -1950,7 +1967,7 @@ public System.Threading.Tasks.Task CreateUserAsync(User body) { return CreateUserAsync(body, System.Threading.CancellationToken.None); } - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// Create user /// Created user object @@ -1960,10 +1977,10 @@ public async System.Threading.Tasks.Task CreateUserAsync(User body, System.Threa { if (body == null) throw new System.ArgumentNullException("body"); - + var urlBuilder_ = new System.Text.StringBuilder(); urlBuilder_.Append(BaseUrl != null ? BaseUrl.TrimEnd('/') : "").Append("/user"); - + var client_ = new System.Net.Http.HttpClient(); var disposeClient_ = true; try @@ -1974,14 +1991,14 @@ public async System.Threading.Tasks.Task CreateUserAsync(User body, System.Threa content_.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json"); request_.Content = content_; request_.Method = new System.Net.Http.HttpMethod("POST"); - + PrepareRequest(client_, request_, urlBuilder_); - + var url_ = urlBuilder_.ToString(); request_.RequestUri = new System.Uri(url_, System.UriKind.RelativeOrAbsolute); - + PrepareRequest(client_, request_, url_); - + var response_ = await client_.SendAsync(request_, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false); var disposeResponse_ = true; try @@ -1992,9 +2009,9 @@ public async System.Threading.Tasks.Task CreateUserAsync(User body, System.Threa foreach (var item_ in response_.Content.Headers) headers_[item_.Key] = item_.Value; } - + ProcessResponse(client_, response_); - + var status_ = (int)response_.StatusCode; } finally @@ -2010,7 +2027,7 @@ public async System.Threading.Tasks.Task CreateUserAsync(User body, System.Threa client_.Dispose(); } } - + protected struct ObjectResponseResult { public ObjectResponseResult(T responseObject, string responseText) @@ -2018,21 +2035,21 @@ public ObjectResponseResult(T responseObject, string responseText) this.Object = responseObject; this.Text = responseText; } - + public T Object { get; } - + public string Text { get; } } - + public bool ReadResponseAsString { get; set; } - + protected virtual async System.Threading.Tasks.Task> ReadObjectResponseAsync(System.Net.Http.HttpResponseMessage response, System.Collections.Generic.IReadOnlyDictionary> headers, System.Threading.CancellationToken cancellationToken) { if (response == null || response.Content == null) { return new ObjectResponseResult(default(T), string.Empty); } - + if (ReadResponseAsString) { var responseText = await response.Content.ReadAsStringAsync().ConfigureAwait(false); @@ -2067,14 +2084,14 @@ protected virtual async System.Threading.Tasks.Task> Rea } } } - + private string ConvertToString(object value, System.Globalization.CultureInfo cultureInfo) { if (value == null) { return ""; } - + if (value is System.Enum) { var name = System.Enum.GetName(value.GetType(), value); @@ -2090,7 +2107,7 @@ private string ConvertToString(object value, System.Globalization.CultureInfo cu return attribute.Value != null ? attribute.Value : name; } } - + var converted = System.Convert.ToString(System.Convert.ChangeType(value, System.Enum.GetUnderlyingType(value.GetType()), cultureInfo)); return converted == null ? string.Empty : converted; } @@ -2108,7 +2125,7 @@ private string ConvertToString(object value, System.Globalization.CultureInfo cu var array = System.Linq.Enumerable.OfType((System.Array) value); return string.Join(",", System.Linq.Enumerable.Select(array, o => ConvertToString(o, cultureInfo))); } - + var result = System.Convert.ToString(value, cultureInfo); return result == null ? "" : result; } @@ -2120,7 +2137,7 @@ public partial class ApiResponse : System.ComponentModel.INotifyPropertyChanged private int? _code; private string _type; private string _message; - + [Newtonsoft.Json.JsonProperty("code", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] public int? Code { @@ -2134,7 +2151,7 @@ public int? Code } } } - + [Newtonsoft.Json.JsonProperty("type", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] public string Type { @@ -2148,7 +2165,7 @@ public string Type } } } - + [Newtonsoft.Json.JsonProperty("message", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] public string Message { @@ -2162,25 +2179,23 @@ public string Message } } } - - + public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged; - + protected virtual void RaisePropertyChanged([System.Runtime.CompilerServices.CallerMemberName] string propertyName = null) { var handler = PropertyChanged; - if (handler != null) + if (handler != null) handler(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName)); } - } - + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.5.2.0 (Newtonsoft.Json v11.0.0.0)")] public partial class Category : System.ComponentModel.INotifyPropertyChanged { private long? _id; private string _name; - + [Newtonsoft.Json.JsonProperty("id", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] public long? Id { @@ -2194,7 +2209,7 @@ public long? Id } } } - + [Newtonsoft.Json.JsonProperty("name", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] public string Name { @@ -2208,19 +2223,17 @@ public string Name } } } - - + public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged; - + protected virtual void RaisePropertyChanged([System.Runtime.CompilerServices.CallerMemberName] string propertyName = null) { var handler = PropertyChanged; - if (handler != null) + if (handler != null) handler(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName)); } - } - + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.5.2.0 (Newtonsoft.Json v11.0.0.0)")] public partial class Pet : System.ComponentModel.INotifyPropertyChanged { @@ -2230,7 +2243,7 @@ public partial class Pet : System.ComponentModel.INotifyPropertyChanged private System.Collections.ObjectModel.ObservableCollection _photoUrls = new System.Collections.ObjectModel.ObservableCollection(); private System.Collections.ObjectModel.ObservableCollection _tags; private PetStatus? _status; - + [Newtonsoft.Json.JsonProperty("id", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] public long? Id { @@ -2244,7 +2257,7 @@ public long? Id } } } - + [Newtonsoft.Json.JsonProperty("category", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] public Category Category { @@ -2258,7 +2271,7 @@ public Category Category } } } - + [Newtonsoft.Json.JsonProperty("name", Required = Newtonsoft.Json.Required.Always)] [System.ComponentModel.DataAnnotations.Required(AllowEmptyStrings = true)] public string Name @@ -2273,7 +2286,7 @@ public string Name } } } - + [Newtonsoft.Json.JsonProperty("photoUrls", Required = Newtonsoft.Json.Required.Always)] [System.ComponentModel.DataAnnotations.Required] public System.Collections.ObjectModel.ObservableCollection PhotoUrls @@ -2288,7 +2301,7 @@ public System.Collections.ObjectModel.ObservableCollection PhotoUrls } } } - + [Newtonsoft.Json.JsonProperty("tags", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] public System.Collections.ObjectModel.ObservableCollection Tags { @@ -2302,7 +2315,7 @@ public System.Collections.ObjectModel.ObservableCollection Tags } } } - + /// pet status in the store [Newtonsoft.Json.JsonProperty("status", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.StringEnumConverter))] @@ -2318,25 +2331,23 @@ public PetStatus? Status } } } - - + public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged; - + protected virtual void RaisePropertyChanged([System.Runtime.CompilerServices.CallerMemberName] string propertyName = null) { var handler = PropertyChanged; - if (handler != null) + if (handler != null) handler(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName)); } - } - + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.5.2.0 (Newtonsoft.Json v11.0.0.0)")] public partial class Tag : System.ComponentModel.INotifyPropertyChanged { private long? _id; private string _name; - + [Newtonsoft.Json.JsonProperty("id", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] public long? Id { @@ -2350,7 +2361,7 @@ public long? Id } } } - + [Newtonsoft.Json.JsonProperty("name", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] public string Name { @@ -2364,19 +2375,17 @@ public string Name } } } - - + public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged; - + protected virtual void RaisePropertyChanged([System.Runtime.CompilerServices.CallerMemberName] string propertyName = null) { var handler = PropertyChanged; - if (handler != null) + if (handler != null) handler(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName)); } - } - + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.5.2.0 (Newtonsoft.Json v11.0.0.0)")] public partial class Order : System.ComponentModel.INotifyPropertyChanged { @@ -2386,7 +2395,7 @@ public partial class Order : System.ComponentModel.INotifyPropertyChanged private System.DateTime? _shipDate; private OrderStatus? _status; private bool? _complete; - + [Newtonsoft.Json.JsonProperty("id", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] public long? Id { @@ -2400,7 +2409,7 @@ public long? Id } } } - + [Newtonsoft.Json.JsonProperty("petId", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] public long? PetId { @@ -2414,7 +2423,7 @@ public long? PetId } } } - + [Newtonsoft.Json.JsonProperty("quantity", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] public int? Quantity { @@ -2428,7 +2437,7 @@ public int? Quantity } } } - + [Newtonsoft.Json.JsonProperty("shipDate", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] public System.DateTime? ShipDate { @@ -2442,7 +2451,7 @@ public System.DateTime? ShipDate } } } - + /// Order Status [Newtonsoft.Json.JsonProperty("status", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.StringEnumConverter))] @@ -2458,7 +2467,7 @@ public OrderStatus? Status } } } - + [Newtonsoft.Json.JsonProperty("complete", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] public bool? Complete { @@ -2472,19 +2481,17 @@ public bool? Complete } } } - - + public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged; - + protected virtual void RaisePropertyChanged([System.Runtime.CompilerServices.CallerMemberName] string propertyName = null) { var handler = PropertyChanged; - if (handler != null) + if (handler != null) handler(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName)); } - } - + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.5.2.0 (Newtonsoft.Json v11.0.0.0)")] public partial class User : System.ComponentModel.INotifyPropertyChanged { @@ -2496,7 +2503,7 @@ public partial class User : System.ComponentModel.INotifyPropertyChanged private string _password; private string _phone; private int? _userStatus; - + [Newtonsoft.Json.JsonProperty("id", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] public long? Id { @@ -2510,7 +2517,7 @@ public long? Id } } } - + [Newtonsoft.Json.JsonProperty("username", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] public string Username { @@ -2524,7 +2531,7 @@ public string Username } } } - + [Newtonsoft.Json.JsonProperty("firstName", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] public string FirstName { @@ -2538,7 +2545,7 @@ public string FirstName } } } - + [Newtonsoft.Json.JsonProperty("lastName", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] public string LastName { @@ -2552,7 +2559,7 @@ public string LastName } } } - + [Newtonsoft.Json.JsonProperty("email", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] public string Email { @@ -2566,7 +2573,7 @@ public string Email } } } - + [Newtonsoft.Json.JsonProperty("password", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] public string Password { @@ -2580,7 +2587,7 @@ public string Password } } } - + [Newtonsoft.Json.JsonProperty("phone", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] public string Phone { @@ -2594,7 +2601,7 @@ public string Phone } } } - + /// User Status [Newtonsoft.Json.JsonProperty("userStatus", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] public int? UserStatus @@ -2609,62 +2616,63 @@ public int? UserStatus } } } - - + public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged; - + protected virtual void RaisePropertyChanged([System.Runtime.CompilerServices.CallerMemberName] string propertyName = null) { var handler = PropertyChanged; - if (handler != null) + if (handler != null) handler(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName)); } - } - + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.5.2.0 (Newtonsoft.Json v11.0.0.0)")] public enum Anonymous { + [System.Runtime.Serialization.EnumMember(Value = @"available")] Available = 0, - + [System.Runtime.Serialization.EnumMember(Value = @"pending")] Pending = 1, - + [System.Runtime.Serialization.EnumMember(Value = @"sold")] Sold = 2, - + } - + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.5.2.0 (Newtonsoft.Json v11.0.0.0)")] public enum PetStatus { + [System.Runtime.Serialization.EnumMember(Value = @"available")] Available = 0, - + [System.Runtime.Serialization.EnumMember(Value = @"pending")] Pending = 1, - + [System.Runtime.Serialization.EnumMember(Value = @"sold")] Sold = 2, - + } - + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.5.2.0 (Newtonsoft.Json v11.0.0.0)")] public enum OrderStatus { + [System.Runtime.Serialization.EnumMember(Value = @"placed")] Placed = 0, - + [System.Runtime.Serialization.EnumMember(Value = @"approved")] Approved = 1, - + [System.Runtime.Serialization.EnumMember(Value = @"delivered")] Delivered = 2, - + } - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.4.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "")] public partial class FileParameter { public FileParameter(System.IO.Stream data) @@ -2691,7 +2699,9 @@ public FileParameter(System.IO.Stream data, string fileName, string contentType) public string ContentType { get; private set; } } - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.4.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] + + + [System.CodeDom.Compiler.GeneratedCode("NSwag", "")] public partial class SwaggerException : System.Exception { public int StatusCode { get; private set; } @@ -2714,7 +2724,7 @@ public override string ToString() } } - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.4.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "")] public partial class SwaggerException : SwaggerException { public TResult Result { get; private set; } diff --git a/src/NSwag.Integration.ClientPCL/ServiceClients.cs b/src/NSwag.Integration.ClientPCL/ServiceClients.cs index 2a6fdb1ca0..73917d248f 100644 --- a/src/NSwag.Integration.ClientPCL/ServiceClients.cs +++ b/src/NSwag.Integration.ClientPCL/ServiceClients.cs @@ -1,6 +1,6 @@ //---------------------- // -// Generated using the NSwag toolchain v13.14.4.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0)) (http://NSwag.org) +// Generated using the NSwag toolchain v (http://NSwag.org) // //---------------------- @@ -18,52 +18,51 @@ namespace NSwag.Integration.ClientPCL { using System = global::System; - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.4.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "")] public partial class GeoClient : ClientBase { private string _baseUrl = "http://localhost:13452"; private System.Net.Http.HttpClient _httpClient; private System.Lazy _settings; - + public GeoClient(System.Net.Http.HttpClient httpClient) { _httpClient = httpClient; _settings = new System.Lazy(CreateSerializerSettings); } - + private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() { var settings = new Newtonsoft.Json.JsonSerializerSettings { PreserveReferencesHandling = Newtonsoft.Json.PreserveReferencesHandling.All, Converters = new Newtonsoft.Json.JsonConverter[] { new Newtonsoft.Json.Converters.StringEnumConverter(), new JsonExceptionConverter() } }; UpdateJsonSerializerSettings(settings); return settings; } - + public string BaseUrl { get { return _baseUrl; } set { _baseUrl = value; } } - + protected Newtonsoft.Json.JsonSerializerSettings JsonSerializerSettings { get { return _settings.Value; } } - - - + partial void PrepareRequest(System.Net.Http.HttpClient client, System.Net.Http.HttpRequestMessage request, string url); partial void PrepareRequest(System.Net.Http.HttpClient client, System.Net.Http.HttpRequestMessage request, System.Text.StringBuilder urlBuilder); partial void ProcessResponse(System.Net.Http.HttpClient client, System.Net.Http.HttpResponseMessage response); + /// A server side error occurred. public System.Threading.Tasks.Task FromBodyTestAsync(GeoPoint location) { return FromBodyTestAsync(location, System.Threading.CancellationToken.None); } - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// A server side error occurred. public async System.Threading.Tasks.Task FromBodyTestAsync(GeoPoint location, System.Threading.CancellationToken cancellationToken) { var urlBuilder_ = new System.Text.StringBuilder(); urlBuilder_.Append(BaseUrl != null ? BaseUrl.TrimEnd('/') : "").Append("/api/Geo/FromBodyTest"); - + var client_ = _httpClient; var disposeClient_ = false; try @@ -74,14 +73,14 @@ public async System.Threading.Tasks.Task FromBodyTestAsync(GeoP content_.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json"); request_.Content = content_; request_.Method = new System.Net.Http.HttpMethod("POST"); - + PrepareRequest(client_, request_, urlBuilder_); - + var url_ = urlBuilder_.ToString(); request_.RequestUri = new System.Uri(url_, System.UriKind.RelativeOrAbsolute); - + PrepareRequest(client_, request_, url_); - + var response_ = await client_.SendAsync(request_, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false); var disposeResponse_ = true; try @@ -92,9 +91,9 @@ public async System.Threading.Tasks.Task FromBodyTestAsync(GeoP foreach (var item_ in response_.Content.Headers) headers_[item_.Key] = item_.Value; } - + ProcessResponse(client_, response_); - + var status_ = (int)response_.StatusCode; if (status_ == 204) { @@ -119,13 +118,13 @@ public async System.Threading.Tasks.Task FromBodyTestAsync(GeoP client_.Dispose(); } } - + /// A server side error occurred. public System.Threading.Tasks.Task FromUriTestAsync(double? latitude, double? longitude) { return FromUriTestAsync(latitude, longitude, System.Threading.CancellationToken.None); } - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// A server side error occurred. public async System.Threading.Tasks.Task FromUriTestAsync(double? latitude, double? longitude, System.Threading.CancellationToken cancellationToken) @@ -141,7 +140,7 @@ public async System.Threading.Tasks.Task FromUriTestAsync(doubl urlBuilder_.Append(System.Uri.EscapeDataString("Longitude") + "=").Append(System.Uri.EscapeDataString(ConvertToString(longitude, System.Globalization.CultureInfo.InvariantCulture))).Append("&"); } urlBuilder_.Length--; - + var client_ = _httpClient; var disposeClient_ = false; try @@ -150,14 +149,14 @@ public async System.Threading.Tasks.Task FromUriTestAsync(doubl { request_.Content = new System.Net.Http.StringContent(string.Empty, System.Text.Encoding.UTF8, "application/json"); request_.Method = new System.Net.Http.HttpMethod("POST"); - + PrepareRequest(client_, request_, urlBuilder_); - + var url_ = urlBuilder_.ToString(); request_.RequestUri = new System.Uri(url_, System.UriKind.RelativeOrAbsolute); - + PrepareRequest(client_, request_, url_); - + var response_ = await client_.SendAsync(request_, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false); var disposeResponse_ = true; try @@ -168,9 +167,9 @@ public async System.Threading.Tasks.Task FromUriTestAsync(doubl foreach (var item_ in response_.Content.Headers) headers_[item_.Key] = item_.Value; } - + ProcessResponse(client_, response_); - + var status_ = (int)response_.StatusCode; if (status_ == 204) { @@ -195,20 +194,20 @@ public async System.Threading.Tasks.Task FromUriTestAsync(doubl client_.Dispose(); } } - + /// A server side error occurred. public System.Threading.Tasks.Task AddPolygonAsync(System.Collections.Generic.IEnumerable points) { return AddPolygonAsync(points, System.Threading.CancellationToken.None); } - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// A server side error occurred. public async System.Threading.Tasks.Task AddPolygonAsync(System.Collections.Generic.IEnumerable points, System.Threading.CancellationToken cancellationToken) { var urlBuilder_ = new System.Text.StringBuilder(); urlBuilder_.Append(BaseUrl != null ? BaseUrl.TrimEnd('/') : "").Append("/api/Geo/AddPolygon"); - + var client_ = _httpClient; var disposeClient_ = false; try @@ -219,14 +218,14 @@ public async System.Threading.Tasks.Task AddPolygonAsync(System content_.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json"); request_.Content = content_; request_.Method = new System.Net.Http.HttpMethod("POST"); - + PrepareRequest(client_, request_, urlBuilder_); - + var url_ = urlBuilder_.ToString(); request_.RequestUri = new System.Uri(url_, System.UriKind.RelativeOrAbsolute); - + PrepareRequest(client_, request_, url_); - + var response_ = await client_.SendAsync(request_, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false); var disposeResponse_ = true; try @@ -237,9 +236,9 @@ public async System.Threading.Tasks.Task AddPolygonAsync(System foreach (var item_ in response_.Content.Headers) headers_[item_.Key] = item_.Value; } - + ProcessResponse(client_, response_); - + var status_ = (int)response_.StatusCode; if (status_ == 204) { @@ -264,13 +263,13 @@ public async System.Threading.Tasks.Task AddPolygonAsync(System client_.Dispose(); } } - + /// A server side error occurred. public System.Threading.Tasks.Task FilterAsync(System.Collections.Generic.IEnumerable currentStates) { return FilterAsync(currentStates, System.Threading.CancellationToken.None); } - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// A server side error occurred. public async System.Threading.Tasks.Task FilterAsync(System.Collections.Generic.IEnumerable currentStates, System.Threading.CancellationToken cancellationToken) @@ -282,7 +281,7 @@ public async System.Threading.Tasks.Task FilterAsync(System.Col foreach (var item_ in currentStates) { urlBuilder_.Append(System.Uri.EscapeDataString("currentStates") + "=").Append(System.Uri.EscapeDataString(ConvertToString(item_, System.Globalization.CultureInfo.InvariantCulture))).Append("&"); } } urlBuilder_.Length--; - + var client_ = _httpClient; var disposeClient_ = false; try @@ -291,14 +290,14 @@ public async System.Threading.Tasks.Task FilterAsync(System.Col { request_.Content = new System.Net.Http.StringContent(string.Empty, System.Text.Encoding.UTF8, "application/json"); request_.Method = new System.Net.Http.HttpMethod("POST"); - + PrepareRequest(client_, request_, urlBuilder_); - + var url_ = urlBuilder_.ToString(); request_.RequestUri = new System.Uri(url_, System.UriKind.RelativeOrAbsolute); - + PrepareRequest(client_, request_, url_); - + var response_ = await client_.SendAsync(request_, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false); var disposeResponse_ = true; try @@ -309,9 +308,9 @@ public async System.Threading.Tasks.Task FilterAsync(System.Col foreach (var item_ in response_.Content.Headers) headers_[item_.Key] = item_.Value; } - + ProcessResponse(client_, response_); - + var status_ = (int)response_.StatusCode; if (status_ == 204) { @@ -336,13 +335,13 @@ public async System.Threading.Tasks.Task FilterAsync(System.Col client_.Dispose(); } } - + /// A server side error occurred. public System.Threading.Tasks.Task>> ReverseAsync(System.Collections.Generic.IEnumerable values) { return ReverseAsync(values, System.Threading.CancellationToken.None); } - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// A server side error occurred. public async System.Threading.Tasks.Task>> ReverseAsync(System.Collections.Generic.IEnumerable values, System.Threading.CancellationToken cancellationToken) @@ -354,7 +353,7 @@ public async System.Threading.Tasks.Task FilterAsync(System.Col foreach (var item_ in values) { urlBuilder_.Append(System.Uri.EscapeDataString("values") + "=").Append(System.Uri.EscapeDataString(ConvertToString(item_, System.Globalization.CultureInfo.InvariantCulture))).Append("&"); } } urlBuilder_.Length--; - + var client_ = _httpClient; var disposeClient_ = false; try @@ -364,14 +363,14 @@ public async System.Threading.Tasks.Task FilterAsync(System.Col request_.Content = new System.Net.Http.StringContent(string.Empty, System.Text.Encoding.UTF8, "application/json"); request_.Method = new System.Net.Http.HttpMethod("POST"); request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); - + PrepareRequest(client_, request_, urlBuilder_); - + var url_ = urlBuilder_.ToString(); request_.RequestUri = new System.Uri(url_, System.UriKind.RelativeOrAbsolute); - + PrepareRequest(client_, request_, url_); - + var response_ = await client_.SendAsync(request_, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false); var disposeResponse_ = true; try @@ -382,9 +381,9 @@ public async System.Threading.Tasks.Task FilterAsync(System.Col foreach (var item_ in response_.Content.Headers) headers_[item_.Key] = item_.Value; } - + ProcessResponse(client_, response_); - + var status_ = (int)response_.StatusCode; if (status_ == 200) { @@ -410,20 +409,20 @@ public async System.Threading.Tasks.Task FilterAsync(System.Col client_.Dispose(); } } - + /// A server side error occurred. public System.Threading.Tasks.Task RefreshAsync() { return RefreshAsync(System.Threading.CancellationToken.None); } - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// A server side error occurred. public async System.Threading.Tasks.Task RefreshAsync(System.Threading.CancellationToken cancellationToken) { var urlBuilder_ = new System.Text.StringBuilder(); urlBuilder_.Append(BaseUrl != null ? BaseUrl.TrimEnd('/') : "").Append("/api/Geo/Refresh"); - + var client_ = _httpClient; var disposeClient_ = false; try @@ -432,14 +431,14 @@ public async System.Threading.Tasks.Task RefreshAsync(System.Th { request_.Content = new System.Net.Http.StringContent(string.Empty, System.Text.Encoding.UTF8, "application/json"); request_.Method = new System.Net.Http.HttpMethod("POST"); - + PrepareRequest(client_, request_, urlBuilder_); - + var url_ = urlBuilder_.ToString(); request_.RequestUri = new System.Uri(url_, System.UriKind.RelativeOrAbsolute); - + PrepareRequest(client_, request_, url_); - + var response_ = await client_.SendAsync(request_, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false); var disposeResponse_ = true; try @@ -450,9 +449,9 @@ public async System.Threading.Tasks.Task RefreshAsync(System.Th foreach (var item_ in response_.Content.Headers) headers_[item_.Key] = item_.Value; } - + ProcessResponse(client_, response_); - + var status_ = (int)response_.StatusCode; if (status_ == 204) { @@ -477,20 +476,20 @@ public async System.Threading.Tasks.Task RefreshAsync(System.Th client_.Dispose(); } } - + /// A server side error occurred. public System.Threading.Tasks.Task> UploadFileAsync(FileParameter file) { return UploadFileAsync(file, System.Threading.CancellationToken.None); } - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// A server side error occurred. public async System.Threading.Tasks.Task> UploadFileAsync(FileParameter file, System.Threading.CancellationToken cancellationToken) { var urlBuilder_ = new System.Text.StringBuilder(); urlBuilder_.Append(BaseUrl != null ? BaseUrl.TrimEnd('/') : "").Append("/api/Geo/UploadFile"); - + var client_ = _httpClient; var disposeClient_ = false; try @@ -501,6 +500,7 @@ public async System.Threading.Tasks.Task> UploadFileAsync( var content_ = new System.Net.Http.MultipartFormDataContent(boundary_); content_.Headers.Remove("Content-Type"); content_.Headers.TryAddWithoutValidation("Content-Type", "multipart/form-data; boundary=" + boundary_); + if (file != null) { var content_file_ = new System.Net.Http.StreamContent(file.Data); @@ -511,14 +511,14 @@ public async System.Threading.Tasks.Task> UploadFileAsync( request_.Content = content_; request_.Method = new System.Net.Http.HttpMethod("POST"); request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); - + PrepareRequest(client_, request_, urlBuilder_); - + var url_ = urlBuilder_.ToString(); request_.RequestUri = new System.Uri(url_, System.UriKind.RelativeOrAbsolute); - + PrepareRequest(client_, request_, url_); - + var response_ = await client_.SendAsync(request_, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false); var disposeResponse_ = true; try @@ -529,9 +529,9 @@ public async System.Threading.Tasks.Task> UploadFileAsync( foreach (var item_ in response_.Content.Headers) headers_[item_.Key] = item_.Value; } - + ProcessResponse(client_, response_); - + var status_ = (int)response_.StatusCode; if (status_ == 200) { @@ -561,20 +561,20 @@ public async System.Threading.Tasks.Task> UploadFileAsync( client_.Dispose(); } } - + /// A server side error occurred. public System.Threading.Tasks.Task UploadFilesAsync(System.Collections.Generic.IEnumerable files) { return UploadFilesAsync(files, System.Threading.CancellationToken.None); } - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// A server side error occurred. public async System.Threading.Tasks.Task UploadFilesAsync(System.Collections.Generic.IEnumerable files, System.Threading.CancellationToken cancellationToken) { var urlBuilder_ = new System.Text.StringBuilder(); urlBuilder_.Append(BaseUrl != null ? BaseUrl.TrimEnd('/') : "").Append("/api/Geo/UploadFiles"); - + var client_ = _httpClient; var disposeClient_ = false; try @@ -585,6 +585,7 @@ public async System.Threading.Tasks.Task UploadFilesAsync(Syste var content_ = new System.Net.Http.MultipartFormDataContent(boundary_); content_.Headers.Remove("Content-Type"); content_.Headers.TryAddWithoutValidation("Content-Type", "multipart/form-data; boundary=" + boundary_); + if (files != null) { foreach (var item_ in files) @@ -597,14 +598,14 @@ public async System.Threading.Tasks.Task UploadFilesAsync(Syste } request_.Content = content_; request_.Method = new System.Net.Http.HttpMethod("POST"); - + PrepareRequest(client_, request_, urlBuilder_); - + var url_ = urlBuilder_.ToString(); request_.RequestUri = new System.Uri(url_, System.UriKind.RelativeOrAbsolute); - + PrepareRequest(client_, request_, url_); - + var response_ = await client_.SendAsync(request_, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false); var disposeResponse_ = true; try @@ -615,9 +616,9 @@ public async System.Threading.Tasks.Task UploadFilesAsync(Syste foreach (var item_ in response_.Content.Headers) headers_[item_.Key] = item_.Value; } - + ProcessResponse(client_, response_); - + var status_ = (int)response_.StatusCode; if (status_ == 204) { @@ -642,14 +643,14 @@ public async System.Threading.Tasks.Task UploadFilesAsync(Syste client_.Dispose(); } } - + /// A server side error occurred. /// A custom error occured. public System.Threading.Tasks.Task SaveItemsAsync(GenericRequestOfAddressAndPerson request) { return SaveItemsAsync(request, System.Threading.CancellationToken.None); } - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// A server side error occurred. /// A custom error occured. @@ -657,7 +658,7 @@ public async System.Threading.Tasks.Task SaveItemsAsync(Generic { var urlBuilder_ = new System.Text.StringBuilder(); urlBuilder_.Append(BaseUrl != null ? BaseUrl.TrimEnd('/') : "").Append("/api/Geo/SaveItems"); - + var client_ = _httpClient; var disposeClient_ = false; try @@ -668,14 +669,14 @@ public async System.Threading.Tasks.Task SaveItemsAsync(Generic content_.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json"); request_.Content = content_; request_.Method = new System.Net.Http.HttpMethod("POST"); - + PrepareRequest(client_, request_, urlBuilder_); - + var url_ = urlBuilder_.ToString(); request_.RequestUri = new System.Uri(url_, System.UriKind.RelativeOrAbsolute); - + PrepareRequest(client_, request_, url_); - + var response_ = await client_.SendAsync(request_, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false); var disposeResponse_ = true; try @@ -686,9 +687,9 @@ public async System.Threading.Tasks.Task SaveItemsAsync(Generic foreach (var item_ in response_.Content.Headers) headers_[item_.Key] = item_.Value; } - + ProcessResponse(client_, response_); - + var status_ = (int)response_.StatusCode; if (status_ == 204) { @@ -727,20 +728,20 @@ public async System.Threading.Tasks.Task SaveItemsAsync(Generic client_.Dispose(); } } - + /// A server side error occurred. public System.Threading.Tasks.Task GetUploadedFileAsync(int id, bool? @override) { return GetUploadedFileAsync(id, @override, System.Threading.CancellationToken.None); } - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// A server side error occurred. public async System.Threading.Tasks.Task GetUploadedFileAsync(int id, bool? @override, System.Threading.CancellationToken cancellationToken) { if (id == null) throw new System.ArgumentNullException("id"); - + var urlBuilder_ = new System.Text.StringBuilder(); urlBuilder_.Append(BaseUrl != null ? BaseUrl.TrimEnd('/') : "").Append("/api/Geo/GetUploadedFile/{id}?"); urlBuilder_.Replace("{id}", System.Uri.EscapeDataString(ConvertToString(id, System.Globalization.CultureInfo.InvariantCulture))); @@ -749,7 +750,7 @@ public async System.Threading.Tasks.Task GetUploadedFileAsync(int urlBuilder_.Append(System.Uri.EscapeDataString("override") + "=").Append(System.Uri.EscapeDataString(ConvertToString(@override, System.Globalization.CultureInfo.InvariantCulture))).Append("&"); } urlBuilder_.Length--; - + var client_ = _httpClient; var disposeClient_ = false; try @@ -758,14 +759,14 @@ public async System.Threading.Tasks.Task GetUploadedFileAsync(int { request_.Method = new System.Net.Http.HttpMethod("GET"); request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); - + PrepareRequest(client_, request_, urlBuilder_); - + var url_ = urlBuilder_.ToString(); request_.RequestUri = new System.Uri(url_, System.UriKind.RelativeOrAbsolute); - + PrepareRequest(client_, request_, url_); - + var response_ = await client_.SendAsync(request_, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false); var disposeResponse_ = true; try @@ -776,14 +777,14 @@ public async System.Threading.Tasks.Task GetUploadedFileAsync(int foreach (var item_ in response_.Content.Headers) headers_[item_.Key] = item_.Value; } - + ProcessResponse(client_, response_); - + var status_ = (int)response_.StatusCode; if (status_ == 200 || status_ == 206) { var responseStream_ = response_.Content == null ? System.IO.Stream.Null : await response_.Content.ReadAsStreamAsync().ConfigureAwait(false); - var fileResponse_ = new FileResponse(status_, headers_, responseStream_, null, response_); + var fileResponse_ = new FileResponse(status_, headers_, responseStream_, null, response_); disposeClient_ = false; disposeResponse_ = false; // response and client are disposed by FileResponse return fileResponse_; } @@ -806,13 +807,13 @@ public async System.Threading.Tasks.Task GetUploadedFileAsync(int client_.Dispose(); } } - + /// A server side error occurred. public System.Threading.Tasks.Task> PostDoubleAsync(double? value) { return PostDoubleAsync(value, System.Threading.CancellationToken.None); } - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// A server side error occurred. public async System.Threading.Tasks.Task> PostDoubleAsync(double? value, System.Threading.CancellationToken cancellationToken) @@ -824,7 +825,7 @@ public async System.Threading.Tasks.Task GetUploadedFileAsync(int urlBuilder_.Append(System.Uri.EscapeDataString("value") + "=").Append(System.Uri.EscapeDataString(ConvertToString(value, System.Globalization.CultureInfo.InvariantCulture))).Append("&"); } urlBuilder_.Length--; - + var client_ = _httpClient; var disposeClient_ = false; try @@ -834,14 +835,14 @@ public async System.Threading.Tasks.Task GetUploadedFileAsync(int request_.Content = new System.Net.Http.StringContent(string.Empty, System.Text.Encoding.UTF8, "application/json"); request_.Method = new System.Net.Http.HttpMethod("POST"); request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); - + PrepareRequest(client_, request_, urlBuilder_); - + var url_ = urlBuilder_.ToString(); request_.RequestUri = new System.Uri(url_, System.UriKind.RelativeOrAbsolute); - + PrepareRequest(client_, request_, url_); - + var response_ = await client_.SendAsync(request_, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false); var disposeResponse_ = true; try @@ -852,9 +853,9 @@ public async System.Threading.Tasks.Task GetUploadedFileAsync(int foreach (var item_ in response_.Content.Headers) headers_[item_.Key] = item_.Value; } - + ProcessResponse(client_, response_); - + var status_ = (int)response_.StatusCode; if (status_ == 200) { @@ -880,7 +881,7 @@ public async System.Threading.Tasks.Task GetUploadedFileAsync(int client_.Dispose(); } } - + protected struct ObjectResponseResult { public ObjectResponseResult(T responseObject, string responseText) @@ -888,21 +889,21 @@ public ObjectResponseResult(T responseObject, string responseText) this.Object = responseObject; this.Text = responseText; } - + public T Object { get; } - + public string Text { get; } } - + public bool ReadResponseAsString { get; set; } - + protected virtual async System.Threading.Tasks.Task> ReadObjectResponseAsync(System.Net.Http.HttpResponseMessage response, System.Collections.Generic.IReadOnlyDictionary> headers, System.Threading.CancellationToken cancellationToken) { if (response == null || response.Content == null) { return new ObjectResponseResult(default(T), string.Empty); } - + if (ReadResponseAsString) { var responseText = await response.Content.ReadAsStringAsync().ConfigureAwait(false); @@ -937,14 +938,14 @@ protected virtual async System.Threading.Tasks.Task> Rea } } } - + private string ConvertToString(object value, System.Globalization.CultureInfo cultureInfo) { if (value == null) { return ""; } - + if (value is System.Enum) { var name = System.Enum.GetName(value.GetType(), value); @@ -960,7 +961,7 @@ private string ConvertToString(object value, System.Globalization.CultureInfo cu return attribute.Value != null ? attribute.Value : name; } } - + var converted = System.Convert.ToString(System.Convert.ChangeType(value, System.Enum.GetUnderlyingType(value.GetType()), cultureInfo)); return converted == null ? string.Empty : converted; } @@ -978,58 +979,57 @@ private string ConvertToString(object value, System.Globalization.CultureInfo cu var array = System.Linq.Enumerable.OfType((System.Array) value); return string.Join(",", System.Linq.Enumerable.Select(array, o => ConvertToString(o, cultureInfo))); } - + var result = System.Convert.ToString(value, cultureInfo); return result == null ? "" : result; } } - - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.4.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] + + [System.CodeDom.Compiler.GeneratedCode("NSwag", "")] public partial class PersonsClient : ClientBase { private string _baseUrl = "http://localhost:13452"; private System.Net.Http.HttpClient _httpClient; private System.Lazy _settings; - + public PersonsClient(System.Net.Http.HttpClient httpClient) { _httpClient = httpClient; _settings = new System.Lazy(CreateSerializerSettings); } - + private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() { var settings = new Newtonsoft.Json.JsonSerializerSettings { PreserveReferencesHandling = Newtonsoft.Json.PreserveReferencesHandling.All, Converters = new Newtonsoft.Json.JsonConverter[] { new Newtonsoft.Json.Converters.StringEnumConverter(), new JsonExceptionConverter() } }; UpdateJsonSerializerSettings(settings); return settings; } - + public string BaseUrl { get { return _baseUrl; } set { _baseUrl = value; } } - + protected Newtonsoft.Json.JsonSerializerSettings JsonSerializerSettings { get { return _settings.Value; } } - - - + partial void PrepareRequest(System.Net.Http.HttpClient client, System.Net.Http.HttpRequestMessage request, string url); partial void PrepareRequest(System.Net.Http.HttpClient client, System.Net.Http.HttpRequestMessage request, System.Text.StringBuilder urlBuilder); partial void ProcessResponse(System.Net.Http.HttpClient client, System.Net.Http.HttpResponseMessage response); + /// A server side error occurred. public System.Threading.Tasks.Task>> GetAllAsync() { return GetAllAsync(System.Threading.CancellationToken.None); } - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// A server side error occurred. public async System.Threading.Tasks.Task>> GetAllAsync(System.Threading.CancellationToken cancellationToken) { var urlBuilder_ = new System.Text.StringBuilder(); urlBuilder_.Append(BaseUrl != null ? BaseUrl.TrimEnd('/') : "").Append("/api/Persons"); - + var client_ = _httpClient; var disposeClient_ = false; try @@ -1038,14 +1038,14 @@ public string BaseUrl { request_.Method = new System.Net.Http.HttpMethod("GET"); request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); - + PrepareRequest(client_, request_, urlBuilder_); - + var url_ = urlBuilder_.ToString(); request_.RequestUri = new System.Uri(url_, System.UriKind.RelativeOrAbsolute); - + PrepareRequest(client_, request_, url_); - + var response_ = await client_.SendAsync(request_, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false); var disposeResponse_ = true; try @@ -1056,9 +1056,9 @@ public string BaseUrl foreach (var item_ in response_.Content.Headers) headers_[item_.Key] = item_.Value; } - + ProcessResponse(client_, response_); - + var status_ = (int)response_.StatusCode; if (status_ == 200) { @@ -1084,20 +1084,20 @@ public string BaseUrl client_.Dispose(); } } - + /// A server side error occurred. public System.Threading.Tasks.Task AddAsync(Person person) { return AddAsync(person, System.Threading.CancellationToken.None); } - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// A server side error occurred. public async System.Threading.Tasks.Task AddAsync(Person person, System.Threading.CancellationToken cancellationToken) { var urlBuilder_ = new System.Text.StringBuilder(); urlBuilder_.Append(BaseUrl != null ? BaseUrl.TrimEnd('/') : "").Append("/api/Persons"); - + var client_ = _httpClient; var disposeClient_ = false; try @@ -1108,14 +1108,14 @@ public async System.Threading.Tasks.Task AddAsync(Person person content_.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json"); request_.Content = content_; request_.Method = new System.Net.Http.HttpMethod("POST"); - + PrepareRequest(client_, request_, urlBuilder_); - + var url_ = urlBuilder_.ToString(); request_.RequestUri = new System.Uri(url_, System.UriKind.RelativeOrAbsolute); - + PrepareRequest(client_, request_, url_); - + var response_ = await client_.SendAsync(request_, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false); var disposeResponse_ = true; try @@ -1126,9 +1126,9 @@ public async System.Threading.Tasks.Task AddAsync(Person person foreach (var item_ in response_.Content.Headers) headers_[item_.Key] = item_.Value; } - + ProcessResponse(client_, response_); - + var status_ = (int)response_.StatusCode; if (status_ == 204) { @@ -1153,24 +1153,24 @@ public async System.Threading.Tasks.Task AddAsync(Person person client_.Dispose(); } } - + /// A server side error occurred. public System.Threading.Tasks.Task>> FindAsync(Gender gender) { return FindAsync(gender, System.Threading.CancellationToken.None); } - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// A server side error occurred. public async System.Threading.Tasks.Task>> FindAsync(Gender gender, System.Threading.CancellationToken cancellationToken) { if (gender == null) throw new System.ArgumentNullException("gender"); - + var urlBuilder_ = new System.Text.StringBuilder(); urlBuilder_.Append(BaseUrl != null ? BaseUrl.TrimEnd('/') : "").Append("/api/Persons/find/{gender}"); urlBuilder_.Replace("{gender}", System.Uri.EscapeDataString(ConvertToString(gender, System.Globalization.CultureInfo.InvariantCulture))); - + var client_ = _httpClient; var disposeClient_ = false; try @@ -1180,14 +1180,14 @@ public async System.Threading.Tasks.Task AddAsync(Person person request_.Content = new System.Net.Http.StringContent(string.Empty, System.Text.Encoding.UTF8, "application/json"); request_.Method = new System.Net.Http.HttpMethod("POST"); request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); - + PrepareRequest(client_, request_, urlBuilder_); - + var url_ = urlBuilder_.ToString(); request_.RequestUri = new System.Uri(url_, System.UriKind.RelativeOrAbsolute); - + PrepareRequest(client_, request_, url_); - + var response_ = await client_.SendAsync(request_, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false); var disposeResponse_ = true; try @@ -1198,9 +1198,9 @@ public async System.Threading.Tasks.Task AddAsync(Person person foreach (var item_ in response_.Content.Headers) headers_[item_.Key] = item_.Value; } - + ProcessResponse(client_, response_); - + var status_ = (int)response_.StatusCode; if (status_ == 200) { @@ -1226,13 +1226,13 @@ public async System.Threading.Tasks.Task AddAsync(Person person client_.Dispose(); } } - + /// A server side error occurred. public System.Threading.Tasks.Task>> FindOptionalAsync(Gender? gender) { return FindOptionalAsync(gender, System.Threading.CancellationToken.None); } - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// A server side error occurred. public async System.Threading.Tasks.Task>> FindOptionalAsync(Gender? gender, System.Threading.CancellationToken cancellationToken) @@ -1241,7 +1241,7 @@ public async System.Threading.Tasks.Task AddAsync(Person person urlBuilder_.Append(BaseUrl != null ? BaseUrl.TrimEnd('/') : "").Append("/api/Persons/find2?"); urlBuilder_.Append(System.Uri.EscapeDataString("gender") + "=").Append(System.Uri.EscapeDataString(gender != null ? ConvertToString(gender, System.Globalization.CultureInfo.InvariantCulture) : "")).Append("&"); urlBuilder_.Length--; - + var client_ = _httpClient; var disposeClient_ = false; try @@ -1251,14 +1251,14 @@ public async System.Threading.Tasks.Task AddAsync(Person person request_.Content = new System.Net.Http.StringContent(string.Empty, System.Text.Encoding.UTF8, "application/json"); request_.Method = new System.Net.Http.HttpMethod("POST"); request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); - + PrepareRequest(client_, request_, urlBuilder_); - + var url_ = urlBuilder_.ToString(); request_.RequestUri = new System.Uri(url_, System.UriKind.RelativeOrAbsolute); - + PrepareRequest(client_, request_, url_); - + var response_ = await client_.SendAsync(request_, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false); var disposeResponse_ = true; try @@ -1269,9 +1269,9 @@ public async System.Threading.Tasks.Task AddAsync(Person person foreach (var item_ in response_.Content.Headers) headers_[item_.Key] = item_.Value; } - + ProcessResponse(client_, response_); - + var status_ = (int)response_.StatusCode; if (status_ == 200) { @@ -1297,14 +1297,14 @@ public async System.Threading.Tasks.Task AddAsync(Person person client_.Dispose(); } } - + /// A server side error occurred. /// A server side error occurred. public System.Threading.Tasks.Task> GetAsync(System.Guid id) { return GetAsync(id, System.Threading.CancellationToken.None); } - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// A server side error occurred. /// A server side error occurred. @@ -1312,11 +1312,11 @@ public async System.Threading.Tasks.Task> GetAsync(Syste { if (id == null) throw new System.ArgumentNullException("id"); - + var urlBuilder_ = new System.Text.StringBuilder(); urlBuilder_.Append(BaseUrl != null ? BaseUrl.TrimEnd('/') : "").Append("/api/Persons/{id}"); urlBuilder_.Replace("{id}", System.Uri.EscapeDataString(ConvertToString(id, System.Globalization.CultureInfo.InvariantCulture))); - + var client_ = _httpClient; var disposeClient_ = false; try @@ -1325,14 +1325,14 @@ public async System.Threading.Tasks.Task> GetAsync(Syste { request_.Method = new System.Net.Http.HttpMethod("GET"); request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); - + PrepareRequest(client_, request_, urlBuilder_); - + var url_ = urlBuilder_.ToString(); request_.RequestUri = new System.Uri(url_, System.UriKind.RelativeOrAbsolute); - + PrepareRequest(client_, request_, url_); - + var response_ = await client_.SendAsync(request_, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false); var disposeResponse_ = true; try @@ -1343,9 +1343,9 @@ public async System.Threading.Tasks.Task> GetAsync(Syste foreach (var item_ in response_.Content.Headers) headers_[item_.Key] = item_.Value; } - + ProcessResponse(client_, response_); - + var status_ = (int)response_.StatusCode; if (status_ == 500) { @@ -1385,24 +1385,24 @@ public async System.Threading.Tasks.Task> GetAsync(Syste client_.Dispose(); } } - + /// A server side error occurred. public System.Threading.Tasks.Task DeleteAsync(System.Guid id) { return DeleteAsync(id, System.Threading.CancellationToken.None); } - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// A server side error occurred. public async System.Threading.Tasks.Task DeleteAsync(System.Guid id, System.Threading.CancellationToken cancellationToken) { if (id == null) throw new System.ArgumentNullException("id"); - + var urlBuilder_ = new System.Text.StringBuilder(); urlBuilder_.Append(BaseUrl != null ? BaseUrl.TrimEnd('/') : "").Append("/api/Persons/{id}"); urlBuilder_.Replace("{id}", System.Uri.EscapeDataString(ConvertToString(id, System.Globalization.CultureInfo.InvariantCulture))); - + var client_ = _httpClient; var disposeClient_ = false; try @@ -1410,14 +1410,14 @@ public async System.Threading.Tasks.Task DeleteAsync(System.Gui using (var request_ = await CreateHttpRequestMessageAsync(cancellationToken).ConfigureAwait(false)) { request_.Method = new System.Net.Http.HttpMethod("DELETE"); - + PrepareRequest(client_, request_, urlBuilder_); - + var url_ = urlBuilder_.ToString(); request_.RequestUri = new System.Uri(url_, System.UriKind.RelativeOrAbsolute); - + PrepareRequest(client_, request_, url_); - + var response_ = await client_.SendAsync(request_, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false); var disposeResponse_ = true; try @@ -1428,9 +1428,9 @@ public async System.Threading.Tasks.Task DeleteAsync(System.Gui foreach (var item_ in response_.Content.Headers) headers_[item_.Key] = item_.Value; } - + ProcessResponse(client_, response_); - + var status_ = (int)response_.StatusCode; if (status_ == 204) { @@ -1455,20 +1455,20 @@ public async System.Threading.Tasks.Task DeleteAsync(System.Gui client_.Dispose(); } } - + /// A server side error occurred. public System.Threading.Tasks.Task> TransformAsync(Person person) { return TransformAsync(person, System.Threading.CancellationToken.None); } - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// A server side error occurred. public async System.Threading.Tasks.Task> TransformAsync(Person person, System.Threading.CancellationToken cancellationToken) { var urlBuilder_ = new System.Text.StringBuilder(); urlBuilder_.Append(BaseUrl != null ? BaseUrl.TrimEnd('/') : "").Append("/api/Persons/transform"); - + var client_ = _httpClient; var disposeClient_ = false; try @@ -1480,14 +1480,14 @@ public async System.Threading.Tasks.Task> TransformAsync request_.Content = content_; request_.Method = new System.Net.Http.HttpMethod("POST"); request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); - + PrepareRequest(client_, request_, urlBuilder_); - + var url_ = urlBuilder_.ToString(); request_.RequestUri = new System.Uri(url_, System.UriKind.RelativeOrAbsolute); - + PrepareRequest(client_, request_, url_); - + var response_ = await client_.SendAsync(request_, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false); var disposeResponse_ = true; try @@ -1498,9 +1498,9 @@ public async System.Threading.Tasks.Task> TransformAsync foreach (var item_ in response_.Content.Headers) headers_[item_.Key] = item_.Value; } - + ProcessResponse(client_, response_); - + var status_ = (int)response_.StatusCode; if (status_ == 200) { @@ -1526,14 +1526,14 @@ public async System.Threading.Tasks.Task> TransformAsync client_.Dispose(); } } - + /// A server side error occurred. /// A server side error occurred. public System.Threading.Tasks.Task> ThrowAsync(System.Guid id) { return ThrowAsync(id, System.Threading.CancellationToken.None); } - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// A server side error occurred. /// A server side error occurred. @@ -1541,12 +1541,12 @@ public async System.Threading.Tasks.Task> ThrowAsync(Sys { if (id == null) throw new System.ArgumentNullException("id"); - + var urlBuilder_ = new System.Text.StringBuilder(); urlBuilder_.Append(BaseUrl != null ? BaseUrl.TrimEnd('/') : "").Append("/api/Persons/Throw?"); urlBuilder_.Append(System.Uri.EscapeDataString("id") + "=").Append(System.Uri.EscapeDataString(ConvertToString(id, System.Globalization.CultureInfo.InvariantCulture))).Append("&"); urlBuilder_.Length--; - + var client_ = _httpClient; var disposeClient_ = false; try @@ -1556,14 +1556,14 @@ public async System.Threading.Tasks.Task> ThrowAsync(Sys request_.Content = new System.Net.Http.StringContent(string.Empty, System.Text.Encoding.UTF8, "application/json"); request_.Method = new System.Net.Http.HttpMethod("POST"); request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); - + PrepareRequest(client_, request_, urlBuilder_); - + var url_ = urlBuilder_.ToString(); request_.RequestUri = new System.Uri(url_, System.UriKind.RelativeOrAbsolute); - + PrepareRequest(client_, request_, url_); - + var response_ = await client_.SendAsync(request_, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false); var disposeResponse_ = true; try @@ -1574,9 +1574,9 @@ public async System.Threading.Tasks.Task> ThrowAsync(Sys foreach (var item_ in response_.Content.Headers) headers_[item_.Key] = item_.Value; } - + ProcessResponse(client_, response_); - + var status_ = (int)response_.StatusCode; if (status_ == 200) { @@ -1620,7 +1620,7 @@ public async System.Threading.Tasks.Task> ThrowAsync(Sys client_.Dispose(); } } - + /// Gets the name of a person. /// The person ID. /// The person's name. @@ -1630,7 +1630,7 @@ public System.Threading.Tasks.Task> GetNameAsync(System. { return GetNameAsync(id, System.Threading.CancellationToken.None); } - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// Gets the name of a person. /// The person ID. @@ -1641,11 +1641,11 @@ public async System.Threading.Tasks.Task> GetNameAsync(S { if (id == null) throw new System.ArgumentNullException("id"); - + var urlBuilder_ = new System.Text.StringBuilder(); urlBuilder_.Append(BaseUrl != null ? BaseUrl.TrimEnd('/') : "").Append("/api/Persons/{id}/Name"); urlBuilder_.Replace("{id}", System.Uri.EscapeDataString(ConvertToString(id, System.Globalization.CultureInfo.InvariantCulture))); - + var client_ = _httpClient; var disposeClient_ = false; try @@ -1654,14 +1654,14 @@ public async System.Threading.Tasks.Task> GetNameAsync(S { request_.Method = new System.Net.Http.HttpMethod("GET"); request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); - + PrepareRequest(client_, request_, urlBuilder_); - + var url_ = urlBuilder_.ToString(); request_.RequestUri = new System.Uri(url_, System.UriKind.RelativeOrAbsolute); - + PrepareRequest(client_, request_, url_); - + var response_ = await client_.SendAsync(request_, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false); var disposeResponse_ = true; try @@ -1672,9 +1672,9 @@ public async System.Threading.Tasks.Task> GetNameAsync(S foreach (var item_ in response_.Content.Headers) headers_[item_.Key] = item_.Value; } - + ProcessResponse(client_, response_); - + var status_ = (int)response_.StatusCode; if (status_ == 200) { @@ -1718,20 +1718,20 @@ public async System.Threading.Tasks.Task> GetNameAsync(S client_.Dispose(); } } - + /// A server side error occurred. public System.Threading.Tasks.Task> AddXmlAsync(string person) { return AddXmlAsync(person, System.Threading.CancellationToken.None); } - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// A server side error occurred. public async System.Threading.Tasks.Task> AddXmlAsync(string person, System.Threading.CancellationToken cancellationToken) { var urlBuilder_ = new System.Text.StringBuilder(); urlBuilder_.Append(BaseUrl != null ? BaseUrl.TrimEnd('/') : "").Append("/api/Persons/AddXml"); - + var client_ = _httpClient; var disposeClient_ = false; try @@ -1743,14 +1743,14 @@ public async System.Threading.Tasks.Task> AddXmlAsync(st request_.Content = content_; request_.Method = new System.Net.Http.HttpMethod("POST"); request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); - + PrepareRequest(client_, request_, urlBuilder_); - + var url_ = urlBuilder_.ToString(); request_.RequestUri = new System.Uri(url_, System.UriKind.RelativeOrAbsolute); - + PrepareRequest(client_, request_, url_); - + var response_ = await client_.SendAsync(request_, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false); var disposeResponse_ = true; try @@ -1761,9 +1761,9 @@ public async System.Threading.Tasks.Task> AddXmlAsync(st foreach (var item_ in response_.Content.Headers) headers_[item_.Key] = item_.Value; } - + ProcessResponse(client_, response_); - + var status_ = (int)response_.StatusCode; if (status_ == 200) { @@ -1789,20 +1789,20 @@ public async System.Threading.Tasks.Task> AddXmlAsync(st client_.Dispose(); } } - + /// A server side error occurred. public System.Threading.Tasks.Task> UploadAsync(FileParameter data) { return UploadAsync(data, System.Threading.CancellationToken.None); } - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// A server side error occurred. public async System.Threading.Tasks.Task> UploadAsync(FileParameter data, System.Threading.CancellationToken cancellationToken) { var urlBuilder_ = new System.Text.StringBuilder(); urlBuilder_.Append(BaseUrl != null ? BaseUrl.TrimEnd('/') : "").Append("/api/Persons/upload"); - + var client_ = _httpClient; var disposeClient_ = false; try @@ -1814,14 +1814,14 @@ public async System.Threading.Tasks.Task> UploadAsync(Fi request_.Content = content_; request_.Method = new System.Net.Http.HttpMethod("POST"); request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); - + PrepareRequest(client_, request_, urlBuilder_); - + var url_ = urlBuilder_.ToString(); request_.RequestUri = new System.Uri(url_, System.UriKind.RelativeOrAbsolute); - + PrepareRequest(client_, request_, url_); - + var response_ = await client_.SendAsync(request_, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false); var disposeResponse_ = true; try @@ -1832,9 +1832,9 @@ public async System.Threading.Tasks.Task> UploadAsync(Fi foreach (var item_ in response_.Content.Headers) headers_[item_.Key] = item_.Value; } - + ProcessResponse(client_, response_); - + var status_ = (int)response_.StatusCode; if (status_ == 200) { @@ -1860,7 +1860,7 @@ public async System.Threading.Tasks.Task> UploadAsync(Fi client_.Dispose(); } } - + protected struct ObjectResponseResult { public ObjectResponseResult(T responseObject, string responseText) @@ -1868,21 +1868,21 @@ public ObjectResponseResult(T responseObject, string responseText) this.Object = responseObject; this.Text = responseText; } - + public T Object { get; } - + public string Text { get; } } - + public bool ReadResponseAsString { get; set; } - + protected virtual async System.Threading.Tasks.Task> ReadObjectResponseAsync(System.Net.Http.HttpResponseMessage response, System.Collections.Generic.IReadOnlyDictionary> headers, System.Threading.CancellationToken cancellationToken) { if (response == null || response.Content == null) { return new ObjectResponseResult(default(T), string.Empty); } - + if (ReadResponseAsString) { var responseText = await response.Content.ReadAsStringAsync().ConfigureAwait(false); @@ -1917,14 +1917,14 @@ protected virtual async System.Threading.Tasks.Task> Rea } } } - + private string ConvertToString(object value, System.Globalization.CultureInfo cultureInfo) { if (value == null) { return ""; } - + if (value is System.Enum) { var name = System.Enum.GetName(value.GetType(), value); @@ -1940,7 +1940,7 @@ private string ConvertToString(object value, System.Globalization.CultureInfo cu return attribute.Value != null ? attribute.Value : name; } } - + var converted = System.Convert.ToString(System.Convert.ChangeType(value, System.Enum.GetUnderlyingType(value.GetType()), cultureInfo)); return converted == null ? string.Empty : converted; } @@ -1958,33 +1958,33 @@ private string ConvertToString(object value, System.Globalization.CultureInfo cu var array = System.Linq.Enumerable.OfType((System.Array) value); return string.Join(",", System.Linq.Enumerable.Select(array, o => ConvertToString(o, cultureInfo))); } - + var result = System.Convert.ToString(value, cultureInfo); return result == null ? "" : result; } } - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.4.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "")] internal class JsonExceptionConverter : Newtonsoft.Json.JsonConverter { private readonly Newtonsoft.Json.Serialization.DefaultContractResolver _defaultContractResolver = new Newtonsoft.Json.Serialization.DefaultContractResolver(); private readonly System.Collections.Generic.IDictionary _searchedNamespaces; private readonly bool _hideStackTrace = false; - + public JsonExceptionConverter() { _searchedNamespaces = new System.Collections.Generic.Dictionary { { typeof(System.Exception).Namespace, System.Reflection.IntrospectionExtensions.GetTypeInfo(typeof(System.Exception)).Assembly } }; } - + public override bool CanWrite => true; - + public override void WriteJson(Newtonsoft.Json.JsonWriter writer, object value, Newtonsoft.Json.JsonSerializer serializer) { var exception = value as System.Exception; if (exception != null) { var resolver = serializer.ContractResolver as Newtonsoft.Json.Serialization.DefaultContractResolver ?? _defaultContractResolver; - + var jObject = new Newtonsoft.Json.Linq.JObject(); jObject.Add(resolver.GetResolvedPropertyName("discriminator"), exception.GetType().Name); jObject.Add(resolver.GetResolvedPropertyName("Message"), exception.Message); @@ -1992,7 +1992,7 @@ public override void WriteJson(Newtonsoft.Json.JsonWriter writer, object value, jObject.Add(resolver.GetResolvedPropertyName("Source"), exception.Source); jObject.Add(resolver.GetResolvedPropertyName("InnerException"), exception.InnerException != null ? Newtonsoft.Json.Linq.JToken.FromObject(exception.InnerException, serializer) : null); - + foreach (var property in GetExceptionProperties(value.GetType())) { var propertyValue = property.Key.GetValue(exception); @@ -2002,37 +2002,37 @@ public override void WriteJson(Newtonsoft.Json.JsonWriter writer, object value, Newtonsoft.Json.Linq.JToken.FromObject(propertyValue, serializer))); } } - + value = jObject; } - + serializer.Serialize(writer, value); } - + public override bool CanConvert(System.Type objectType) { return System.Reflection.IntrospectionExtensions.GetTypeInfo(typeof(System.Exception)).IsAssignableFrom(System.Reflection.IntrospectionExtensions.GetTypeInfo(objectType)); } - + public override object ReadJson(Newtonsoft.Json.JsonReader reader, System.Type objectType, object existingValue, Newtonsoft.Json.JsonSerializer serializer) { var jObject = serializer.Deserialize(reader); if (jObject == null) return null; - + var newSerializer = new Newtonsoft.Json.JsonSerializer(); newSerializer.ContractResolver = (Newtonsoft.Json.Serialization.IContractResolver)System.Activator.CreateInstance(serializer.ContractResolver.GetType()); - + var field = GetField(typeof(Newtonsoft.Json.Serialization.DefaultContractResolver), "_sharedCache"); if (field != null) field.SetValue(newSerializer.ContractResolver, false); - + dynamic resolver = newSerializer.ContractResolver; if (System.Reflection.RuntimeReflectionExtensions.GetRuntimeProperty(newSerializer.ContractResolver.GetType(), "IgnoreSerializableAttribute") != null) resolver.IgnoreSerializableAttribute = true; if (System.Reflection.RuntimeReflectionExtensions.GetRuntimeProperty(newSerializer.ContractResolver.GetType(), "IgnoreSerializableInterface") != null) resolver.IgnoreSerializableInterface = true; - + Newtonsoft.Json.Linq.JToken token; if (jObject.TryGetValue("discriminator", System.StringComparison.OrdinalIgnoreCase, out token)) { @@ -2053,11 +2053,11 @@ public override object ReadJson(Newtonsoft.Json.JsonReader reader, System.Type o break; } } - + } } } - + var value = jObject.ToObject(objectType, newSerializer); foreach (var property in GetExceptionProperties(value.GetType())) { @@ -2072,15 +2072,15 @@ public override object ReadJson(Newtonsoft.Json.JsonReader reader, System.Type o field.SetValue(value, propertyValue); } } - + SetExceptionFieldValue(jObject, "Message", value, "_message", resolver, newSerializer); SetExceptionFieldValue(jObject, "StackTrace", value, "_stackTraceString", resolver, newSerializer); SetExceptionFieldValue(jObject, "Source", value, "_source", resolver, newSerializer); SetExceptionFieldValue(jObject, "InnerException", value, "_innerException", resolver, serializer); - + return value; } - + private System.Reflection.FieldInfo GetField(System.Type type, string fieldName) { var field = System.Reflection.IntrospectionExtensions.GetTypeInfo(type).GetDeclaredField(fieldName); @@ -2088,7 +2088,7 @@ private System.Reflection.FieldInfo GetField(System.Type type, string fieldName) return GetField(System.Reflection.IntrospectionExtensions.GetTypeInfo(type).BaseType, fieldName); return field; } - + private System.Collections.Generic.IDictionary GetExceptionProperties(System.Type exceptionType) { var result = new System.Collections.Generic.Dictionary(); @@ -2097,13 +2097,13 @@ private System.Reflection.FieldInfo GetField(System.Type type, string fieldName) { var attribute = System.Reflection.CustomAttributeExtensions.GetCustomAttribute(property); var propertyName = attribute != null ? attribute.PropertyName : property.Name; - + if (!System.Linq.Enumerable.Contains(new[] { "Message", "StackTrace", "Source", "InnerException", "Data", "TargetSite", "HelpLink", "HResult" }, propertyName)) result[property] = propertyName; } return result; } - + private void SetExceptionFieldValue(Newtonsoft.Json.Linq.JObject jObject, string propertyName, object value, string fieldName, Newtonsoft.Json.Serialization.IContractResolver resolver, Newtonsoft.Json.JsonSerializer serializer) { var field = System.Reflection.IntrospectionExtensions.GetTypeInfo(typeof(System.Exception)).GetDeclaredField(fieldName); diff --git a/src/NSwag.Integration.ClientPCL/ServiceClientsContracts.cs b/src/NSwag.Integration.ClientPCL/ServiceClientsContracts.cs index dd3966108c..3288afcccb 100644 --- a/src/NSwag.Integration.ClientPCL/ServiceClientsContracts.cs +++ b/src/NSwag.Integration.ClientPCL/ServiceClientsContracts.cs @@ -1,6 +1,6 @@ //---------------------- // -// Generated using the NSwag toolchain v13.14.4.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0)) (http://NSwag.org) +// Generated using the NSwag toolchain v (http://NSwag.org) // //---------------------- @@ -19,132 +19,129 @@ namespace NSwag.Integration.ClientPCL.Contracts [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.5.2.0 (Newtonsoft.Json v11.0.0.0)")] - public partial class GeoPoint + public partial class GeoPoint { [Newtonsoft.Json.JsonProperty("Latitude", Required = Newtonsoft.Json.Required.Always)] public double Latitude { get; set; } - + [Newtonsoft.Json.JsonProperty("Longitude", Required = Newtonsoft.Json.Required.Always)] public double Longitude { get; set; } - - + } - + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.5.2.0 (Newtonsoft.Json v11.0.0.0)")] - public partial class GenericRequestOfAddressAndPerson + public partial class GenericRequestOfAddressAndPerson { [Newtonsoft.Json.JsonProperty("Item1", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] public Address Item1 { get; set; } - + [Newtonsoft.Json.JsonProperty("Item2", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] public Person Item2 { get; set; } - - + } - + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.5.2.0 (Newtonsoft.Json v11.0.0.0)")] - public partial class Address + public partial class Address { [Newtonsoft.Json.JsonProperty("IsPrimary", Required = Newtonsoft.Json.Required.Always)] public bool IsPrimary { get; set; } - + [Newtonsoft.Json.JsonProperty("City", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] public string City { get; set; } - - + } - + [Newtonsoft.Json.JsonConverter(typeof(JsonInheritanceConverter), "discriminator")] [JsonInheritanceAttribute("Teacher", typeof(Teacher))] [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.5.2.0 (Newtonsoft.Json v11.0.0.0)")] - public partial class Person + public partial class Person { [Newtonsoft.Json.JsonProperty("Id", Required = Newtonsoft.Json.Required.Always)] [System.ComponentModel.DataAnnotations.Required(AllowEmptyStrings = true)] public System.Guid Id { get; set; } - + /// Gets or sets the first name. [Newtonsoft.Json.JsonProperty("FirstName", Required = Newtonsoft.Json.Required.Always)] [System.ComponentModel.DataAnnotations.Required] [System.ComponentModel.DataAnnotations.StringLength(int.MaxValue, MinimumLength = 2)] public string FirstName { get; set; } - + /// Gets or sets the last name. [Newtonsoft.Json.JsonProperty("LastName", Required = Newtonsoft.Json.Required.Always)] [System.ComponentModel.DataAnnotations.Required] public string LastName { get; set; } - + [Newtonsoft.Json.JsonProperty("Gender", Required = Newtonsoft.Json.Required.Always)] [System.ComponentModel.DataAnnotations.Required(AllowEmptyStrings = true)] [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.StringEnumConverter))] public Gender Gender { get; set; } - + [Newtonsoft.Json.JsonProperty("DateOfBirth", Required = Newtonsoft.Json.Required.Always)] [System.ComponentModel.DataAnnotations.Required(AllowEmptyStrings = true)] public System.DateTime DateOfBirth { get; set; } - + [Newtonsoft.Json.JsonProperty("Weight", Required = Newtonsoft.Json.Required.Always)] public decimal Weight { get; set; } - + [Newtonsoft.Json.JsonProperty("Height", Required = Newtonsoft.Json.Required.Always)] public double Height { get; set; } - + [Newtonsoft.Json.JsonProperty("Age", Required = Newtonsoft.Json.Required.Always)] [System.ComponentModel.DataAnnotations.Range(5, 99)] public int Age { get; set; } - + [Newtonsoft.Json.JsonProperty("AverageSleepTime", Required = Newtonsoft.Json.Required.Always)] [System.ComponentModel.DataAnnotations.Required(AllowEmptyStrings = true)] public System.TimeSpan AverageSleepTime { get; set; } - + [Newtonsoft.Json.JsonProperty("Address", Required = Newtonsoft.Json.Required.Always)] [System.ComponentModel.DataAnnotations.Required] public Address Address { get; set; } = new Address(); - + [Newtonsoft.Json.JsonProperty("Children", Required = Newtonsoft.Json.Required.Always)] [System.ComponentModel.DataAnnotations.Required] public System.Collections.ObjectModel.ObservableCollection Children { get; set; } = new System.Collections.ObjectModel.ObservableCollection(); - + [Newtonsoft.Json.JsonProperty("Skills", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] public System.Collections.Generic.Dictionary Skills { get; set; } - - + } - + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.5.2.0 (Newtonsoft.Json v11.0.0.0)")] public enum Gender { + [System.Runtime.Serialization.EnumMember(Value = @"Male")] Male = 0, - + [System.Runtime.Serialization.EnumMember(Value = @"Female")] Female = 1, - + } - + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.5.2.0 (Newtonsoft.Json v11.0.0.0)")] public enum SkillLevel { + Low = 0, - + Medium = 1, - + Height = 2, - + } - + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.5.2.0 (Newtonsoft.Json v11.0.0.0)")] public partial class Teacher : Person { [Newtonsoft.Json.JsonProperty("Course", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] public string Course { get; set; } - + [Newtonsoft.Json.JsonProperty("SkillLevel", Required = Newtonsoft.Json.Required.Always)] public SkillLevel SkillLevel { get; set; } = NSwag.Integration.ClientPCL.Contracts.SkillLevel.Medium; - - + } - + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.5.2.0 (Newtonsoft.Json v11.0.0.0)")] [Newtonsoft.Json.JsonObjectAttribute] public partial class PersonNotFoundException : System.Exception @@ -152,10 +149,9 @@ public partial class PersonNotFoundException : System.Exception [Newtonsoft.Json.JsonProperty("id", Required = Newtonsoft.Json.Required.Always)] [System.ComponentModel.DataAnnotations.Required(AllowEmptyStrings = true)] public System.Guid Id { get; set; } - - + } - + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.5.2.0 (Newtonsoft.Json v11.0.0.0)")] [System.AttributeUsage(System.AttributeTargets.Class | System.AttributeTargets.Interface, AllowMultiple = true)] internal class JsonInheritanceAttribute : System.Attribute @@ -165,41 +161,41 @@ public JsonInheritanceAttribute(string key, System.Type type) Key = key; Type = type; } - + public string Key { get; } - + public System.Type Type { get; } } - + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.5.2.0 (Newtonsoft.Json v11.0.0.0)")] internal class JsonInheritanceConverter : Newtonsoft.Json.JsonConverter { internal static readonly string DefaultDiscriminatorName = "discriminator"; - + private readonly string _discriminator; - + [System.ThreadStatic] private static bool _isReading; - + [System.ThreadStatic] private static bool _isWriting; - + public JsonInheritanceConverter() { _discriminator = DefaultDiscriminatorName; } - + public JsonInheritanceConverter(string discriminator) { _discriminator = discriminator; } - + public override void WriteJson(Newtonsoft.Json.JsonWriter writer, object value, Newtonsoft.Json.JsonSerializer serializer) { try { _isWriting = true; - + var jObject = Newtonsoft.Json.Linq.JObject.FromObject(value, serializer); jObject.AddFirst(new Newtonsoft.Json.Linq.JProperty(_discriminator, GetSubtypeDiscriminator(value.GetType()))); writer.WriteToken(jObject.CreateReader()); @@ -209,7 +205,7 @@ public override void WriteJson(Newtonsoft.Json.JsonWriter writer, object value, _isWriting = false; } } - + public override bool CanWrite { get @@ -222,7 +218,7 @@ public override bool CanWrite return true; } } - + public override bool CanRead { get @@ -235,28 +231,28 @@ public override bool CanRead return true; } } - + public override bool CanConvert(System.Type objectType) { return true; } - + public override object ReadJson(Newtonsoft.Json.JsonReader reader, System.Type objectType, object existingValue, Newtonsoft.Json.JsonSerializer serializer) { var jObject = serializer.Deserialize(reader); if (jObject == null) return null; - + var discriminatorValue = jObject.GetValue(_discriminator); var discriminator = discriminatorValue != null ? Newtonsoft.Json.Linq.Extensions.Value(discriminatorValue) : null; var subtype = GetObjectSubtype(objectType, discriminator); - + var objectContract = serializer.ContractResolver.ResolveContract(subtype) as Newtonsoft.Json.Serialization.JsonObjectContract; if (objectContract == null || System.Linq.Enumerable.All(objectContract.Properties, p => p.PropertyName != _discriminator)) { jObject.Remove(_discriminator); } - + try { _isReading = true; @@ -267,7 +263,7 @@ public override object ReadJson(Newtonsoft.Json.JsonReader reader, System.Type o _isReading = false; } } - + private System.Type GetObjectSubtype(System.Type objectType, string discriminator) { foreach (var attribute in System.Reflection.CustomAttributeExtensions.GetCustomAttributes(System.Reflection.IntrospectionExtensions.GetTypeInfo(objectType), true)) @@ -275,10 +271,10 @@ private System.Type GetObjectSubtype(System.Type objectType, string discriminato if (attribute.Key == discriminator) return attribute.Type; } - + return objectType; } - + private string GetSubtypeDiscriminator(System.Type objectType) { foreach (var attribute in System.Reflection.CustomAttributeExtensions.GetCustomAttributes(System.Reflection.IntrospectionExtensions.GetTypeInfo(objectType), true)) @@ -286,12 +282,12 @@ private string GetSubtypeDiscriminator(System.Type objectType) if (attribute.Type == objectType) return attribute.Key; } - + return objectType.Name; } } - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.4.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "")] public partial class FileParameter { public FileParameter(System.IO.Stream data) @@ -318,7 +314,7 @@ public FileParameter(System.IO.Stream data, string fileName, string contentType) public string ContentType { get; private set; } } - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.4.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "")] public partial class FileResponse : System.IDisposable { private System.IDisposable _client; @@ -354,7 +350,7 @@ public void Dispose() } } - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.4.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "")] public partial class SwaggerResponse { public int StatusCode { get; private set; } @@ -368,7 +364,7 @@ public SwaggerResponse(int statusCode, System.Collections.Generic.IReadOnlyDicti } } - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.4.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "")] public partial class SwaggerResponse : SwaggerResponse { public TResult Result { get; private set; } @@ -380,7 +376,8 @@ public SwaggerResponse(int statusCode, System.Collections.Generic.IReadOnlyDicti } } - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.4.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] + + [System.CodeDom.Compiler.GeneratedCode("NSwag", "")] public partial class GeoClientException : System.Exception { public int StatusCode { get; private set; } @@ -403,7 +400,7 @@ public override string ToString() } } - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.4.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "")] public partial class GeoClientException : GeoClientException { public TResult Result { get; private set; } @@ -415,7 +412,7 @@ public GeoClientException(string message, int statusCode, string response, Syste } } - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.4.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "")] public partial class PersonsClientException : System.Exception { public int StatusCode { get; private set; } @@ -438,7 +435,7 @@ public override string ToString() } } - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.4.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "")] public partial class PersonsClientException : PersonsClientException { public TResult Result { get; private set; } diff --git a/src/NSwag.Integration.ClientPCL/UberClient.cs b/src/NSwag.Integration.ClientPCL/UberClient.cs index 90607f9b3e..f9d4f3bae0 100644 --- a/src/NSwag.Integration.ClientPCL/UberClient.cs +++ b/src/NSwag.Integration.ClientPCL/UberClient.cs @@ -1,6 +1,6 @@ //---------------------- // -// Generated using the NSwag toolchain v13.14.4.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0)) (http://NSwag.org) +// Generated using the NSwag toolchain v (http://NSwag.org) // //---------------------- @@ -16,40 +16,40 @@ namespace Uber { using System = global::System; - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.4.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "")] public partial class Client { private string _baseUrl = "https://api.uber.com/v1"; private System.Net.Http.HttpClient _httpClient; private System.Lazy _settings; - + public Client(System.Net.Http.HttpClient httpClient) { _httpClient = httpClient; _settings = new System.Lazy(CreateSerializerSettings); } - + private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() { var settings = new Newtonsoft.Json.JsonSerializerSettings(); UpdateJsonSerializerSettings(settings); return settings; } - + public string BaseUrl { get { return _baseUrl; } set { _baseUrl = value; } } - + protected Newtonsoft.Json.JsonSerializerSettings JsonSerializerSettings { get { return _settings.Value; } } - + partial void UpdateJsonSerializerSettings(Newtonsoft.Json.JsonSerializerSettings settings); - - + partial void PrepareRequest(System.Net.Http.HttpClient client, System.Net.Http.HttpRequestMessage request, string url); partial void PrepareRequest(System.Net.Http.HttpClient client, System.Net.Http.HttpRequestMessage request, System.Text.StringBuilder urlBuilder); partial void ProcessResponse(System.Net.Http.HttpClient client, System.Net.Http.HttpResponseMessage response); + /// Product Types /// Latitude component of location. /// Longitude component of location. @@ -59,7 +59,7 @@ public string BaseUrl { return ProductsAsync(latitude, longitude, System.Threading.CancellationToken.None); } - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// Product Types /// Latitude component of location. @@ -70,16 +70,16 @@ public string BaseUrl { if (latitude == null) throw new System.ArgumentNullException("latitude"); - + if (longitude == null) throw new System.ArgumentNullException("longitude"); - + var urlBuilder_ = new System.Text.StringBuilder(); urlBuilder_.Append(BaseUrl != null ? BaseUrl.TrimEnd('/') : "").Append("/products?"); urlBuilder_.Append(System.Uri.EscapeDataString("latitude") + "=").Append(System.Uri.EscapeDataString(ConvertToString(latitude, System.Globalization.CultureInfo.InvariantCulture))).Append("&"); urlBuilder_.Append(System.Uri.EscapeDataString("longitude") + "=").Append(System.Uri.EscapeDataString(ConvertToString(longitude, System.Globalization.CultureInfo.InvariantCulture))).Append("&"); urlBuilder_.Length--; - + var client_ = _httpClient; var disposeClient_ = false; try @@ -88,14 +88,14 @@ public string BaseUrl { request_.Method = new System.Net.Http.HttpMethod("GET"); request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); - + PrepareRequest(client_, request_, urlBuilder_); - + var url_ = urlBuilder_.ToString(); request_.RequestUri = new System.Uri(url_, System.UriKind.RelativeOrAbsolute); - + PrepareRequest(client_, request_, url_); - + var response_ = await client_.SendAsync(request_, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false); var disposeResponse_ = true; try @@ -106,9 +106,9 @@ public string BaseUrl foreach (var item_ in response_.Content.Headers) headers_[item_.Key] = item_.Value; } - + ProcessResponse(client_, response_); - + var status_ = (int)response_.StatusCode; if (status_ == 200) { @@ -142,7 +142,7 @@ public string BaseUrl client_.Dispose(); } } - + /// Price Estimates /// Latitude component of start location. /// Longitude component of start location. @@ -154,7 +154,7 @@ public string BaseUrl { return PriceAsync(start_latitude, start_longitude, end_latitude, end_longitude, System.Threading.CancellationToken.None); } - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// Price Estimates /// Latitude component of start location. @@ -167,16 +167,16 @@ public string BaseUrl { if (start_latitude == null) throw new System.ArgumentNullException("start_latitude"); - + if (start_longitude == null) throw new System.ArgumentNullException("start_longitude"); - + if (end_latitude == null) throw new System.ArgumentNullException("end_latitude"); - + if (end_longitude == null) throw new System.ArgumentNullException("end_longitude"); - + var urlBuilder_ = new System.Text.StringBuilder(); urlBuilder_.Append(BaseUrl != null ? BaseUrl.TrimEnd('/') : "").Append("/estimates/price?"); urlBuilder_.Append(System.Uri.EscapeDataString("start_latitude") + "=").Append(System.Uri.EscapeDataString(ConvertToString(start_latitude, System.Globalization.CultureInfo.InvariantCulture))).Append("&"); @@ -184,7 +184,7 @@ public string BaseUrl urlBuilder_.Append(System.Uri.EscapeDataString("end_latitude") + "=").Append(System.Uri.EscapeDataString(ConvertToString(end_latitude, System.Globalization.CultureInfo.InvariantCulture))).Append("&"); urlBuilder_.Append(System.Uri.EscapeDataString("end_longitude") + "=").Append(System.Uri.EscapeDataString(ConvertToString(end_longitude, System.Globalization.CultureInfo.InvariantCulture))).Append("&"); urlBuilder_.Length--; - + var client_ = _httpClient; var disposeClient_ = false; try @@ -193,14 +193,14 @@ public string BaseUrl { request_.Method = new System.Net.Http.HttpMethod("GET"); request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); - + PrepareRequest(client_, request_, urlBuilder_); - + var url_ = urlBuilder_.ToString(); request_.RequestUri = new System.Uri(url_, System.UriKind.RelativeOrAbsolute); - + PrepareRequest(client_, request_, url_); - + var response_ = await client_.SendAsync(request_, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false); var disposeResponse_ = true; try @@ -211,9 +211,9 @@ public string BaseUrl foreach (var item_ in response_.Content.Headers) headers_[item_.Key] = item_.Value; } - + ProcessResponse(client_, response_); - + var status_ = (int)response_.StatusCode; if (status_ == 200) { @@ -247,7 +247,7 @@ public string BaseUrl client_.Dispose(); } } - + /// Time Estimates /// Latitude component of start location. /// Longitude component of start location. @@ -259,7 +259,7 @@ public string BaseUrl { return TimeAsync(start_latitude, start_longitude, customer_uuid, product_id, System.Threading.CancellationToken.None); } - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// Time Estimates /// Latitude component of start location. @@ -272,10 +272,10 @@ public string BaseUrl { if (start_latitude == null) throw new System.ArgumentNullException("start_latitude"); - + if (start_longitude == null) throw new System.ArgumentNullException("start_longitude"); - + var urlBuilder_ = new System.Text.StringBuilder(); urlBuilder_.Append(BaseUrl != null ? BaseUrl.TrimEnd('/') : "").Append("/estimates/time?"); urlBuilder_.Append(System.Uri.EscapeDataString("start_latitude") + "=").Append(System.Uri.EscapeDataString(ConvertToString(start_latitude, System.Globalization.CultureInfo.InvariantCulture))).Append("&"); @@ -289,7 +289,7 @@ public string BaseUrl urlBuilder_.Append(System.Uri.EscapeDataString("product_id") + "=").Append(System.Uri.EscapeDataString(ConvertToString(product_id, System.Globalization.CultureInfo.InvariantCulture))).Append("&"); } urlBuilder_.Length--; - + var client_ = _httpClient; var disposeClient_ = false; try @@ -298,14 +298,14 @@ public string BaseUrl { request_.Method = new System.Net.Http.HttpMethod("GET"); request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); - + PrepareRequest(client_, request_, urlBuilder_); - + var url_ = urlBuilder_.ToString(); request_.RequestUri = new System.Uri(url_, System.UriKind.RelativeOrAbsolute); - + PrepareRequest(client_, request_, url_); - + var response_ = await client_.SendAsync(request_, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false); var disposeResponse_ = true; try @@ -316,9 +316,9 @@ public string BaseUrl foreach (var item_ in response_.Content.Headers) headers_[item_.Key] = item_.Value; } - + ProcessResponse(client_, response_); - + var status_ = (int)response_.StatusCode; if (status_ == 200) { @@ -352,7 +352,7 @@ public string BaseUrl client_.Dispose(); } } - + /// User Profile /// Profile information for a user /// A server side error occurred. @@ -360,7 +360,7 @@ public System.Threading.Tasks.Task MeAsync() { return MeAsync(System.Threading.CancellationToken.None); } - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// User Profile /// Profile information for a user @@ -369,7 +369,7 @@ public async System.Threading.Tasks.Task MeAsync(System.Threading.Cance { var urlBuilder_ = new System.Text.StringBuilder(); urlBuilder_.Append(BaseUrl != null ? BaseUrl.TrimEnd('/') : "").Append("/me"); - + var client_ = _httpClient; var disposeClient_ = false; try @@ -378,14 +378,14 @@ public async System.Threading.Tasks.Task MeAsync(System.Threading.Cance { request_.Method = new System.Net.Http.HttpMethod("GET"); request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); - + PrepareRequest(client_, request_, urlBuilder_); - + var url_ = urlBuilder_.ToString(); request_.RequestUri = new System.Uri(url_, System.UriKind.RelativeOrAbsolute); - + PrepareRequest(client_, request_, url_); - + var response_ = await client_.SendAsync(request_, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false); var disposeResponse_ = true; try @@ -396,9 +396,9 @@ public async System.Threading.Tasks.Task MeAsync(System.Threading.Cance foreach (var item_ in response_.Content.Headers) headers_[item_.Key] = item_.Value; } - + ProcessResponse(client_, response_); - + var status_ = (int)response_.StatusCode; if (status_ == 200) { @@ -432,7 +432,7 @@ public async System.Threading.Tasks.Task MeAsync(System.Threading.Cance client_.Dispose(); } } - + /// User Activity /// Offset the list of returned results by this amount. Default is zero. /// Number of items to retrieve. Default is 5, maximum is 100. @@ -442,7 +442,7 @@ public System.Threading.Tasks.Task HistoryAsync(int? offset, int? li { return HistoryAsync(offset, limit, System.Threading.CancellationToken.None); } - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// User Activity /// Offset the list of returned results by this amount. Default is zero. @@ -462,7 +462,7 @@ public async System.Threading.Tasks.Task HistoryAsync(int? offset, i urlBuilder_.Append(System.Uri.EscapeDataString("limit") + "=").Append(System.Uri.EscapeDataString(ConvertToString(limit, System.Globalization.CultureInfo.InvariantCulture))).Append("&"); } urlBuilder_.Length--; - + var client_ = _httpClient; var disposeClient_ = false; try @@ -471,14 +471,14 @@ public async System.Threading.Tasks.Task HistoryAsync(int? offset, i { request_.Method = new System.Net.Http.HttpMethod("GET"); request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); - + PrepareRequest(client_, request_, urlBuilder_); - + var url_ = urlBuilder_.ToString(); request_.RequestUri = new System.Uri(url_, System.UriKind.RelativeOrAbsolute); - + PrepareRequest(client_, request_, url_); - + var response_ = await client_.SendAsync(request_, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false); var disposeResponse_ = true; try @@ -489,9 +489,9 @@ public async System.Threading.Tasks.Task HistoryAsync(int? offset, i foreach (var item_ in response_.Content.Headers) headers_[item_.Key] = item_.Value; } - + ProcessResponse(client_, response_); - + var status_ = (int)response_.StatusCode; if (status_ == 200) { @@ -525,7 +525,7 @@ public async System.Threading.Tasks.Task HistoryAsync(int? offset, i client_.Dispose(); } } - + protected struct ObjectResponseResult { public ObjectResponseResult(T responseObject, string responseText) @@ -533,21 +533,21 @@ public ObjectResponseResult(T responseObject, string responseText) this.Object = responseObject; this.Text = responseText; } - + public T Object { get; } - + public string Text { get; } } - + public bool ReadResponseAsString { get; set; } - + protected virtual async System.Threading.Tasks.Task> ReadObjectResponseAsync(System.Net.Http.HttpResponseMessage response, System.Collections.Generic.IReadOnlyDictionary> headers, System.Threading.CancellationToken cancellationToken) { if (response == null || response.Content == null) { return new ObjectResponseResult(default(T), string.Empty); } - + if (ReadResponseAsString) { var responseText = await response.Content.ReadAsStringAsync().ConfigureAwait(false); @@ -582,14 +582,14 @@ protected virtual async System.Threading.Tasks.Task> Rea } } } - + private string ConvertToString(object value, System.Globalization.CultureInfo cultureInfo) { if (value == null) { return ""; } - + if (value is System.Enum) { var name = System.Enum.GetName(value.GetType(), value); @@ -605,7 +605,7 @@ private string ConvertToString(object value, System.Globalization.CultureInfo cu return attribute.Value != null ? attribute.Value : name; } } - + var converted = System.Convert.ToString(System.Convert.ChangeType(value, System.Enum.GetUnderlyingType(value.GetType()), cultureInfo)); return converted == null ? string.Empty : converted; } @@ -623,7 +623,7 @@ private string ConvertToString(object value, System.Globalization.CultureInfo cu var array = System.Linq.Enumerable.OfType((System.Array) value); return string.Join(",", System.Linq.Enumerable.Select(array, o => ConvertToString(o, cultureInfo))); } - + var result = System.Convert.ToString(value, cultureInfo); return result == null ? "" : result; } @@ -637,7 +637,7 @@ public partial class Product : System.ComponentModel.INotifyPropertyChanged private string _display_name; private string _capacity; private string _image; - + /// Unique identifier representing a specific product for a given latitude & longitude. For example, uberX in San Francisco will have a different product_id than uberX in Los Angeles. [Newtonsoft.Json.JsonProperty("product_id", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] public string Product_id @@ -652,7 +652,7 @@ public string Product_id } } } - + /// Description of product. [Newtonsoft.Json.JsonProperty("description", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] public string Description @@ -667,7 +667,7 @@ public string Description } } } - + /// Display name of product. [Newtonsoft.Json.JsonProperty("display_name", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] public string Display_name @@ -682,7 +682,7 @@ public string Display_name } } } - + /// Capacity of product. For example, 4 people. [Newtonsoft.Json.JsonProperty("capacity", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] public string Capacity @@ -697,7 +697,7 @@ public string Capacity } } } - + /// Image URL representing the product. [Newtonsoft.Json.JsonProperty("image", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] public string Image @@ -712,19 +712,17 @@ public string Image } } } - - + public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged; - + protected virtual void RaisePropertyChanged([System.Runtime.CompilerServices.CallerMemberName] string propertyName = null) { var handler = PropertyChanged; - if (handler != null) + if (handler != null) handler(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName)); } - } - + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.5.2.0 (Newtonsoft.Json v11.0.0.0)")] public partial class PriceEstimate : System.ComponentModel.INotifyPropertyChanged { @@ -735,7 +733,7 @@ public partial class PriceEstimate : System.ComponentModel.INotifyPropertyChange private double? _low_estimate; private double? _high_estimate; private double? _surge_multiplier; - + /// Unique identifier representing a specific product for a given latitude & longitude. For example, uberX in San Francisco will have a different product_id than uberX in Los Angeles [Newtonsoft.Json.JsonProperty("product_id", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] public string Product_id @@ -750,7 +748,7 @@ public string Product_id } } } - + /// [ISO 4217](http://en.wikipedia.org/wiki/ISO_4217) currency code. [Newtonsoft.Json.JsonProperty("currency_code", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] public string Currency_code @@ -765,7 +763,7 @@ public string Currency_code } } } - + /// Display name of product. [Newtonsoft.Json.JsonProperty("display_name", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] public string Display_name @@ -780,7 +778,7 @@ public string Display_name } } } - + /// Formatted string of estimate in local currency of the start location. Estimate could be a range, a single number (flat rate) or "Metered" for TAXI. [Newtonsoft.Json.JsonProperty("estimate", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] public string Estimate @@ -795,7 +793,7 @@ public string Estimate } } } - + /// Lower bound of the estimated price. [Newtonsoft.Json.JsonProperty("low_estimate", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] public double? Low_estimate @@ -810,7 +808,7 @@ public double? Low_estimate } } } - + /// Upper bound of the estimated price. [Newtonsoft.Json.JsonProperty("high_estimate", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] public double? High_estimate @@ -825,7 +823,7 @@ public double? High_estimate } } } - + /// Expected surge multiplier. Surge is active if surge_multiplier is greater than 1. Price estimate already factors in the surge multiplier. [Newtonsoft.Json.JsonProperty("surge_multiplier", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] public double? Surge_multiplier @@ -840,19 +838,17 @@ public double? Surge_multiplier } } } - - + public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged; - + protected virtual void RaisePropertyChanged([System.Runtime.CompilerServices.CallerMemberName] string propertyName = null) { var handler = PropertyChanged; - if (handler != null) + if (handler != null) handler(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName)); } - } - + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.5.2.0 (Newtonsoft.Json v11.0.0.0)")] public partial class Profile : System.ComponentModel.INotifyPropertyChanged { @@ -861,7 +857,7 @@ public partial class Profile : System.ComponentModel.INotifyPropertyChanged private string _email; private string _picture; private string _promo_code; - + /// First name of the Uber user. [Newtonsoft.Json.JsonProperty("first_name", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] public string First_name @@ -876,7 +872,7 @@ public string First_name } } } - + /// Last name of the Uber user. [Newtonsoft.Json.JsonProperty("last_name", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] public string Last_name @@ -891,7 +887,7 @@ public string Last_name } } } - + /// Email address of the Uber user [Newtonsoft.Json.JsonProperty("email", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] public string Email @@ -906,7 +902,7 @@ public string Email } } } - + /// Image URL of the Uber user. [Newtonsoft.Json.JsonProperty("picture", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] public string Picture @@ -921,7 +917,7 @@ public string Picture } } } - + /// Promo code of the Uber user. [Newtonsoft.Json.JsonProperty("promo_code", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] public string Promo_code @@ -936,24 +932,22 @@ public string Promo_code } } } - - + public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged; - + protected virtual void RaisePropertyChanged([System.Runtime.CompilerServices.CallerMemberName] string propertyName = null) { var handler = PropertyChanged; - if (handler != null) + if (handler != null) handler(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName)); } - } - + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.5.2.0 (Newtonsoft.Json v11.0.0.0)")] public partial class Activity : System.ComponentModel.INotifyPropertyChanged { private string _uuid; - + /// Unique identifier for the activity [Newtonsoft.Json.JsonProperty("uuid", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] public string Uuid @@ -968,19 +962,17 @@ public string Uuid } } } - - + public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged; - + protected virtual void RaisePropertyChanged([System.Runtime.CompilerServices.CallerMemberName] string propertyName = null) { var handler = PropertyChanged; - if (handler != null) + if (handler != null) handler(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName)); } - } - + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.5.2.0 (Newtonsoft.Json v11.0.0.0)")] public partial class Activities : System.ComponentModel.INotifyPropertyChanged { @@ -988,7 +980,7 @@ public partial class Activities : System.ComponentModel.INotifyPropertyChanged private int? _limit; private int? _count; private System.Collections.ObjectModel.ObservableCollection _history; - + /// Position in pagination. [Newtonsoft.Json.JsonProperty("offset", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] public int? Offset @@ -1003,7 +995,7 @@ public int? Offset } } } - + /// Number of items to retrieve (100 max). [Newtonsoft.Json.JsonProperty("limit", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] public int? Limit @@ -1018,7 +1010,7 @@ public int? Limit } } } - + /// Total number of items available. [Newtonsoft.Json.JsonProperty("count", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] public int? Count @@ -1033,7 +1025,7 @@ public int? Count } } } - + [Newtonsoft.Json.JsonProperty("history", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] public System.Collections.ObjectModel.ObservableCollection History { @@ -1047,26 +1039,24 @@ public System.Collections.ObjectModel.ObservableCollection History } } } - - + public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged; - + protected virtual void RaisePropertyChanged([System.Runtime.CompilerServices.CallerMemberName] string propertyName = null) { var handler = PropertyChanged; - if (handler != null) + if (handler != null) handler(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName)); } - } - + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.5.2.0 (Newtonsoft.Json v11.0.0.0)")] public partial class Error : System.ComponentModel.INotifyPropertyChanged { private int? _code; private string _message; private string _fields; - + [Newtonsoft.Json.JsonProperty("code", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] public int? Code { @@ -1080,7 +1070,7 @@ public int? Code } } } - + [Newtonsoft.Json.JsonProperty("message", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] public string Message { @@ -1094,7 +1084,7 @@ public string Message } } } - + [Newtonsoft.Json.JsonProperty("fields", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] public string Fields { @@ -1108,20 +1098,20 @@ public string Fields } } } - - + public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged; - + protected virtual void RaisePropertyChanged([System.Runtime.CompilerServices.CallerMemberName] string propertyName = null) { var handler = PropertyChanged; - if (handler != null) + if (handler != null) handler(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName)); } - } - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.4.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] + + + [System.CodeDom.Compiler.GeneratedCode("NSwag", "")] public partial class SwaggerException : System.Exception { public int StatusCode { get; private set; } @@ -1144,7 +1134,7 @@ public override string ToString() } } - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.4.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "")] public partial class SwaggerException : SwaggerException { public TResult Result { get; private set; } diff --git a/src/NSwag.Integration.Console/Controllers.cs b/src/NSwag.Integration.Console/Controllers.cs index a0202e7387..c332785d13 100644 --- a/src/NSwag.Integration.Console/Controllers.cs +++ b/src/NSwag.Integration.Console/Controllers.cs @@ -1,6 +1,6 @@ //---------------------- // -// Generated using the NSwag toolchain v13.14.4.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0)) (http://NSwag.org) +// Generated using the NSwag toolchain v (http://NSwag.org) // //---------------------- @@ -18,349 +18,398 @@ namespace MyNamespace { using System = global::System; - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.4.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "")] public interface IGeoController { + + + System.Threading.Tasks.Task FromBodyTestAsync(GeoPoint location); - + + + System.Threading.Tasks.Task FromUriTestAsync(double? latitude, double? longitude); - + + System.Threading.Tasks.Task AddPolygonAsync(System.Collections.Generic.IEnumerable points); - + + System.Threading.Tasks.Task FilterAsync(System.Collections.Generic.IEnumerable currentStates); - + + System.Threading.Tasks.Task> ReverseAsync(System.Collections.Generic.IEnumerable values); - + + System.Threading.Tasks.Task RefreshAsync(); - + + System.Threading.Tasks.Task UploadFileAsync(FileParameter file); - + + System.Threading.Tasks.Task UploadFilesAsync(System.Collections.Generic.IEnumerable files); - + + System.Threading.Tasks.Task SaveItemsAsync(GenericRequestOfAddressAndPerson request); - + + + System.Threading.Tasks.Task GetUploadedFileAsync(int id, bool @override); - + + System.Threading.Tasks.Task PostDoubleAsync(double? value); - + } - - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.4.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] + + [System.CodeDom.Compiler.GeneratedCode("NSwag", "")] + public partial class GeoController : System.Web.Http.ApiController { private IGeoController _implementation; - + public GeoController(IGeoController implementation) { _implementation = implementation; } - + [System.Web.Http.HttpPost, System.Web.Http.Route("api/Geo/FromBodyTest")] public System.Threading.Tasks.Task FromBodyTest([System.Web.Http.FromBody] GeoPoint location) { + return _implementation.FromBodyTestAsync(location); } - + [System.Web.Http.HttpPost, System.Web.Http.Route("api/Geo/FromUriTest")] public System.Threading.Tasks.Task FromUriTest([System.Web.Http.FromUri] double? latitude, [System.Web.Http.FromUri] double? longitude) { + return _implementation.FromUriTestAsync(latitude, longitude); } - + [System.Web.Http.HttpPost, System.Web.Http.Route("api/Geo/AddPolygon")] public System.Threading.Tasks.Task AddPolygon([System.Web.Http.FromBody] System.Collections.Generic.IEnumerable points) { + return _implementation.AddPolygonAsync(points); } - + [System.Web.Http.HttpPost, System.Web.Http.Route("api/Geo/Filter")] public System.Threading.Tasks.Task Filter([System.Web.Http.FromUri] System.Collections.Generic.IEnumerable currentStates) { + return _implementation.FilterAsync(currentStates); } - + [System.Web.Http.HttpPost, System.Web.Http.Route("api/Geo/Reverse")] public System.Threading.Tasks.Task> Reverse([System.Web.Http.FromUri] System.Collections.Generic.IEnumerable values) { + return _implementation.ReverseAsync(values); } - + [System.Web.Http.HttpPost, System.Web.Http.Route("api/Geo/Refresh")] public System.Threading.Tasks.Task Refresh() { + return _implementation.RefreshAsync(); } - + [System.Web.Http.HttpPost, System.Web.Http.Route("api/Geo/UploadFile")] public System.Threading.Tasks.Task UploadFile(FileParameter file) { + return _implementation.UploadFileAsync(file); } - + [System.Web.Http.HttpPost, System.Web.Http.Route("api/Geo/UploadFiles")] public System.Threading.Tasks.Task UploadFiles(System.Collections.Generic.IEnumerable files) { + return _implementation.UploadFilesAsync(files); } - + [System.Web.Http.HttpPost, System.Web.Http.Route("api/Geo/SaveItems")] public System.Threading.Tasks.Task SaveItems([System.Web.Http.FromBody] GenericRequestOfAddressAndPerson request) { + return _implementation.SaveItemsAsync(request); } - + [System.Web.Http.HttpGet, System.Web.Http.Route("api/Geo/GetUploadedFile/{id}")] public System.Threading.Tasks.Task GetUploadedFile(int id, [System.Web.Http.FromUri(Name = "override")] bool? @override) { + return _implementation.GetUploadedFileAsync(id, @override ?? false); } - + [System.Web.Http.HttpPost, System.Web.Http.Route("api/Geo/PostDouble")] public System.Threading.Tasks.Task PostDouble([System.Web.Http.FromUri] double? value) { + return _implementation.PostDoubleAsync(value); } - + } - - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.4.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] + + [System.CodeDom.Compiler.GeneratedCode("NSwag", "")] public interface IPersonsController { + System.Threading.Tasks.Task> GetAllAsync(); - + + System.Threading.Tasks.Task AddAsync(Person person); - + + System.Threading.Tasks.Task> FindAsync(Gender gender); - + + System.Threading.Tasks.Task> FindOptionalAsync(Gender? gender); - + + System.Threading.Tasks.Task GetAsync(System.Guid id); - + + System.Threading.Tasks.Task DeleteAsync(System.Guid id); - + + System.Threading.Tasks.Task TransformAsync(Person person); - + + System.Threading.Tasks.Task ThrowAsync(System.Guid id); - + /// Gets the name of a person. + /// The person ID. + /// The person's name. + System.Threading.Tasks.Task GetNameAsync(System.Guid id); - + + System.Threading.Tasks.Task AddXmlAsync(string person); - + + System.Threading.Tasks.Task UploadAsync(System.Web.HttpPostedFileBase data); - + } - - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.4.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] + + [System.CodeDom.Compiler.GeneratedCode("NSwag", "")] + public partial class PersonsController : System.Web.Http.ApiController { private IPersonsController _implementation; - + public PersonsController(IPersonsController implementation) { _implementation = implementation; } - + [System.Web.Http.HttpGet, System.Web.Http.Route("api/Persons")] public System.Threading.Tasks.Task> GetAll() { + return _implementation.GetAllAsync(); } - + [System.Web.Http.HttpPost, System.Web.Http.Route("api/Persons")] public System.Threading.Tasks.Task Add([System.Web.Http.FromBody] Person person) { + return _implementation.AddAsync(person); } - + [System.Web.Http.HttpPost, System.Web.Http.Route("api/Persons/find/{gender}")] public System.Threading.Tasks.Task> Find(Gender gender) { + return _implementation.FindAsync(gender); } - + [System.Web.Http.HttpPost, System.Web.Http.Route("api/Persons/find2")] public System.Threading.Tasks.Task> FindOptional([System.Web.Http.FromUri] Gender? gender) { + return _implementation.FindOptionalAsync(gender); } - + [System.Web.Http.HttpGet, System.Web.Http.Route("api/Persons/{id}")] public System.Threading.Tasks.Task Get(System.Guid id) { + return _implementation.GetAsync(id); } - + [System.Web.Http.HttpDelete, System.Web.Http.Route("api/Persons/{id}")] public System.Threading.Tasks.Task Delete(System.Guid id) { + return _implementation.DeleteAsync(id); } - + [System.Web.Http.HttpPost, System.Web.Http.Route("api/Persons/transform")] public System.Threading.Tasks.Task Transform([System.Web.Http.FromBody] Person person) { + return _implementation.TransformAsync(person); } - + [System.Web.Http.HttpPost, System.Web.Http.Route("api/Persons/Throw")] public System.Threading.Tasks.Task Throw([System.Web.Http.FromUri] System.Guid id) { + return _implementation.ThrowAsync(id); } - + /// Gets the name of a person. /// The person ID. /// The person's name. [System.Web.Http.HttpGet, System.Web.Http.Route("api/Persons/{id}/Name")] public System.Threading.Tasks.Task GetName(System.Guid id) { + return _implementation.GetNameAsync(id); } - + [System.Web.Http.HttpPost, System.Web.Http.Route("api/Persons/AddXml")] public System.Threading.Tasks.Task AddXml([System.Web.Http.FromBody] string person) { + return _implementation.AddXmlAsync(person); } - + [System.Web.Http.HttpPost, System.Web.Http.Route("api/Persons/upload")] public System.Threading.Tasks.Task Upload(System.Web.HttpPostedFileBase data) { + return _implementation.UploadAsync(data); } - + } [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.5.2.0 (Newtonsoft.Json v11.0.0.0)")] - public partial class GeoPoint + public partial class GeoPoint { [Newtonsoft.Json.JsonProperty("Latitude", Required = Newtonsoft.Json.Required.Always)] public double Latitude { get; set; } - + [Newtonsoft.Json.JsonProperty("Longitude", Required = Newtonsoft.Json.Required.Always)] public double Longitude { get; set; } - - + } - + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.5.2.0 (Newtonsoft.Json v11.0.0.0)")] - public partial class GenericRequestOfAddressAndPerson + public partial class GenericRequestOfAddressAndPerson { [Newtonsoft.Json.JsonProperty("Item1", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] public Address Item1 { get; set; } - + [Newtonsoft.Json.JsonProperty("Item2", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] public Person Item2 { get; set; } - - + } - + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.5.2.0 (Newtonsoft.Json v11.0.0.0)")] - public partial class Address + public partial class Address { [Newtonsoft.Json.JsonProperty("IsPrimary", Required = Newtonsoft.Json.Required.Always)] public bool IsPrimary { get; set; } - + [Newtonsoft.Json.JsonProperty("City", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] public string City { get; set; } - - + } - + [Newtonsoft.Json.JsonConverter(typeof(JsonInheritanceConverter), "discriminator")] [JsonInheritanceAttribute("Teacher", typeof(Teacher))] [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.5.2.0 (Newtonsoft.Json v11.0.0.0)")] - public partial class Person + public partial class Person { [Newtonsoft.Json.JsonProperty("Id", Required = Newtonsoft.Json.Required.Always)] [System.ComponentModel.DataAnnotations.Required(AllowEmptyStrings = true)] public System.Guid Id { get; set; } - + /// Gets or sets the first name. [Newtonsoft.Json.JsonProperty("FirstName", Required = Newtonsoft.Json.Required.Always)] [System.ComponentModel.DataAnnotations.Required] [System.ComponentModel.DataAnnotations.StringLength(int.MaxValue, MinimumLength = 2)] public string FirstName { get; set; } - + /// Gets or sets the last name. [Newtonsoft.Json.JsonProperty("LastName", Required = Newtonsoft.Json.Required.Always)] [System.ComponentModel.DataAnnotations.Required] public string LastName { get; set; } - + [Newtonsoft.Json.JsonProperty("Gender", Required = Newtonsoft.Json.Required.Always)] [System.ComponentModel.DataAnnotations.Required(AllowEmptyStrings = true)] [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.StringEnumConverter))] public Gender Gender { get; set; } - + [Newtonsoft.Json.JsonProperty("DateOfBirth", Required = Newtonsoft.Json.Required.Always)] [System.ComponentModel.DataAnnotations.Required(AllowEmptyStrings = true)] public System.DateTime DateOfBirth { get; set; } - + [Newtonsoft.Json.JsonProperty("Weight", Required = Newtonsoft.Json.Required.Always)] public decimal Weight { get; set; } - + [Newtonsoft.Json.JsonProperty("Height", Required = Newtonsoft.Json.Required.Always)] public double Height { get; set; } - + [Newtonsoft.Json.JsonProperty("Age", Required = Newtonsoft.Json.Required.Always)] [System.ComponentModel.DataAnnotations.Range(5, 99)] public int Age { get; set; } - + [Newtonsoft.Json.JsonProperty("AverageSleepTime", Required = Newtonsoft.Json.Required.Always)] [System.ComponentModel.DataAnnotations.Required(AllowEmptyStrings = true)] public System.TimeSpan AverageSleepTime { get; set; } - + [Newtonsoft.Json.JsonProperty("Address", Required = Newtonsoft.Json.Required.Always)] [System.ComponentModel.DataAnnotations.Required] public Address Address { get; set; } = new Address(); - + [Newtonsoft.Json.JsonProperty("Children", Required = Newtonsoft.Json.Required.Always)] [System.ComponentModel.DataAnnotations.Required] public System.Collections.Generic.List Children { get; set; } = new System.Collections.Generic.List(); - + [Newtonsoft.Json.JsonProperty("Skills", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] public System.Collections.Generic.Dictionary Skills { get; set; } - - + } - + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.5.2.0 (Newtonsoft.Json v11.0.0.0)")] public enum Gender { + [System.Runtime.Serialization.EnumMember(Value = @"Male")] Male = 0, - + [System.Runtime.Serialization.EnumMember(Value = @"Female")] Female = 1, - + } - + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.5.2.0 (Newtonsoft.Json v11.0.0.0)")] public enum SkillLevel { + Low = 0, - + Medium = 1, - + Height = 2, - + } - + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.5.2.0 (Newtonsoft.Json v11.0.0.0)")] public partial class Teacher : Person { [Newtonsoft.Json.JsonProperty("Course", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] public string Course { get; set; } - + [Newtonsoft.Json.JsonProperty("SkillLevel", Required = Newtonsoft.Json.Required.Always)] public SkillLevel SkillLevel { get; set; } = MyNamespace.SkillLevel.Medium; - - + } - + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.5.2.0 (Newtonsoft.Json v11.0.0.0)")] [Newtonsoft.Json.JsonObjectAttribute] public partial class PersonNotFoundException : System.Exception @@ -368,10 +417,9 @@ public partial class PersonNotFoundException : System.Exception [Newtonsoft.Json.JsonProperty("id", Required = Newtonsoft.Json.Required.Always)] [System.ComponentModel.DataAnnotations.Required(AllowEmptyStrings = true)] public System.Guid Id { get; set; } - - + } - + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.5.2.0 (Newtonsoft.Json v11.0.0.0)")] [System.AttributeUsage(System.AttributeTargets.Class | System.AttributeTargets.Interface, AllowMultiple = true)] internal class JsonInheritanceAttribute : System.Attribute @@ -381,41 +429,41 @@ public JsonInheritanceAttribute(string key, System.Type type) Key = key; Type = type; } - + public string Key { get; } - + public System.Type Type { get; } } - + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.5.2.0 (Newtonsoft.Json v11.0.0.0)")] internal class JsonInheritanceConverter : Newtonsoft.Json.JsonConverter { internal static readonly string DefaultDiscriminatorName = "discriminator"; - + private readonly string _discriminator; - + [System.ThreadStatic] private static bool _isReading; - + [System.ThreadStatic] private static bool _isWriting; - + public JsonInheritanceConverter() { _discriminator = DefaultDiscriminatorName; } - + public JsonInheritanceConverter(string discriminator) { _discriminator = discriminator; } - + public override void WriteJson(Newtonsoft.Json.JsonWriter writer, object value, Newtonsoft.Json.JsonSerializer serializer) { try { _isWriting = true; - + var jObject = Newtonsoft.Json.Linq.JObject.FromObject(value, serializer); jObject.AddFirst(new Newtonsoft.Json.Linq.JProperty(_discriminator, GetSubtypeDiscriminator(value.GetType()))); writer.WriteToken(jObject.CreateReader()); @@ -425,7 +473,7 @@ public override void WriteJson(Newtonsoft.Json.JsonWriter writer, object value, _isWriting = false; } } - + public override bool CanWrite { get @@ -438,7 +486,7 @@ public override bool CanWrite return true; } } - + public override bool CanRead { get @@ -451,28 +499,28 @@ public override bool CanRead return true; } } - + public override bool CanConvert(System.Type objectType) { return true; } - + public override object ReadJson(Newtonsoft.Json.JsonReader reader, System.Type objectType, object existingValue, Newtonsoft.Json.JsonSerializer serializer) { var jObject = serializer.Deserialize(reader); if (jObject == null) return null; - + var discriminatorValue = jObject.GetValue(_discriminator); var discriminator = discriminatorValue != null ? Newtonsoft.Json.Linq.Extensions.Value(discriminatorValue) : null; var subtype = GetObjectSubtype(objectType, discriminator); - + var objectContract = serializer.ContractResolver.ResolveContract(subtype) as Newtonsoft.Json.Serialization.JsonObjectContract; if (objectContract == null || System.Linq.Enumerable.All(objectContract.Properties, p => p.PropertyName != _discriminator)) { jObject.Remove(_discriminator); } - + try { _isReading = true; @@ -483,7 +531,7 @@ public override object ReadJson(Newtonsoft.Json.JsonReader reader, System.Type o _isReading = false; } } - + private System.Type GetObjectSubtype(System.Type objectType, string discriminator) { foreach (var attribute in System.Reflection.CustomAttributeExtensions.GetCustomAttributes(System.Reflection.IntrospectionExtensions.GetTypeInfo(objectType), true)) @@ -491,10 +539,10 @@ private System.Type GetObjectSubtype(System.Type objectType, string discriminato if (attribute.Key == discriminator) return attribute.Type; } - + return objectType; } - + private string GetSubtypeDiscriminator(System.Type objectType) { foreach (var attribute in System.Reflection.CustomAttributeExtensions.GetCustomAttributes(System.Reflection.IntrospectionExtensions.GetTypeInfo(objectType), true)) @@ -502,12 +550,12 @@ private string GetSubtypeDiscriminator(System.Type objectType) if (attribute.Type == objectType) return attribute.Key; } - + return objectType.Name; } } - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.4.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "")] public partial class FileParameter { public FileParameter(System.IO.Stream data) @@ -534,7 +582,7 @@ public FileParameter(System.IO.Stream data, string fileName, string contentType) public string ContentType { get; private set; } } - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.4.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "")] public partial class FileResponse : System.IDisposable { private System.IDisposable _client; @@ -570,27 +618,27 @@ public void Dispose() } } - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.4.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "")] internal class JsonExceptionConverter : Newtonsoft.Json.JsonConverter { private readonly Newtonsoft.Json.Serialization.DefaultContractResolver _defaultContractResolver = new Newtonsoft.Json.Serialization.DefaultContractResolver(); private readonly System.Collections.Generic.IDictionary _searchedNamespaces; private readonly bool _hideStackTrace = false; - + public JsonExceptionConverter() { _searchedNamespaces = new System.Collections.Generic.Dictionary { { typeof(System.Exception).Namespace, System.Reflection.IntrospectionExtensions.GetTypeInfo(typeof(System.Exception)).Assembly } }; } - + public override bool CanWrite => true; - + public override void WriteJson(Newtonsoft.Json.JsonWriter writer, object value, Newtonsoft.Json.JsonSerializer serializer) { var exception = value as System.Exception; if (exception != null) { var resolver = serializer.ContractResolver as Newtonsoft.Json.Serialization.DefaultContractResolver ?? _defaultContractResolver; - + var jObject = new Newtonsoft.Json.Linq.JObject(); jObject.Add(resolver.GetResolvedPropertyName("discriminator"), exception.GetType().Name); jObject.Add(resolver.GetResolvedPropertyName("Message"), exception.Message); @@ -598,7 +646,7 @@ public override void WriteJson(Newtonsoft.Json.JsonWriter writer, object value, jObject.Add(resolver.GetResolvedPropertyName("Source"), exception.Source); jObject.Add(resolver.GetResolvedPropertyName("InnerException"), exception.InnerException != null ? Newtonsoft.Json.Linq.JToken.FromObject(exception.InnerException, serializer) : null); - + foreach (var property in GetExceptionProperties(value.GetType())) { var propertyValue = property.Key.GetValue(exception); @@ -608,37 +656,37 @@ public override void WriteJson(Newtonsoft.Json.JsonWriter writer, object value, Newtonsoft.Json.Linq.JToken.FromObject(propertyValue, serializer))); } } - + value = jObject; } - + serializer.Serialize(writer, value); } - + public override bool CanConvert(System.Type objectType) { return System.Reflection.IntrospectionExtensions.GetTypeInfo(typeof(System.Exception)).IsAssignableFrom(System.Reflection.IntrospectionExtensions.GetTypeInfo(objectType)); } - + public override object ReadJson(Newtonsoft.Json.JsonReader reader, System.Type objectType, object existingValue, Newtonsoft.Json.JsonSerializer serializer) { var jObject = serializer.Deserialize(reader); if (jObject == null) return null; - + var newSerializer = new Newtonsoft.Json.JsonSerializer(); newSerializer.ContractResolver = (Newtonsoft.Json.Serialization.IContractResolver)System.Activator.CreateInstance(serializer.ContractResolver.GetType()); - + var field = GetField(typeof(Newtonsoft.Json.Serialization.DefaultContractResolver), "_sharedCache"); if (field != null) field.SetValue(newSerializer.ContractResolver, false); - + dynamic resolver = newSerializer.ContractResolver; if (System.Reflection.RuntimeReflectionExtensions.GetRuntimeProperty(newSerializer.ContractResolver.GetType(), "IgnoreSerializableAttribute") != null) resolver.IgnoreSerializableAttribute = true; if (System.Reflection.RuntimeReflectionExtensions.GetRuntimeProperty(newSerializer.ContractResolver.GetType(), "IgnoreSerializableInterface") != null) resolver.IgnoreSerializableInterface = true; - + Newtonsoft.Json.Linq.JToken token; if (jObject.TryGetValue("discriminator", System.StringComparison.OrdinalIgnoreCase, out token)) { @@ -659,11 +707,11 @@ public override object ReadJson(Newtonsoft.Json.JsonReader reader, System.Type o break; } } - + } } } - + var value = jObject.ToObject(objectType, newSerializer); foreach (var property in GetExceptionProperties(value.GetType())) { @@ -678,15 +726,15 @@ public override object ReadJson(Newtonsoft.Json.JsonReader reader, System.Type o field.SetValue(value, propertyValue); } } - + SetExceptionFieldValue(jObject, "Message", value, "_message", resolver, newSerializer); SetExceptionFieldValue(jObject, "StackTrace", value, "_stackTraceString", resolver, newSerializer); SetExceptionFieldValue(jObject, "Source", value, "_source", resolver, newSerializer); SetExceptionFieldValue(jObject, "InnerException", value, "_innerException", resolver, serializer); - + return value; } - + private System.Reflection.FieldInfo GetField(System.Type type, string fieldName) { var field = System.Reflection.IntrospectionExtensions.GetTypeInfo(type).GetDeclaredField(fieldName); @@ -694,7 +742,7 @@ private System.Reflection.FieldInfo GetField(System.Type type, string fieldName) return GetField(System.Reflection.IntrospectionExtensions.GetTypeInfo(type).BaseType, fieldName); return field; } - + private System.Collections.Generic.IDictionary GetExceptionProperties(System.Type exceptionType) { var result = new System.Collections.Generic.Dictionary(); @@ -703,13 +751,13 @@ private System.Reflection.FieldInfo GetField(System.Type type, string fieldName) { var attribute = System.Reflection.CustomAttributeExtensions.GetCustomAttribute(property); var propertyName = attribute != null ? attribute.PropertyName : property.Name; - + if (!System.Linq.Enumerable.Contains(new[] { "Message", "StackTrace", "Source", "InnerException", "Data", "TargetSite", "HelpLink", "HResult" }, propertyName)) result[property] = propertyName; } return result; } - + private void SetExceptionFieldValue(Newtonsoft.Json.Linq.JObject jObject, string propertyName, object value, string fieldName, Newtonsoft.Json.Serialization.IContractResolver resolver, Newtonsoft.Json.JsonSerializer serializer) { var field = System.Reflection.IntrospectionExtensions.GetTypeInfo(typeof(System.Exception)).GetDeclaredField(fieldName); diff --git a/src/NSwag.Integration.Console/ServiceClients.cs b/src/NSwag.Integration.Console/ServiceClients.cs index c024210b76..078d3dc2db 100644 --- a/src/NSwag.Integration.Console/ServiceClients.cs +++ b/src/NSwag.Integration.Console/ServiceClients.cs @@ -1,6 +1,6 @@ //---------------------- // -// Generated using the NSwag toolchain v13.14.4.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0)) (http://NSwag.org) +// Generated using the NSwag toolchain v (http://NSwag.org) // //---------------------- @@ -18,44 +18,44 @@ namespace NSwag.Integration.Console { using System = global::System; - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.4.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "")] public partial class GeoClient { private System.Lazy _settings; - + public GeoClient() { _settings = new System.Lazy(CreateSerializerSettings); } - + private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() { var settings = new Newtonsoft.Json.JsonSerializerSettings { Converters = new Newtonsoft.Json.JsonConverter[] { new Newtonsoft.Json.Converters.StringEnumConverter(), new JsonExceptionConverter() } }; UpdateJsonSerializerSettings(settings); return settings; } - + protected Newtonsoft.Json.JsonSerializerSettings JsonSerializerSettings { get { return _settings.Value; } } - + partial void UpdateJsonSerializerSettings(Newtonsoft.Json.JsonSerializerSettings settings); - - + partial void PrepareRequest(System.Net.Http.HttpClient client, System.Net.Http.HttpRequestMessage request, string url); partial void PrepareRequest(System.Net.Http.HttpClient client, System.Net.Http.HttpRequestMessage request, System.Text.StringBuilder urlBuilder); partial void ProcessResponse(System.Net.Http.HttpClient client, System.Net.Http.HttpResponseMessage response); + /// A server side error occurred. public System.Threading.Tasks.Task FromBodyTestAsync(GeoPoint location) { return FromBodyTestAsync(location, System.Threading.CancellationToken.None); } - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// A server side error occurred. public async System.Threading.Tasks.Task FromBodyTestAsync(GeoPoint location, System.Threading.CancellationToken cancellationToken) { var urlBuilder_ = new System.Text.StringBuilder(); urlBuilder_.Append("api/Geo/FromBodyTest"); - + var client_ = new System.Net.Http.HttpClient(); var disposeClient_ = true; try @@ -66,14 +66,14 @@ public async System.Threading.Tasks.Task FromBodyTestAsync(GeoPoint location, Sy content_.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json"); request_.Content = content_; request_.Method = new System.Net.Http.HttpMethod("POST"); - + PrepareRequest(client_, request_, urlBuilder_); - + var url_ = urlBuilder_.ToString(); request_.RequestUri = new System.Uri(url_, System.UriKind.RelativeOrAbsolute); - + PrepareRequest(client_, request_, url_); - + var response_ = await client_.SendAsync(request_, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false); var disposeResponse_ = true; try @@ -84,9 +84,9 @@ public async System.Threading.Tasks.Task FromBodyTestAsync(GeoPoint location, Sy foreach (var item_ in response_.Content.Headers) headers_[item_.Key] = item_.Value; } - + ProcessResponse(client_, response_); - + var status_ = (int)response_.StatusCode; if (status_ == 204) { @@ -111,13 +111,13 @@ public async System.Threading.Tasks.Task FromBodyTestAsync(GeoPoint location, Sy client_.Dispose(); } } - + /// A server side error occurred. public System.Threading.Tasks.Task FromUriTestAsync(double? latitude, double? longitude) { return FromUriTestAsync(latitude, longitude, System.Threading.CancellationToken.None); } - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// A server side error occurred. public async System.Threading.Tasks.Task FromUriTestAsync(double? latitude, double? longitude, System.Threading.CancellationToken cancellationToken) @@ -133,7 +133,7 @@ public async System.Threading.Tasks.Task FromUriTestAsync(double? latitude, doub urlBuilder_.Append(System.Uri.EscapeDataString("Longitude") + "=").Append(System.Uri.EscapeDataString(ConvertToString(longitude, System.Globalization.CultureInfo.InvariantCulture))).Append("&"); } urlBuilder_.Length--; - + var client_ = new System.Net.Http.HttpClient(); var disposeClient_ = true; try @@ -142,14 +142,14 @@ public async System.Threading.Tasks.Task FromUriTestAsync(double? latitude, doub { request_.Content = new System.Net.Http.StringContent(string.Empty, System.Text.Encoding.UTF8, "application/json"); request_.Method = new System.Net.Http.HttpMethod("POST"); - + PrepareRequest(client_, request_, urlBuilder_); - + var url_ = urlBuilder_.ToString(); request_.RequestUri = new System.Uri(url_, System.UriKind.RelativeOrAbsolute); - + PrepareRequest(client_, request_, url_); - + var response_ = await client_.SendAsync(request_, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false); var disposeResponse_ = true; try @@ -160,9 +160,9 @@ public async System.Threading.Tasks.Task FromUriTestAsync(double? latitude, doub foreach (var item_ in response_.Content.Headers) headers_[item_.Key] = item_.Value; } - + ProcessResponse(client_, response_); - + var status_ = (int)response_.StatusCode; if (status_ == 204) { @@ -187,20 +187,20 @@ public async System.Threading.Tasks.Task FromUriTestAsync(double? latitude, doub client_.Dispose(); } } - + /// A server side error occurred. public System.Threading.Tasks.Task AddPolygonAsync(System.Collections.Generic.IEnumerable points) { return AddPolygonAsync(points, System.Threading.CancellationToken.None); } - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// A server side error occurred. public async System.Threading.Tasks.Task AddPolygonAsync(System.Collections.Generic.IEnumerable points, System.Threading.CancellationToken cancellationToken) { var urlBuilder_ = new System.Text.StringBuilder(); urlBuilder_.Append("api/Geo/AddPolygon"); - + var client_ = new System.Net.Http.HttpClient(); var disposeClient_ = true; try @@ -211,14 +211,14 @@ public async System.Threading.Tasks.Task AddPolygonAsync(System.Collections.Gene content_.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json"); request_.Content = content_; request_.Method = new System.Net.Http.HttpMethod("POST"); - + PrepareRequest(client_, request_, urlBuilder_); - + var url_ = urlBuilder_.ToString(); request_.RequestUri = new System.Uri(url_, System.UriKind.RelativeOrAbsolute); - + PrepareRequest(client_, request_, url_); - + var response_ = await client_.SendAsync(request_, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false); var disposeResponse_ = true; try @@ -229,9 +229,9 @@ public async System.Threading.Tasks.Task AddPolygonAsync(System.Collections.Gene foreach (var item_ in response_.Content.Headers) headers_[item_.Key] = item_.Value; } - + ProcessResponse(client_, response_); - + var status_ = (int)response_.StatusCode; if (status_ == 204) { @@ -256,13 +256,13 @@ public async System.Threading.Tasks.Task AddPolygonAsync(System.Collections.Gene client_.Dispose(); } } - + /// A server side error occurred. public System.Threading.Tasks.Task FilterAsync(System.Collections.Generic.IEnumerable currentStates) { return FilterAsync(currentStates, System.Threading.CancellationToken.None); } - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// A server side error occurred. public async System.Threading.Tasks.Task FilterAsync(System.Collections.Generic.IEnumerable currentStates, System.Threading.CancellationToken cancellationToken) @@ -274,7 +274,7 @@ public async System.Threading.Tasks.Task FilterAsync(System.Collections.Generic. foreach (var item_ in currentStates) { urlBuilder_.Append(System.Uri.EscapeDataString("currentStates") + "=").Append(System.Uri.EscapeDataString(ConvertToString(item_, System.Globalization.CultureInfo.InvariantCulture))).Append("&"); } } urlBuilder_.Length--; - + var client_ = new System.Net.Http.HttpClient(); var disposeClient_ = true; try @@ -283,14 +283,14 @@ public async System.Threading.Tasks.Task FilterAsync(System.Collections.Generic. { request_.Content = new System.Net.Http.StringContent(string.Empty, System.Text.Encoding.UTF8, "application/json"); request_.Method = new System.Net.Http.HttpMethod("POST"); - + PrepareRequest(client_, request_, urlBuilder_); - + var url_ = urlBuilder_.ToString(); request_.RequestUri = new System.Uri(url_, System.UriKind.RelativeOrAbsolute); - + PrepareRequest(client_, request_, url_); - + var response_ = await client_.SendAsync(request_, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false); var disposeResponse_ = true; try @@ -301,9 +301,9 @@ public async System.Threading.Tasks.Task FilterAsync(System.Collections.Generic. foreach (var item_ in response_.Content.Headers) headers_[item_.Key] = item_.Value; } - + ProcessResponse(client_, response_); - + var status_ = (int)response_.StatusCode; if (status_ == 204) { @@ -328,13 +328,13 @@ public async System.Threading.Tasks.Task FilterAsync(System.Collections.Generic. client_.Dispose(); } } - + /// A server side error occurred. public System.Threading.Tasks.Task> ReverseAsync(System.Collections.Generic.IEnumerable values) { return ReverseAsync(values, System.Threading.CancellationToken.None); } - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// A server side error occurred. public async System.Threading.Tasks.Task> ReverseAsync(System.Collections.Generic.IEnumerable values, System.Threading.CancellationToken cancellationToken) @@ -346,7 +346,7 @@ public async System.Threading.Tasks.Task FilterAsync(System.Collections.Generic. foreach (var item_ in values) { urlBuilder_.Append(System.Uri.EscapeDataString("values") + "=").Append(System.Uri.EscapeDataString(ConvertToString(item_, System.Globalization.CultureInfo.InvariantCulture))).Append("&"); } } urlBuilder_.Length--; - + var client_ = new System.Net.Http.HttpClient(); var disposeClient_ = true; try @@ -356,14 +356,14 @@ public async System.Threading.Tasks.Task FilterAsync(System.Collections.Generic. request_.Content = new System.Net.Http.StringContent(string.Empty, System.Text.Encoding.UTF8, "application/json"); request_.Method = new System.Net.Http.HttpMethod("POST"); request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); - + PrepareRequest(client_, request_, urlBuilder_); - + var url_ = urlBuilder_.ToString(); request_.RequestUri = new System.Uri(url_, System.UriKind.RelativeOrAbsolute); - + PrepareRequest(client_, request_, url_); - + var response_ = await client_.SendAsync(request_, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false); var disposeResponse_ = true; try @@ -374,9 +374,9 @@ public async System.Threading.Tasks.Task FilterAsync(System.Collections.Generic. foreach (var item_ in response_.Content.Headers) headers_[item_.Key] = item_.Value; } - + ProcessResponse(client_, response_); - + var status_ = (int)response_.StatusCode; if (status_ == 200) { @@ -402,20 +402,20 @@ public async System.Threading.Tasks.Task FilterAsync(System.Collections.Generic. client_.Dispose(); } } - + /// A server side error occurred. public System.Threading.Tasks.Task RefreshAsync() { return RefreshAsync(System.Threading.CancellationToken.None); } - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// A server side error occurred. public async System.Threading.Tasks.Task RefreshAsync(System.Threading.CancellationToken cancellationToken) { var urlBuilder_ = new System.Text.StringBuilder(); urlBuilder_.Append("api/Geo/Refresh"); - + var client_ = new System.Net.Http.HttpClient(); var disposeClient_ = true; try @@ -424,14 +424,14 @@ public async System.Threading.Tasks.Task RefreshAsync(System.Threading.Cancellat { request_.Content = new System.Net.Http.StringContent(string.Empty, System.Text.Encoding.UTF8, "application/json"); request_.Method = new System.Net.Http.HttpMethod("POST"); - + PrepareRequest(client_, request_, urlBuilder_); - + var url_ = urlBuilder_.ToString(); request_.RequestUri = new System.Uri(url_, System.UriKind.RelativeOrAbsolute); - + PrepareRequest(client_, request_, url_); - + var response_ = await client_.SendAsync(request_, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false); var disposeResponse_ = true; try @@ -442,9 +442,9 @@ public async System.Threading.Tasks.Task RefreshAsync(System.Threading.Cancellat foreach (var item_ in response_.Content.Headers) headers_[item_.Key] = item_.Value; } - + ProcessResponse(client_, response_); - + var status_ = (int)response_.StatusCode; if (status_ == 204) { @@ -469,20 +469,20 @@ public async System.Threading.Tasks.Task RefreshAsync(System.Threading.Cancellat client_.Dispose(); } } - + /// A server side error occurred. public System.Threading.Tasks.Task UploadFileAsync(FileParameter file) { return UploadFileAsync(file, System.Threading.CancellationToken.None); } - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// A server side error occurred. public async System.Threading.Tasks.Task UploadFileAsync(FileParameter file, System.Threading.CancellationToken cancellationToken) { var urlBuilder_ = new System.Text.StringBuilder(); urlBuilder_.Append("api/Geo/UploadFile"); - + var client_ = new System.Net.Http.HttpClient(); var disposeClient_ = true; try @@ -493,6 +493,7 @@ public async System.Threading.Tasks.Task UploadFileAsync(FileParameter fil var content_ = new System.Net.Http.MultipartFormDataContent(boundary_); content_.Headers.Remove("Content-Type"); content_.Headers.TryAddWithoutValidation("Content-Type", "multipart/form-data; boundary=" + boundary_); + if (file != null) { var content_file_ = new System.Net.Http.StreamContent(file.Data); @@ -503,14 +504,14 @@ public async System.Threading.Tasks.Task UploadFileAsync(FileParameter fil request_.Content = content_; request_.Method = new System.Net.Http.HttpMethod("POST"); request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); - + PrepareRequest(client_, request_, urlBuilder_); - + var url_ = urlBuilder_.ToString(); request_.RequestUri = new System.Uri(url_, System.UriKind.RelativeOrAbsolute); - + PrepareRequest(client_, request_, url_); - + var response_ = await client_.SendAsync(request_, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false); var disposeResponse_ = true; try @@ -521,9 +522,9 @@ public async System.Threading.Tasks.Task UploadFileAsync(FileParameter fil foreach (var item_ in response_.Content.Headers) headers_[item_.Key] = item_.Value; } - + ProcessResponse(client_, response_); - + var status_ = (int)response_.StatusCode; if (status_ == 200) { @@ -553,20 +554,20 @@ public async System.Threading.Tasks.Task UploadFileAsync(FileParameter fil client_.Dispose(); } } - + /// A server side error occurred. public System.Threading.Tasks.Task UploadFilesAsync(System.Collections.Generic.IEnumerable files) { return UploadFilesAsync(files, System.Threading.CancellationToken.None); } - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// A server side error occurred. public async System.Threading.Tasks.Task UploadFilesAsync(System.Collections.Generic.IEnumerable files, System.Threading.CancellationToken cancellationToken) { var urlBuilder_ = new System.Text.StringBuilder(); urlBuilder_.Append("api/Geo/UploadFiles"); - + var client_ = new System.Net.Http.HttpClient(); var disposeClient_ = true; try @@ -577,6 +578,7 @@ public async System.Threading.Tasks.Task UploadFilesAsync(System.Collections.Gen var content_ = new System.Net.Http.MultipartFormDataContent(boundary_); content_.Headers.Remove("Content-Type"); content_.Headers.TryAddWithoutValidation("Content-Type", "multipart/form-data; boundary=" + boundary_); + if (files != null) { foreach (var item_ in files) @@ -589,14 +591,14 @@ public async System.Threading.Tasks.Task UploadFilesAsync(System.Collections.Gen } request_.Content = content_; request_.Method = new System.Net.Http.HttpMethod("POST"); - + PrepareRequest(client_, request_, urlBuilder_); - + var url_ = urlBuilder_.ToString(); request_.RequestUri = new System.Uri(url_, System.UriKind.RelativeOrAbsolute); - + PrepareRequest(client_, request_, url_); - + var response_ = await client_.SendAsync(request_, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false); var disposeResponse_ = true; try @@ -607,9 +609,9 @@ public async System.Threading.Tasks.Task UploadFilesAsync(System.Collections.Gen foreach (var item_ in response_.Content.Headers) headers_[item_.Key] = item_.Value; } - + ProcessResponse(client_, response_); - + var status_ = (int)response_.StatusCode; if (status_ == 204) { @@ -634,14 +636,14 @@ public async System.Threading.Tasks.Task UploadFilesAsync(System.Collections.Gen client_.Dispose(); } } - + /// A server side error occurred. /// A custom error occured. public System.Threading.Tasks.Task SaveItemsAsync(GenericRequestOfAddressAndPerson request) { return SaveItemsAsync(request, System.Threading.CancellationToken.None); } - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// A server side error occurred. /// A custom error occured. @@ -649,7 +651,7 @@ public async System.Threading.Tasks.Task SaveItemsAsync(GenericRequestOfAddressA { var urlBuilder_ = new System.Text.StringBuilder(); urlBuilder_.Append("api/Geo/SaveItems"); - + var client_ = new System.Net.Http.HttpClient(); var disposeClient_ = true; try @@ -660,14 +662,14 @@ public async System.Threading.Tasks.Task SaveItemsAsync(GenericRequestOfAddressA content_.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json"); request_.Content = content_; request_.Method = new System.Net.Http.HttpMethod("POST"); - + PrepareRequest(client_, request_, urlBuilder_); - + var url_ = urlBuilder_.ToString(); request_.RequestUri = new System.Uri(url_, System.UriKind.RelativeOrAbsolute); - + PrepareRequest(client_, request_, url_); - + var response_ = await client_.SendAsync(request_, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false); var disposeResponse_ = true; try @@ -678,9 +680,9 @@ public async System.Threading.Tasks.Task SaveItemsAsync(GenericRequestOfAddressA foreach (var item_ in response_.Content.Headers) headers_[item_.Key] = item_.Value; } - + ProcessResponse(client_, response_); - + var status_ = (int)response_.StatusCode; if (status_ == 204) { @@ -719,20 +721,20 @@ public async System.Threading.Tasks.Task SaveItemsAsync(GenericRequestOfAddressA client_.Dispose(); } } - + /// A server side error occurred. public System.Threading.Tasks.Task GetUploadedFileAsync(int id, bool? @override) { return GetUploadedFileAsync(id, @override, System.Threading.CancellationToken.None); } - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// A server side error occurred. public async System.Threading.Tasks.Task GetUploadedFileAsync(int id, bool? @override, System.Threading.CancellationToken cancellationToken) { if (id == null) throw new System.ArgumentNullException("id"); - + var urlBuilder_ = new System.Text.StringBuilder(); urlBuilder_.Append("api/Geo/GetUploadedFile/{id}?"); urlBuilder_.Replace("{id}", System.Uri.EscapeDataString(ConvertToString(id, System.Globalization.CultureInfo.InvariantCulture))); @@ -741,7 +743,7 @@ public async System.Threading.Tasks.Task GetUploadedFileAsync(int urlBuilder_.Append(System.Uri.EscapeDataString("override") + "=").Append(System.Uri.EscapeDataString(ConvertToString(@override, System.Globalization.CultureInfo.InvariantCulture))).Append("&"); } urlBuilder_.Length--; - + var client_ = new System.Net.Http.HttpClient(); var disposeClient_ = true; try @@ -750,14 +752,14 @@ public async System.Threading.Tasks.Task GetUploadedFileAsync(int { request_.Method = new System.Net.Http.HttpMethod("GET"); request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); - + PrepareRequest(client_, request_, urlBuilder_); - + var url_ = urlBuilder_.ToString(); request_.RequestUri = new System.Uri(url_, System.UriKind.RelativeOrAbsolute); - + PrepareRequest(client_, request_, url_); - + var response_ = await client_.SendAsync(request_, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false); var disposeResponse_ = true; try @@ -768,14 +770,14 @@ public async System.Threading.Tasks.Task GetUploadedFileAsync(int foreach (var item_ in response_.Content.Headers) headers_[item_.Key] = item_.Value; } - + ProcessResponse(client_, response_); - + var status_ = (int)response_.StatusCode; if (status_ == 200 || status_ == 206) { var responseStream_ = response_.Content == null ? System.IO.Stream.Null : await response_.Content.ReadAsStreamAsync().ConfigureAwait(false); - var fileResponse_ = new FileResponse(status_, headers_, responseStream_, client_, response_); + var fileResponse_ = new FileResponse(status_, headers_, responseStream_, client_, response_); disposeClient_ = false; disposeResponse_ = false; // response and client are disposed by FileResponse return fileResponse_; } @@ -798,13 +800,13 @@ public async System.Threading.Tasks.Task GetUploadedFileAsync(int client_.Dispose(); } } - + /// A server side error occurred. public System.Threading.Tasks.Task PostDoubleAsync(double? value) { return PostDoubleAsync(value, System.Threading.CancellationToken.None); } - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// A server side error occurred. public async System.Threading.Tasks.Task PostDoubleAsync(double? value, System.Threading.CancellationToken cancellationToken) @@ -816,7 +818,7 @@ public async System.Threading.Tasks.Task GetUploadedFileAsync(int urlBuilder_.Append(System.Uri.EscapeDataString("value") + "=").Append(System.Uri.EscapeDataString(ConvertToString(value, System.Globalization.CultureInfo.InvariantCulture))).Append("&"); } urlBuilder_.Length--; - + var client_ = new System.Net.Http.HttpClient(); var disposeClient_ = true; try @@ -826,14 +828,14 @@ public async System.Threading.Tasks.Task GetUploadedFileAsync(int request_.Content = new System.Net.Http.StringContent(string.Empty, System.Text.Encoding.UTF8, "application/json"); request_.Method = new System.Net.Http.HttpMethod("POST"); request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); - + PrepareRequest(client_, request_, urlBuilder_); - + var url_ = urlBuilder_.ToString(); request_.RequestUri = new System.Uri(url_, System.UriKind.RelativeOrAbsolute); - + PrepareRequest(client_, request_, url_); - + var response_ = await client_.SendAsync(request_, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false); var disposeResponse_ = true; try @@ -844,9 +846,9 @@ public async System.Threading.Tasks.Task GetUploadedFileAsync(int foreach (var item_ in response_.Content.Headers) headers_[item_.Key] = item_.Value; } - + ProcessResponse(client_, response_); - + var status_ = (int)response_.StatusCode; if (status_ == 200) { @@ -872,7 +874,7 @@ public async System.Threading.Tasks.Task GetUploadedFileAsync(int client_.Dispose(); } } - + protected struct ObjectResponseResult { public ObjectResponseResult(T responseObject, string responseText) @@ -880,21 +882,21 @@ public ObjectResponseResult(T responseObject, string responseText) this.Object = responseObject; this.Text = responseText; } - + public T Object { get; } - + public string Text { get; } } - + public bool ReadResponseAsString { get; set; } - + protected virtual async System.Threading.Tasks.Task> ReadObjectResponseAsync(System.Net.Http.HttpResponseMessage response, System.Collections.Generic.IReadOnlyDictionary> headers, System.Threading.CancellationToken cancellationToken) { if (response == null || response.Content == null) { return new ObjectResponseResult(default(T), string.Empty); } - + if (ReadResponseAsString) { var responseText = await response.Content.ReadAsStringAsync().ConfigureAwait(false); @@ -929,14 +931,14 @@ protected virtual async System.Threading.Tasks.Task> Rea } } } - + private string ConvertToString(object value, System.Globalization.CultureInfo cultureInfo) { if (value == null) { return ""; } - + if (value is System.Enum) { var name = System.Enum.GetName(value.GetType(), value); @@ -952,7 +954,7 @@ private string ConvertToString(object value, System.Globalization.CultureInfo cu return attribute.Value != null ? attribute.Value : name; } } - + var converted = System.Convert.ToString(System.Convert.ChangeType(value, System.Enum.GetUnderlyingType(value.GetType()), cultureInfo)); return converted == null ? string.Empty : converted; } @@ -970,50 +972,50 @@ private string ConvertToString(object value, System.Globalization.CultureInfo cu var array = System.Linq.Enumerable.OfType((System.Array) value); return string.Join(",", System.Linq.Enumerable.Select(array, o => ConvertToString(o, cultureInfo))); } - + var result = System.Convert.ToString(value, cultureInfo); return result == null ? "" : result; } } - - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.4.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] + + [System.CodeDom.Compiler.GeneratedCode("NSwag", "")] public partial class PersonsClient { private System.Lazy _settings; - + public PersonsClient() { _settings = new System.Lazy(CreateSerializerSettings); } - + private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() { var settings = new Newtonsoft.Json.JsonSerializerSettings { Converters = new Newtonsoft.Json.JsonConverter[] { new Newtonsoft.Json.Converters.StringEnumConverter(), new JsonExceptionConverter() } }; UpdateJsonSerializerSettings(settings); return settings; } - + protected Newtonsoft.Json.JsonSerializerSettings JsonSerializerSettings { get { return _settings.Value; } } - + partial void UpdateJsonSerializerSettings(Newtonsoft.Json.JsonSerializerSettings settings); - - + partial void PrepareRequest(System.Net.Http.HttpClient client, System.Net.Http.HttpRequestMessage request, string url); partial void PrepareRequest(System.Net.Http.HttpClient client, System.Net.Http.HttpRequestMessage request, System.Text.StringBuilder urlBuilder); partial void ProcessResponse(System.Net.Http.HttpClient client, System.Net.Http.HttpResponseMessage response); + /// A server side error occurred. public System.Threading.Tasks.Task> GetAllAsync() { return GetAllAsync(System.Threading.CancellationToken.None); } - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// A server side error occurred. public async System.Threading.Tasks.Task> GetAllAsync(System.Threading.CancellationToken cancellationToken) { var urlBuilder_ = new System.Text.StringBuilder(); urlBuilder_.Append("api/Persons"); - + var client_ = new System.Net.Http.HttpClient(); var disposeClient_ = true; try @@ -1022,14 +1024,14 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() { request_.Method = new System.Net.Http.HttpMethod("GET"); request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); - + PrepareRequest(client_, request_, urlBuilder_); - + var url_ = urlBuilder_.ToString(); request_.RequestUri = new System.Uri(url_, System.UriKind.RelativeOrAbsolute); - + PrepareRequest(client_, request_, url_); - + var response_ = await client_.SendAsync(request_, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false); var disposeResponse_ = true; try @@ -1040,9 +1042,9 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() foreach (var item_ in response_.Content.Headers) headers_[item_.Key] = item_.Value; } - + ProcessResponse(client_, response_); - + var status_ = (int)response_.StatusCode; if (status_ == 200) { @@ -1068,20 +1070,20 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() client_.Dispose(); } } - + /// A server side error occurred. public System.Threading.Tasks.Task AddAsync(Person person) { return AddAsync(person, System.Threading.CancellationToken.None); } - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// A server side error occurred. public async System.Threading.Tasks.Task AddAsync(Person person, System.Threading.CancellationToken cancellationToken) { var urlBuilder_ = new System.Text.StringBuilder(); urlBuilder_.Append("api/Persons"); - + var client_ = new System.Net.Http.HttpClient(); var disposeClient_ = true; try @@ -1092,14 +1094,14 @@ public async System.Threading.Tasks.Task AddAsync(Person person, System.Threadin content_.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json"); request_.Content = content_; request_.Method = new System.Net.Http.HttpMethod("POST"); - + PrepareRequest(client_, request_, urlBuilder_); - + var url_ = urlBuilder_.ToString(); request_.RequestUri = new System.Uri(url_, System.UriKind.RelativeOrAbsolute); - + PrepareRequest(client_, request_, url_); - + var response_ = await client_.SendAsync(request_, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false); var disposeResponse_ = true; try @@ -1110,9 +1112,9 @@ public async System.Threading.Tasks.Task AddAsync(Person person, System.Threadin foreach (var item_ in response_.Content.Headers) headers_[item_.Key] = item_.Value; } - + ProcessResponse(client_, response_); - + var status_ = (int)response_.StatusCode; if (status_ == 204) { @@ -1137,24 +1139,24 @@ public async System.Threading.Tasks.Task AddAsync(Person person, System.Threadin client_.Dispose(); } } - + /// A server side error occurred. public System.Threading.Tasks.Task> FindAsync(Gender gender) { return FindAsync(gender, System.Threading.CancellationToken.None); } - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// A server side error occurred. public async System.Threading.Tasks.Task> FindAsync(Gender gender, System.Threading.CancellationToken cancellationToken) { if (gender == null) throw new System.ArgumentNullException("gender"); - + var urlBuilder_ = new System.Text.StringBuilder(); urlBuilder_.Append("api/Persons/find/{gender}"); urlBuilder_.Replace("{gender}", System.Uri.EscapeDataString(ConvertToString(gender, System.Globalization.CultureInfo.InvariantCulture))); - + var client_ = new System.Net.Http.HttpClient(); var disposeClient_ = true; try @@ -1164,14 +1166,14 @@ public async System.Threading.Tasks.Task AddAsync(Person person, System.Threadin request_.Content = new System.Net.Http.StringContent(string.Empty, System.Text.Encoding.UTF8, "application/json"); request_.Method = new System.Net.Http.HttpMethod("POST"); request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); - + PrepareRequest(client_, request_, urlBuilder_); - + var url_ = urlBuilder_.ToString(); request_.RequestUri = new System.Uri(url_, System.UriKind.RelativeOrAbsolute); - + PrepareRequest(client_, request_, url_); - + var response_ = await client_.SendAsync(request_, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false); var disposeResponse_ = true; try @@ -1182,9 +1184,9 @@ public async System.Threading.Tasks.Task AddAsync(Person person, System.Threadin foreach (var item_ in response_.Content.Headers) headers_[item_.Key] = item_.Value; } - + ProcessResponse(client_, response_); - + var status_ = (int)response_.StatusCode; if (status_ == 200) { @@ -1210,13 +1212,13 @@ public async System.Threading.Tasks.Task AddAsync(Person person, System.Threadin client_.Dispose(); } } - + /// A server side error occurred. public System.Threading.Tasks.Task> FindOptionalAsync(Gender? gender) { return FindOptionalAsync(gender, System.Threading.CancellationToken.None); } - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// A server side error occurred. public async System.Threading.Tasks.Task> FindOptionalAsync(Gender? gender, System.Threading.CancellationToken cancellationToken) @@ -1225,7 +1227,7 @@ public async System.Threading.Tasks.Task AddAsync(Person person, System.Threadin urlBuilder_.Append("api/Persons/find2?"); urlBuilder_.Append(System.Uri.EscapeDataString("gender") + "=").Append(System.Uri.EscapeDataString(gender != null ? ConvertToString(gender, System.Globalization.CultureInfo.InvariantCulture) : "")).Append("&"); urlBuilder_.Length--; - + var client_ = new System.Net.Http.HttpClient(); var disposeClient_ = true; try @@ -1235,14 +1237,14 @@ public async System.Threading.Tasks.Task AddAsync(Person person, System.Threadin request_.Content = new System.Net.Http.StringContent(string.Empty, System.Text.Encoding.UTF8, "application/json"); request_.Method = new System.Net.Http.HttpMethod("POST"); request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); - + PrepareRequest(client_, request_, urlBuilder_); - + var url_ = urlBuilder_.ToString(); request_.RequestUri = new System.Uri(url_, System.UriKind.RelativeOrAbsolute); - + PrepareRequest(client_, request_, url_); - + var response_ = await client_.SendAsync(request_, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false); var disposeResponse_ = true; try @@ -1253,9 +1255,9 @@ public async System.Threading.Tasks.Task AddAsync(Person person, System.Threadin foreach (var item_ in response_.Content.Headers) headers_[item_.Key] = item_.Value; } - + ProcessResponse(client_, response_); - + var status_ = (int)response_.StatusCode; if (status_ == 200) { @@ -1281,14 +1283,14 @@ public async System.Threading.Tasks.Task AddAsync(Person person, System.Threadin client_.Dispose(); } } - + /// A server side error occurred. /// A server side error occurred. public System.Threading.Tasks.Task GetAsync(System.Guid id) { return GetAsync(id, System.Threading.CancellationToken.None); } - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// A server side error occurred. /// A server side error occurred. @@ -1296,11 +1298,11 @@ public async System.Threading.Tasks.Task GetAsync(System.Guid id, System { if (id == null) throw new System.ArgumentNullException("id"); - + var urlBuilder_ = new System.Text.StringBuilder(); urlBuilder_.Append("api/Persons/{id}"); urlBuilder_.Replace("{id}", System.Uri.EscapeDataString(ConvertToString(id, System.Globalization.CultureInfo.InvariantCulture))); - + var client_ = new System.Net.Http.HttpClient(); var disposeClient_ = true; try @@ -1309,14 +1311,14 @@ public async System.Threading.Tasks.Task GetAsync(System.Guid id, System { request_.Method = new System.Net.Http.HttpMethod("GET"); request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); - + PrepareRequest(client_, request_, urlBuilder_); - + var url_ = urlBuilder_.ToString(); request_.RequestUri = new System.Uri(url_, System.UriKind.RelativeOrAbsolute); - + PrepareRequest(client_, request_, url_); - + var response_ = await client_.SendAsync(request_, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false); var disposeResponse_ = true; try @@ -1327,9 +1329,9 @@ public async System.Threading.Tasks.Task GetAsync(System.Guid id, System foreach (var item_ in response_.Content.Headers) headers_[item_.Key] = item_.Value; } - + ProcessResponse(client_, response_); - + var status_ = (int)response_.StatusCode; if (status_ == 500) { @@ -1369,24 +1371,24 @@ public async System.Threading.Tasks.Task GetAsync(System.Guid id, System client_.Dispose(); } } - + /// A server side error occurred. public System.Threading.Tasks.Task DeleteAsync(System.Guid id) { return DeleteAsync(id, System.Threading.CancellationToken.None); } - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// A server side error occurred. public async System.Threading.Tasks.Task DeleteAsync(System.Guid id, System.Threading.CancellationToken cancellationToken) { if (id == null) throw new System.ArgumentNullException("id"); - + var urlBuilder_ = new System.Text.StringBuilder(); urlBuilder_.Append("api/Persons/{id}"); urlBuilder_.Replace("{id}", System.Uri.EscapeDataString(ConvertToString(id, System.Globalization.CultureInfo.InvariantCulture))); - + var client_ = new System.Net.Http.HttpClient(); var disposeClient_ = true; try @@ -1394,14 +1396,14 @@ public async System.Threading.Tasks.Task DeleteAsync(System.Guid id, System.Thre using (var request_ = new System.Net.Http.HttpRequestMessage()) { request_.Method = new System.Net.Http.HttpMethod("DELETE"); - + PrepareRequest(client_, request_, urlBuilder_); - + var url_ = urlBuilder_.ToString(); request_.RequestUri = new System.Uri(url_, System.UriKind.RelativeOrAbsolute); - + PrepareRequest(client_, request_, url_); - + var response_ = await client_.SendAsync(request_, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false); var disposeResponse_ = true; try @@ -1412,9 +1414,9 @@ public async System.Threading.Tasks.Task DeleteAsync(System.Guid id, System.Thre foreach (var item_ in response_.Content.Headers) headers_[item_.Key] = item_.Value; } - + ProcessResponse(client_, response_); - + var status_ = (int)response_.StatusCode; if (status_ == 204) { @@ -1439,20 +1441,20 @@ public async System.Threading.Tasks.Task DeleteAsync(System.Guid id, System.Thre client_.Dispose(); } } - + /// A server side error occurred. public System.Threading.Tasks.Task TransformAsync(Person person) { return TransformAsync(person, System.Threading.CancellationToken.None); } - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// A server side error occurred. public async System.Threading.Tasks.Task TransformAsync(Person person, System.Threading.CancellationToken cancellationToken) { var urlBuilder_ = new System.Text.StringBuilder(); urlBuilder_.Append("api/Persons/transform"); - + var client_ = new System.Net.Http.HttpClient(); var disposeClient_ = true; try @@ -1464,14 +1466,14 @@ public async System.Threading.Tasks.Task TransformAsync(Person person, S request_.Content = content_; request_.Method = new System.Net.Http.HttpMethod("POST"); request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); - + PrepareRequest(client_, request_, urlBuilder_); - + var url_ = urlBuilder_.ToString(); request_.RequestUri = new System.Uri(url_, System.UriKind.RelativeOrAbsolute); - + PrepareRequest(client_, request_, url_); - + var response_ = await client_.SendAsync(request_, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false); var disposeResponse_ = true; try @@ -1482,9 +1484,9 @@ public async System.Threading.Tasks.Task TransformAsync(Person person, S foreach (var item_ in response_.Content.Headers) headers_[item_.Key] = item_.Value; } - + ProcessResponse(client_, response_); - + var status_ = (int)response_.StatusCode; if (status_ == 200) { @@ -1510,14 +1512,14 @@ public async System.Threading.Tasks.Task TransformAsync(Person person, S client_.Dispose(); } } - + /// A server side error occurred. /// A server side error occurred. public System.Threading.Tasks.Task ThrowAsync(System.Guid id) { return ThrowAsync(id, System.Threading.CancellationToken.None); } - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// A server side error occurred. /// A server side error occurred. @@ -1525,12 +1527,12 @@ public async System.Threading.Tasks.Task ThrowAsync(System.Guid id, Syst { if (id == null) throw new System.ArgumentNullException("id"); - + var urlBuilder_ = new System.Text.StringBuilder(); urlBuilder_.Append("api/Persons/Throw?"); urlBuilder_.Append(System.Uri.EscapeDataString("id") + "=").Append(System.Uri.EscapeDataString(ConvertToString(id, System.Globalization.CultureInfo.InvariantCulture))).Append("&"); urlBuilder_.Length--; - + var client_ = new System.Net.Http.HttpClient(); var disposeClient_ = true; try @@ -1540,14 +1542,14 @@ public async System.Threading.Tasks.Task ThrowAsync(System.Guid id, Syst request_.Content = new System.Net.Http.StringContent(string.Empty, System.Text.Encoding.UTF8, "application/json"); request_.Method = new System.Net.Http.HttpMethod("POST"); request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); - + PrepareRequest(client_, request_, urlBuilder_); - + var url_ = urlBuilder_.ToString(); request_.RequestUri = new System.Uri(url_, System.UriKind.RelativeOrAbsolute); - + PrepareRequest(client_, request_, url_); - + var response_ = await client_.SendAsync(request_, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false); var disposeResponse_ = true; try @@ -1558,9 +1560,9 @@ public async System.Threading.Tasks.Task ThrowAsync(System.Guid id, Syst foreach (var item_ in response_.Content.Headers) headers_[item_.Key] = item_.Value; } - + ProcessResponse(client_, response_); - + var status_ = (int)response_.StatusCode; if (status_ == 200) { @@ -1604,7 +1606,7 @@ public async System.Threading.Tasks.Task ThrowAsync(System.Guid id, Syst client_.Dispose(); } } - + /// Gets the name of a person. /// The person ID. /// The person's name. @@ -1614,7 +1616,7 @@ public System.Threading.Tasks.Task GetNameAsync(System.Guid id) { return GetNameAsync(id, System.Threading.CancellationToken.None); } - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// Gets the name of a person. /// The person ID. @@ -1625,11 +1627,11 @@ public async System.Threading.Tasks.Task GetNameAsync(System.Guid id, Sy { if (id == null) throw new System.ArgumentNullException("id"); - + var urlBuilder_ = new System.Text.StringBuilder(); urlBuilder_.Append("api/Persons/{id}/Name"); urlBuilder_.Replace("{id}", System.Uri.EscapeDataString(ConvertToString(id, System.Globalization.CultureInfo.InvariantCulture))); - + var client_ = new System.Net.Http.HttpClient(); var disposeClient_ = true; try @@ -1638,14 +1640,14 @@ public async System.Threading.Tasks.Task GetNameAsync(System.Guid id, Sy { request_.Method = new System.Net.Http.HttpMethod("GET"); request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); - + PrepareRequest(client_, request_, urlBuilder_); - + var url_ = urlBuilder_.ToString(); request_.RequestUri = new System.Uri(url_, System.UriKind.RelativeOrAbsolute); - + PrepareRequest(client_, request_, url_); - + var response_ = await client_.SendAsync(request_, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false); var disposeResponse_ = true; try @@ -1656,9 +1658,9 @@ public async System.Threading.Tasks.Task GetNameAsync(System.Guid id, Sy foreach (var item_ in response_.Content.Headers) headers_[item_.Key] = item_.Value; } - + ProcessResponse(client_, response_); - + var status_ = (int)response_.StatusCode; if (status_ == 200) { @@ -1702,20 +1704,20 @@ public async System.Threading.Tasks.Task GetNameAsync(System.Guid id, Sy client_.Dispose(); } } - + /// A server side error occurred. public System.Threading.Tasks.Task AddXmlAsync(string person) { return AddXmlAsync(person, System.Threading.CancellationToken.None); } - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// A server side error occurred. public async System.Threading.Tasks.Task AddXmlAsync(string person, System.Threading.CancellationToken cancellationToken) { var urlBuilder_ = new System.Text.StringBuilder(); urlBuilder_.Append("api/Persons/AddXml"); - + var client_ = new System.Net.Http.HttpClient(); var disposeClient_ = true; try @@ -1727,14 +1729,14 @@ public async System.Threading.Tasks.Task AddXmlAsync(string person, Syst request_.Content = content_; request_.Method = new System.Net.Http.HttpMethod("POST"); request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); - + PrepareRequest(client_, request_, urlBuilder_); - + var url_ = urlBuilder_.ToString(); request_.RequestUri = new System.Uri(url_, System.UriKind.RelativeOrAbsolute); - + PrepareRequest(client_, request_, url_); - + var response_ = await client_.SendAsync(request_, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false); var disposeResponse_ = true; try @@ -1745,9 +1747,9 @@ public async System.Threading.Tasks.Task AddXmlAsync(string person, Syst foreach (var item_ in response_.Content.Headers) headers_[item_.Key] = item_.Value; } - + ProcessResponse(client_, response_); - + var status_ = (int)response_.StatusCode; if (status_ == 200) { @@ -1773,20 +1775,20 @@ public async System.Threading.Tasks.Task AddXmlAsync(string person, Syst client_.Dispose(); } } - + /// A server side error occurred. public System.Threading.Tasks.Task UploadAsync(FileParameter data) { return UploadAsync(data, System.Threading.CancellationToken.None); } - + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// A server side error occurred. public async System.Threading.Tasks.Task UploadAsync(FileParameter data, System.Threading.CancellationToken cancellationToken) { var urlBuilder_ = new System.Text.StringBuilder(); urlBuilder_.Append("api/Persons/upload"); - + var client_ = new System.Net.Http.HttpClient(); var disposeClient_ = true; try @@ -1798,14 +1800,14 @@ public async System.Threading.Tasks.Task UploadAsync(FileParameter data, request_.Content = content_; request_.Method = new System.Net.Http.HttpMethod("POST"); request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); - + PrepareRequest(client_, request_, urlBuilder_); - + var url_ = urlBuilder_.ToString(); request_.RequestUri = new System.Uri(url_, System.UriKind.RelativeOrAbsolute); - + PrepareRequest(client_, request_, url_); - + var response_ = await client_.SendAsync(request_, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false); var disposeResponse_ = true; try @@ -1816,9 +1818,9 @@ public async System.Threading.Tasks.Task UploadAsync(FileParameter data, foreach (var item_ in response_.Content.Headers) headers_[item_.Key] = item_.Value; } - + ProcessResponse(client_, response_); - + var status_ = (int)response_.StatusCode; if (status_ == 200) { @@ -1844,7 +1846,7 @@ public async System.Threading.Tasks.Task UploadAsync(FileParameter data, client_.Dispose(); } } - + protected struct ObjectResponseResult { public ObjectResponseResult(T responseObject, string responseText) @@ -1852,21 +1854,21 @@ public ObjectResponseResult(T responseObject, string responseText) this.Object = responseObject; this.Text = responseText; } - + public T Object { get; } - + public string Text { get; } } - + public bool ReadResponseAsString { get; set; } - + protected virtual async System.Threading.Tasks.Task> ReadObjectResponseAsync(System.Net.Http.HttpResponseMessage response, System.Collections.Generic.IReadOnlyDictionary> headers, System.Threading.CancellationToken cancellationToken) { if (response == null || response.Content == null) { return new ObjectResponseResult(default(T), string.Empty); } - + if (ReadResponseAsString) { var responseText = await response.Content.ReadAsStringAsync().ConfigureAwait(false); @@ -1901,14 +1903,14 @@ protected virtual async System.Threading.Tasks.Task> Rea } } } - + private string ConvertToString(object value, System.Globalization.CultureInfo cultureInfo) { if (value == null) { return ""; } - + if (value is System.Enum) { var name = System.Enum.GetName(value.GetType(), value); @@ -1924,7 +1926,7 @@ private string ConvertToString(object value, System.Globalization.CultureInfo cu return attribute.Value != null ? attribute.Value : name; } } - + var converted = System.Convert.ToString(System.Convert.ChangeType(value, System.Enum.GetUnderlyingType(value.GetType()), cultureInfo)); return converted == null ? string.Empty : converted; } @@ -1942,33 +1944,33 @@ private string ConvertToString(object value, System.Globalization.CultureInfo cu var array = System.Linq.Enumerable.OfType((System.Array) value); return string.Join(",", System.Linq.Enumerable.Select(array, o => ConvertToString(o, cultureInfo))); } - + var result = System.Convert.ToString(value, cultureInfo); return result == null ? "" : result; } } - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.4.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "")] internal class JsonExceptionConverter : Newtonsoft.Json.JsonConverter { private readonly Newtonsoft.Json.Serialization.DefaultContractResolver _defaultContractResolver = new Newtonsoft.Json.Serialization.DefaultContractResolver(); private readonly System.Collections.Generic.IDictionary _searchedNamespaces; private readonly bool _hideStackTrace = false; - + public JsonExceptionConverter() { _searchedNamespaces = new System.Collections.Generic.Dictionary { { typeof(System.Exception).Namespace, System.Reflection.IntrospectionExtensions.GetTypeInfo(typeof(System.Exception)).Assembly } }; } - + public override bool CanWrite => true; - + public override void WriteJson(Newtonsoft.Json.JsonWriter writer, object value, Newtonsoft.Json.JsonSerializer serializer) { var exception = value as System.Exception; if (exception != null) { var resolver = serializer.ContractResolver as Newtonsoft.Json.Serialization.DefaultContractResolver ?? _defaultContractResolver; - + var jObject = new Newtonsoft.Json.Linq.JObject(); jObject.Add(resolver.GetResolvedPropertyName("discriminator"), exception.GetType().Name); jObject.Add(resolver.GetResolvedPropertyName("Message"), exception.Message); @@ -1976,7 +1978,7 @@ public override void WriteJson(Newtonsoft.Json.JsonWriter writer, object value, jObject.Add(resolver.GetResolvedPropertyName("Source"), exception.Source); jObject.Add(resolver.GetResolvedPropertyName("InnerException"), exception.InnerException != null ? Newtonsoft.Json.Linq.JToken.FromObject(exception.InnerException, serializer) : null); - + foreach (var property in GetExceptionProperties(value.GetType())) { var propertyValue = property.Key.GetValue(exception); @@ -1986,37 +1988,37 @@ public override void WriteJson(Newtonsoft.Json.JsonWriter writer, object value, Newtonsoft.Json.Linq.JToken.FromObject(propertyValue, serializer))); } } - + value = jObject; } - + serializer.Serialize(writer, value); } - + public override bool CanConvert(System.Type objectType) { return System.Reflection.IntrospectionExtensions.GetTypeInfo(typeof(System.Exception)).IsAssignableFrom(System.Reflection.IntrospectionExtensions.GetTypeInfo(objectType)); } - + public override object ReadJson(Newtonsoft.Json.JsonReader reader, System.Type objectType, object existingValue, Newtonsoft.Json.JsonSerializer serializer) { var jObject = serializer.Deserialize(reader); if (jObject == null) return null; - + var newSerializer = new Newtonsoft.Json.JsonSerializer(); newSerializer.ContractResolver = (Newtonsoft.Json.Serialization.IContractResolver)System.Activator.CreateInstance(serializer.ContractResolver.GetType()); - + var field = GetField(typeof(Newtonsoft.Json.Serialization.DefaultContractResolver), "_sharedCache"); if (field != null) field.SetValue(newSerializer.ContractResolver, false); - + dynamic resolver = newSerializer.ContractResolver; if (System.Reflection.RuntimeReflectionExtensions.GetRuntimeProperty(newSerializer.ContractResolver.GetType(), "IgnoreSerializableAttribute") != null) resolver.IgnoreSerializableAttribute = true; if (System.Reflection.RuntimeReflectionExtensions.GetRuntimeProperty(newSerializer.ContractResolver.GetType(), "IgnoreSerializableInterface") != null) resolver.IgnoreSerializableInterface = true; - + Newtonsoft.Json.Linq.JToken token; if (jObject.TryGetValue("discriminator", System.StringComparison.OrdinalIgnoreCase, out token)) { @@ -2037,11 +2039,11 @@ public override object ReadJson(Newtonsoft.Json.JsonReader reader, System.Type o break; } } - + } } } - + var value = jObject.ToObject(objectType, newSerializer); foreach (var property in GetExceptionProperties(value.GetType())) { @@ -2056,15 +2058,15 @@ public override object ReadJson(Newtonsoft.Json.JsonReader reader, System.Type o field.SetValue(value, propertyValue); } } - + SetExceptionFieldValue(jObject, "Message", value, "_message", resolver, newSerializer); SetExceptionFieldValue(jObject, "StackTrace", value, "_stackTraceString", resolver, newSerializer); SetExceptionFieldValue(jObject, "Source", value, "_source", resolver, newSerializer); SetExceptionFieldValue(jObject, "InnerException", value, "_innerException", resolver, serializer); - + return value; } - + private System.Reflection.FieldInfo GetField(System.Type type, string fieldName) { var field = System.Reflection.IntrospectionExtensions.GetTypeInfo(type).GetDeclaredField(fieldName); @@ -2072,7 +2074,7 @@ private System.Reflection.FieldInfo GetField(System.Type type, string fieldName) return GetField(System.Reflection.IntrospectionExtensions.GetTypeInfo(type).BaseType, fieldName); return field; } - + private System.Collections.Generic.IDictionary GetExceptionProperties(System.Type exceptionType) { var result = new System.Collections.Generic.Dictionary(); @@ -2081,13 +2083,13 @@ private System.Reflection.FieldInfo GetField(System.Type type, string fieldName) { var attribute = System.Reflection.CustomAttributeExtensions.GetCustomAttribute(property); var propertyName = attribute != null ? attribute.PropertyName : property.Name; - + if (!System.Linq.Enumerable.Contains(new[] { "Message", "StackTrace", "Source", "InnerException", "Data", "TargetSite", "HelpLink", "HResult" }, propertyName)) result[property] = propertyName; } return result; } - + private void SetExceptionFieldValue(Newtonsoft.Json.Linq.JObject jObject, string propertyName, object value, string fieldName, Newtonsoft.Json.Serialization.IContractResolver resolver, Newtonsoft.Json.JsonSerializer serializer) { var field = System.Reflection.IntrospectionExtensions.GetTypeInfo(typeof(System.Exception)).GetDeclaredField(fieldName); diff --git a/src/NSwag.Integration.Console/ServiceClientsContracts.cs b/src/NSwag.Integration.Console/ServiceClientsContracts.cs index e7abbb780b..b6cc92e06c 100644 --- a/src/NSwag.Integration.Console/ServiceClientsContracts.cs +++ b/src/NSwag.Integration.Console/ServiceClientsContracts.cs @@ -1,6 +1,6 @@ //---------------------- // -// Generated using the NSwag toolchain v13.14.4.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0)) (http://NSwag.org) +// Generated using the NSwag toolchain v (http://NSwag.org) // //---------------------- @@ -19,132 +19,129 @@ namespace NSwag.Integration.Console.Contracts [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.5.2.0 (Newtonsoft.Json v11.0.0.0)")] - public partial class GeoPoint + public partial class GeoPoint { [Newtonsoft.Json.JsonProperty("Latitude", Required = Newtonsoft.Json.Required.Always)] public double Latitude { get; set; } - + [Newtonsoft.Json.JsonProperty("Longitude", Required = Newtonsoft.Json.Required.Always)] public double Longitude { get; set; } - - + } - + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.5.2.0 (Newtonsoft.Json v11.0.0.0)")] - public partial class GenericRequestOfAddressAndPerson + public partial class GenericRequestOfAddressAndPerson { [Newtonsoft.Json.JsonProperty("Item1", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] public Address Item1 { get; set; } - + [Newtonsoft.Json.JsonProperty("Item2", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] public Person Item2 { get; set; } - - + } - + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.5.2.0 (Newtonsoft.Json v11.0.0.0)")] - public partial class Address + public partial class Address { [Newtonsoft.Json.JsonProperty("IsPrimary", Required = Newtonsoft.Json.Required.Always)] public bool IsPrimary { get; set; } - + [Newtonsoft.Json.JsonProperty("City", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] public string City { get; set; } - - + } - + [Newtonsoft.Json.JsonConverter(typeof(JsonInheritanceConverter), "discriminator")] [JsonInheritanceAttribute("Teacher", typeof(Teacher))] [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.5.2.0 (Newtonsoft.Json v11.0.0.0)")] - public partial class Person + public partial class Person { [Newtonsoft.Json.JsonProperty("Id", Required = Newtonsoft.Json.Required.Always)] [System.ComponentModel.DataAnnotations.Required(AllowEmptyStrings = true)] public System.Guid Id { get; set; } - + /// Gets or sets the first name. [Newtonsoft.Json.JsonProperty("FirstName", Required = Newtonsoft.Json.Required.Always)] [System.ComponentModel.DataAnnotations.Required] [System.ComponentModel.DataAnnotations.StringLength(int.MaxValue, MinimumLength = 2)] public string FirstName { get; set; } - + /// Gets or sets the last name. [Newtonsoft.Json.JsonProperty("LastName", Required = Newtonsoft.Json.Required.Always)] [System.ComponentModel.DataAnnotations.Required] public string LastName { get; set; } - + [Newtonsoft.Json.JsonProperty("Gender", Required = Newtonsoft.Json.Required.Always)] [System.ComponentModel.DataAnnotations.Required(AllowEmptyStrings = true)] [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.StringEnumConverter))] public Gender Gender { get; set; } - + [Newtonsoft.Json.JsonProperty("DateOfBirth", Required = Newtonsoft.Json.Required.Always)] [System.ComponentModel.DataAnnotations.Required(AllowEmptyStrings = true)] public System.DateTime DateOfBirth { get; set; } - + [Newtonsoft.Json.JsonProperty("Weight", Required = Newtonsoft.Json.Required.Always)] public decimal Weight { get; set; } - + [Newtonsoft.Json.JsonProperty("Height", Required = Newtonsoft.Json.Required.Always)] public double Height { get; set; } - + [Newtonsoft.Json.JsonProperty("Age", Required = Newtonsoft.Json.Required.Always)] [System.ComponentModel.DataAnnotations.Range(5, 99)] public int Age { get; set; } - + [Newtonsoft.Json.JsonProperty("AverageSleepTime", Required = Newtonsoft.Json.Required.Always)] [System.ComponentModel.DataAnnotations.Required(AllowEmptyStrings = true)] public System.TimeSpan AverageSleepTime { get; set; } - + [Newtonsoft.Json.JsonProperty("Address", Required = Newtonsoft.Json.Required.Always)] [System.ComponentModel.DataAnnotations.Required] public Address Address { get; set; } = new Address(); - + [Newtonsoft.Json.JsonProperty("Children", Required = Newtonsoft.Json.Required.Always)] [System.ComponentModel.DataAnnotations.Required] public System.Collections.ObjectModel.ObservableCollection Children { get; set; } = new System.Collections.ObjectModel.ObservableCollection(); - + [Newtonsoft.Json.JsonProperty("Skills", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] public System.Collections.Generic.Dictionary Skills { get; set; } - - + } - + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.5.2.0 (Newtonsoft.Json v11.0.0.0)")] public enum Gender { + [System.Runtime.Serialization.EnumMember(Value = @"Male")] Male = 0, - + [System.Runtime.Serialization.EnumMember(Value = @"Female")] Female = 1, - + } - + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.5.2.0 (Newtonsoft.Json v11.0.0.0)")] public enum SkillLevel { + Low = 0, - + Medium = 1, - + Height = 2, - + } - + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.5.2.0 (Newtonsoft.Json v11.0.0.0)")] public partial class Teacher : Person { [Newtonsoft.Json.JsonProperty("Course", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] public string Course { get; set; } - + [Newtonsoft.Json.JsonProperty("SkillLevel", Required = Newtonsoft.Json.Required.Always)] public SkillLevel SkillLevel { get; set; } = NSwag.Integration.Console.Contracts.SkillLevel.Medium; - - + } - + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.5.2.0 (Newtonsoft.Json v11.0.0.0)")] [Newtonsoft.Json.JsonObjectAttribute] public partial class PersonNotFoundException : System.Exception @@ -152,10 +149,9 @@ public partial class PersonNotFoundException : System.Exception [Newtonsoft.Json.JsonProperty("id", Required = Newtonsoft.Json.Required.Always)] [System.ComponentModel.DataAnnotations.Required(AllowEmptyStrings = true)] public System.Guid Id { get; set; } - - + } - + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.5.2.0 (Newtonsoft.Json v11.0.0.0)")] [System.AttributeUsage(System.AttributeTargets.Class | System.AttributeTargets.Interface, AllowMultiple = true)] internal class JsonInheritanceAttribute : System.Attribute @@ -165,41 +161,41 @@ public JsonInheritanceAttribute(string key, System.Type type) Key = key; Type = type; } - + public string Key { get; } - + public System.Type Type { get; } } - + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.5.2.0 (Newtonsoft.Json v11.0.0.0)")] internal class JsonInheritanceConverter : Newtonsoft.Json.JsonConverter { internal static readonly string DefaultDiscriminatorName = "discriminator"; - + private readonly string _discriminator; - + [System.ThreadStatic] private static bool _isReading; - + [System.ThreadStatic] private static bool _isWriting; - + public JsonInheritanceConverter() { _discriminator = DefaultDiscriminatorName; } - + public JsonInheritanceConverter(string discriminator) { _discriminator = discriminator; } - + public override void WriteJson(Newtonsoft.Json.JsonWriter writer, object value, Newtonsoft.Json.JsonSerializer serializer) { try { _isWriting = true; - + var jObject = Newtonsoft.Json.Linq.JObject.FromObject(value, serializer); jObject.AddFirst(new Newtonsoft.Json.Linq.JProperty(_discriminator, GetSubtypeDiscriminator(value.GetType()))); writer.WriteToken(jObject.CreateReader()); @@ -209,7 +205,7 @@ public override void WriteJson(Newtonsoft.Json.JsonWriter writer, object value, _isWriting = false; } } - + public override bool CanWrite { get @@ -222,7 +218,7 @@ public override bool CanWrite return true; } } - + public override bool CanRead { get @@ -235,28 +231,28 @@ public override bool CanRead return true; } } - + public override bool CanConvert(System.Type objectType) { return true; } - + public override object ReadJson(Newtonsoft.Json.JsonReader reader, System.Type objectType, object existingValue, Newtonsoft.Json.JsonSerializer serializer) { var jObject = serializer.Deserialize(reader); if (jObject == null) return null; - + var discriminatorValue = jObject.GetValue(_discriminator); var discriminator = discriminatorValue != null ? Newtonsoft.Json.Linq.Extensions.Value(discriminatorValue) : null; var subtype = GetObjectSubtype(objectType, discriminator); - + var objectContract = serializer.ContractResolver.ResolveContract(subtype) as Newtonsoft.Json.Serialization.JsonObjectContract; if (objectContract == null || System.Linq.Enumerable.All(objectContract.Properties, p => p.PropertyName != _discriminator)) { jObject.Remove(_discriminator); } - + try { _isReading = true; @@ -267,7 +263,7 @@ public override object ReadJson(Newtonsoft.Json.JsonReader reader, System.Type o _isReading = false; } } - + private System.Type GetObjectSubtype(System.Type objectType, string discriminator) { foreach (var attribute in System.Reflection.CustomAttributeExtensions.GetCustomAttributes(System.Reflection.IntrospectionExtensions.GetTypeInfo(objectType), true)) @@ -275,10 +271,10 @@ private System.Type GetObjectSubtype(System.Type objectType, string discriminato if (attribute.Key == discriminator) return attribute.Type; } - + return objectType; } - + private string GetSubtypeDiscriminator(System.Type objectType) { foreach (var attribute in System.Reflection.CustomAttributeExtensions.GetCustomAttributes(System.Reflection.IntrospectionExtensions.GetTypeInfo(objectType), true)) @@ -286,12 +282,12 @@ private string GetSubtypeDiscriminator(System.Type objectType) if (attribute.Type == objectType) return attribute.Key; } - + return objectType.Name; } } - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.4.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "")] public partial class FileParameter { public FileParameter(System.IO.Stream data) @@ -318,7 +314,7 @@ public FileParameter(System.IO.Stream data, string fileName, string contentType) public string ContentType { get; private set; } } - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.4.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "")] public partial class FileResponse : System.IDisposable { private System.IDisposable _client; @@ -354,7 +350,8 @@ public void Dispose() } } - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.4.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] + + [System.CodeDom.Compiler.GeneratedCode("NSwag", "")] public partial class SwaggerException : System.Exception { public int StatusCode { get; private set; } @@ -377,7 +374,7 @@ public override string ToString() } } - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.4.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "")] public partial class SwaggerException : SwaggerException { public TResult Result { get; private set; } diff --git a/src/NSwag.Integration.WebAPI/NSwag.Integration.WebAPI.csproj b/src/NSwag.Integration.WebAPI/NSwag.Integration.WebAPI.csproj index ab5e383128..6365d73cd2 100644 --- a/src/NSwag.Integration.WebAPI/NSwag.Integration.WebAPI.csproj +++ b/src/NSwag.Integration.WebAPI/NSwag.Integration.WebAPI.csproj @@ -13,7 +13,7 @@ Properties NSwag.Integration.WebAPI NSwag.Integration.WebAPI - v4.6 + v4.6.1 win true diff --git a/src/NSwag.Integration.WebAPI/build.bat b/src/NSwag.Integration.WebAPI/build.bat index 28a13a224f..2387c4a073 100644 --- a/src/NSwag.Integration.WebAPI/build.bat +++ b/src/NSwag.Integration.WebAPI/build.bat @@ -1 +1 @@ -"../NSwag.Console/bin/Debug/net461/nswag.exe" run \ No newline at end of file +dotnet run -c Release --project "../NSwag.Console" -- run \ No newline at end of file diff --git a/src/NSwag.Sample.NetGlobalAsax/NSwag.Sample.NetGlobalAsax.csproj b/src/NSwag.Sample.NetGlobalAsax/NSwag.Sample.NetGlobalAsax.csproj index df10ca8e7b..d100b071af 100644 --- a/src/NSwag.Sample.NetGlobalAsax/NSwag.Sample.NetGlobalAsax.csproj +++ b/src/NSwag.Sample.NetGlobalAsax/NSwag.Sample.NetGlobalAsax.csproj @@ -14,7 +14,7 @@ NSwag.Sample.NetGlobalAsax NSwag.Sample.NetGlobalAsax win - v4.5.2 + v4.6.1 false true @@ -199,9 +199,8 @@ - + - diff --git a/src/NSwagStudio/NSwagStudio.csproj b/src/NSwagStudio/NSwagStudio.csproj index cff2342ea1..91bcbd9e1f 100644 --- a/src/NSwagStudio/NSwagStudio.csproj +++ b/src/NSwagStudio/NSwagStudio.csproj @@ -57,19 +57,18 @@ - - + - - - - + + + +